Merge branch 'master' of github.com:KoffeinFlummi/ACE3

This commit is contained in:
esteldunedain 2015-04-14 23:22:35 -03:00
commit c6c7ef7c79
4 changed files with 7 additions and 30 deletions

View File

@ -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"};
};
};

View File

@ -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);

View File

@ -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];

View File

@ -12,24 +12,6 @@
<Portuguese>Avançado Missile Guidance</Portuguese>
<Hungarian>Részletes rakéta irányító</Hungarian>
<Russian>Расширенный ракетой</Russian>
</Key>
<Key ID="STR_ACE_MissileGuidance_AI">
<English>Advanced Missile Guidance for AI</English>
</Key>
<Key ID="STR_ACE_MissileGuidance_AI_Desc">
<English>Enables advanced guidance on AI units.</English>
</Key>
<Key ID="STR_ACE_MissileGuidance_Desc">
<English>Enables advanced guidance mechanics and selection for different missiles and fire modes.</English>
<Spanish></Spanish>
<French></French>
<Polish>Włącza zaawansowaną mechanikę i wybór dla różnych rakiet i trybów strzału.</Polish>
<German>Aktiviert die erweiterten Mechaniken für unterschiedliche Raketen und Feuermodi.</German>
<Czech>Povoluje pokročilou mechaniku řízení střel.</Czech>
<Italian></Italian>
<Portuguese></Portuguese>
<Hungarian></Hungarian>
<Russian></Russian>
</Key>
<Key ID="STR_ACE_Hydra70_DAGR">
<English>Hydra-70 DAGR Missile</English>