sending working

gruppe-adler · May 10, 2019 · b874eae · b874eae
1 parent a4c4bee
commit b874eae
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 14 deletions.
diff --git a/BC_loadouts/factions/bwGM.hpp b/BC_loadouts/factions/bwGM.hpp
@@ -206,7 +206,7 @@ class bwGM {
             };
         };
         class Soldier_SL_F: Soldier_TL_F {
-            backpack = "TFAR_rt1523g_sage";
+            backpack = "TFAR_rt1523g_green";
             addItemsToUniform[] = {
                 LIST_7("ACE_fieldDressing"),
                 LIST_2("ACE_epinephrine"),

diff --git a/BC_loadouts/factions/nvaGM.hpp b/BC_loadouts/factions/nvaGM.hpp
@@ -176,7 +176,7 @@ class nvaGM {
             headgear = "gm_gc_army_headgear_m56";
             handgunWeapon = "gm_lp1_blk";
             handgunWeaponMagazine = "gm_1Rnd_265mm_smoke_single_yel_gc";
-            backpack = "TFAR_mr3000_rhs";
+            backpack = "TFAR_mr6000l";
             addItemsToUniform[] = {
                 LIST_7("ACE_fieldDressing"),
                 LIST_2("ACE_epinephrine"),

diff --git a/BC_setup/functions/client/fn_addInteractions.sqf b/BC_setup/functions/client/fn_addInteractions.sqf
@@ -104,6 +104,14 @@ if (!hasInterface) exitWith {};
                         private _cache = fuel _target;
                         _target setVariable ["BC_currentFuelCache", _cache, true];
                         _target setFuel 0;
+
+                        [{
+                            params ["_target"];
+                            (_target animationSourcePhase "antennaMast_1_1_source" == 1)
+                        }, {
+                            params ["_target"];
+                            _target setVariable ["tf_range", 50000, true];
+                        }, [_target]] call CBA_fnc_waitUntilAndExecute;
                     },
                     [],
                     1.5, 
@@ -123,8 +131,17 @@ if (!hasInterface) exitWith {};
                         params ["_target", "_caller", "_actionId", "_arguments"];
 
                         _target animateSource ["antennaMast_1_1_source", 0];
-                        private _cache = _target getVariable ["BC_currentFuelCache", 0];
-                        _target setFuel _cache;
+                        _target setVariable ["tf_range", 0, true];
+
+
+                        [{
+                            params ["_target"];
+                            (_target animationSourcePhase "antennaMast_1_1_source" == 0)
+                        }, {
+                            params ["_target"];
+                            private _cache = _target getVariable ["BC_currentFuelCache", 0];
+                            _target setFuel _cache;
+                        }, [_target]] call CBA_fnc_waitUntilAndExecute;
                     },
                     [],
                     1.5, 

diff --git a/grad_tracking/functions/server/fn_radioVehIsSending.sqf b/grad_tracking/functions/server/fn_radioVehIsSending.sqf
@@ -2,7 +2,6 @@ params ["_obj"];
 
 // rhs gaz66 radio truck and GM command BTR
 (
-	(((_obj getVariable ["tf_range",0]) == 50000) ||
-	(_obj animationSourcePhase "antennaMast_1_1_source" == 1)) && 
+	((_obj getVariable ["tf_range",0]) == 50000) && 
 	alive _obj
 )
diff --git a/grad_tracking/init.sqf b/grad_tracking/init.sqf
@@ -59,11 +59,11 @@ if (isServer) then {
           {MISSION_COMPLETED}
      ] call GRAD_tracking_fnc_mainLoop;
 
-     call GRAD_tracking_fnc_terminalDistanceListenerServer;
+     [] call GRAD_tracking_fnc_terminalDistanceListenerServer;
 };
 
 if (hasInterface) then {
 
      [] call GRAD_tracking_fnc_initClient;
-     call GRAD_tracking_fnc_terminalDistanceListenerClient;
+     [] call GRAD_tracking_fnc_terminalDistanceListenerClient;
 };
diff --git a/mission.sqm b/mission.sqm
@@ -8,18 +8,18 @@ class EditorData
 	toggles=1;
 	class ItemIDProvider
 	{
-		nextID=1395;
+		nextID=1399;
 	};
 	class MarkerIDProvider
 	{
 		nextID=16;
 	};
 	class Camera
 	{
-		pos[]={1547.8607,17.405811,5049.4575};
-		dir[]={0.63623017,-0.40258449,0.65832615};
-		up[]={0.27983695,0.91532236,0.28956032};
-		aside[]={0.71915776,-2.7809292e-006,-0.69502789};
+		pos[]={1574.1765,8.401433,5206.876};
+		dir[]={-0.83335257,-0.49722448,-0.24197085};
+		up[]={-0.47757709,0.86756057,-0.13867171};
+		aside[]={-0.27887109,-2.1987362e-006,0.96045929};
 	};
 };
 binarizationWanted=0;
@@ -118,7 +118,7 @@ class ScenarioData
 };
 class CustomAttributes
 {
-	class Category0
+	class Category1
 	{
 		name="Scenario";
 		class Attribute0