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

rebase melee hatchet to fix #814

Browse Source
This commit is contained in:
[VB]AWOL
2013-11-28 09:58:08 -06:00
parent f33f406c73
commit 5b21ceae00
9 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/Configs/CfgWeapons/Melee/ItemHatchet.hpp
View File

@@ -16,7 +16,7 @@ class ItemHatchet_DZE : ItemCore {
}; };
output[]= output[]=
{ {
"MeleeHatchet" "MeleeHatchet_DZE"
}; };
}; };
}; };

4
SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeHatchet.hpp
View File

@@ -1,4 +1,4 @@
class MeleeHatchet: MeleeWeapon class MeleeHatchet_DZE: MeleeWeapon
{ {
scope=2; scope=2;
melee= "true"; melee= "true";
@@ -25,7 +25,7 @@ class MeleeHatchet: MeleeWeapon
script="spawn player_addToolbelt;"; script="spawn player_addToolbelt;";
use[]= use[]=
{ {
"MeleeHatchet" "MeleeHatchet_DZE"
}; };
output[]= output[]=
{ {

2
SQF/dayz_code/actions/object_pickup.sqf
View File

@@ -44,7 +44,7 @@ if(_qty >= 1) then {
_isOk = [player,_config] call BIS_fnc_invAdd; _isOk = [player,_config] call BIS_fnc_invAdd;
if (_isOk) then { if (_isOk) then {
deleteVehicle _holder; deleteVehicle _holder;
if (_classname in ["MeleeHatchet","MeleeCrowbar","MeleeMachete","MeleeFishingPole","MeleeSledge"]) then { if (_classname in ["MeleeHatchet_DZE","MeleeCrowbar","MeleeMachete","MeleeFishingPole","MeleeSledge"]) then {
if (_type == "cfgWeapons") then { if (_type == "cfgWeapons") then {
_muzzles = getArray(configFile >> "cfgWeapons" >> _classname >> "muzzles"); _muzzles = getArray(configFile >> "cfgWeapons" >> _classname >> "muzzles");
//_wtype = ((weapons player) select 0); //_wtype = ((weapons player) select 0);

12
SQF/dayz_code/actions/player_addToolbelt.sqf
View File

@@ -20,7 +20,7 @@ _create = getArray (_config >> "ItemActions" >> "Toolbelt" >> "output") select
_config2 = configFile >> "cfgWeapons" >> _create; _config2 = configFile >> "cfgWeapons" >> _create;
//Remove magazines if needed //Remove magazines if needed
if (_item in ["MeleeHatchet","MeleeCrowbar","MeleeMachete","MeleeFishingPole","MeleeSledge"]) then { if (_item in ["MeleeHatchet_DZE","MeleeCrowbar","MeleeMachete","MeleeFishingPole","MeleeSledge"]) then {
_magType = ([] + getArray (configFile >> "cfgWeapons" >> _item >> "magazines")) select 0; _magType = ([] + getArray (configFile >> "cfgWeapons" >> _item >> "magazines")) select 0;
_meleeNum = ({_x == _magType} count magazines player); _meleeNum = ({_x == _magType} count magazines player);
for "_i" from 1 to _meleeNum do { for "_i" from 1 to _meleeNum do {
@@ -31,7 +31,7 @@ if (_item in ["MeleeHatchet","MeleeCrowbar","MeleeMachete","MeleeFishingPole","M
if (_item in ["ItemHatchet_DZE","ItemCrowbar","ItemMachete","ItemFishingPole","ItemSledge"]) then { if (_item in ["ItemHatchet_DZE","ItemCrowbar","ItemMachete","ItemFishingPole","ItemSledge"]) then {
switch (primaryWeapon player) do switch (primaryWeapon player) do
{ {
case "MeleeHatchet": { "MeleeHatchet" call player_addToolbelt }; case "MeleeHatchet_DZE": { "MeleeHatchet_DZE" call player_addToolbelt };
case "MeleeCrowbar": { "MeleeCrowbar" call player_addToolbelt }; case "MeleeCrowbar": { "MeleeCrowbar" call player_addToolbelt };
case "MeleeMachete": { "MeleeMachete" call player_addToolbelt }; case "MeleeMachete": { "MeleeMachete" call player_addToolbelt };
case "MeleeFishingPole": { "MeleeFishingPole" call player_addToolbelt }; case "MeleeFishingPole": { "MeleeFishingPole" call player_addToolbelt };
@@ -46,14 +46,14 @@ if (_isOk) then {
player removeWeapon _item; player removeWeapon _item;
//Add magazines if needed //Add magazines if needed
if (_create in ["MeleeHatchet","MeleeCrowbar","MeleeMachete","MeleeFishingPole","MeleeSledge"]) then { if (_create in ["MeleeHatchet_DZE","MeleeCrowbar","MeleeMachete","MeleeFishingPole","MeleeSledge"]) then {
if (_create == "MeleeCrowbar") then { if (_create == "MeleeCrowbar") then {
player addMagazine 'crowbar_swing'; player addMagazine 'crowbar_swing';
}; };
if (_create == "MeleeSledge") then { if (_create == "MeleeSledge") then {
player addMagazine 'sledge_swing'; player addMagazine 'sledge_swing';
}; };
if (_create == "MeleeHatchet") then { if (_create == "MeleeHatchet_DZE") then {
player addMagazine 'Hatchet_swing'; player addMagazine 'Hatchet_swing';
}; };
if (_create == "MeleeMachete") then { if (_create == "MeleeMachete") then {
@@ -76,14 +76,14 @@ if (_isOk) then {
cutText [localize "STR_DAYZ_CODE_2", "PLAIN DOWN"]; cutText [localize "STR_DAYZ_CODE_2", "PLAIN DOWN"];
//Add magazines back //Add magazines back
if (_item in ["MeleeHatchet","MeleeCrowbar","MeleeMachete","MeleeFishingPole","MeleeSledge"]) then { if (_item in ["MeleeHatchet_DZE","MeleeCrowbar","MeleeMachete","MeleeFishingPole","MeleeSledge"]) then {
if (_item == "MeleeCrowbar") then { if (_item == "MeleeCrowbar") then {
player addMagazine 'crowbar_swing'; player addMagazine 'crowbar_swing';
}; };
if (_item == "MeleeSledge") then { if (_item == "MeleeSledge") then {
player addMagazine 'sledge_swing'; player addMagazine 'sledge_swing';
}; };
if (_item == "MeleeHatchet") then { if (_item == "MeleeHatchet_DZE") then {
player addMagazine 'Hatchet_Swing'; player addMagazine 'Hatchet_Swing';
}; };
if (_item == "MeleeMachete") then { if (_item == "MeleeMachete") then {

2
SQF/dayz_code/actions/player_chopWood.sqf
View File

@@ -8,7 +8,7 @@ private ["_isOk","_objName","_finished","_proceed","_counter","_itemOut","_count
if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_53") , "PLAIN DOWN"]; }; if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_53") , "PLAIN DOWN"]; };
DZE_ActionInProgress = true; DZE_ActionInProgress = true;
if((currentWeapon player) != "MeleeHatchet") exitWith {DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_54"), "PLAIN DOWN"]; }; if((currentWeapon player) != "MeleeHatchet_DZE") exitWith {DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_54"), "PLAIN DOWN"]; };
// allowed trees list move this later // allowed trees list move this later
_trees = DZE_trees; _trees = DZE_trees;

2
SQF/dayz_code/actions/player_dropWeapon.sqf
View File

@@ -15,7 +15,7 @@ for "_i" from 1 to _meleeNum do {
}; };
player removeWeapon _item; player removeWeapon _item;
if (_item == "MeleeHatchet") then {_item = "ItemHatchet_DZE";}; if (_item == "MeleeHatchet_DZE") then {_item = "ItemHatchet_DZE";};
if (_item == "MeleeCrowbar") then {_item = "MeleeCrowbar";}; if (_item == "MeleeCrowbar") then {_item = "MeleeCrowbar";};
if (_item == "MeleeMachete") then {_item = "ItemMachete";}; if (_item == "MeleeMachete") then {_item = "ItemMachete";};

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

@@ -127,7 +127,7 @@ diag_log (str(_backpackMag));
if (_primweapon == "MeleeSledge") then { if (_primweapon == "MeleeSledge") then {
_newUnit addMagazine 'sledge_swing'; _newUnit addMagazine 'sledge_swing';
}; };
if (_primweapon == "MeleeHatchet") then { if (_primweapon == "MeleeHatchet_DZE") then {
_newUnit addMagazine 'Hatchet_Swing'; _newUnit addMagazine 'Hatchet_Swing';
}; };
if (_primweapon == "MeleeMachete") then { if (_primweapon == "MeleeMachete") then {

2
SQF/dayz_code/external/R3F_Realism/R3F_Weight/R3F_CfgWeight.h vendored
View File

@@ -1232,7 +1232,7 @@ class CfgWeight
{ {
weight = 1; weight = 1;
}; };
class MeleeHatchet class MeleeHatchet_DZE
{ {
weight = 1; weight = 1;
}; };

2
SQF/dayz_code/system/player_monitor.fsm
View File

@@ -1098,7 +1098,7 @@ class FSM
" player removeMagazine 'sledge_swing'; " \n " player removeMagazine 'sledge_swing'; " \n
" player addMagazine 'sledge_swing';" \n " player addMagazine 'sledge_swing';" \n
"};" \n "};" \n
"if (player hasWeapon ""MeleeHatchet"") then {" \n "if (player hasWeapon ""MeleeHatchet_DZE"") then {" \n
" player removeMagazine 'Hatchet_Swing'; " \n " player removeMagazine 'Hatchet_Swing'; " \n
" player addMagazine 'Hatchet_Swing';" \n " player addMagazine 'Hatchet_Swing';" \n
"};" \n "};" \n