Merge pull request #137 from ultranoobian/master

Hotfix candidate for FOB creation and rewards
DUWS-R-Team · Mar 15, 2017 · 273eb4a · 273eb4a
2 parents 6c08cd7 + 1306db5
commit 273eb4a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git 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")};

diff --git 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;
 };