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

Remove Hatchet_DZE

Browse Source 
The two items are 100% identical now. There is no need to have a
separate class for it anymore.
This commit is contained in:
ebaydayz
2016-03-31 15:44:23 -04:00
parent 3f6cd7de42
commit d926a81038
18 changed files with 25 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp
View File

@@ -7,9 +7,8 @@ Castle[] =
{Loot_WEAPON, 2, ItemFlashlight},
{Loot_WEAPON, 1, ItemPickaxe},
{Loot_WEAPON, 2, ItemPickaxeBroken},
{Loot_WEAPON, 2, ItemShovel},
// {Loot_WEAPON, 1, ItemHatchet},
{Loot_WEAPON, 1, ItemHatchet_DZE},
// {Loot_WEAPON, 2, ItemShovel},
{Loot_WEAPON, 1, ItemHatchet},
//Weapons
{Loot_WEAPON, 2, Mosin_DZ},

4
SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/DZE_Other.hpp
View File

@@ -8,7 +8,7 @@ DynamicDebris[] =
{Loot_WEAPON, 2, ItemMap},
{Loot_WEAPON, 5, ItemKnife},
{Loot_WEAPON, 5, ItemToolbox},
{Loot_WEAPON, 5, ItemHatchet_DZE},
{Loot_WEAPON, 5, ItemHatchet},
{Loot_WEAPON, 5, ItemCompass},
{Loot_PILE, 12, Consumable, 1, 2},
{Loot_MAGAZINE, 7, ItemJerryCan},
@@ -27,7 +27,7 @@ DynamicDebrisMilitary[] =
{Loot_WEAPON, 2, ItemMap},
{Loot_WEAPON, 5, ItemKnife},
{Loot_WEAPON, 5, ItemToolbox},
{Loot_WEAPON, 5, ItemHatchet_DZE},
{Loot_WEAPON, 5, ItemHatchet},
{Loot_WEAPON, 5, ItemCompass},
{Loot_PILE, 12, Consumable, 1, 2},
{Loot_MAGAZINE, 7, ItemJerryCan},

2
SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Farm.hpp
View File

@@ -7,7 +7,7 @@ Farm[] =
//Tools
{Loot_WEAPON, 5, ItemMachete},
// {Loot_WEAPON, 6, ItemHatchet},
{Loot_WEAPON, 6, ItemHatchet_DZE},
{Loot_WEAPON, 6, ItemHatchet},
{Loot_WEAPON, 5, ItemKnife},
//Items

2
SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp
View File

@@ -11,7 +11,7 @@ Hunting[] =
{Loot_WEAPON, 6, ItemFlashlight},
{Loot_WEAPON, 7, ItemKnife},
{Loot_WEAPON, 2, ItemCompass},
{Loot_WEAPON, 4, ItemHatchet_DZE},
{Loot_WEAPON, 4, ItemHatchet},
{Loot_MAGAZINE, 1, 5Rnd_17HMR},
{Loot_MAGAZINE, 1, 10Rnd_303British},
{Loot_MAGAZINE, 2, ItemWaterbottleUnfilled},

2
SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp
View File

@@ -7,7 +7,7 @@ Industrial[] =
// {Loot_WEAPON, 8, ItemCrowbar},
{Loot_WEAPON, 8, ItemCrowbar},
// {Loot_WEAPON, 5, ItemHatchet},
{Loot_WEAPON, 5, ItemHatchet_DZE},
{Loot_WEAPON, 5, ItemHatchet},
{Loot_WEAPON, 1, ItemPickaxe},
{Loot_WEAPON, 2, ItemPickaxeBroken},
{Loot_WEAPON, 1, ItemSledgeHammer},

1
SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp
View File

