Spike - Add Olive Launcher Variant (#11003)

* Hide Spike Base Weapon from ACE Arsenal

* Add Olive Spike Variant

* Also hide base weapon from vanilla arsenal

* Use config for enabled check

* rem short

---------

Co-authored-by: mrschick <58027418+mrschick@users.noreply.github.com>

Author: PabstMirror

addons/spike/CfgWeapons.hpp

@@ -4,10 +4,12 @@ class CfgWeapons {
         class Single;
     };
     class GVAR(base): launch_B_Titan_short_F {
+        scope = 1;
         class Single: Single {
             EGVAR(missileGuidance,attackProfile) = "SPIKE_TOP";
         };
     };
+
     class GVAR(launcher): GVAR(base) {
         scope = 2;
         GVAR(enabled) = 1;
@@ -25,5 +27,12 @@ class CfgWeapons {
         magazines[] = {QGVAR(lr)};
         magazineWell[] = {};
     };
+
+    class GVAR(launcher_olive): GVAR(launcher) {
+        GVAR(enabled) = 1;
+        displayName = CSTRING(LR_olive);
+        hiddenSelectionsTextures[] = {"A3\Weapons_F_Beta\Launchers\Titan\Data\Launcher_INDP_CO.paa","A3\Weapons_F_Beta\Launchers\Titan\Data\TubeM_INDP_CO.paa"};
+        picture = "\A3\Weapons_F_Beta\Launchers\Titan\Data\UI\icon_launch_I_Titan_short_F_ca.paa";
+    };
 };
 

addons/spike/XEH_postInit.sqf

@@ -20,4 +20,5 @@ if (hasInterface) then {
 
     GVAR(activeCamera) = objNull;
     GVAR(projectileHashMap) = createHashMap; // used in the seeker to get the namespace for the associated projectile
+    GVAR(launcherWeapons) = createHashMap; // Used to quickly determine whether the current weapon is a Spike launcher
 };

addons/spike/functions/fnc_keyDown.sqf

@@ -15,7 +15,12 @@
  *
  * Public: No
  */
-if ((currentWeapon ACE_player) != QGVAR(launcher)) exitWith {};
+
+private _currentWeapon = currentWeapon ACE_player;
+if !(GVAR(launcherWeapons) getOrDefaultCall [_currentWeapon, {
+    private _weaponConfig = configProperties [configFile >> "CfgWeapons" >> _currentWeapon, QUOTE(configName _x == QUOTE(QGVAR(enabled))), false];
+    (_weaponConfig isNotEqualTo []) && {(getNumber (_weaponConfig select 0)) == 1}
+}, true]) exitWith {};
 
 params ["_key", "_down"];
 

addons/spike/stringtable.xml

@@ -22,6 +22,13 @@
             <Korean>LR</Korean>
             <Japanese>LR</Japanese>
         </Key>
+        <Key ID="STR_ACE_SPIKE_LR_olive">
+            <English>Spike LR (Olive)</English>
+            <French>Spike LR (Olive)</French>
+            <Russian>Spike LR (олива)</Russian>
+            <Korean>스파이크 LR (올리브)</Korean>
+            <Japanese>スパイク LR (オリーブ)</Japanese>
+        </Key>
         <Key ID="STR_ACE_SPIKE_LeaveCamera">
             <English>Leave Camera</English>
             <French>Quitter l'appareil</French>