Skip to content

Commit

Permalink
Don't wait on populate AO scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
@theace0296
theace0296 committed Sep 25, 2021
1 parent e61d822 commit 84eee68
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 36 deletions.
6 changes: 4 additions & 2 deletions RandFramework/Server/mission/fn_startInfMission.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,8 @@ if (isNil "TRGM_VAR_allLocationPositions") then {

["Mission Setup: 12.5", true] call TRGM_GLOBAL_fnc_log;

private _populateAOHandles = [];

while {(TRGM_VAR_InfTaskCount < count _ThisTaskTypes)} do {
private _iTaskIndex = TRGM_VAR_InfTaskCount;
if (_bIsCampaign) then {
Expand Down Expand Up @@ -551,12 +553,12 @@ while {(TRGM_VAR_InfTaskCount < count _ThisTaskTypes)} do {
publicVariable "TRGM_VAR_ClearedPositions";
_markerInformant1 setMarkerText (localize "STR_TRGM2_startInfMission_markerInformant");
if (!_SamePrevAO) then {
[[_inf1X,_inf1Y],_iThisTaskType,_infBuilding,_bIsMainObjective, _iTaskIndex, _allowFriendlyIns, true] spawn TRGM_SERVER_fnc_populateSideMission;
_populateAOHandles pushBack ([[_inf1X,_inf1Y],_iThisTaskType,_infBuilding,_bIsMainObjective, _iTaskIndex, _allowFriendlyIns, true] spawn TRGM_SERVER_fnc_populateSideMission);
};
}
else {
if (!_SamePrevAO) then {
[[_inf1X,_inf1Y],_iThisTaskType,_infBuilding,_bIsMainObjective, _iTaskIndex, _allowFriendlyIns] spawn TRGM_SERVER_fnc_populateSideMission;
_populateAOHandles pushBack ([[_inf1X,_inf1Y],_iThisTaskType,_infBuilding,_bIsMainObjective, _iTaskIndex, _allowFriendlyIns] spawn TRGM_SERVER_fnc_populateSideMission);
};
};

Expand Down
62 changes: 28 additions & 34 deletions RandFramework/Server/objectives/fn_setOtherAreaStuff.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,64 +99,63 @@ if (count _TowersNear > 0) then {

["Mission Events: CommsEND", true] call TRGM_GLOBAL_fnc_log;

private _eventsHandles = [];

["Loading Events : 15", true] call TRGM_GLOBAL_fnc_log;
if (selectRandom TRGM_VAR_ChanceOfOccurance) then {
_eventsHandles pushBack ([_mainObjPos,1900,false,false,nil, false] spawn TRGM_SERVER_fnc_setTargetEvent);
[_mainObjPos,1900,false,false,nil, false] spawn TRGM_SERVER_fnc_setTargetEvent;
sleep 1;
};

["Loading Events : 14", true] call TRGM_GLOBAL_fnc_log;
if (selectRandom TRGM_VAR_ChanceOfOccurance) then {
_eventsHandles pushBack ([_mainObjPos,1900,false,false,nil, true] spawn TRGM_SERVER_fnc_setTargetEvent);
[_mainObjPos,1900,false,false,nil, true] spawn TRGM_SERVER_fnc_setTargetEvent;
sleep 1;
};

["Loading Events : 13", true] call TRGM_GLOBAL_fnc_log;
if (selectRandom TRGM_VAR_ChanceOfOccurance) then {
_eventsHandles pushBack ([_mainObjPos] spawn TRGM_SERVER_fnc_setATMineEvent);
[_mainObjPos] spawn TRGM_SERVER_fnc_setATMineEvent;
sleep 1;
};

["Loading Events : 12", true] call TRGM_GLOBAL_fnc_log;
if (selectRandom TRGM_VAR_ChanceOfOccurance) then {
_eventsHandles pushBack ([_mainObjPos] spawn TRGM_SERVER_fnc_setDownCivCarEvent);
[_mainObjPos] spawn TRGM_SERVER_fnc_setDownCivCarEvent;
sleep 1;
};

["Loading Events : 11", true] call TRGM_GLOBAL_fnc_log;
if (selectRandom TRGM_VAR_ChanceOfOccurance) then {
_eventsHandles pushBack ([_mainObjPos] spawn TRGM_SERVER_fnc_setATMineEvent);
[_mainObjPos] spawn TRGM_SERVER_fnc_setATMineEvent;
sleep 1;
};
["Loading Events : 10", true] call TRGM_GLOBAL_fnc_log;
if (selectRandom TRGM_VAR_ChanceOfOccurance || !isNil("TRGM_VAR_ForceWarZoneLoc")) then {
if (!isNil("TRGM_VAR_ForceWarZoneLoc")) then {
_eventsHandles pushBack ([TRGM_VAR_ForceWarZoneLoc,4] spawn TRGM_SERVER_fnc_setFireFightEvent);
[TRGM_VAR_ForceWarZoneLoc,4] spawn TRGM_SERVER_fnc_setFireFightEvent;
} else {
_eventsHandles pushBack ([_mainObjPos,4] spawn TRGM_SERVER_fnc_setFireFightEvent);
[_mainObjPos,4] spawn TRGM_SERVER_fnc_setFireFightEvent;
};
sleep 1;
};
["Loading Events : 9", true] call TRGM_GLOBAL_fnc_log;
if (selectRandom TRGM_VAR_ChanceOfOccurance) then {
_eventsHandles pushBack ([_mainObjPos] spawn TRGM_SERVER_fnc_setMedicalEvent);
[_mainObjPos] spawn TRGM_SERVER_fnc_setMedicalEvent;
sleep 1;
};
["Loading Events : 8", true] call TRGM_GLOBAL_fnc_log;
if (selectRandom TRGM_VAR_ChanceOfOccurance) then {
_eventsHandles pushBack ([_mainObjPos] spawn TRGM_SERVER_fnc_setDownedChopperEvent);
[_mainObjPos] spawn TRGM_SERVER_fnc_setDownedChopperEvent;
sleep 1;
};
["Loading Events : 7", true] call TRGM_GLOBAL_fnc_log;
if (selectRandom TRGM_VAR_ChanceOfOccurance) then {
_eventsHandles pushBack ([_mainObjPos] spawn TRGM_SERVER_fnc_setDownConvoyEvent);
[_mainObjPos] spawn TRGM_SERVER_fnc_setDownConvoyEvent;
sleep 1;
};
["Loading Events : 6", true] call TRGM_GLOBAL_fnc_log;
if (selectRandom TRGM_VAR_ChanceOfOccurance) then {
_eventsHandles pushBack ([_mainObjPos] spawn TRGM_SERVER_fnc_setDownCivCarEvent);
[_mainObjPos] spawn TRGM_SERVER_fnc_setDownCivCarEvent;
sleep 1;
};

Expand All @@ -165,37 +164,35 @@ if (selectRandom TRGM_VAR_ChanceOfOccurance) then {
//these are more likely to show (instead of using TRGM_VAR_ChanceOfOccurance), as a lot of times, these are not a trap, just an empty vehicle or a pile of rubbish
["Loading Events : 5", true] call TRGM_GLOBAL_fnc_log;
if (random 1 < .66) then {
_eventsHandles pushBack ([_mainObjPos] spawn TRGM_SERVER_fnc_setIEDEvent);
[_mainObjPos] spawn TRGM_SERVER_fnc_setIEDEvent;
sleep 1;
};
["Loading Events : 4", true] call TRGM_GLOBAL_fnc_log;
if (random 1 < .66) then {
_eventsHandles pushBack ([_mainObjPos] spawn TRGM_SERVER_fnc_setIEDEvent);
[_mainObjPos] spawn TRGM_SERVER_fnc_setIEDEvent;
sleep 1;
};
["Loading Events : 3", true] call TRGM_GLOBAL_fnc_log;
if (random 1 < .66) then {
_eventsHandles pushBack ([_mainObjPos] spawn TRGM_SERVER_fnc_setIEDEvent);
[_mainObjPos] spawn TRGM_SERVER_fnc_setIEDEvent;
sleep 1;
};
["Loading Events : 2", true] call TRGM_GLOBAL_fnc_log;
if (random 1 < .66) then {
_eventsHandles pushBack ([_mainObjPos] spawn TRGM_SERVER_fnc_setIEDEvent);
[_mainObjPos] spawn TRGM_SERVER_fnc_setIEDEvent;
sleep 1;
};
["Loading Events : 1", true] call TRGM_GLOBAL_fnc_log;
if (random 1 < .66) then {
_eventsHandles pushBack ([_mainObjPos] spawn TRGM_SERVER_fnc_setIEDEvent);
[_mainObjPos] spawn TRGM_SERVER_fnc_setIEDEvent;
sleep 1;
};
["Loading Events : 0", true] call TRGM_GLOBAL_fnc_log;
if (random 1 < .66) then {
_eventsHandles pushBack ([_mainObjPos] spawn TRGM_SERVER_fnc_setIEDEvent);
[_mainObjPos] spawn TRGM_SERVER_fnc_setIEDEvent;
sleep 1;
};

waitUntil { sleep 5; ({scriptDone _x;} count _eventsHandles) isEqualTo (count _eventsHandles); };

["Loading Events : END", true] call TRGM_GLOBAL_fnc_log;

//worldName call BIS_fnc_mapSize << equals the width in meters
Expand All @@ -213,27 +210,24 @@ if (_mapSize < 10000) then {

if (TRGM_VAR_IsFullMap) then {
["Loading Full Map Events : BEGIN", true] call TRGM_GLOBAL_fnc_log;
private _fullMapEventsHandles = [];

_fullMapEventsHandles pushBack ([_mainObjPos,true] spawn TRGM_SERVER_fnc_setDownCivCarEvent);
_fullMapEventsHandles pushBack ([_mainObjPos,true] spawn TRGM_SERVER_fnc_setDownedChopperEvent);
_fullMapEventsHandles pushBack ([_mainObjPos,true] spawn TRGM_SERVER_fnc_setATMineEvent);
_fullMapEventsHandles pushBack ([_mainObjPos,2000,false,false,nil,nil,true] spawn TRGM_SERVER_fnc_setIEDEvent);
_fullMapEventsHandles pushBack ([_mainObjPos,2000,false,false,nil,nil,true] spawn TRGM_SERVER_fnc_setIEDEvent);
[_mainObjPos,true] spawn TRGM_SERVER_fnc_setDownCivCarEvent;
[_mainObjPos,true] spawn TRGM_SERVER_fnc_setDownedChopperEvent;
[_mainObjPos,true] spawn TRGM_SERVER_fnc_setATMineEvent;
[_mainObjPos,2000,false,false,nil,nil,true] spawn TRGM_SERVER_fnc_setIEDEvent;
[_mainObjPos,2000,false,false,nil,nil,true] spawn TRGM_SERVER_fnc_setIEDEvent;

if (_mapSizeTxt isEqualTo "MEDIUM" || _mapSizeTxt isEqualTo "LARGE") then {
_fullMapEventsHandles pushBack ([_mainObjPos,2000,false,false,nil,nil,true] spawn TRGM_SERVER_fnc_setIEDEvent);
_fullMapEventsHandles pushBack ([_mainObjPos,2000,false,false,nil,nil,true] spawn TRGM_SERVER_fnc_setIEDEvent);
_fullMapEventsHandles pushBack ([_mainObjPos,true] spawn TRGM_SERVER_fnc_setATMineEvent);
[_mainObjPos,2000,false,false,nil,nil,true] spawn TRGM_SERVER_fnc_setIEDEvent;
[_mainObjPos,2000,false,false,nil,nil,true] spawn TRGM_SERVER_fnc_setIEDEvent;
[_mainObjPos,true] spawn TRGM_SERVER_fnc_setATMineEvent;
};
if (_mapSizeTxt isEqualTo "LARGE") then {
_fullMapEventsHandles pushBack ([_mainObjPos,true] spawn TRGM_SERVER_fnc_setDownCivCarEvent);
_fullMapEventsHandles pushBack ([_mainObjPos,true] spawn TRGM_SERVER_fnc_setDownedChopperEvent);
_fullMapEventsHandles pushBack ([_mainObjPos,2000,false,false,nil,nil,true] spawn TRGM_SERVER_fnc_setIEDEvent);
[_mainObjPos,true] spawn TRGM_SERVER_fnc_setDownCivCarEvent;
[_mainObjPos,true] spawn TRGM_SERVER_fnc_setDownedChopperEvent;
[_mainObjPos,2000,false,false,nil,nil,true] spawn TRGM_SERVER_fnc_setIEDEvent;
};

waitUntil { sleep 5; ({scriptDone _x;} count _fullMapEventsHandles) isEqualTo (count _fullMapEventsHandles); };

["Loading Full Map Events : END", true] call TRGM_GLOBAL_fnc_log;

};
Expand Down

0 comments on commit 84eee68

Please sign in to comment.