diff --git a/addons/spike/CfgWeapons.hpp b/addons/spike/CfgWeapons.hpp index 89f658ee82c..b360c54f600 100644 --- a/addons/spike/CfgWeapons.hpp +++ b/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"; + }; }; diff --git a/addons/spike/XEH_postInit.sqf b/addons/spike/XEH_postInit.sqf index ae629ec91ba..be0a83d083e 100644 --- a/addons/spike/XEH_postInit.sqf +++ b/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 }; diff --git a/addons/spike/functions/fnc_keyDown.sqf b/addons/spike/functions/fnc_keyDown.sqf index 71fb65654f2..a771d38ac66 100644 --- a/addons/spike/functions/fnc_keyDown.sqf +++ b/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"]; diff --git a/addons/spike/stringtable.xml b/addons/spike/stringtable.xml index 6de1a8835b7..20bdfc23a2f 100644 --- a/addons/spike/stringtable.xml +++ b/addons/spike/stringtable.xml @@ -22,6 +22,13 @@ LR LR + + Spike LR (Olive) + Spike LR (Olive) + Spike LR (олива) + 스파이크 LR (올리브) + スパイク LR (オリーブ) + Leave Camera Quitter l'appareil