@@ -550,7 +550,6 @@ class CfgVehicles {
#include "DZE\Prop_Defs.hpp"
#include "DZE\Veins.hpp"
#include "DZE\ModularBuilding.hpp"
#include "DZE\WeaponHolder.hpp"
class Land_A_tent; // External class reference
#include "DZE\Grave.hpp"
class WeaponHolder; // External class reference

24
SQF/dayz_code/Configs/CfgVehicles/DZE/WeaponHolder.hpp
View File

@@ -1,24 +0,0 @@
class WeaponHolder_ItemHatchet_DZE: WeaponHolderBase {
scope = public;
displayName = $STR_EQUIP_NAME_HATCHET;
model = "\dayz_equip\models\hatchet.p3d";
class eventHandlers {
init = "[(_this select 0),'cfgWeapons','ItemHatchet_DZE'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
};
};
class WeaponHolder_ItemMachete: WeaponHolderBase {
scope = public;
displayName = "Machete";
model="\z\addons\dayz_communityassets\models\machete.p3d";
class eventHandlers {
init = "[(_this select 0),'cfgWeapons','ItemMachete'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
};
};
class WeaponHolder_MeleeCrowbar: WeaponHolderBase {
scope = public;
displayName = "Crowbar";
model = "\dayz_equip\models\crowbar.p3d";
class eventHandlers {
init = "[(_this select 0),'cfgWeapons','ItemCrowbar'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";
};
};

49
SQF/dayz_code/Configs/CfgWeapons/Melee/Hatchet.hpp
View File

@@ -39,51 +39,4 @@ class MeleeHatchet : MeleeWeapon
{
libTextDesc = $STR_EQUIP_DESC_HATCHET;
};
};
class MeleeHatchet_DZE: MeleeWeapon
{
scope = public;
model="\dayz_weapons\models\Hatchet_weaponized";
picture="\dayz_equip\textures\equip_hatchet_CA.paa";
displayName=$STR_EQUIP_NAME_HATCHET;
droppeditem= "ItemHatchet_DZE";
magazines[]=
{
"Hatchet_Swing"
};
handAnim[]=
{
"OFP2_ManSkeleton",
"\dayz_weapons\anim\melee_hatchet_holding.rtm"
};
class ItemActions
{
class Use
{
text = $STR_ACTIONS_CHOPWOOD;
script = "spawn player_chopWood";
};
class Toolbelt
{
text = $STR_ACTIONS_2TB;
script = "spawn player_addToolbelt";
use[] = {"MeleeHatchet_DZE"};
output[] = {"ItemHatchet_DZE"};
};
class Drop
{
text = $STR_ACTIONS_DROP;
script = "spawn player_dropWeapon; r_action_count = r_action_count + 1;";
use[] = {"Hatchet_Swing"};
};
};
class Library
{
libTextDesc=$STR_EQUIP_DESC_HATCHET;
};
descriptionShort=$STR_EQUIP_DESC_HATCHET;
};
};

30
SQF/dayz_code/Configs/CfgWeapons/Tools/Hatchet.hpp
View File

