From d926a810384e8a8c52849c02c0f1336f99bce7f9 Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Thu, 31 Mar 2016 15:44:23 -0400 Subject: [PATCH] Remove Hatchet_DZE The two items are 100% identical now. There is no need to have a separate class for it anymore. --- .../CfgLoot/Groups/Buildings/Castle.hpp | 5 +- .../CfgLoot/Groups/Buildings/DZE_Other.hpp | 4 +- .../Configs/CfgLoot/Groups/Buildings/Farm.hpp | 2 +- .../CfgLoot/Groups/Buildings/Hunting.hpp | 2 +- .../CfgLoot/Groups/Buildings/Industrial.hpp | 2 +- .../Configs/CfgVehicles/CfgVehicles.hpp | 1 - .../Configs/CfgVehicles/DZE/WeaponHolder.hpp | 24 --------- .../Configs/CfgWeapons/Melee/Hatchet.hpp | 49 +------------------ .../Configs/CfgWeapons/Tools/Hatchet.hpp | 30 ------------ SQF/dayz_code/actions/player_addToolbelt.sqf | 4 +- SQF/dayz_code/actions/player_addtoBack.sqf | 3 +- SQF/dayz_code/actions/player_dropWeapon.sqf | 1 - SQF/dayz_code/actions/player_mineStone.sqf | 1 - .../R3F_Realism/R3F_Weight/R3F_CfgWeight.h | 7 +-- SQF/dayz_code/init/variables.sqf | 4 +- .../Category/FriendlyToolbeltItems.hpp | 6 +-- .../Category/NeutralToolbeltItems.hpp | 4 +- Server Files/SQL/1.0.6_Updates.sql | 7 +++ 18 files changed, 25 insertions(+), 131 deletions(-) delete mode 100644 SQF/dayz_code/Configs/CfgVehicles/DZE/WeaponHolder.hpp diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp index 7fe2d11f3..092a20365 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp @@ -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}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/DZE_Other.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/DZE_Other.hpp index a600e378a..c5bc5e1f9 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/DZE_Other.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/DZE_Other.hpp @@ -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}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Farm.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Farm.hpp index 471a1cfa2..9f072f960 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Farm.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Farm.hpp @@ -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 diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp index 6ffa2706e..2dad0136c 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp @@ -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}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp index 44a1d57e4..b1acd91ef 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp @@ -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}, diff --git a/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp b/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp index d5050b04a..729bb6288 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp @@ -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 diff --git a/SQF/dayz_code/Configs/CfgVehicles/DZE/WeaponHolder.hpp b/SQF/dayz_code/Configs/CfgVehicles/DZE/WeaponHolder.hpp deleted file mode 100644 index c0ccbb08b..000000000 --- a/SQF/dayz_code/Configs/CfgVehicles/DZE/WeaponHolder.hpp +++ /dev/null @@ -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';"; - }; -}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Melee/Hatchet.hpp b/SQF/dayz_code/Configs/CfgWeapons/Melee/Hatchet.hpp index 98176d472..5a5e5a778 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Melee/Hatchet.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Melee/Hatchet.hpp @@ -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; -}; +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Hatchet.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Hatchet.hpp index 95ee78717..4c8602a92 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Hatchet.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Hatchet.hpp @@ -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 { diff --git a/SQF/dayz_code/actions/player_addToolbelt.sqf b/SQF/dayz_code/actions/player_addToolbelt.sqf index af7a39680..cdd21986e 100644 --- a/SQF/dayz_code/actions/player_addToolbelt.sqf +++ b/SQF/dayz_code/actions/player_addToolbelt.sqf @@ -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; diff --git a/SQF/dayz_code/actions/player_addtoBack.sqf b/SQF/dayz_code/actions/player_addtoBack.sqf index 7a76a94d0..6a7faf260 100644 --- a/SQF/dayz_code/actions/player_addtoBack.sqf +++ b/SQF/dayz_code/actions/player_addtoBack.sqf @@ -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; diff --git a/SQF/dayz_code/actions/player_dropWeapon.sqf b/SQF/dayz_code/actions/player_dropWeapon.sqf index 6eb7131fa..85495c9db 100644 --- a/SQF/dayz_code/actions/player_dropWeapon.sqf +++ b/SQF/dayz_code/actions/player_dropWeapon.sqf @@ -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; diff --git a/SQF/dayz_code/actions/player_mineStone.sqf b/SQF/dayz_code/actions/player_mineStone.sqf index 090818e9c..c3c673465 100644 --- a/SQF/dayz_code/actions/player_mineStone.sqf +++ b/SQF/dayz_code/actions/player_mineStone.sqf @@ -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 { diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/R3F_CfgWeight.h b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/R3F_CfgWeight.h index 57091caa2..cafb6b1c0 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/R3F_CfgWeight.h +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/R3F_CfgWeight.h @@ -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; diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index abbfc89b1..245d234ab 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -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"]; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyToolbeltItems.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyToolbeltItems.hpp index d532ebc4f..7e9f6678b 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyToolbeltItems.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyToolbeltItems.hpp @@ -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"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralToolbeltItems.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralToolbeltItems.hpp index 6c92f584c..9d2f881a6 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralToolbeltItems.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralToolbeltItems.hpp @@ -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"}; diff --git a/Server Files/SQL/1.0.6_Updates.sql b/Server Files/SQL/1.0.6_Updates.sql index 86c683a76..d91ddc282 100644 --- a/Server Files/SQL/1.0.6_Updates.sql +++ b/Server Files/SQL/1.0.6_Updates.sql @@ -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