From d7f35c0cf36c9899dd18c7a6135f03beb40a5407 Mon Sep 17 00:00:00 2001 From: oiad Date: Sat, 5 Nov 2016 14:40:27 +1300 Subject: [PATCH] Fix spelling mistake of classname DZ_Czech_Vest_Pouch (#1792) * Fix spelling mistake of classname DZ_Czech_Vest_Pouch As per subject * Fix typo from 1.0.5.1 and rename DZ_Czech_Vest_Puch to DZ_Czech_Vest_Pouch. As per subject * Fix typo from 1.0.5.1 and rename DZ_Czech_Vest_Puch to DZ_Czech_Vest_Pouch. As per * More typo SQL goodness As per subject --- SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp | 2 +- .../CfgServerTrader/Category/FriendlyBackpacks.hpp | 2 +- SQF/dayz_code/Configs/CfgVehicles/Bags.hpp | 4 ++-- SQF/dayz_code/init/variables.sqf | 2 +- Server Files/Battleye/createvehicle.txt | 2 +- Server Files/SQL/1.0.6_Updates.sql | 13 ++++++++++--- Server Files/SQL/epoch.sql | 10 +++++----- 7 files changed, 21 insertions(+), 14 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp b/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp index 71a6eeb8d..c66208dd8 100644 --- a/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp @@ -5,7 +5,7 @@ class CfgLoot class Groups { //Not renamed yet - #define DZ_BP_VestPouch DZ_Czech_Vest_Puch + #define DZ_BP_VestPouch DZ_Czech_Vest_Pouch #define DZ_BP_Patrol DZ_Patrol_Pack_EP1 #define DZ_BP_Assault DZ_Assault_Pack_EP1 #define DZ_BP_Survival DZ_TK_Assault_Pack_EP1 diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyBackpacks.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyBackpacks.hpp index 8a6954e25..1b3059f0d 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyBackpacks.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyBackpacks.hpp @@ -1,5 +1,5 @@ class Category_538 { - class DZ_Czech_Vest_Puch { + class DZ_Czech_Vest_Pouch { type = "trade_backpacks"; buy[] = {4,"ItemSilverBar"}; sell[] = {2,"ItemSilverBar"}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Bags.hpp b/SQF/dayz_code/Configs/CfgVehicles/Bags.hpp index 6c943dff7..61b169ef4 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Bags.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Bags.hpp @@ -52,7 +52,7 @@ class DZ_Assault_Pack_EP1: Bag_Base_EP1 }; }; -class DZ_Czech_Vest_Puch: Bag_Base_EP1 +class DZ_Czech_Vest_Pouch: Bag_Base_EP1 { displayname = $STR_BACKPACK_NAME_VEST; descriptionShort = $STR_BACKPACK_DESC_VEST; @@ -65,7 +65,7 @@ class DZ_Czech_Vest_Puch: Bag_Base_EP1 transportmaxweapons = 0; class eventHandlers { - init="[(_this select 0),'CfgVehicles','DZ_Czech_Vest_Puch'] execVM '\z\addons\dayz_code\init\object_BackpackAction.sqf';"; + init="[(_this select 0),'CfgVehicles','DZ_Czech_Vest_Pouch'] execVM '\z\addons\dayz_code\init\object_BackpackAction.sqf';"; }; }; diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index 9a65766b0..e079adfd7 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -50,7 +50,7 @@ Dayz_attachment_array = ["Attachment_ACG","Attachment_AIM"]; //DayZ_Tents = ["TentStorage","TentStorage0","TentStorage1","TentStorage2","TentStorage3","TentStorage4","DomeTentStorage","DomeTentStorage0","DomeTentStorage1","DomeTentStorage2","DomeTentStorage3","DomeTentStorage4"] //DayZ_Stashs = ["StashSmall","StashSmall1","StashSmall2","StashSmall3","StashSmall4","StashMedium","StashMedium1","StashMedium2","StashMedium3","StashMedium4"] //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_Backpacks = ["DZ_Patrol_Pack_EP1","DZ_Assault_Pack_EP1","DZ_Czech_Vest_Pouch","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"]; DayZ_fuelCans = ["ItemJerrycan","ItemFuelcan","ItemFuelBarrel"]; diff --git a/Server Files/Battleye/createvehicle.txt b/Server Files/Battleye/createvehicle.txt index c77eff67e..b991b7fde 100644 --- a/Server Files/Battleye/createvehicle.txt +++ b/Server Files/Battleye/createvehicle.txt @@ -1,7 +1,7 @@ //new 5 !(^DZ_|^z_|^pz_|^WeaponHolder|Box|dog|PZombie_VB|^Smoke|^Chem|^._40mm|_DZ$|^Trap) !=(SeaGull|SmallSecondary|HelicopterExplo(Small|Big)|DesertTentStorage|Stash(Small|Medium)(|[1-4])|(|Dome)TentStorage(|[0-4])) !=(CZ_VestPouch_EP1|R_M136_AT|R_MEEWS_HEAT|Wire_cat1) !=(JackDaniels|(Tin|Soda)Can|RoadFlare|WoodenArrowF|zZombie_Base|Parachute(West|C)|Grenade(_|HandTimed)(West|East)) !=(CMflareAmmo|Pipebomb) !=(WildBoar|Rabbit|Sheep|Sheep(01_EP1|02_EP1)|Goat|Goat(01_EP1|02_EP1)|Hen|Cow0[1234]|Cow01_EP1|Cock) !=Blood_Trail_DZ !^(Wooden|Metal)Fence !^WoodenGate_ !=(ShantyHouse(|Stage[2-7])|SurvivorWorkshop(|Stage2|[ABC]Stage[345])|WorkBench) !=explosive_bolt !"Land_" !=Sign_(arrow_down_large|sphere10cm)_EP1 !="MAP_c_fern" !="Grave" !"VaultStorage" !="LaserTargetW" !Fort_ !Nest !CMflare !="GyroGrenade" !="CraterLong" !="pook_camel_HE" 5 SeaGull //set to its own line so we know which kick we have here with out looking in the logs -1 ^DZ_ !=DZ_(British_ACU|Czech_Vest_Puch|(TK_Assault_Pack|Patrol_Pack|Assault_Pack|ALICE_Pack|CivilBackpack|Backpack)_EP1) +1 ^DZ_ !=DZ_(British_ACU|Czech_Vest_Pouch|(TK_Assault_Pack|Patrol_Pack|Assault_Pack|ALICE_Pack|CivilBackpack|Backpack)_EP1) 1 ^z_ !=z_((|new_)villager[1234]|(|new_)worker[1234]|teacher|hunter|suit[12]|soldier(|_pilot|_heavy)|policeman|doctor|priest) 1 ^WeaponHolder !=WeaponHolder !WeaponHolder_part !=WeaponHolder_(Item(DomeTent|CamoNet|Crowbar|Fuelcan|Hatchet|Jerrycan|Tent)|Melee(BaseBallBat(|Nails)|BatBarbed|Machete)) !=WeaponHolder_Part(Engine|Fueltank|Generic|Glass|VRotor|Wheel)!=WeaponHolder_Item(WorkBench|MetalSheet|ConcreteBlock|RSJ) 1 Box !=(MedBox[01]|AmmoBoxSmall_(556|762)|Item(Match|Tool)box|equip_pvc_box|FoodBox[012]|DebugBoxPlayer_DZ|Lockbox(StorageLocked|Storage)|WeaponHolder_ItemLockbox) diff --git a/Server Files/SQL/1.0.6_Updates.sql b/Server Files/SQL/1.0.6_Updates.sql index ea8f683e3..4c7d3892d 100644 --- a/Server Files/SQL/1.0.6_Updates.sql +++ b/Server Files/SQL/1.0.6_Updates.sql @@ -51,11 +51,18 @@ ALTER TABLE Player_DATA ADD PlayerCoins bigint(20) NOT NULL DEFAULT '0'; ALTER TABLE Player_DATA ADD BankCoins bigint(20) NOT NULL DEFAULT '0'; -- ---------------------------- --- Remove CZ_VestPouch_EP1 from traders and inventories. It is the same model as DZ_Czech_Vest_Puch with half the slots. +-- Remove CZ_VestPouch_EP1 from traders and inventories. It is the same model as DZ_Czech_Vest_Pouch with half the slots. -- ---------------------------- DELETE FROM `Traders_DATA` WHERE item = '["CZ_VestPouch_EP1",2]'; -UPDATE character_data SET Inventory = REPLACE(Inventory, 'CZ_VestPouch_EP1', 'DZ_Czech_Vest_Puch') WHERE INSTR(Inventory, 'CZ_VestPouch_EP1') > 0; -UPDATE object_data SET Inventory = REPLACE(Inventory, 'CZ_VestPouch_EP1', 'DZ_Czech_Vest_Puch') WHERE INSTR(Inventory, 'CZ_VestPouch_EP1') > 0; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'CZ_VestPouch_EP1', 'DZ_Czech_Vest_Pouch') WHERE INSTR(Backpack, 'CZ_VestPouch_EP1') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'CZ_VestPouch_EP1', 'DZ_Czech_Vest_Pouch') WHERE INSTR(Inventory, 'CZ_VestPouch_EP1') > 0; + +-- ---------------------------- +-- Fix typo from 1.0.5.1 and rename DZ_Czech_Vest_Puch to DZ_Czech_Vest_Pouch. +-- ---------------------------- +UPDATE `Traders_DATA` SET `item` = '["DZ_Czech_Vest_Pouch",2]' WHERE `item` = '["DZ_Czech_Vest_Puch",2]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'DZ_Czech_Vest_Puch', 'DZ_Czech_Vest_Pouch') WHERE INSTR(Backpack, 'DZ_Czech_Vest_Puch') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'DZ_Czech_Vest_Puch', 'DZ_Czech_Vest_Pouch') WHERE INSTR(Inventory, 'DZ_Czech_Vest_Puch') > 0; -- ---------------------------- -- Fix typo from 1.0.5.1 updates causing Merlin and CH53 to show as magazines instead of vehicles diff --git a/Server Files/SQL/epoch.sql b/Server Files/SQL/epoch.sql index 42a7d8086..390acd5ed 100644 --- a/Server Files/SQL/epoch.sql +++ b/Server Files/SQL/epoch.sql @@ -410,7 +410,7 @@ INSERT INTO `Traders_DATA` VALUES(5119, '["DZ_Assault_Pack_EP1",2]', 10, '[1,"It INSERT INTO `Traders_DATA` VALUES(5120, '["DZ_Backpack_EP1",2]', 10, '[8,"ItemGoldBar",1]', '[4,"ItemGoldBar",1]', 0, 496, 'trade_backpacks'); INSERT INTO `Traders_DATA` VALUES(5121, '["DZ_British_ACU",2]', 10, '[4,"ItemGoldBar",1]', '[2,"ItemGoldBar",1]', 0, 496, 'trade_backpacks'); INSERT INTO `Traders_DATA` VALUES(5122, '["DZ_CivilBackpack_EP1",2]', 10, '[6,"ItemGoldBar",1]', '[4,"ItemGoldBar",1]', 0, 496, 'trade_backpacks'); -INSERT INTO `Traders_DATA` VALUES(5123, '["DZ_Czech_Vest_Puch",2]', 10, '[2,"ItemSilverBar",1]', '[1,"ItemSilverBar",1]', 0, 496, 'trade_backpacks'); +INSERT INTO `Traders_DATA` VALUES(5123, '["DZ_Czech_Vest_Pouch",2]', 10, '[2,"ItemSilverBar",1]', '[1,"ItemSilverBar",1]', 0, 496, 'trade_backpacks'); INSERT INTO `Traders_DATA` VALUES(5124, '["DZ_TK_Assault_Pack_EP1",2]', 10, '[6,"ItemSilverBar10oz",1]', '[3,"ItemSilverBar10oz",1]', 0, 496, 'trade_backpacks'); INSERT INTO `Traders_DATA` VALUES(5125, '["DZ_TerminalPack_EP1",2]', 10, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 496, 'trade_backpacks'); INSERT INTO `Traders_DATA` VALUES(5126, '["DZ_GunBag_EP1",2]', 10, '[6,"ItemGoldBar",1]', '[3,"ItemGoldBar",1]', 0, 496, 'trade_backpacks'); @@ -1076,7 +1076,7 @@ INSERT INTO `Traders_DATA` VALUES(6397, '["DZ_Assault_Pack_EP1",2]', 10, '[1,"It INSERT INTO `Traders_DATA` VALUES(6398, '["DZ_Backpack_EP1",2]', 10, '[8,"ItemGoldBar",1]', '[4,"ItemGoldBar",1]', 0, 632, 'trade_backpacks'); INSERT INTO `Traders_DATA` VALUES(6399, '["DZ_British_ACU",2]', 10, '[4,"ItemGoldBar",1]', '[2,"ItemGoldBar",1]', 0, 632, 'trade_backpacks'); INSERT INTO `Traders_DATA` VALUES(6400, '["DZ_CivilBackpack_EP1",2]', 10, '[6,"ItemGoldBar",1]', '[4,"ItemGoldBar",1]', 0, 632, 'trade_backpacks'); -INSERT INTO `Traders_DATA` VALUES(6401, '["DZ_Czech_Vest_Puch",2]', 10, '[2,"ItemSilverBar",1]', '[1,"ItemSilverBar",1]', 0, 632, 'trade_backpacks'); +INSERT INTO `Traders_DATA` VALUES(6401, '["DZ_Czech_Vest_Pouch",2]', 10, '[2,"ItemSilverBar",1]', '[1,"ItemSilverBar",1]', 0, 632, 'trade_backpacks'); INSERT INTO `Traders_DATA` VALUES(6402, '["DZ_TK_Assault_Pack_EP1",2]', 10, '[6,"ItemSilverBar10oz",1]', '[3,"ItemSilverBar10oz",1]', 0, 632, 'trade_backpacks'); INSERT INTO `Traders_DATA` VALUES(6403, '["DZ_TerminalPack_EP1",2]', 10, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 632, 'trade_backpacks'); INSERT INTO `Traders_DATA` VALUES(6404, '["DZ_GunBag_EP1",2]', 10, '[6,"ItemGoldBar",1]', '[3,"ItemGoldBar",1]', 0, 632, 'trade_backpacks'); @@ -1436,7 +1436,7 @@ INSERT INTO `Traders_DATA` VALUES(6873, '["DZ_Assault_Pack_EP1",2]', 10, '[1,"It INSERT INTO `Traders_DATA` VALUES(6874, '["DZ_Backpack_EP1",2]', 10, '[8,"ItemGoldBar",1]', '[4,"ItemGoldBar",1]', 0, 685, 'trade_backpacks'); INSERT INTO `Traders_DATA` VALUES(6875, '["DZ_British_ACU",2]', 10, '[4,"ItemGoldBar",1]', '[2,"ItemGoldBar",1]', 0, 685, 'trade_backpacks'); INSERT INTO `Traders_DATA` VALUES(6876, '["DZ_CivilBackpack_EP1",2]', 10, '[6,"ItemGoldBar",1]', '[4,"ItemGoldBar",1]', 0, 685, 'trade_backpacks'); -INSERT INTO `Traders_DATA` VALUES(6877, '["DZ_Czech_Vest_Puch",2]', 10, '[2,"ItemSilverBar",1]', '[1,"ItemSilverBar",1]', 0, 685, 'trade_backpacks'); +INSERT INTO `Traders_DATA` VALUES(6877, '["DZ_Czech_Vest_Pouch",2]', 10, '[2,"ItemSilverBar",1]', '[1,"ItemSilverBar",1]', 0, 685, 'trade_backpacks'); INSERT INTO `Traders_DATA` VALUES(6878, '["DZ_TK_Assault_Pack_EP1",2]', 10, '[6,"ItemSilverBar10oz",1]', '[3,"ItemSilverBar10oz",1]', 0, 685, 'trade_backpacks'); INSERT INTO `Traders_DATA` VALUES(6879, '["DZ_TerminalPack_EP1",2]', 10, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 685, 'trade_backpacks'); INSERT INTO `Traders_DATA` VALUES(6880, '["DZ_GunBag_EP1",2]', 10, '[6,"ItemGoldBar",1]', '[3,"ItemGoldBar",1]', 0, 685, 'trade_backpacks'); @@ -1461,7 +1461,7 @@ INSERT INTO `Traders_DATA` VALUES(6899, '["DZ_Assault_Pack_EP1",2]', 10, '[1,"It INSERT INTO `Traders_DATA` VALUES(6900, '["DZ_Backpack_EP1",2]', 10, '[8,"ItemGoldBar",1]', '[4,"ItemGoldBar",1]', 0, 688, 'trade_backpacks'); INSERT INTO `Traders_DATA` VALUES(6901, '["DZ_British_ACU",2]', 10, '[4,"ItemGoldBar",1]', '[2,"ItemGoldBar",1]', 0, 688, 'trade_backpacks'); INSERT INTO `Traders_DATA` VALUES(6902, '["DZ_CivilBackpack_EP1",2]', 10, '[6,"ItemGoldBar",1]', '[4,"ItemGoldBar",1]', 0, 688, 'trade_backpacks'); -INSERT INTO `Traders_DATA` VALUES(6903, '["DZ_Czech_Vest_Puch",2]', 10, '[2,"ItemSilverBar",1]', '[1,"ItemSilverBar",1]', 0, 688, 'trade_backpacks'); +INSERT INTO `Traders_DATA` VALUES(6903, '["DZ_Czech_Vest_Pouch",2]', 10, '[2,"ItemSilverBar",1]', '[1,"ItemSilverBar",1]', 0, 688, 'trade_backpacks'); INSERT INTO `Traders_DATA` VALUES(6904, '["DZ_TK_Assault_Pack_EP1",2]', 10, '[6,"ItemSilverBar10oz",1]', '[3,"ItemSilverBar10oz",1]', 0, 688, 'trade_backpacks'); INSERT INTO `Traders_DATA` VALUES(6905, '["DZ_TerminalPack_EP1",2]', 10, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 688, 'trade_backpacks'); INSERT INTO `Traders_DATA` VALUES(6906, '["DZ_GunBag_EP1",2]', 10, '[6,"ItemGoldBar",1]', '[3,"ItemGoldBar",1]', 0, 688, 'trade_backpacks'); @@ -1582,7 +1582,7 @@ INSERT INTO `Traders_DATA` VALUES(7233, '["bulk_ItemTankTrap",1]', 10, '[1,"Item INSERT INTO `Traders_DATA` VALUES(7240, '["bulk_ItemTankTrap",1]', 10, '[1,"ItemGoldBar",1]', '[1,"ItemGoldBar",1]', 0, 636, 'trade_items'); INSERT INTO `Traders_DATA` VALUES(7241, '["bulk_ItemWire",1]', 10, '[3,"ItemSilverBar10oz",1]', '[3,"ItemSilverBar10oz",1]', 0, 636, 'trade_items'); INSERT INTO `Traders_DATA` VALUES(7242, '["bulk_PartGeneric",1]', 10, '[6,"ItemSilverBar10oz",1]', '[6,"ItemSilverBar10oz",1]', 0, 555, 'trade_items'); -INSERT INTO `Traders_DATA` VALUES(7250, '["DZ_Czech_Vest_Puch",2]', 10, '[2,"ItemSilverBar",1]', '[1,"ItemSilverBar",1]', 0, 538, 'trade_backpacks'); +INSERT INTO `Traders_DATA` VALUES(7250, '["DZ_Czech_Vest_Pouch",2]', 10, '[2,"ItemSilverBar",1]', '[1,"ItemSilverBar",1]', 0, 538, 'trade_backpacks'); INSERT INTO `Traders_DATA` VALUES(7251, '["DZ_TK_Assault_Pack_EP1",2]', 10, '[6,"ItemSilverBar10oz",1]', '[3,"ItemSilverBar10oz",1]', 0, 538, 'trade_backpacks'); INSERT INTO `Traders_DATA` VALUES(7252, '["DZ_TerminalPack_EP1",2]', 10, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 538, 'trade_backpacks'); INSERT INTO `Traders_DATA` VALUES(7253, '["DZ_GunBag_EP1",2]', 10, '[6,"ItemGoldBar",1]', '[3,"ItemGoldBar",1]', 0, 538, 'trade_backpacks');