diff --git a/addons/missileguidance/ACE_Settings.hpp b/addons/missileguidance/ACE_Settings.hpp
index 0ecd4b8cbc..d489ef15f3 100644
--- a/addons/missileguidance/ACE_Settings.hpp
+++ b/addons/missileguidance/ACE_Settings.hpp
@@ -1,16 +1,10 @@
class ACE_Settings {
class GVAR(enabled) {
- value = 1;
- typeName = "BOOL";
+ value = 2;
+ typeName = "SCALAR";
isClientSettable = 1;
displayName = "$STR_ACE_MissileGuidance";
description = "$STR_ACE_MissileGuidance_Desc";
- };
- class GVAR(enabledForAI) {
- value = 1;
- typeName = "BOOL";
- isClientSettable = 1;
- displayName = "$STR_ACE_MissileGuidance_AI";
- description = "$STR_ACE_MissileGuidance_AI_Desc";
+ values[] = {"Off", "Player Only", "Player and AI"};
};
};
\ No newline at end of file
diff --git a/addons/missileguidance/functions/fnc_onFired.sqf b/addons/missileguidance/functions/fnc_onFired.sqf
index dea8d256f1..186a622417 100644
--- a/addons/missileguidance/functions/fnc_onFired.sqf
+++ b/addons/missileguidance/functions/fnc_onFired.sqf
@@ -3,9 +3,9 @@
// Bail if guidance is disabled
// Bail on locality of the projectile, it should be local to us
-if(!GVAR(enabled) || {!local _projectile} ) exitWith { false };
+if(GVAR(enabled) < 1 || {!local _projectile} ) exitWith { false };
-if(!GVAR(enableForAI) && {!isPlayer _shooter} ) exitWith { false };
+if( !isPlayer _shooter && { GVAR(enabled) < 2 } ) exitWith { false };
private["_config", "_enabled", "_target", "_seekerType", "_attackProfile"];
PARAMS_7(_shooter,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile);
diff --git a/addons/missileguidance/functions/fnc_onIncomingMissile.sqf b/addons/missileguidance/functions/fnc_onIncomingMissile.sqf
index f819a97562..33ebeb34e2 100644
--- a/addons/missileguidance/functions/fnc_onIncomingMissile.sqf
+++ b/addons/missileguidance/functions/fnc_onIncomingMissile.sqf
@@ -2,6 +2,7 @@
#include "script_component.hpp"
PARAMS_3(_target,_ammo,_shooter);
-if !(local (gunner _shooter) || {local _shooter}) exitWith {};
+if(GVAR(enabled) < 1) exitWith {}; // bail if enabled
+if !(local (gunner _shooter) || {local _shooter}) exitWith {}; // bail if not shooter
_shooter setVariable [QGVAR(vanilla_target),_target, false];
\ No newline at end of file
diff --git a/addons/missileguidance/stringtable.xml b/addons/missileguidance/stringtable.xml
index 5c136388ba..16c9a7ec74 100644
--- a/addons/missileguidance/stringtable.xml
+++ b/addons/missileguidance/stringtable.xml
@@ -12,24 +12,6 @@
Avançado Missile Guidance
Részletes rakéta irányító
Расширенный ракетой
-
-
- Advanced Missile Guidance for AI
-
-
- Enables advanced guidance on AI units.
-
-
- Enables advanced guidance mechanics and selection for different missiles and fire modes.
-
-
- Włącza zaawansowaną mechanikę i wybór dla różnych rakiet i trybów strzału.
- Aktiviert die erweiterten Mechaniken für unterschiedliche Raketen und Feuermodi.
- Povoluje pokročilou mechaniku řízení střel.
-
-
-
-
Hydra-70 DAGR Missile