diff --git a/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp b/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp index 5dbee42f4..3fe79e528 100644 --- a/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp @@ -228,14 +228,14 @@ class CfgLootLegacy { ,{"ItemWaterbottle",0.01} ,{"ItemBandage",0.07} ,{"7Rnd_45ACP_1911",0.03} - ,{"5x_22_LR_17_HMR",0.01} - ,{"10x_303",0.04} + ,{"5Rnd_17HMR",0.01} + ,{"10Rnd_303British",0.04} ,{"6Rnd_45ACP",0.04} ,{"2Rnd_12Gauge_Slug",0.05} ,{"2Rnd_12Gauge_Buck",0.05} ,{"8Rnd_9x18_Makarov",0.08} ,{"15Rnd_W1866_Slug",0.02} - ,{"WoodenArrow",0.04} + ,{"1Rnd_Arrow_Wood",0.04} ,{"350Rnd_BB_Magazine",0.05} ,{"HandRoadFlare",0.07} ,{"ItemPainkiller",0.02} @@ -260,14 +260,14 @@ class CfgLootLegacy { ,{"ItemWaterbottle",0.01} ,{"ItemBandage",0.11} ,{"7Rnd_45ACP_1911",0.03} - ,{"5x_22_LR_17_HMR",0.01} - ,{"10x_303",0.04} + ,{"5Rnd_17HMR",0.01} + ,{"10Rnd_303British",0.04} ,{"6Rnd_45ACP",0.04} ,{"2Rnd_12Gauge_Slug",0.05} ,{"2Rnd_12Gauge_Buck",0.05} ,{"8Rnd_9x18_Makarov",0.09} ,{"15Rnd_W1866_Slug",0.02} - ,{"WoodenArrow",0.04} + ,{"1Rnd_Arrow_Wood",0.04} ,{"350Rnd_BB_Magazine",0.05} ,{"HandRoadFlare",0.07} ,{"ItemPainkiller",0.02} @@ -397,11 +397,11 @@ class CfgLootLegacy { }; hunter[] = { {"ItemBandage",0.4} - ,{"5x_22_LR_17_HMR",0.15} + ,{"5Rnd_17HMR",0.15} ,{"7Rnd_45ACP_1911",0.03} - ,{"10x_303",0.1} + ,{"10Rnd_303British",0.1} ,{"ItemWaterbottleUnfilled",0.05} - ,{"WoodenArrow",0.2} + ,{"1Rnd_Arrow_Wood",0.2} ,{"350Rnd_BB_Magazine",0.05} ,{"ItemHeatPack",0.02} ,{"FoodMRE",0.01} @@ -567,7 +567,7 @@ class CfgLootLegacy { ,{"10Rnd_762x54_SVD",0.2} ,{"20Rnd_762x51_DMR",0.1} ,{"5Rnd_762x51_M24",0.15} - ,{"5x_22_LR_17_HMR",0.1} + ,{"5Rnd_17HMR",0.1} ,{"20Rnd_762x51_SB_SCAR",0.07} ,{"20Rnd_9x39_SP5_VSS",0.05} }; diff --git a/SQF/dayz_code/Configs/CfgLoot/CfgLootSmall.hpp b/SQF/dayz_code/Configs/CfgLoot/CfgLootSmall.hpp index 4b0bb245d..88222927b 100644 --- a/SQF/dayz_code/Configs/CfgLoot/CfgLootSmall.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/CfgLootSmall.hpp @@ -74,14 +74,14 @@ class CfgLootSmall { {"ItemWaterbottle",0.01}, {"ItemBandage",0.08}, {"7Rnd_45ACP_1911",0.03}, - {"5x_22_LR_17_HMR",0.01}, - {"10x_303",0.04}, + {"5Rnd_17HMR",0.01}, + {"10Rnd_303British",0.04}, {"6Rnd_45ACP",0.04}, {"2Rnd_12Gauge_Slug",0.05}, {"2Rnd_12Gauge_Buck",0.05}, {"8Rnd_9x18_Makarov",0.09}, {"15Rnd_W1866_Slug",0.02}, - {"WoodenArrow",0.04}, + {"1Rnd_Arrow_Wood",0.04}, {"HandRoadFlare",0.07}, {"ItemPainkiller",0.02}, {"HandChemGreen",0.01}, @@ -103,14 +103,14 @@ class CfgLootSmall { {"ItemWaterbottle",0.01}, {"ItemBandage",0.11}, {"7Rnd_45ACP_1911",0.03}, - {"5x_22_LR_17_HMR",0.01}, - {"10x_303",0.04}, + {"5Rnd_17HMR",0.01}, + {"10Rnd_303British",0.04}, {"6Rnd_45ACP",0.04}, {"2Rnd_12Gauge_Slug",0.05}, {"2Rnd_12Gauge_Buck",0.05}, {"8Rnd_9x18_Makarov",0.09}, {"15Rnd_W1866_Slug",0.02}, - {"WoodenArrow",0.04}, + {"1Rnd_Arrow_Wood",0.04}, {"HandRoadFlare",0.07}, {"ItemPainkiller",0.02}, {"HandChemGreen",0.01}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp index bd05300a3..cc99461c8 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp @@ -83,7 +83,7 @@ AmmoMilitaryLow[] = //DZE {Loot_MAGAZINE, 3, 5Rnd_127x108_KSVK}, {Loot_MAGAZINE, 2, 10Rnd_127x99_m107}, - {Loot_MAGAZINE, 4, 5x_22_LR_17_HMR}, + {Loot_MAGAZINE, 4, 5Rnd_17HMR}, {Loot_MAGAZINE, 3, 20Rnd_762x51_SB_SCAR}, {Loot_MAGAZINE, 3, 20Rnd_9x39_SP5_VSS}, {Loot_MAGAZINE, 3, 5Rnd_86x70_L115A1}, @@ -307,7 +307,7 @@ sniperriflesammo[] = { ,{Loot_MAGAZINE, 3, 10Rnd_762x54_SVD} ,{Loot_MAGAZINE, 4, 20Rnd_762x51_DMR} ,{Loot_MAGAZINE, 4, 5Rnd_762x51_M24} - ,{Loot_MAGAZINE, 4, 5x_22_LR_17_HMR} + ,{Loot_MAGAZINE, 4, 5Rnd_17HMR} ,{Loot_MAGAZINE, 3, 20Rnd_762x51_SB_SCAR} ,{Loot_MAGAZINE, 3, 20Rnd_9x39_SP5_VSS} }; diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp index 45d9e7ff2..96021a6a9 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp @@ -12,8 +12,8 @@ Hunting[] = {Loot_WEAPON, 7, ItemKnife}, {Loot_WEAPON, 2, ItemCompass}, {Loot_WEAPON, 4, ItemHatchet_DZE}, - {Loot_MAGAZINE, 1, 5x_22_LR_17_HMR}, - {Loot_MAGAZINE, 1, 10x_303}, + {Loot_MAGAZINE, 1, 5Rnd_17HMR}, + {Loot_MAGAZINE, 1, 10Rnd_303British}, {Loot_MAGAZINE, 2, ItemWaterbottleUnfilled}, {Loot_MAGAZINE, 2, ItemHeatPack}, {Loot_MAGAZINE, 2, FoodMRE}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Office.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Office.hpp index 903209c3a..957c9ac44 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Office.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Office.hpp @@ -31,8 +31,8 @@ Office[] = {Loot_MAGAZINE, 1, ItemLockbox}, {Loot_MAGAZINE, 1, PartPlywoodPack}, {Loot_MAGAZINE, 1, ItemDocument}, - //{Loot_MAGAZINE, 3, 10x_303}, //IN GENERIC - //{Loot_MAGAZINE, 1, 5x_22_LR_17_HMR}, //IN GENERIC + //{Loot_MAGAZINE, 3, 10Rnd_303British}, //IN GENERIC + //{Loot_MAGAZINE, 1, 5Rnd_17HMR}, //IN GENERIC //Groups {Loot_GROUP, 8, Consumable}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Generic.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Generic.hpp index da1f84ea1..c8d9b9a0f 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Generic.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Generic.hpp @@ -8,8 +8,8 @@ Generic[] = {Loot_MAGAZINE, 1, HandChemRed}, //DZE - {Loot_MAGAZINE, 1, 5x_22_LR_17_HMR}, - {Loot_MAGAZINE, 2, 10x_303}, + {Loot_MAGAZINE, 1, 5Rnd_17HMR}, + {Loot_MAGAZINE, 2, 10Rnd_303British}, // {Loot_MAGAZINE, 1, ItemBookBible}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Hunter.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Hunter.hpp index 1edf1c07b..7f34927f6 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Hunter.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Hunter.hpp @@ -4,8 +4,8 @@ ZombieHunter[] = {Loot_GROUP, 7, AmmoCivilian}, {Loot_MAGAZINE, 1, 1Rnd_Arrow_Wood}, {Loot_MAGAZINE, 3, ItemBandage}, - {Loot_MAGAZINE, 1, 5x_22_LR_17_HMR}, - {Loot_MAGAZINE, 2, 10x_303}, + {Loot_MAGAZINE, 1, 5Rnd_17HMR}, + {Loot_MAGAZINE, 2, 10Rnd_303British}, {Loot_MAGAZINE, 2, ItemMixOil}, {Loot_MAGAZINE, 2, ItemDocument} }; 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 c82683a2a..ef7df7bcc 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 @@ -922,7 +922,7 @@ class CfgWeight weight = 0.4; }; - class 10x_303 + class 10Rnd_303British { weight = 0.15; }; @@ -946,7 +946,7 @@ class CfgWeight { weight = 8; }; - class 5x_22_LR_17_HMR + class 5Rnd_17HMR { weight = 0.15; }; @@ -1627,11 +1627,11 @@ class CfgWeight { weight = 0.08; }; - class WoodenArrow + class 1Rnd_Arrow_Wood { weight = 0.02; }; - class Quiver + class 12Rnd_Quiver_Wood { weight = 0.08; }; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyShotgunsandSingleshotAmmo.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyShotgunsandSingleshotAmmo.hpp index e23e66fb0..f5416f940 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyShotgunsandSingleshotAmmo.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyShotgunsandSingleshotAmmo.hpp @@ -24,7 +24,7 @@ class Category_623 { buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; }; - class WoodenArrow { + class 1Rnd_Arrow_Wood { type = "trade_items"; buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; @@ -34,7 +34,7 @@ class Category_623 { buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; }; - class 10x_303 { + class 10Rnd_303British { type = "trade_items"; buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; @@ -71,7 +71,7 @@ class Category_573 { buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; }; - class 10x_303 { + class 10Rnd_303British { type = "trade_items"; buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlySniperRifleAmmo.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlySniperRifleAmmo.hpp index 87a25e092..71b09842f 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlySniperRifleAmmo.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlySniperRifleAmmo.hpp @@ -14,7 +14,7 @@ class Category_624 { buy[] = {1,"ItemSilverBar10oz"}; sell[] = {5,"ItemSilverBar"}; }; - class 5x_22_LR_17_HMR { + class 5Rnd_17HMR { type = "trade_items"; buy[] = {1,"ItemGoldBar"}; sell[] = {5,"ItemSilverBar10oz"}; @@ -36,7 +36,7 @@ class Category_482 { buy[] = {1,"ItemSilverBar10oz"}; sell[] = {5,"ItemSilverBar"}; }; - class 5x_22_LR_17_HMR { + class 5Rnd_17HMR { type = "trade_items"; buy[] = {1,"ItemGoldBar"}; sell[] = {5,"ItemSilverBar10oz"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralShotgunsandSingleshotAmmo.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralShotgunsandSingleshotAmmo.hpp index 8c1ca868f..4fa4848c8 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralShotgunsandSingleshotAmmo.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralShotgunsandSingleshotAmmo.hpp @@ -24,7 +24,7 @@ class Category_649 { buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; }; - class WoodenArrow { + class 1Rnd_Arrow_Wood { type = "trade_items"; buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; @@ -34,7 +34,7 @@ class Category_649 { buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; }; - class 10x_303 { + class 10Rnd_303British { type = "trade_items"; buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; @@ -66,7 +66,7 @@ class Category_613 { buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; }; - class WoodenArrow { + class 1Rnd_Arrow_Wood { type = "trade_items"; buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; @@ -76,7 +76,7 @@ class Category_613 { buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; }; - class 10x_303 { + class 10Rnd_303British { type = "trade_items"; buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralSniperRifleAmmo.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralSniperRifleAmmo.hpp index 95adf2757..63fbd6dab 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralSniperRifleAmmo.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralSniperRifleAmmo.hpp @@ -14,7 +14,7 @@ class Category_647 { buy[] = {1,"ItemSilverBar10oz"}; sell[] = {5,"ItemSilverBar"}; }; - class 5x_22_LR_17_HMR { + class 5Rnd_17HMR { type = "trade_items"; buy[] = {1,"ItemGoldBar"}; sell[] = {5,"ItemSilverBar10oz"}; @@ -36,7 +36,7 @@ class Category_614 { buy[] = {1,"ItemSilverBar10oz"}; sell[] = {5,"ItemSilverBar"}; }; - class 5x_22_LR_17_HMR { + class 5Rnd_17HMR { type = "trade_items"; buy[] = {1,"ItemGoldBar"}; sell[] = {5,"ItemSilverBar10oz"}; diff --git a/Server Files/SQL/1.0.6_Updates.sql b/Server Files/SQL/1.0.6_Updates.sql index 7965db382..86c683a76 100644 --- a/Server Files/SQL/1.0.6_Updates.sql +++ b/Server Files/SQL/1.0.6_Updates.sql @@ -61,4 +61,30 @@ UPDATE object_data SET Inventory = REPLACE(Inventory, '8Rnd_B_Beneli_74Slug', '8 UPDATE `Traders_DATA` SET `item` = '["8Rnd_12Gauge_Buck",1]' WHERE `item` = '["8Rnd_B_Beneli_Pellets",1]'; UPDATE character_data SET Backpack = REPLACE(Backpack, '8Rnd_B_Beneli_Pellets', '8Rnd_12Gauge_Buck') WHERE INSTR(Backpack, '8Rnd_B_Beneli_Pellets') > 0; UPDATE character_data SET Inventory = REPLACE(Inventory, '8Rnd_B_Beneli_Pellets', '8Rnd_12Gauge_Buck') WHERE INSTR(Inventory, '8Rnd_B_Beneli_Pellets') > 0; -UPDATE object_data SET Inventory = REPLACE(Inventory, '8Rnd_B_Beneli_Pellets', '8Rnd_12Gauge_Buck') WHERE INSTR(Inventory, '8Rnd_B_Beneli_Pellets') > 0; \ No newline at end of file +UPDATE object_data SET Inventory = REPLACE(Inventory, '8Rnd_B_Beneli_Pellets', '8Rnd_12Gauge_Buck') WHERE INSTR(Inventory, '8Rnd_B_Beneli_Pellets') > 0; + +-- ---------------------------- +-- Updated arrow and quiver names from 1.8.7 +-- ---------------------------- +UPDATE `Traders_DATA` SET `item` = '["1Rnd_Arrow_Wood",1]' WHERE `item` = '["WoodenArrow",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'WoodenArrow', '1Rnd_Arrow_Wood') WHERE INSTR(Backpack, 'WoodenArrow') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'WoodenArrow', '1Rnd_Arrow_Wood') WHERE INSTR(Inventory, 'WoodenArrow') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'WoodenArrow', '1Rnd_Arrow_Wood') WHERE INSTR(Inventory, 'WoodenArrow') > 0; + +UPDATE `Traders_DATA` SET `item` = '["12Rnd_Quiver_Wood",1]' WHERE `item` = '["Quiver",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'Quiver', '12Rnd_Quiver_Wood') WHERE INSTR(Backpack, 'Quiver') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'Quiver', '12Rnd_Quiver_Wood') WHERE INSTR(Inventory, 'Quiver') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'Quiver', '12Rnd_Quiver_Wood') WHERE INSTR(Inventory, 'Quiver') > 0; + +-- ---------------------------- +-- Updated CZ550 and Lee-Enfield ammo names from 1.8.7 +-- ---------------------------- +UPDATE `Traders_DATA` SET `item` = '["5Rnd_17HMR",1]' WHERE `item` = '["5x_22_LR_17_HMR",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, '5x_22_LR_17_HMR', '5Rnd_17HMR') WHERE INSTR(Backpack, '5x_22_LR_17_HMR') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, '5x_22_LR_17_HMR', '5Rnd_17HMR') WHERE INSTR(Inventory, '5x_22_LR_17_HMR') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, '5x_22_LR_17_HMR', '5Rnd_17HMR') WHERE INSTR(Inventory, '5x_22_LR_17_HMR') > 0; + +UPDATE `Traders_DATA` SET `item` = '["10Rnd_303British",1]' WHERE `item` = '["10x_303",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, '10x_303', '10Rnd_303British') WHERE INSTR(Backpack, '10x_303') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, '10x_303', '10Rnd_303British') WHERE INSTR(Inventory, '10x_303') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, '10x_303', '10Rnd_303British') WHERE INSTR(Inventory, '10x_303') > 0; \ No newline at end of file