From 514f7f5a03e8dc65873388b785ecd96bdcb74527 Mon Sep 17 00:00:00 2001 From: Ultranoobian Date: Wed, 15 Mar 2017 09:26:47 +1100 Subject: [PATCH 1/2] Changed FOB initialization to occur as remoteExecCall Issue reference: DUWS-R-Team/DUWS-R#135 Previously, this was called only on the server and is never executed on players. Added notification for FOB help to remoteExecCall as well --- source/zones_bonus.sqf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source/zones_bonus.sqf b/source/zones_bonus.sqf index b38f52f..6f9165a 100644 --- a/source/zones_bonus.sqf +++ b/source/zones_bonus.sqf @@ -1,7 +1,9 @@ [] spawn { waitUntil {zoneundercontrolblu >= 1}; sleep 20; - _sitrep = [player,"fob_support"] call BIS_fnc_addCommMenuItem; - ["info",["Establishing a FOB","Check the briefing for more info (RTI Manual)"]] call bis_fnc_showNotification; + [player,"fob_support"] remoteExecCall ["BIS_fnc_addCommMenuItem", 0, true]; + //_sitrep = [player,"fob_support"] call BIS_fnc_addCommMenuItem; + ["info",["Establishing a FOB","Check the briefing for more info (RTI Manual)"]] remoteExecCall ["bis_fnc_showNotification", 0, true]; + //["info",["Establishing a FOB","Check the briefing for more info (RTI Manual)"]] call bis_fnc_showNotification; sleep 2; }; \ No newline at end of file From d0bfc31a1097afdad8f885d51c8332fc459f4b60 Mon Sep 17 00:00:00 2001 From: Brenden Cai Date: Thu, 16 Mar 2017 00:57:18 +1100 Subject: [PATCH 2/2] Changed run order of zone control and FOB bonus script to before WARCOM Zone Control and FOB bonus script have been moved to before WARCOM is initialized due to bug with execution order. Placed a FIXME tag to remind to fix. Related to: DUWS-R-Team/DUWS-R#135 --- source/serverinit.sqf | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/source/serverinit.sqf b/source/serverinit.sqf index e4dfd29..9b5aab8 100644 --- a/source/serverinit.sqf +++ b/source/serverinit.sqf @@ -203,7 +203,16 @@ game_master = ["player1"];publicVariable "game_master"; _zones_create = {[50,0.2] execVM "initZones\locatorZonesV2.sqf"} remoteExec ["bis_fnc_spawn", game_master select 0]; // CHECK IF ZONES HAVE ALREADY BEEN PLACED }; }; - + +//FIX ME: Execution Order requires zone bonus and reward be before WARCOM INIT + if (isServer) then { + // initialise the ressources per zone bonus + _basepoint = [] execVM "zonesundercontrol.sqf"; + }; + + // init the bonuses you get when capturing zones + _basepoint = [] execVM "zones_bonus.sqf"; + waitUntil { !isNil "serv_zones_array" }; diag_log format ["serv_zones_array: %1", serv_zones_array]; _warcom_init = [serv_zones_array, getpos hq_blu1, [0,0,0], blufor_ap, opfor_ap, 2700,blufor_ai_skill,opfor_ai_skill, 2000] execVM "WARCOM\WARCOM_init.sqf"; // 2700 is 40 mins @@ -221,13 +230,6 @@ if (isServer) then { }; -if (isServer) then { - // initialise the ressources per zone bonus - _basepoint = [] execVM "zonesundercontrol.sqf"; -}; - -// init the bonuses you get when capturing zones -_basepoint = [] execVM "zones_bonus.sqf"; if (zones_manually_placed) then { waitUntil {!isNil ("Array_of_OPFOR_zones")};