From 8de50c46192a2b32c69e53ccdf7291c8756f1b9f Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Thu, 31 Mar 2016 16:23:09 -0400 Subject: [PATCH] New variable for match stick counting --- CHANGE LOG 1.0.6.txt | 1 + .../Configs/CfgLoot/Groups/Backpacks.hpp | 15 ++++++----- .../CfgLoot/Groups/Buildings/Castle.hpp | 7 ++--- .../CfgLoot/Groups/Buildings/Church.hpp | 2 +- .../CfgLoot/Groups/Buildings/DZE_Other.hpp | 4 +-- .../Configs/CfgLoot/Groups/Buildings/Farm.hpp | 2 +- .../CfgLoot/Groups/Buildings/Hunting.hpp | 2 +- .../CfgLoot/Groups/Buildings/Office.hpp | 2 +- .../CfgLoot/Groups/Buildings/Residential.hpp | 2 +- .../CfgLoot/Groups/Buildings/Supermarket.hpp | 2 +- .../Configs/CfgLoot/Groups/CarePackage.hpp | 2 +- .../CfgLoot/Groups/ConsumableItems.hpp | 2 +- .../Configs/CfgLoot/Groups/InfectedCamp.hpp | 2 +- .../Configs/CfgMagazines/DZE/Misc.hpp | 2 +- .../Configs/CfgMagazines/Items/Wood.hpp | 2 +- .../Configs/CfgWeapons/Tools/Matchbox.hpp | 15 +---------- SQF/dayz_code/actions/player_destroyTent.sqf | 26 ++++++++++--------- SQF/dayz_code/configVariables.sqf | 1 + SQF/dayz_code/init/variables.sqf | 4 +-- .../Category/FriendlyToolbeltItems.hpp | 6 ++--- .../Category/NeutralToolbeltItems.hpp | 4 +-- Server Files/SQL/1.0.6_Updates.sql | 8 ++++++ 22 files changed, 57 insertions(+), 56 deletions(-) diff --git a/CHANGE LOG 1.0.6.txt b/CHANGE LOG 1.0.6.txt index c73bb6e3a..b07a3495a 100644 --- a/CHANGE LOG 1.0.6.txt +++ b/CHANGE LOG 1.0.6.txt @@ -4,6 +4,7 @@ - Blood types system is disabled by default. Set DZE_UseBloodTypes = true; in init.sqf to enable - Bandit heartbeat sound is disabled by default. Set DZE_HeartBeat = true; in init.sqf to enable - Knife dulling is disabled by default. Set dayz_knifeDulling = true; in init.sqf to enable + - Match stick counting is disabled by default. Set dayz_matchboxCount = true; in init.sqf to enable - Water bottle breaking is disabled by default. Set dayz_waterBottleBreaking = true; in init.sqf to enable - New loot table format is incompatible with old loot tables. See CfgLoot\README - Mission.sqm and description.ext now use compact format diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Backpacks.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Backpacks.hpp index c455d9b67..6d72151d7 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Backpacks.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Backpacks.hpp @@ -1,16 +1,17 @@ backpacks[] = { - {Loot_BACKPACK, 4, DZ_Assault_Pack_EP1}, - {Loot_BACKPACK, 2, DZ_Czech_Vest_Puch}, + {Loot_BACKPACK, 4, DZ_BP_Assault}, + {Loot_BACKPACK, 2, DZ_BP_VestPouch}, + {Loot_BACKPACK, 2, DZ_BP_Patrol}, {Loot_BACKPACK, 4, DZ_TerminalPack_EP1}, - {Loot_BACKPACK, 3, DZ_ALICE_Pack_EP1}, - {Loot_BACKPACK, 3, DZ_TK_Assault_Pack_EP1}, + {Loot_BACKPACK, 3, DZ_BP_Alice}, + {Loot_BACKPACK, 3, DZ_BP_Survival}, {Loot_BACKPACK, 3, DZ_CompactPack_EP1} }; militarybackpacks[] = { //{Loot_GROUP, 10, backpacks}, - {Loot_BACKPACK, 3, DZ_British_ACU}, + {Loot_BACKPACK, 3, DZ_BP_British}, {Loot_BACKPACK, 2, DZ_GunBag_EP1}, - {Loot_BACKPACK, 2, DZ_CivilBackpack_EP1}, - {Loot_BACKPACK, 2, DZ_Backpack_EP1}, + {Loot_BACKPACK, 2, DZ_BP_Czech}, + {Loot_BACKPACK, 2, DZ_BP_Coyote}, {Loot_BACKPACK, 1, DZ_LargeGunBag_EP1} }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp index 092a20365..d0014ca4d 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Castle.hpp @@ -8,7 +8,8 @@ Castle[] = {Loot_WEAPON, 1, ItemPickaxe}, {Loot_WEAPON, 2, ItemPickaxeBroken}, // {Loot_WEAPON, 2, ItemShovel}, - {Loot_WEAPON, 1, ItemHatchet}, +// {Loot_WEAPON, 1, ItemHatchet}, + {Loot_VEHICLE, 1, WeaponHolder_ItemHatchet}, //Weapons {Loot_WEAPON, 2, Mosin_DZ}, @@ -28,8 +29,8 @@ Castle[] = //Groups {Loot_GROUP, 5, AmmoCivilian}, {Loot_GROUP, 10, Trash}, - //{Loot_GROUP, 2, AttachmentsGeneric}, + {Loot_GROUP, 2, AttachmentsGeneric}, {Loot_GROUP, 5, Generic}, - {Loot_WEAPON, 3, ItemMatchbox_DZE}, + {Loot_WEAPON, 3, ItemMatchbox}, {Loot_GROUP, 5, Consumable} }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Church.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Church.hpp index c5383da4e..bc37e70b4 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Church.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Church.hpp @@ -20,6 +20,6 @@ Church[] = {Loot_GROUP, 5, AmmoCivilian}, //{Loot_GROUP, 2, AttachmentsGeneric}, {Loot_GROUP, 4, Generic}, - {Loot_WEAPON, 3, ItemMatchbox_DZE}, + {Loot_WEAPON, 3, ItemMatchbox}, {Loot_GROUP, 8, Consumable} }; \ No newline at end of file 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 c5bc5e1f9..ce7314b2e 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/DZE_Other.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/DZE_Other.hpp @@ -1,7 +1,7 @@ DynamicDebris[] = { {Loot_WEAPON, 2, ItemWatch}, - {Loot_WEAPON, 4, ItemMatchbox_DZE}, + {Loot_WEAPON, 4, ItemMatchbox}, {Loot_WEAPON, 4, ItemFlashlight}, {Loot_WEAPON, 3, Colt1911}, {Loot_WEAPON, 4, Makarov}, @@ -18,7 +18,7 @@ DynamicDebris[] = DynamicDebrisMilitary[] = { {Loot_WEAPON, 2, ItemWatch}, - {Loot_WEAPON, 4, ItemMatchbox_DZE}, + {Loot_WEAPON, 4, ItemMatchbox}, {Loot_WEAPON, 4, ItemFlashlight}, {Loot_WEAPON, 4, ItemEtool}, {Loot_WEAPON, 3, Colt1911}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Farm.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Farm.hpp index 9f072f960..fc4dff822 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Farm.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Farm.hpp @@ -32,6 +32,6 @@ Farm[] = {Loot_GROUP, 15, AmmoCivilian}, //{Loot_GROUP, 3, AttachmentsGeneric}, {Loot_GROUP, 8, Consumable}, - {Loot_WEAPON, 3, ItemMatchbox_DZE}, + {Loot_WEAPON, 3, ItemMatchbox}, {Loot_GROUP, 8, Generic} }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp index 2dad0136c..d1bf19414 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp @@ -38,6 +38,6 @@ Hunting[] = {Loot_PILE, 10, AmmoCivilian, 1, 3}, {Loot_PILE, 10, Consumable, 1, 3}, - {Loot_WEAPON, 3, ItemMatchbox_DZE}, + {Loot_WEAPON, 3, ItemMatchbox}, {Loot_GROUP, 10, Generic} }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Office.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Office.hpp index 1ac1adb98..467372033 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Office.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Office.hpp @@ -6,7 +6,7 @@ Office[] = {Loot_WEAPON, 6, ItemCompass}, {Loot_WEAPON, 6, ItemKnife}, {Loot_WEAPON, 4, ItemFlashlight}, - {Loot_WEAPON, 4, ItemMatchbox_DZE}, + {Loot_WEAPON, 4, ItemMatchbox}, {Loot_WEAPON, 4, Binocular}, {Loot_WEAPON, 3, ItemCrowbar}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Residential.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Residential.hpp index e2b3c98d0..30f165858 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Residential.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Residential.hpp @@ -40,6 +40,6 @@ Residential[] = {Loot_GROUP, 5, clothes}, {Loot_GROUP, 3, specialclothes}, {Loot_GROUP, 3, tents}, - {Loot_WEAPON, 3, ItemMatchbox_DZE}, + {Loot_WEAPON, 3, ItemMatchbox}, {Loot_GROUP, 8, Generic} }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Supermarket.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Supermarket.hpp index 7ad4b8a9d..abc887a1f 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Supermarket.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Supermarket.hpp @@ -41,7 +41,7 @@ Supermarket[] = {Loot_GROUP, 10, AmmoCivilian}, //{Loot_GROUP, 3, AttachmentsGeneric}, {Loot_GROUP, 3, tents}, - {Loot_WEAPON, 3, ItemMatchbox_DZE}, + {Loot_WEAPON, 3, ItemMatchbox}, {Loot_GROUP, 10, Trash} // {Loot_GROUP, 3, MedicalLow} }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/CarePackage.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/CarePackage.hpp index d06211412..4d9a39126 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/CarePackage.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/CarePackage.hpp @@ -28,6 +28,6 @@ CarePackage[] = {Loot_MAGAZINE, 4, ItemDomeTent}, {Loot_PILE, 10, MedicalLow, 1, 3}, {Loot_PILE, 15, Consumable, 1, 3}, - {Loot_WEAPON, 3, ItemMatchbox_DZE}, + {Loot_WEAPON, 3, ItemMatchbox}, {Loot_GROUP, 12, Generic} }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/ConsumableItems.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/ConsumableItems.hpp index aac455c5c..4d5e06d1b 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/ConsumableItems.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/ConsumableItems.hpp @@ -1,5 +1,5 @@ Matchbox[] = -{ //Change your loottable to use this loot_GROUP if you want matchbox ammo count, otherwise {Loot_WEAPON, 3, ItemMatchbox_DZE}, +{ {Loot_WEAPON, 1, ItemMatchbox}, {Loot_WEAPON, 1, Item5Matchbox}, {Loot_WEAPON, 1, Item4Matchbox}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/InfectedCamp.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/InfectedCamp.hpp index 04faf550d..2c0bcd84a 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/InfectedCamp.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/InfectedCamp.hpp @@ -60,5 +60,5 @@ InfectedCamp[] = {Loot_GROUP, 20, MedicalHigh}, {Loot_GROUP, 10, Parts}, {Loot_GROUP, 100, Consumable}, - {Loot_WEAPON, 3, ItemMatchbox_DZE} + {Loot_WEAPON, 3, ItemMatchbox} }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp b/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp index ae4e61d8f..a7e768d31 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp @@ -298,7 +298,7 @@ class ItemFuelBarrelEmpty: ItemFuelBarrel text = $STR_EPOCH_PLAYER_276; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; neednearby[] = {}; - requiretools[] = {"ItemToolbox","ItemMatchbox_DZE"}; + requiretools[] = {"ItemToolbox","ItemMatchbox"}; output[] = {{"ItemFireBarrel_kit",1}}; input[] = {{"ItemFuelBarrelEmpty",1},{"ItemJerryCan",1},{"PartWoodPile",4}}; }; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp index 5a453e329..0e5df7393 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp @@ -60,7 +60,7 @@ class PartWoodPile : CA_Magazine class Build { text = $STR_EPOCH_PLAYER_241; script = "spawn player_build;"; - require[] = {"ItemMatchbox_DZE"}; + require[] = {"ItemMatchbox"}; create = "Land_Fire_DZ"; }; class Crafting diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Matchbox.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Matchbox.hpp index 6bed9d6dd..fd5c85277 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Matchbox.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Matchbox.hpp @@ -87,17 +87,4 @@ class Item1Matchbox : ItemMatchbox qtyRemaining = "ItemMatchboxEmpty"; matches = 1; }; -}; - - -// EPOCH ADDITION - -class ItemMatchbox_DZE: ItemMatchbox -{ - class Ignators - { - chance = 1; - matches = -1; - qtyRemaining = "ItemMatchbox_DZE"; //Use new matchbox system but don't reduce quantity - }; -}; +}; \ No newline at end of file diff --git a/SQF/dayz_code/actions/player_destroyTent.sqf b/SQF/dayz_code/actions/player_destroyTent.sqf index 071aa23c6..28b08be9b 100644 --- a/SQF/dayz_code/actions/player_destroyTent.sqf +++ b/SQF/dayz_code/actions/player_destroyTent.sqf @@ -57,19 +57,21 @@ player addMagazine _emptycan; _randomBoxMatches = _matchArray call BIS_fnc_selectRandom; _qtyRemaining = getText (configFile >> "cfgWeapons" >> _randomBoxMatches >> "Ignators" >> "qtyRemaining"); -switch _randomBoxMatches do { - case "ItemMatchbox" : { - if ([0.3] call fn_chance) then { +if (dayz_matchboxCount) then { + switch _randomBoxMatches do { + case "ItemMatchbox" : { + if ([0.3] call fn_chance) then { + player removeWeapon _randomBoxMatches; + player addWeapon _qtyRemaining; + + //info box. + systemChat (localize "str_info_limitedbox"); + }; + }; + default { player removeWeapon _randomBoxMatches; player addWeapon _qtyRemaining; - - //info box. - systemChat (localize "str_info_limitedbox"); - }; - }; - default { - player removeWeapon _randomBoxMatches; - player addWeapon _qtyRemaining; + }; }; }; @@ -82,7 +84,7 @@ _sfx = "tentpack"; // Added Nutrition-Factor for work ["Working",0,[20,40,15,0]] call dayz_NutritionSystem; -uisleep 3; +uiSleep 3; _activatingPlayer = player; PVDZ_obj_Destroy = [_objectID,_objectUID, _activatingPlayer]; diff --git a/SQF/dayz_code/configVariables.sqf b/SQF/dayz_code/configVariables.sqf index 3c1d07466..d5c3cb7e4 100644 --- a/SQF/dayz_code/configVariables.sqf +++ b/SQF/dayz_code/configVariables.sqf @@ -4,6 +4,7 @@ // Standard DayZ variables are found in dayz_code\init\variables.sqf dayz_knifeDulling = false; // Enable knife dulling. Knives need to be sharpened after so many uses. +dayz_matchboxCount = false; // Enable match stick count. After five uses matches run out and must be replaced. dayz_waterBottleBreaking = false; // Water bottles have a chance to break when boiling and require duct tape to fix dayz_sellDistance_vehicle = 10; // Max distance players can sell land vehicles from at traders dayz_sellDistance_boat = 30; // Max distance players can sell boats from at traders diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index 245d234ab..f0adc460e 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -43,7 +43,7 @@ Dayz_attachment_array = ["Attachment_ACG","Attachment_AIM"]; //DayZ_cutter = ["Wire_cat1","Sandbag1_DZ","Fence_DZ","Generator_DZ","Hedgehog_DZ","CamoNet_DZ"] DayZ_Backpacks = ["DZ_Patrol_Pack_EP1","DZ_Assault_Pack_EP1","DZ_Czech_Vest_Puch","DZ_ALICE_Pack_EP1","DZ_TK_Assault_Pack_EP1","DZ_British_ACU","DZ_CivilBackpack_EP1","DZ_Backpack_EP1","DZ_TerminalPack_EP1","DZ_CompactPack_EP1","DZ_GunBag_EP1","DZ_LargeGunBag_EP1"]; Dayz_Gutting = ["ItemKnife","ItemKnife5","ItemKnife4","ItemKnife3","ItemKnife2","ItemKnife1","ItemKnifeBlunt"]; -Dayz_Ignators = ["ItemMatchbox","Item5Matchbox","Item4Matchbox","Item3Matchbox","Item2Matchbox","Item1Matchbox","ItemMatchbox_DZE"]; +Dayz_Ignators = ["ItemMatchbox","Item5Matchbox","Item4Matchbox","Item3Matchbox","Item2Matchbox","Item1Matchbox"]; DayZ_fuelCans = ["ItemJerrycan","ItemFuelcan","ItemFuelBarrel"]; DayZ_fuelCansEmpty = ["ItemJerrycanEmpty","ItemFuelcanEmpty","ItemFuelBarrelEmpty"]; DayZ_traps = ["Trap_Cans","TrapTripwireFlare","TrapBearTrapSmoke","TrapTripwireGrenade","TrapTripwireSmoke","TrapBearTrapFlare"]; @@ -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"],["Crossbow_DZ","ItemMatchbox_DZE"]]; +DZE_REPLACE_WEAPONS = [["Crossbow"],["Crossbow_DZ"]]; 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 7e9f6678b..39c2b5046 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyToolbeltItems.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyToolbeltItems.hpp @@ -49,7 +49,7 @@ class Category_679 { buy[] = {6,"ItemSilverBar"}; sell[] = {3,"ItemSilverBar"}; }; - class ItemMatchbox_DZE { + class ItemMatchbox { type = "trade_weapons"; buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; @@ -136,7 +136,7 @@ class Category_681 { buy[] = {6,"ItemSilverBar"}; sell[] = {3,"ItemSilverBar"}; }; - class ItemMatchbox_DZE { + class ItemMatchbox { type = "trade_weapons"; buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; @@ -223,7 +223,7 @@ class Category_532 { buy[] = {6,"ItemSilverBar"}; sell[] = {3,"ItemSilverBar"}; }; - class ItemMatchbox_DZE { + class ItemMatchbox { 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 9d2f881a6..cffa73eea 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralToolbeltItems.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralToolbeltItems.hpp @@ -49,7 +49,7 @@ class Category_663 { buy[] = {6,"ItemSilverBar"}; sell[] = {3,"ItemSilverBar"}; }; - class ItemMatchbox_DZE { + class ItemMatchbox { type = "trade_weapons"; buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; @@ -136,7 +136,7 @@ class Category_510 { buy[] = {6,"ItemSilverBar"}; sell[] = {3,"ItemSilverBar"}; }; - class ItemMatchbox_DZE { + class ItemMatchbox { 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 d91ddc282..8fc4eef4d 100644 --- a/Server Files/SQL/1.0.6_Updates.sql +++ b/Server Files/SQL/1.0.6_Updates.sql @@ -6,6 +6,14 @@ -- 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; +-- ---------------------------- +-- ItemMatchbox_DZE was removed, use dayz_matchboxCount config variable for match stick count +-- ---------------------------- +UPDATE `Traders_DATA` SET `item` = '["ItemMatchbox",1]' WHERE `item` = '["ItemMatchbox_DZE",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'ItemMatchbox_DZE', 'ItemMatchbox') WHERE INSTR(Backpack, 'ItemMatchbox_DZE') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'ItemMatchbox_DZE', 'ItemMatchbox') WHERE INSTR(Inventory, 'ItemMatchbox_DZE') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'ItemMatchbox_DZE', 'ItemMatchbox') WHERE INSTR(Inventory, 'ItemMatchbox_DZE') > 0; + -- ---------------------------- -- ItemHatchet_DZE was removed because it was identical to ItemHatchet -- ----------------------------