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

Dragging - Add compatibilty for 1.84 static weapons and radars (#6494)

Browse Source 
* Dragging - Add compatibilty for 1.84 static weapons and radars

* Reload - Disable check ammo keybind when in UAV
This commit is contained in:
PabstMirror 2018-08-01 15:29:54 -05:00 committed by GitHub
parent 9f85a53711
commit 6ae7c28025
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
addons/dragging/CfgVehicles.hpp
View File

@ -30,7 +30,7 @@ class CfgVehicles {
GVAR(dragDirection) = 0; GVAR(dragDirection) = 0;
}; };
// Big 1.70 Autonomous AA Turrets // Big 1.70 and 1.84 Autonomous AA Turrets
class StaticMGWeapon; class StaticMGWeapon;
class AAA_System_01_base_F: StaticMGWeapon { // Praetorian 1C (aka Phalanx CIWS) class AAA_System_01_base_F: StaticMGWeapon { // Praetorian 1C (aka Phalanx CIWS)
GVAR(canCarry) = 0; GVAR(canCarry) = 0;
@ -44,6 +44,30 @@ class CfgVehicles {
GVAR(canCarry) = 0; GVAR(canCarry) = 0;
GVAR(canDrag) = 0; GVAR(canDrag) = 0;
}; };
class SAM_System_03_base_F: StaticMGWeapon { // MIM-145 Defender
GVAR(canCarry) = 0;
GVAR(canDrag) = 0;
};
class SAM_System_04_base_F: StaticMGWeapon { // S-750 Rhea
GVAR(canCarry) = 0;
GVAR(canDrag) = 0;
};
class B_Ship_Gun_01_base_F: StaticMGWeapon { // Mk45 Hammer
GVAR(canCarry) = 0;
GVAR(canDrag) = 0;
};
class B_Ship_MRLS_01_base_F: StaticMGWeapon { // Mk41 VLS
GVAR(canCarry) = 0;
GVAR(canDrag) = 0;
};
class Radar_System_01_base_F: StaticMGWeapon { // AN/MPQ-105 Radar
GVAR(canCarry) = 0;
GVAR(canDrag) = 0;
};
class Radar_System_02_base_F: StaticMGWeapon { // R-750 Cronus Radar
GVAR(canCarry) = 0;
GVAR(canDrag) = 0;
};
// ammo boxes // ammo boxes
class ThingX; class ThingX;

2
addons/reload/XEH_postInit.sqf
View File

@ -9,6 +9,8 @@ if (!hasInterface) exitWith {};
if !([ACE_player, vehicle ACE_player, ["isNotInside", "isNotSwimming", "isNotSitting"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, vehicle ACE_player, ["isNotInside", "isNotSwimming", "isNotSitting"]] call EFUNC(common,canInteractWith)) exitWith {false};
// Conditions: specific // Conditions: specific
if !(ACE_player call CBA_fnc_canUseWeapon || {(vehicle ACE_player) isKindOf "StaticWeapon"}) exitWith {false}; if !(ACE_player call CBA_fnc_canUseWeapon || {(vehicle ACE_player) isKindOf "StaticWeapon"}) exitWith {false};
// Ignore if controlling UAV (blocks radar keybind)
if (!isNull (ACE_controlledUAV param [0, objNull])) exitWith {false};
// Statement // Statement
[ACE_player] call FUNC(checkAmmo); [ACE_player] call FUNC(checkAmmo);