diff --git a/SQF/dayz_code/Configs/CfgVehicles/CommonActions.hpp b/SQF/dayz_code/Configs/CfgVehicles/CommonActions.hpp index 873276cc2..738eb94be 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/CommonActions.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/CommonActions.hpp @@ -8,7 +8,7 @@ condition = "(['Repair',this] call userActionConditions)";\ statement = "this call player_repairVehicle;";\ hideOnUse = 0 - + #define ACTION_SALVAGE displayName = $STR_ACTIONS_SALVAGEVEH;\ displayNameDefault = $STR_ACTIONS_SALVAGEVEH;\ priority = 0;\ @@ -29,4 +29,13 @@ onlyForPlayer = 1;\ shortcut = "";\ condition = "(['PushPlane',this] call userActionConditions)";\ - statement = "this call player_pushPlane;" \ No newline at end of file + statement = "this call player_pushPlane;" + +#define ACTION_REARM priority = 3;\ + radius = 3;\ + position = "camera";\ + showWindow = 0;\ + onlyForPlayer = 1;\ + shortcut = "reloadMagazine";\ + condition = "(['AddAmmo',this] call userActionConditions)";\ + hideOnUse = 1 diff --git a/SQF/dayz_code/actions/userActionConditions.sqf b/SQF/dayz_code/actions/userActionConditions.sqf index c99badf4b..0ca22692d 100644 --- a/SQF/dayz_code/actions/userActionConditions.sqf +++ b/SQF/dayz_code/actions/userActionConditions.sqf @@ -26,6 +26,8 @@ _show = switch _action do { //case "ObjectUpgrade": {CAN_DO && !IN_VEHICLE && !(_object getVariable["BuildLock",false])}; //case "ObjectMaintenance": {CAN_DO && !IN_VEHICLE && (_object getVariable["Maintenance",false] or IS_DAMAGED)}; //case "ObjectDisassembly": {CAN_DO && !IN_VEHICLE && HAS_TOOLBOX && !(_object getVariable["BuildLock",false]) && (((getPlayerUID player) in (_object getVariable["ownerArray",[]])) or (count (_object getVariable["ownerArray",[]]) == 0) or (typeOf _object in ["WoodenFence_1_foundation","WoodenGate_foundation"]))}; + //Turrets + //case "AddAmmo": {IS_ALIVE && CAN_DO && IN_VEHICLE && (((assignedVehicleRole player) select 0) == 'Turret')}; default {false}; }; diff --git a/SQF/dayz_code/compile/player_fired.sqf b/SQF/dayz_code/compile/player_fired.sqf index 0fb158a62..e68855737 100644 --- a/SQF/dayz_code/compile/player_fired.sqf +++ b/SQF/dayz_code/compile/player_fired.sqf @@ -1,4 +1,4 @@ -private ["_projectile","_unit","_ammo"]; +private ["_projectile","_unit","_ammo","_audible","_caliber","_distance"]; //[unit, weapon, muzzle, mode, ammo, magazine, projectile] _unit = _this select 0;