W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-10 10:12:54 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update weapon switch hotkey for DZE_TwoPrimaries=2

Browse Source 
Also forgot new dropped class for SledgeHammer
This commit is contained in:
ebaydayz
2016-04-27 16:11:40 -04:00
parent 7753ae2859
commit 244b84e74b
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp
View File

@@ -19,6 +19,15 @@ class WeaponHolder_ItemCrowbar: WeaponHolderBase
init="[(_this select 0),'cfgWeapons','ItemCrowbar'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
};
};
class WeaponHolder_ItemSledge : WeaponHolderBase { // Epoch class. Needed for player_dropWeapon
scope = public;
displayName = $STR_EQUIP_NAME_SledgeHammer;
model="\z\addons\dayz_epoch\models\sledge_mag.p3d";
class eventHandlers {
init = "[(_this select 0),'cfgWeapons','ItemSledge'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
};
};
/*
class WeaponHolder_MeleeBaseBallBat: WeaponHolderBase
{

4
SQF/dayz_code/actions/player_switchWeapon.sqf
View File

@@ -160,8 +160,8 @@ dz_fn_switchWeapon =
//Current weapon is primary
if (IS_PRIMARY(_current)) exitWith
{
//if current is rifle and on back is melee
if (!IS_MELEE(_current) && { IS_MELEE(dayz_onBack) }) then
//if current is rifle and on back is melee OR two rifles are allowed
if ((!IS_MELEE(_current) && { IS_MELEE(dayz_onBack) }) or (DZE_TwoPrimaries > 1)) then
{
if (dayz_quickSwitch) then
{

2
SQF/dayz_code/compile/keyboard.sqf
View File

@@ -63,7 +63,7 @@ if (isNil "keyboard_keys") then {
3 call dz_fn_switchWeapon;
_handled = true;
};
_melee = {
_melee = { // Also works for rifle on back if DZE_TwoPrimaries = 2;
4 call dz_fn_switchWeapon;
_handled = true;
};