Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consume uses message_stack, trader chat colored in orange now

Browse Source
This commit is contained in:
Raymix 2017-10-25 22:27:17 +01:00
parent 529078dbc2
commit 2b0119f574
15 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/epoch_code/compile/EPOCH_fish.sqf
View File

@ -61,10 +61,10 @@ if (surfaceIsWater _currentPos) then {
_fish = selectRandom _fishes;
if (_fish != "") then {
_fish call EPOCH_fnc_addItemOverflow;
["Fish Caught", 5] call Epoch_message;
["Fish Caught", 5,[[0,0,0,0.5],[0,1,0,1]]] call Epoch_message;
};
} else {
["Fish Got Away", 5] call Epoch_message;
["Fish Got Away", 5,[[0,0,0,0.5],[1,0,0,1]]] call Epoch_message;
};
};
};

2
Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf
View File

@ -67,7 +67,7 @@ if (Epoch_canBeRevived) then {
createDialog _tapDiag;
} else {
setPlayerRespawnTime 15;
["You can be just revived once per life!", 5] call Epoch_message;
["You can be just revived once per life!", 5,[[0,0,0,0.5],[1,0,0,1]]] call Epoch_message;
};
[_killer, _tapDiag] spawn{

8
Sources/epoch_code/compile/interface_event_handlers/EPOCH_KeyDown.sqf
View File

@ -62,13 +62,13 @@ if (_dikCode in [EPOCH_keysfav1,EPOCH_keysfav2,EPOCH_keysfav3,EPOCH_keysfav4,EPO
if (_ctrl && _dikCode == EPOCH_keysVolumeUp) then {
EPOCH_soundLevel = (EPOCH_soundLevel + 0.1) min 1;
5 fadeSound EPOCH_soundLevel;
[format["Internal sound level: %1%2", EPOCH_soundLevel * 100, "%"], 5] call Epoch_message;
[format["Internal sound level: %1%2", EPOCH_soundLevel * 100, "%"], 5,[[0,0,0,0.5],[0,1,1,1]]] call Epoch_message;
};
// lower vol
if (_ctrl && _dikCode == EPOCH_keysVolumeDown) then {
EPOCH_soundLevel = (EPOCH_soundLevel - 0.1) max 0.1;
5 fadeSound EPOCH_soundLevel;
[format["Internal sound level: %1%2", EPOCH_soundLevel * 100,"%"], 5] call Epoch_message;
[format["Internal sound level: %1%2", EPOCH_soundLevel * 100,"%"], 5,[[0,0,0,0.5],[0,1,1,1]]] call Epoch_message;
};
// ESC default to cancel
@ -91,9 +91,9 @@ if (_dikCode == 0x01) then {
if (_dikCode == EPOCH_keysDebugMon) then {
EPOCH_debugMode = !EPOCH_debugMode;
if (EPOCH_debugMode) then {
["Debug Mode Enabled", 5] call Epoch_message;
["Debug Mode Enabled", 5,[[0,0,0,0.5],[1,1,0,1]]] call Epoch_message;
} else {
["Debug Mode Disabled", 5] call Epoch_message;
["Debug Mode Disabled", 5,[[0,0,0,0.5],[1,1,0,1]]] call Epoch_message;
hintSilent "";
};
_handled = true;

6
Sources/epoch_code/compile/missions/EPOCH_mission_accept.sqf
View File

@ -49,7 +49,7 @@ if !(isNull _trader) then {
if !(EPOCH_ActiveTraderMission isequalto []) exitwith {
EPOCH_ActiveTraderMission params ['','',['_missionname','ERROR']];
_msg = format ['You are already running %1. Finish or cancel it first',_missionname];
[_msg, 5] call Epoch_message;
[_msg, 5,[[0,0,0,0.5],[1,0.5,0,1]]] call Epoch_message;
};
if (_simpleTask > 0) then { //Simple Task
@ -75,9 +75,9 @@ if !(isNull _trader) then {
["TraderMissions",1,true] call EPOCH_client_updatePlayerStat;
}
else {
[format["Mission Not Allowed !",_menuCondition], 5] call Epoch_message; //Not formatting, is this intended?
[format["Mission Not Allowed !",_menuCondition], 5,[[0,0,0,0.5],[1,0.5,0,1]]] call Epoch_message; //Not formatting, is this intended?
};
}
else {
["Trader Lost. Goodbye.", 5] call Epoch_message;
["Trader Lost. Goodbye.", 5,[[0,0,0,0.5],[1,0.5,0,1]]] call Epoch_message;
};

2
Sources/epoch_code/compile/missions/tasks/traderDebug_resetMissions.sqf
View File

@ -1,2 +1,2 @@
missionNamespace setVariable ["EPOCH_playerMissionArray",[]];
["Missions Reset - Re-open Trader Menu.", 5] call Epoch_message;
["Missions Reset - Re-open Trader Menu.", 5,[[0,0,0,0.5],[1,0.5,0,1]]] call Epoch_message;

2
Sources/epoch_code/compile/missions/tasks/traderDiag_name.sqf
View File

@ -15,4 +15,4 @@ _trader setVariable ["traderName",_newName, true];
};
_responseArr = ["I don't know. You can only be regenerated so many times before the memory starts to go..","You again..! Go bother someone else.",format["There was a time when names mattered, call me %1.",name _trader],"My name..? What does it matter.","Hey buddy you rock up here unannounced and suddenly we're friends ? On your bike if you aren't buying or selling.",format["My name.. I am known as %1",name _trader], format["When names mattered I was called %1",name _trader],"I forget.. At least, I try to forget."];
[selectRandom _responseArr, 5] call Epoch_message;
[selectRandom _responseArr, 5,[[0,0,0,0.5],[1,0.5,0,1]]] call Epoch_message;

2
Sources/epoch_code/compile/missions/tasks/traderDiag_nearPlayers.sqf
View File

@ -11,4 +11,4 @@ if (count _plyrs < 2) then {
_plyr = selectRandom _plyrs;
_trdrMsg = format["%2 %1.",name _plyr, selectRandom ["The last person picked up by the UAV was","I did spot someone earlier, their name was","I heard there was somebody new in the area, "]];
};
[_trdrMsg, 5] call Epoch_message;
[_trdrMsg, 5,[[0,0,0,0.5],[1,0.5,0,1]]] call Epoch_message;

2
Sources/epoch_code/compile/missions/tasks/traderDiag_nearVehicles.sqf
View File

@ -12,4 +12,4 @@ if (count _vehs < 1) then {
_dist = _veh distance _plyr;
_trdrMsg = format["I know of at least one vehicle within %1m of my current location. It looks like a %2.",_dist, typeof _veh];
};
[_trdrMsg, 5] call Epoch_message;
[_trdrMsg, 5,[[0,0,0,0.5],[1,0.5,0,1]]] call Epoch_message;

2
Sources/epoch_code/compile/missions/tasks/traderDiag_news.sqf
View File

@ -1,3 +1,3 @@
private _newsArr = ["My dog was shot. That made me sad.","Business has been quiet since word got out that sappers are in the area.","Looters are expecting too much crypto for all the junk they bring in.","What do I look like ? A newspaper vendor. Go Away.","The sun came up again this morning.. That's good news I suppose.","Keep your dog fed with raw or cooked carcasses.","Sappers are known to be good for their pelts. Just don't get too close to one","Some very strange rumours that a Construct was seen in the mountains. Those things are just bedtime stories to scare kids with.","UAVs are a good source of components.","Some say the nearby town is haunted by malevolent spirits.","I hear the military are helping survivors with air drops. Your loot is always welcome here if you find one.","Dogs can help you find pelts and animal carcasses","I heard that a new vehicle has been seen, some kind of board that you stand on. I personally don't believe the rumours."];
[selectRandom _newsArr, 5] call Epoch_message;
[selectRandom _newsArr, 5,[[0,0,0,0.5],[1,0.5,0,1]]] call Epoch_message;

2
Sources/epoch_code/compile/missions/tasks/traderDiag_timePlease.sqf
View File

@ -12,4 +12,4 @@ if(count _min < 2)then{
_min = "0" + _min;
};
[format ["The time is %1:%2.",_hour, _min], 5] call Epoch_message;
[format ["The time is %1:%2.",_hour, _min], 5,[[0,0,0,0.5],[1,0.5,0,1]]] call Epoch_message;

4
Sources/epoch_code/compile/missions/tasks/traderDiag_triggerAirDrop.sqf
View File

@ -1,6 +1,6 @@
if((random 100) < 6)then{
[] execFSM "\x\addons\a3_epoch_code\System\Event_Air_Drop.fsm";
["Air Drop Incoming !", 5] call Epoch_message;
["Air Drop Incoming !", 5,[[0,0,0,0.5],[1,0.5,0,1]]] call Epoch_message;
}else{
["Sorry, None Available!", 5] call Epoch_message;
["Sorry, None Available!", 5,[[0,0,0,0.5],[1,0.5,0,1]]] call Epoch_message;
};

8
Sources/epoch_code/compile/setup/masterLoop/Event1.sqf
View File

@ -246,7 +246,7 @@ if (!isnil "EPOCH_ResetTraderMission") then {
EPOCH_ActiveTraderMission = [];
_EPOCH_TraderMissionArray = [];
_LastMissionTrigger = 0;
["Mission sucessfully resettet", 5] call Epoch_message;
["Mission sucessfully resettet", 5,[[0,0,0,0.5],[1,0.5,0,1]]] call Epoch_message;
EPOCH_ResetTraderMission = nil;
};
@ -264,7 +264,7 @@ if !(EPOCH_ActiveTraderMission isequalto []) then {
if (diag_ticktime > _taskFailTime || call _taskFailedCond) exitwith {
if (count _taskFailedDiags > 0) then {
_diag = selectRandom _taskFailedDiags;
[format ["%1",_diag], 5] call Epoch_message;
[format ["%1",_diag], 5,[[0,0,0,0.5],[1,0.5,0,1]]] call Epoch_message;
};
if !(_taskFailedSQF isequalto '') then {
call compile format ["[_taskName,_plyr,_unit,_taskItem] execVM ""%1""",_taskFailedSQF];
@ -285,7 +285,7 @@ if !(EPOCH_ActiveTraderMission isequalto []) then {
if (call _taskCompleteCond) exitwith {
if (count _taskCompleteDiags > 0) then {
_diag = selectrandom _taskCompleteDiags;
[format ["%1",_diag], 5] call Epoch_message;
[format ["%1",_diag], 5,[[0,0,0,0.5],[1,0.5,0,1]]] call Epoch_message;
};
if(count _taskReward > 0) then {
[player,Epoch_personalToken,_taskReward,[],objNull,false] remoteExec ["EPOCH_Server_createObject",2];
@ -327,7 +327,7 @@ if !(EPOCH_ActiveTraderMission isequalto []) then {
if (call _taskDiagCond) exitwith {
_diag = selectRandom _taskDiag;
if !(_diag isequalto "") then {
[format ["%1",_diag], 5] call Epoch_message;
[format ["%1",_diag], 5,[[0,0,0,0.5],[1,0.5,0,1]]] call Epoch_message;
};
_taskDialogues deleteat _foreachindex;
};

2
Sources/epoch_config/Configs/CfgMissions/CfgmissionDelivery.hpp
View File

@ -70,7 +70,7 @@ class doDelivery {
callevents[] = { // {{ARRAY1},{ARRAY2},... }
{ // {"condition",{"Message1","Message2", ...},{"NextTask1","NextTask2", ...}}
"(EPOCH_task_startTime + 480 < diag_tickTime) && (count (((player nearentities [['C_Man_1'],500]) apply {_x getVariable ['AI_SLOT',-1]}) select {_x in (uiNameSpace getVariable ['axeStartTraders',[]])}) > 0)",
"[""Hey, what are you doing here ? Get on with your task !"", 5] call Epoch_message",
"[""Hey, what are you doing here ? Get on with your task !"", 5,[[0,0,0,0.5],[1,0.5,0,1]]] call Epoch_message",
{}
}
};

2
Sources/epoch_config/Configs/CfgMissions/CfgmissionMilitary.hpp
View File

@ -197,7 +197,7 @@ class milFindCrashSite{
callEventCondition1 = "count (units group player select {_x distance milCrashPos < 800}) > 0";
callEventCondition2 = "count (units group player select {_x distance milCrashPos < 480}) > 0 && random 100 < 12";
callEventCondition3 = "";
callEventCALL1 = "_diag = format [""Great work the UAV has spotted %1 nearly on-site."",name ((units group player select {_x distance milCrashPos < 800}) select 0)];[_diag, 5] call Epoch_message;";
callEventCALL1 = "_diag = format [""Great work the UAV has spotted %1 nearly on-site."",name ((units group player select {_x distance milCrashPos < 800}) select 0)];[_diag, 5,[[0,0,0,0.5],[1,0.5,0,1]]] call Epoch_message;";
callEventFSM1 = "";
callEventSQF1 = "";
callEventTask1 = "";

2
Sources/epoch_config/Configs/CfgMissions/CfgmissionUav.hpp
View File

@ -56,7 +56,7 @@ class uavMissionStart{
callevents[] = {
{
"missionNameSpace getVariable [""InSafeZone"",false]",
"['Mission not allowed in Safe Zone',5] call Epoch_Message",
"['Mission not allowed in Safe Zone',5,[[0,0,0,0.5],[1,0.5,0,1]]] call Epoch_Message",
{}
}