W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-06-28 04:31:55 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update player_fired.sqf

Browse Source 
Vanilla commits:

https://github.com/DayZMod/DayZ/commit/70fc0070625545b5f4a1234df1e0fe2e837ad313

https://github.com/DayZMod/DayZ/commit/f327c99b023377f81ffe958c259e6c68bd4c68be
This commit is contained in:
ebayShopper
2017-11-22 12:49:06 -05:00
parent c671cf9661
commit 90487cde10
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SQF/dayz_code/Configs/CfgVehicles/CommonActions.hpp
+11 -2
View File
@@ -8,7 +8,7 @@
condition = "(['Repair',this] call userActionConditions)";\ condition = "(['Repair',this] call userActionConditions)";\
statement = "this call player_repairVehicle;";\ statement = "this call player_repairVehicle;";\
hideOnUse = 0 hideOnUse = 0
#define ACTION_SALVAGE displayName = $STR_ACTIONS_SALVAGEVEH;\ #define ACTION_SALVAGE displayName = $STR_ACTIONS_SALVAGEVEH;\
displayNameDefault = $STR_ACTIONS_SALVAGEVEH;\ displayNameDefault = $STR_ACTIONS_SALVAGEVEH;\
priority = 0;\ priority = 0;\
@@ -29,4 +29,13 @@
onlyForPlayer = 1;\ onlyForPlayer = 1;\
shortcut = "";\ shortcut = "";\
condition = "(['PushPlane',this] call userActionConditions)";\ condition = "(['PushPlane',this] call userActionConditions)";\
statement = "this call player_pushPlane;" 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
SQF/dayz_code/actions/userActionConditions.sqf
+2
View File
@@ -26,6 +26,8 @@ _show = switch _action do {
//case "ObjectUpgrade": {CAN_DO && !IN_VEHICLE && !(_object getVariable["BuildLock",false])}; //case "ObjectUpgrade": {CAN_DO && !IN_VEHICLE && !(_object getVariable["BuildLock",false])};
//case "ObjectMaintenance": {CAN_DO && !IN_VEHICLE && (_object getVariable["Maintenance",false] or IS_DAMAGED)}; //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"]))}; //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}; default {false};
}; };
SQF/dayz_code/compile/player_fired.sqf
+1 -1
View File
@@ -1,4 +1,4 @@
private ["_projectile","_unit","_ammo"]; private ["_projectile","_unit","_ammo","_audible","_caliber","_distance"];
//[unit, weapon, muzzle, mode, ammo, magazine, projectile] //[unit, weapon, muzzle, mode, ammo, magazine, projectile]
_unit = _this select 0; _unit = _this select 0;