Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable all variants of Titan. Can now vanilla-lock in cadet mode.

Browse Source
This commit is contained in:
jaynus
2015-04-15 09:55:40 -07:00
parent 5923f246fd
commit ea2281616e
5 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
addons/javelin/CfgWeapons.hpp
View File

@ -8,6 +8,9 @@ class CfgWeapons {
weaponInfoType = "ACE_RscOptics_javelin"; weaponInfoType = "ACE_RscOptics_javelin";
modelOptics = PATHTOF(data\reticle_titan.p3d); modelOptics = PATHTOF(data\reticle_titan.p3d);
canLock = 1;
lockingTargetSound[] = {"",0,1}; lockingTargetSound[] = {"",0,1};
lockedTargetSound[] = {"",0,1}; lockedTargetSound[] = {"",0,1};
}; };

4
addons/javelin/functions/fnc_onFired.sqf
View File

@ -4,7 +4,9 @@
PARAMS_7(_shooter,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile); PARAMS_7(_shooter,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile);
// Bail on not missile // Bail on not missile
if( _shooter != ACE_player || { ! (_weapon in ["launch_Titan_short_F"]) } ) exitWith { false }; if( _shooter != ACE_player) exitWith { false };
if( ! ([ (configFile >> "CfgWeapons" >> (currentWeapon (vehicle ACE_player)) ), "launch_Titan_base"] call EFUNC(common,inheritsFrom)) ) exitWith { };
_pfh_handle = uiNamespace getVariable ["ACE_RscOptics_javelin_PFH", nil]; _pfh_handle = uiNamespace getVariable ["ACE_RscOptics_javelin_PFH", nil];
if(!isNil "_pfh_handle") then { if(!isNil "_pfh_handle") then {

4
addons/javelin/functions/fnc_onOpticDraw.sqf
View File

@ -30,9 +30,7 @@ _soundTime = _args select 4;
_randomLockInterval = _args select 5; _randomLockInterval = _args select 5;
_fireDisabledEH = _args select 6; _fireDisabledEH = _args select 6;
if( ! ([ (configFile >> "CfgWeapons" >> (currentWeapon (vehicle ACE_player)) ), "launch_Titan_base"] call EFUNC(common,inheritsFrom)) if( ! ([ (configFile >> "CfgWeapons" >> (currentWeapon (vehicle ACE_player)) ), "launch_Titan_base"] call EFUNC(common,inheritsFrom)) ) exitWith {
|| { (vehicle ACE_player) != ACE_player }
) exitWith {
__JavelinIGUITargeting ctrlShow false; __JavelinIGUITargeting ctrlShow false;
__JavelinIGUITargetingGate ctrlShow false; __JavelinIGUITargetingGate ctrlShow false;
__JavelinIGUITargetingLines ctrlShow false; __JavelinIGUITargetingLines ctrlShow false;

4
addons/missileguidance/CfgAmmo.hpp
View File

@ -50,6 +50,8 @@ class CfgAmmo {
//maxDeflection = 0.5; //maxDeflection = 0.5;
//incDeflection = 0.005; //incDeflection = 0.005;
canVanillaLock = 0; // Can this default vanilla lock? Only applicable to non-cadet mode
// Guidance type for munitions // Guidance type for munitions
defaultSeekerType = "SALH"; defaultSeekerType = "SALH";
seekerTypes[] = { "SALH", "LIDAR", "SARH", "Optic", "Thermal", "GPS", "SACLOS", "MCLOS" }; seekerTypes[] = { "SALH", "LIDAR", "SARH", "Optic", "Thermal", "GPS", "SACLOS", "MCLOS" };
@ -120,6 +122,8 @@ class CfgAmmo {
//maxDeflection = 0.5; //maxDeflection = 0.5;
//incDeflection = 0.005; //incDeflection = 0.005;
canVanillaLock = 0;
// Guidance type for munitions // Guidance type for munitions
defaultSeekerType = "Optic"; defaultSeekerType = "Optic";
seekerTypes[] = { "Optic" }; seekerTypes[] = { "Optic" };

3
addons/missileguidance/functions/fnc_onFired.sqf
View File

@ -41,15 +41,14 @@ if ( isNil "_lockMode" || { ! ( _lockMode in (getArray (_config >> "seekerLockMo
// If we didn't get a target, try to fall back on tab locking // If we didn't get a target, try to fall back on tab locking
if(isNil "_target") then { if(isNil "_target") then {
if(!isPlayer _shooter) then { if(!isPlayer _shooter) then {
// This was an AI shot, lets still guide it on the AI target // This was an AI shot, lets still guide it on the AI target
_target = _shooter getVariable[QGVAR(vanilla_target), nil]; _target = _shooter getVariable[QGVAR(vanilla_target), nil];
TRACE_1("Detected AI Shooter!", _target); TRACE_1("Detected AI Shooter!", _target);
} else { } else {
_canUseLock = getNumber (_config >> "canVanillaLock"); _canUseLock = getNumber (_config >> "canVanillaLock");
if(_canUseLock > 0) then {
// @TODO: Get vanilla target // @TODO: Get vanilla target
if(_canUseLock > 0 || cadetMode) then {
_vanillaTarget = cursorTarget; _vanillaTarget = cursorTarget;
TRACE_1("Using Vanilla Locking", _vanillaTarget); TRACE_1("Using Vanilla Locking", _vanillaTarget);