@@ -32,36 +32,6 @@ class ItemHatchet : ItemCore
};
};
};
class ItemHatchet_DZE : ItemCore {
scope = public;
displayName = $STR_EQUIP_NAME_HATCHET;
model = "\dayz_equip\models\hatchet.p3d";
picture = "\dayz_equip\textures\equip_hatchet_CA.paa";
descriptionShort = $STR_EQUIP_DESC_HATCHET;
class ItemActions
{
class Use
{
text = $STR_ACTIONS_CHOPWOOD;
script = "spawn player_chopWood;";
};
class ToBack
{
text = $STR_ACTIONS_2BACK;
script = "spawn player_addtoBack;";
use[] = {"ItemHatchet_DZE"};
output[] = {"MeleeHatchet_DZE"};
};
class Toolbelt
{
text = "Remove from Toolbelt";
script = "spawn player_addToolbelt;";
use[] = {"ItemHatchet_DZE"};
output[] = {"MeleeHatchet_DZE"};
};
};
};
class ItemHatchetBroken : ItemCore
{

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

@@ -22,7 +22,7 @@ _config2 = configFile >> "cfgWeapons" >> _create;
//removing current melee weapon if new melee selected
_melee2tb = "";
if ((_item in ["ItemHatchet","ItemCrowbar","ItemMachete","ItemFishingPole","ItemHatchet_DZE","ItemSledge"]) || _item == DayZ_onBack) then {
if ((_item in ["ItemHatchet","ItemCrowbar","ItemMachete","ItemFishingPole","ItemSledge"]) || _item == DayZ_onBack) then {
if (!carryClick) then {
//free primary slot for new melee (remember item to add after)
switch (primaryWeapon player) do {
@@ -30,7 +30,6 @@ if ((_item in ["ItemHatchet","ItemCrowbar","ItemMachete","ItemFishingPole","Item
case "MeleeCrowbar": {if !("ItemCrowbar" in weapons player) then {player removeWeapon "MeleeCrowbar"; _melee2tb = "ItemCrowbar";};};
case "MeleeMachete": {if !("ItemMachete" in weapons player) then {player removeWeapon "MeleeMachete"; _melee2tb = "ItemMachete";};};
case "MeleeFishingPole": {player removeWeapon "MeleeFishingPole"; _melee2tb = "ItemFishingPole";};
case "MeleeHatchet_DZE": {if !("ItemHatchet_DZE" in weapons player) then {player removeWeapon "MeleeHatchet_DZE"; _melee2tb = "ItemHatchet_DZE";};};
case "MeleeSledge": {if !("ItemSledge" in weapons player) then {player removeWeapon "MeleeSledge"; _melee2tb = "ItemSledge";};};
};
} else {
@@ -40,7 +39,6 @@ if ((_item in ["ItemHatchet","ItemCrowbar","ItemMachete","ItemFishingPole","Item
case "MeleeCrowbar": {if !("ItemCrowbar" in weapons player) then {dayz_onBack = ""; _melee2tb = "ItemCrowbar";};};
case "MeleeMachete": {if !("ItemMachete" in weapons player) then {dayz_onBack = ""; _melee2tb = "ItemMachete";};};
case "MeleeFishingPole": {dayz_onBack = ""; _melee2tb = "ItemFishingPole";};
case "MeleeHatchet_DZE": {if !("ItemHatchet_DZE" in weapons player) then {dayz_onBack = ""; _melee2tb = "ItemHatchet_DZE";};};
case "MeleeSledge": {if !("ItemSledge" in weapons player) then {dayz_onBack = ""; _melee2tb = "ItemSledge";};};
};
carryClick = false;

3
SQF/dayz_code/actions/player_addtoBack.sqf
View File

@@ -14,14 +14,13 @@ if (dayZ_OnBack != "") exitWith {closeDialog 0; cutText [format [localize "str_p
call gear_ui_init;
if (_item in ["ItemHatchet","ItemCrowbar","ItemMachete","ItemFishingPole","ItemHatchet_DZE","ItemSledge"]) then {
if (_item in ["ItemHatchet","ItemCrowbar","ItemMachete","ItemFishingPole","ItemSledge"]) then {
//free primary slot for new melee (remember item to add after)
switch (_item) do {
case "ItemHatchet": {player removeWeapon "ItemHatchet"; dayz_onBack = "MeleeHatchet";};
case "ItemCrowbar": {player removeWeapon "ItemCrowbar"; dayz_onBack = "MeleeCrowbar";};
case "ItemMachete": {player removeWeapon "ItemMachete"; dayz_onBack = "MeleeMachete";};
case "ItemFishingPole": {player removeWeapon "ItemFishingPole"; dayz_onBack = "MeleeFishingPole";};
case "ItemHatchet_DZE": {player removeWeapon "ItemHatchet_DZE"; dayz_onBack = "MeleeHatchet_DZE";};
case "ItemSledge": {player removeWeapon "ItemSledge"; dayz_onBack = "MeleeSledge";};
};
disableSerialization;

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

@@ -18,7 +18,6 @@ if ((dayz_onBack != "") && (dayz_onBack in MeleeWeapons) && carryClick) then {
case "MeleeHatchet": {_item = "ItemHatchet"; dayz_onBack = "";};
case "MeleeCrowbar": {_item = "ItemCrowbar"; dayz_onBack = "";};
case "MeleeMachete": {_item = "ItemMachete"; dayz_onBack = "";};
case "MeleeHatchet_DZE": {_item = "ItemHatchet_DZE"; dayz_onBack = "";};
case "MeleeSledge": {_item = "ItemSledge"; dayz_onBack = "";};
};
carryClick = false;

1
SQF/dayz_code/actions/player_mineStone.sqf
View File

@@ -143,7 +143,6 @@ if (!isNull _findNearestRock) then {
case "MeleeCrowbar": {player addMagazine 'Crowbar_Swing';};
case "MeleeMachete": {player addMagazine 'Machete_Swing';};
case "MeleeFishingPole": {player addMagazine 'Fishing_Swing';};
case "MeleeHatchet_DZE": {player addMagazine 'Hatchet_Swing';};
case "MeleeSledge": {player addMagazine 'Sledge_Swing';};
};
} else {

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

@@ -1226,7 +1226,7 @@ class CfgWeight
{
weight = 1;
};
class MeleeHatchet_DZE
class MeleeHatchet
{
weight = 1;
};
@@ -1246,11 +1246,6 @@ class CfgWeight
{
weight = 1;
};
class ItemHatchet_DZE
{
weight = 1;
};
class ItemCrowbar
{
weight = 1;

4
SQF/dayz_code/init/variables.sqf
View File

@@ -33,7 +33,7 @@ DayZ_Male = ["Survivor_DZ","Survivor1_DZ","Survivor2_DZ","Survivor3_DZ","Sniper1
DayZ_Female = ["SurvivorW2_DZ","BanditW1_DZ","BanditW2_DZ","SurvivorWcombat_DZ","SurvivorWurban_DZ","SurvivorWdesert_DZ","SurvivorWsequishaD_DZ","SurvivorWsequisha_DZ","SurvivorWpink_DZ","SurvivorW3_DZ"];
//Classnames for specific items
MeleeWeapons = ["MeleeHatchet","MeleeCrowbar","MeleeMachete","MeleeBaseball","MeleeBaseBallBat","MeleeBaseBallBatBarbed","MeleeBaseBallBatNails","MeleeFishingPole","MeleeSledge","MeleeHatchet_DZE"];
MeleeWeapons = ["MeleeHatchet","MeleeCrowbar","MeleeMachete","MeleeBaseball","MeleeBaseBallBat","MeleeBaseBallBatBarbed","MeleeBaseBallBatNails","MeleeFishingPole","MeleeSledge"];
MeleeMagazines = ["Hatchet_Swing","Crowbar_Swing","Machete_Swing","Bat_Swing","BatBarbed_Swing","BatNails_Swing","Fishing_Swing","Sledge_Swing"];
Dayz_fishingItems = ["MeleeFishingPole"];
Dayz_plants = ["Dayz_Plant1","Dayz_Plant2","Dayz_Plant3"];
@@ -490,7 +490,7 @@ DZE_fueltruckarray = ["KamazRefuel_DZ","UralRefuel_TK_EP1_DZ","MtvrRefuel_DES_EP
DZE_Lock_Door = "";
DZE_HeliAllowTowFrom = ["CH_47F_EP1_DZE","CH_47F_EP1_DZ","CH_47F_BAF","CH_47F_EP1","BAF_Merlin_DZE","CH53_DZE"];
DZE_HeliAllowToTow = ["hilux1_civil_1_open","HMMWV_Base","Lada_base","Offroad_DSHKM_base","Pickup_PK_base","SkodaBase","tractor","VWGolf","Volha_TK_CIV_Base_EP1","S1203_TK_CIV_EP1","SUV_Base_EP1","ArmoredSUV_Base_PMC","UAZ_Base","LandRover_Base","Ship"];
DZE_REPLACE_WEAPONS = [["Crossbow","ItemMatchbox","ItemHatchet"],["Crossbow_DZ","ItemMatchbox_DZE","ItemHatchet_DZE"]];
DZE_REPLACE_WEAPONS = [["Crossbow","ItemMatchbox"],["Crossbow_DZ","ItemMatchbox_DZE"]];
DZE_LockableStorage = ["VaultStorage","VaultStorageLocked","LockboxStorageLocked","LockboxStorage"];
DZE_LockedStorage = ["VaultStorageLocked","LockboxStorageLocked"];
DZE_UnLockedStorage = ["VaultStorage","LockboxStorage"];

6
SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyToolbeltItems.hpp
View File

@@ -34,7 +34,7 @@ class Category_679 {
buy[] = {2,"ItemGoldBar"};
sell[] = {1,"ItemGoldBar"};
};
class ItemHatchet_DZE {
class ItemHatchet {
type = "trade_weapons";
buy[] = {2,"ItemSilverBar"};
sell[] = {1,"ItemSilverBar"};
@@ -121,7 +121,7 @@ class Category_681 {
buy[] = {2,"ItemGoldBar"};
sell[] = {1,"ItemGoldBar"};
};
class ItemHatchet_DZE {
class ItemHatchet {
type = "trade_weapons";
buy[] = {2,"ItemSilverBar"};
sell[] = {1,"ItemSilverBar"};
@@ -208,7 +208,7 @@ class Category_532 {
buy[] = {2,"ItemGoldBar"};
sell[] = {1,"ItemGoldBar"};
};
class ItemHatchet_DZE {
class ItemHatchet {
type = "trade_weapons";
buy[] = {2,"ItemSilverBar"};
sell[] = {1,"ItemSilverBar"};

4
SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralToolbeltItems.hpp
View File

@@ -34,7 +34,7 @@ class Category_663 {
buy[] = {2,"ItemGoldBar"};
sell[] = {1,"ItemGoldBar"};
};
class ItemHatchet_DZE {
class ItemHatchet {
type = "trade_weapons";
buy[] = {2,"ItemSilverBar"};
sell[] = {1,"ItemSilverBar"};
@@ -121,7 +121,7 @@ class Category_510 {
buy[] = {2,"ItemGoldBar"};
sell[] = {1,"ItemGoldBar"};
};
class ItemHatchet_DZE {
class ItemHatchet {
type = "trade_weapons";
buy[] = {2,"ItemSilverBar"};
sell[] = {1,"ItemSilverBar"};

7
Server Files/SQL/1.0.6_Updates.sql
View File

@@ -6,6 +6,13 @@
-- UPDATE character_data SET Inventory = REPLACE(Inventory, 'ItemBloodbag', 'bloodBagONEG') WHERE INSTR(Inventory, 'ItemBloodbag') > 0;
-- UPDATE object_data SET Inventory = REPLACE(Inventory, 'ItemBloodbag', 'bloodBagONEG') WHERE INSTR(Inventory, 'ItemBloodbag') > 0;
-- ----------------------------
-- ItemHatchet_DZE was removed because it was identical to ItemHatchet
-- ----------------------------
UPDATE `Traders_DATA` SET `item` = '["ItemHatchet",1]' WHERE `item` = '["ItemHatchet_DZE",1]';
UPDATE character_data SET Backpack = REPLACE(Backpack, 'ItemHatchet_DZE', 'ItemHatchet') WHERE INSTR(Backpack, 'ItemHatchet_DZE') > 0;
UPDATE character_data SET Inventory = REPLACE(Inventory, 'ItemHatchet_DZE', 'ItemHatchet') WHERE INSTR(Inventory, 'ItemHatchet_DZE') > 0;
UPDATE object_data SET Inventory = REPLACE(Inventory, 'ItemHatchet_DZE', 'ItemHatchet') WHERE INSTR(Inventory, 'ItemHatchet_DZE') > 0;
-- ----------------------------
-- Updated fish names from 1.8.7