W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-16 13:12:56 +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
{