Merge pull request #799 from ColdEvul/sabre-update

Updated saber based on feedback
7Cav · Oct 25, 2021 · f4b53e6 · f4b53e6
2 parents e0d2dc5 + 66a776d
commit f4b53e6
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 4 deletions.
diff --git a/cScripts/functions/players/fn_getRadioChannel.sqf b/cScripts/functions/players/fn_getRadioChannel.sqf
@@ -81,9 +81,9 @@ if (_radio == "ACRE_PRC343") then {
 
         // Ground
         case "SABER-1": {_channel = 97};
-        case "SABER-2": {_channel = 98};
-        case "SABER-3": {_channel = 99};
-        case "SABER-4": {_channel = 100};
+        case "SABER-2": {_channel = 97};
+        case "SABER-3": {_channel = 98};
+        case "SABER-4": {_channel = 98};
         case "SABER-7": {_channel = 100};
 
         case "VIKING-1": {_channel = 65};

diff --git a/cScripts/functions/vehicle/fn_vehicle_addCosmetics.sqf b/cScripts/functions/vehicle/fn_vehicle_addCosmetics.sqf
@@ -71,7 +71,69 @@ if (_vehicle iskindOf "RHS_MELB_base") then {
 };
 
 if (_vehicle iskindOf "rhsusf_m1a1tank_base") then {
-    _vehicle animateSource ["Miles_Hide", 1, true];
+    _vehicle setVariable ["RHS_Decal_Enabled", false];
+
+    [{
+        (_this select 0) animateSource ["Miles_Hide", 1, true];
+        (_this select 0) animateSource ["IFF_Panels_Hide", 1, true];
+    }, [_vehicle]] call CBA_fnc_execNextFrame;
+
+    switch (_vehicle getVariable [QEGVAR(Vehicle,Callsign), 0]) do {
+        case 1: {
+            _vehicle setObjectTextureGlobal [11, "\rhsusf\addons\RHSUSF_Decals\Data\Labels\ArmyPlt_Abrams_D\1_ca.paa"];
+            _vehicle setObjectTextureGlobal [12, "\z\cav\addons\textures\data\vehicles\abrams\BarrelArt_120mmIV_ca.paa"];
+            _vehicle setVariable [QEGVAR(Vehicle,Callsign), 1];
+            _vehicle setVariable [QEGVAR(Vehicle,Name), "SABRE-1"];
+        };
+        case 2: {
+            _vehicle setObjectTextureGlobal [11, "\rhsusf\addons\RHSUSF_Decals\Data\Labels\ArmyPlt_Abrams_D\2_ca.paa"];
+            _vehicle setObjectTextureGlobal [12, "\z\cav\addons\textures\data\vehicles\abrams\BarrelArt_BountyHunters_ca.paa"];
+            _vehicle setVariable [QEGVAR(Vehicle,Callsign), 2];
+            _vehicle setVariable [QEGVAR(Vehicle,Name), "SABRE-2"];
+        };
+        case 3: {
+            _vehicle setObjectTextureGlobal [11, "\rhsusf\addons\RHSUSF_Decals\Data\Labels\ArmyPlt_Abrams_D\3_ca.paa"];
+            _vehicle setObjectTextureGlobal [12, "\z\cav\addons\textures\data\vehicles\abrams\BarrelArt_IronCladLads_ca.paa"];
+            _vehicle setVariable [QEGVAR(Vehicle,Callsign), 3];
+            _vehicle setVariable [QEGVAR(Vehicle,Name), "SABRE-3"];
+        };
+        case 4: {
+            _vehicle setObjectTextureGlobal [11, "\rhsusf\addons\RHSUSF_Decals\Data\Labels\ArmyPlt_Abrams_D\4_ca.paa"];
+            _vehicle setObjectTextureGlobal [12, "\z\cav\addons\textures\data\vehicles\abrams\BarrelArt_WarSaw_ca.paa"];
+            _vehicle setVariable [QEGVAR(Vehicle,Callsign), 4];
+            _vehicle setVariable [QEGVAR(Vehicle,Name), "SABRE-4"];
+        };
+        case -1: {
+            _vehicle setObjectTextureGlobal [11, "\rhsusf\addons\RHSUSF_Decals\Data\Labels\ArmyPlt_Abrams_D\1_ca.paa"];
+            _vehicle setObjectTextureGlobal [12, ""];
+            _vehicle setVariable [QEGVAR(Vehicle,Callsign), -1];
+            _vehicle setVariable [QEGVAR(Vehicle,Name), "SABRE-1"];
+        };
+        case -2: {
+            _vehicle setObjectTextureGlobal [11, "\rhsusf\addons\RHSUSF_Decals\Data\Labels\ArmyPlt_Abrams_D\2_ca.paa"];
+            _vehicle setObjectTextureGlobal [12, ""];
+            _vehicle setVariable [QEGVAR(Vehicle,Callsign), -2];
+            _vehicle setVariable [QEGVAR(Vehicle,Name), "SABRE-2"];
+        };
+        case -3: {
+            _vehicle setObjectTextureGlobal [11, "\rhsusf\addons\RHSUSF_Decals\Data\Labels\ArmyPlt_Abrams_D\3_ca.paa"];
+            _vehicle setObjectTextureGlobal [12, ""];
+            _vehicle setVariable [QEGVAR(Vehicle,Callsign), -3];
+            _vehicle setVariable [QEGVAR(Vehicle,Name), "SABRE-3"];
+        };
+        case -4: {
+            _vehicle setObjectTextureGlobal [11, "\rhsusf\addons\RHSUSF_Decals\Data\Labels\ArmyPlt_Abrams_D\4_ca.paa"];
+            _vehicle setObjectTextureGlobal [12, ""];
+            _vehicle setVariable [QEGVAR(Vehicle,Callsign), -4];
+            _vehicle setVariable [QEGVAR(Vehicle,Name), "SABRE-4"];
+        };
+        default {
+            _vehicle setObjectTextureGlobal [11, "\rhsusf\addons\RHSUSF_Decals\Data\Labels\ArmyPlt_Abrams_D\0_ca.paa"];
+            _vehicle setObjectTextureGlobal [12, ""];
+            _vehicle setVariable [QEGVAR(Vehicle,Callsign), 0];
+            _vehicle setVariable [QEGVAR(Vehicle,Name), ""];
+        };
+    };
 };
 
 if (_vehicle iskindOf "RHS_UH60_Base") then {