From 01529e51bc2b829f417f74c98c400f812b409f12 Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Fri, 11 Mar 2016 14:10:45 -0500 Subject: [PATCH] Update shotgun ammo names See: https://github.com/DayZMod/DayZ/commit/634214570c2a6c3efe53e2b09bf01250fcc3d2e2 --- SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp | 26 +++++----- .../Configs/CfgLoot/CfgLootSmall.hpp | 22 ++++----- SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp | 8 ++-- .../Configs/CfgLoot/Groups/Zombies/Police.hpp | 2 +- .../Configs/CfgMagazines/DZE/Misc.hpp | 48 ------------------- .../Configs/CfgMagazines/Items/Wood.hpp | 41 +++++++++++++++- .../CfgMagazines/Magazines/Shotgun.hpp | 38 --------------- .../R3F_Realism/R3F_Weight/R3F_CfgWeight.h | 4 +- .../FriendlyShotgunsandSingleshotAmmo.hpp | 16 +++---- .../Category/NeutralBlackMarketAmmo.hpp | 4 +- .../NeutralShotgunsandSingleshotAmmo.hpp | 16 +++---- Server Files/SQL/1.0.6_Updates.sql | 25 +++++++++- 12 files changed, 112 insertions(+), 138 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp b/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp index 7588b573f..5dbee42f4 100644 --- a/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp @@ -168,8 +168,8 @@ class CfgLootLegacy { ,{"FoodCanPasta",0.05} ,{"8Rnd_9x18_Makarov",0.07} ,{"7Rnd_45ACP_1911",0.05} - ,{"2Rnd_shotgun_74Slug",0.05} - ,{"2Rnd_shotgun_74Pellets",0.05} + ,{"2Rnd_12Gauge_Slug",0.05} + ,{"2Rnd_12Gauge_Buck",0.05} ,{"ItemBandage",0.06} ,{"ItemPainkiller",0.06} ,{"FoodBioMeat",0.01} @@ -190,8 +190,8 @@ class CfgLootLegacy { ,{"FoodCanPasta",0.05} ,{"8Rnd_9x18_Makarov",0.07} ,{"7Rnd_45ACP_1911",0.05} - ,{"2Rnd_shotgun_74Slug",0.05} - ,{"2Rnd_shotgun_74Pellets",0.05} + ,{"2Rnd_12Gauge_Slug",0.05} + ,{"2Rnd_12Gauge_Buck",0.05} ,{"ItemBandage",0.06} ,{"ItemPainkiller",0.06} ,{"FoodBioMeat",0.01} @@ -231,8 +231,8 @@ class CfgLootLegacy { ,{"5x_22_LR_17_HMR",0.01} ,{"10x_303",0.04} ,{"6Rnd_45ACP",0.04} - ,{"2Rnd_shotgun_74Slug",0.05} - ,{"2Rnd_shotgun_74Pellets",0.05} + ,{"2Rnd_12Gauge_Slug",0.05} + ,{"2Rnd_12Gauge_Buck",0.05} ,{"8Rnd_9x18_Makarov",0.08} ,{"15Rnd_W1866_Slug",0.02} ,{"WoodenArrow",0.04} @@ -263,8 +263,8 @@ class CfgLootLegacy { ,{"5x_22_LR_17_HMR",0.01} ,{"10x_303",0.04} ,{"6Rnd_45ACP",0.04} - ,{"2Rnd_shotgun_74Slug",0.05} - ,{"2Rnd_shotgun_74Pellets",0.05} + ,{"2Rnd_12Gauge_Slug",0.05} + ,{"2Rnd_12Gauge_Buck",0.05} ,{"8Rnd_9x18_Makarov",0.09} ,{"15Rnd_W1866_Slug",0.02} ,{"WoodenArrow",0.04} @@ -311,7 +311,7 @@ class CfgLootLegacy { ,{"30Rnd_545x39_AK",0.04} ,{"5Rnd_762x51_M24",0.01} ,{"5Rnd_86x70_L115A1",0.01} - ,{"8Rnd_B_Beneli_74Slug",0.04} + ,{"8Rnd_12Gauge_Slug",0.04} ,{"1Rnd_HE_M203",0.01} ,{"FlareWhite_M203",0.01} ,{"FlareGreen_M203",0.01} @@ -322,7 +322,7 @@ class CfgLootLegacy { ,{"SmokeShell",0.04} ,{"SmokeShellRed",0.02} ,{"SmokeShellGreen",0.02} - ,{"8Rnd_B_Beneli_Pellets",0.04} + ,{"8Rnd_12Gauge_Buck",0.04} ,{"30Rnd_556x45_StanagSD",0.01} ,{"30Rnd_9x19_MP5",0.02} ,{"30Rnd_9x19_MP5SD",0.01} @@ -355,7 +355,7 @@ class CfgLootLegacy { ,{"30Rnd_545x39_AK",0.04} ,{"5Rnd_762x51_M24",0.01} ,{"5Rnd_86x70_L115A1",0.01} - ,{"8Rnd_B_Beneli_74Slug",0.04} + ,{"8Rnd_12Gauge_Slug",0.04} ,{"1Rnd_HE_M203",0.01} ,{"FlareWhite_M203",0.01} ,{"FlareGreen_M203",0.01} @@ -366,7 +366,7 @@ class CfgLootLegacy { ,{"SmokeShell",0.04} ,{"SmokeShellRed",0.02} ,{"SmokeShellGreen",0.02} - ,{"8Rnd_B_Beneli_Pellets",0.04} + ,{"8Rnd_12Gauge_Buck",0.04} ,{"30Rnd_556x45_StanagSD",0.01} ,{"30Rnd_9x19_MP5",0.02} ,{"30Rnd_9x19_MP5SD",0.01} @@ -386,7 +386,7 @@ class CfgLootLegacy { ,{"7Rnd_45ACP_1911",0.08} ,{"6Rnd_45ACP",0.08} ,{"15Rnd_W1866_Slug",0.14} - ,{"8Rnd_B_Beneli_Pellets",0.16} + ,{"8Rnd_12Gauge_Buck",0.16} ,{"HandRoadFlare",0.07} ,{"8Rnd_9x18_MakarovSD",0.01} ,{"ItemComboLock",0.05} diff --git a/SQF/dayz_code/Configs/CfgLoot/CfgLootSmall.hpp b/SQF/dayz_code/Configs/CfgLoot/CfgLootSmall.hpp index 0e77201d6..4b0bb245d 100644 --- a/SQF/dayz_code/Configs/CfgLoot/CfgLootSmall.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/CfgLootSmall.hpp @@ -18,8 +18,8 @@ class CfgLootSmall { {"FoodCanPasta",0.05}, {"8Rnd_9x18_Makarov",0.07}, {"7Rnd_45ACP_1911",0.05}, - {"2Rnd_shotgun_74Slug",0.05}, - {"2Rnd_shotgun_74Pellets",0.05}, + {"2Rnd_12Gauge_Slug",0.05}, + {"2Rnd_12Gauge_Buck",0.05}, {"ItemBandage",0.06}, {"ItemPainkiller",0.06}, {"FoodBioMeat",0.01}, @@ -37,8 +37,8 @@ class CfgLootSmall { {"FoodCanPasta",0.05}, {"8Rnd_9x18_Makarov",0.07}, {"7Rnd_45ACP_1911",0.05}, - {"2Rnd_shotgun_74Slug",0.05}, - {"2Rnd_shotgun_74Pellets",0.05}, + {"2Rnd_12Gauge_Slug",0.05}, + {"2Rnd_12Gauge_Buck",0.05}, {"ItemBandage",0.06}, {"ItemPainkiller",0.06}, {"FoodBioMeat",0.01}, @@ -77,8 +77,8 @@ class CfgLootSmall { {"5x_22_LR_17_HMR",0.01}, {"10x_303",0.04}, {"6Rnd_45ACP",0.04}, - {"2Rnd_shotgun_74Slug",0.05}, - {"2Rnd_shotgun_74Pellets",0.05}, + {"2Rnd_12Gauge_Slug",0.05}, + {"2Rnd_12Gauge_Buck",0.05}, {"8Rnd_9x18_Makarov",0.09}, {"15Rnd_W1866_Slug",0.02}, {"WoodenArrow",0.04}, @@ -106,8 +106,8 @@ class CfgLootSmall { {"5x_22_LR_17_HMR",0.01}, {"10x_303",0.04}, {"6Rnd_45ACP",0.04}, - {"2Rnd_shotgun_74Slug",0.05}, - {"2Rnd_shotgun_74Pellets",0.05}, + {"2Rnd_12Gauge_Slug",0.05}, + {"2Rnd_12Gauge_Buck",0.05}, {"8Rnd_9x18_Makarov",0.09}, {"15Rnd_W1866_Slug",0.02}, {"WoodenArrow",0.04}, @@ -152,7 +152,7 @@ class CfgLootSmall { {"30Rnd_545x39_AK",0.04}, {"5Rnd_762x51_M24",0.01}, {"5Rnd_86x70_L115A1",0.01}, - {"8Rnd_B_Beneli_74Slug",0.04}, + {"8Rnd_12Gauge_Slug",0.04}, {"1Rnd_HE_M203",0.01}, {"FlareWhite_M203",0.01}, {"FlareGreen_M203",0.01}, @@ -163,7 +163,7 @@ class CfgLootSmall { {"SmokeShell",0.04}, {"SmokeShellRed",0.02}, {"SmokeShellGreen",0.02}, - {"8Rnd_B_Beneli_Pellets",0.04}, + {"8Rnd_12Gauge_Buck",0.04}, {"30Rnd_556x45_StanagSD",0.01}, {"30Rnd_9x19_MP5",0.02}, {"30Rnd_9x19_MP5SD",0.01}, @@ -181,7 +181,7 @@ class CfgLootSmall { {"7Rnd_45ACP_1911",0.08}, {"6Rnd_45ACP",0.08}, {"15Rnd_W1866_Slug",0.14}, - {"8Rnd_B_Beneli_Pellets",0.17}, + {"8Rnd_12Gauge_Buck",0.17}, {"HandRoadFlare",0.08}, {"8Rnd_9x18_MakarovSD",0.01}, {"ItemComboLock",0.05}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp index c788a6cfa..bd05300a3 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp @@ -13,10 +13,10 @@ AmmoCivilian[] = {Loot_MAGAZINE, 1, 5Rnd_17HMR}, //Shotgun - {Loot_MAGAZINE, 1, 8Rnd_B_Beneli_Pellets}, - {Loot_MAGAZINE, 3, 8Rnd_B_Beneli_74Slug}, - {Loot_MAGAZINE, 3, 2Rnd_shotgun_74Pellets}, - {Loot_MAGAZINE, 5, 2Rnd_shotgun_74Slug} + {Loot_MAGAZINE, 1, 8Rnd_12Gauge_Buck}, + {Loot_MAGAZINE, 3, 8Rnd_12Gauge_Slug}, + {Loot_MAGAZINE, 3, 2Rnd_12Gauge_Buck}, + {Loot_MAGAZINE, 5, 2Rnd_12Gauge_Slug} }; militaryVehicleAmmo[] = { //DZE {Loot_MAGAZINE, 2, 2000Rnd_762x51_M134} diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Police.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Police.hpp index 762d2051c..ae035dff0 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Police.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Zombies/Police.hpp @@ -4,7 +4,7 @@ ZombiePolice[] = {Loot_MAGAZINE, 2, 7Rnd_45ACP_1911}, {Loot_MAGAZINE, 2, ItemDocument}, {Loot_MAGAZINE, 3, 6Rnd_45ACP}, - {Loot_MAGAZINE, 1, 8Rnd_B_Beneli_Pellets}, + {Loot_MAGAZINE, 1, 8Rnd_12Gauge_Buck}, {Loot_MAGAZINE, 1, ItemHotwireKit}, {Loot_MAGAZINE, 2, ItemComboLock}, {Loot_MAGAZINE, 3, HandRoadFlare} diff --git a/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp b/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp index a3027211e..ae4e61d8f 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp @@ -836,54 +836,6 @@ class ItemLockbox: CA_Magazine }; }; -class PartWoodPile: CA_Magazine -{ - scope = public; - count = 1; - type = 256; - displayName = $STR_EQUIP_NAME_40; - model = "\dayz_equip\models\woodPile.p3d"; - picture = "\dayz_equip\textures\equip_woodPile_ca.paa"; - descriptionShort = $STR_EQUIP_DESC_40; - class ItemActions { - class Build { - text = $STR_EPOCH_PLAYER_241; - script = "spawn player_build;"; - require[] = {"ItemMatchbox_DZE"}; - create = "Land_Fire_DZ"; - }; - class Crafting - { - text = $STR_EPOCH_PLAYER_242; - script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; - neednearby[] = {"sawmill"}; - requiretools[] = {"ItemToolbox","ItemKnife"}; - output[] = {{"PartWoodLumber",1}}; - input[] = {{"PartWoodPile",2}}; - }; - class Crafting1 - { - text = $STR_EPOCH_PLAYER_243; - script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; - neednearby[] = {}; - requiretools[] = {"ItemKnife"}; - output[] = {{"WoodenArrow",3}}; - input[] = {{"PartWoodPile",1},{"ItemTrashRazor",1}}; - - }; - class Crafting2 - { - text = $STR_EPOCH_PLAYER_244; - script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; - neednearby[] = {}; - requiretools[] = {"ItemToolbox","ItemKnife"}; - output[] = {{"stick_fence_kit",1}}; - input[] = {{"PartWoodPile",6}}; - - }; - - }; -}; class PartPlankPack: CA_Magazine { scope = public; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp index 158edba6d..5a453e329 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp @@ -45,7 +45,7 @@ class ItemPlank : CA_Magazine }; }; }; -/* Redifined in DZE/Misc + class PartWoodPile : CA_Magazine { scope = public; @@ -56,4 +56,41 @@ class PartWoodPile : CA_Magazine picture = "\dayz_equip\textures\equip_woodPile_ca.paa"; displayName = $STR_EQUIP_NAME_40; descriptionShort = $STR_EQUIP_DESC_40; -}; */ \ No newline at end of file + class ItemActions { + class Build { + text = $STR_EPOCH_PLAYER_241; + script = "spawn player_build;"; + require[] = {"ItemMatchbox_DZE"}; + create = "Land_Fire_DZ"; + }; + class Crafting + { + text = $STR_EPOCH_PLAYER_242; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + neednearby[] = {"sawmill"}; + requiretools[] = {"ItemToolbox","ItemKnife"}; + output[] = {{"PartWoodLumber",1}}; + input[] = {{"PartWoodPile",2}}; + }; + class Crafting1 + { + text = $STR_EPOCH_PLAYER_243; + script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + neednearby[] = {}; + requiretools[] = {"ItemKnife"}; + output[] = {{"WoodenArrow",3}}; + input[] = {{"PartWoodPile",1},{"ItemTrashRazor",1}}; + + }; + class Crafting2 + { + text = $STR_EPOCH_PLAYER_244; + script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;"; + neednearby[] = {}; + requiretools[] = {"ItemToolbox","ItemKnife"}; + output[] = {{"stick_fence_kit",1}}; + input[] = {{"PartWoodPile",6}}; + + }; + }; +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp index a161eb83b..f826e61b3 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp @@ -59,25 +59,6 @@ class 2Rnd_12Gauge_Slug : 8Rnd_12Gauge_Slug }; }; }; -class 2Rnd_shotgun_74Slug: 2Rnd_12Gauge_Slug { - count=2; - class ItemActions { - class ReloadMag { - text="Combine to 8 rounds"; - script="spawn player_reloadMag;"; - use[]= { - "2Rnd_shotgun_74Slug", - "2Rnd_shotgun_74Slug", - "2Rnd_shotgun_74Slug", - "2Rnd_shotgun_74Slug" - }; - output[]= { - "8Rnd_12Gauge_Slug" //USE THIS AMMO TYPE INSTEAD OF 8Rnd_B_Beneli_74Slug - }; - }; - }; -}; - /* Buckshot */ @@ -137,23 +118,4 @@ class 2Rnd_12Gauge_Buck : 8Rnd_12Gauge_Buck }; }; }; -}; -class 2Rnd_shotgun_74Pellets: 2Rnd_12Gauge_Buck { - displayName="2Rnd. Pellets"; - count=2; - class ItemActions { - class ReloadMag { - text="Combine to 8 rounds"; - script="spawn player_reloadMag;"; - use[]= { - "2Rnd_shotgun_74Pellets", - "2Rnd_shotgun_74Pellets", - "2Rnd_shotgun_74Pellets", - "2Rnd_shotgun_74Pellets" - }; - output[]= { - "8Rnd_12Gauge_Buck" //USE THIS TYPE INSTEAD OF 8Rnd_B_Beneli_Pellets - }; - }; - }; }; \ No newline at end of file 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 43df432cd..c82683a2a 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 @@ -432,7 +432,7 @@ class CfgWeight { weight = 1.2; }; - class 8Rnd_B_Beneli_74Slug + class 8Rnd_12Gauge_Slug { weight = 0.3; }; @@ -841,7 +841,7 @@ class CfgWeight { weight = 0.5; }; - class 8Rnd_B_Beneli_Pellets + class 8Rnd_12Gauge_Buck { weight = 0.3; }; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyShotgunsandSingleshotAmmo.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyShotgunsandSingleshotAmmo.hpp index 3e5d1920a..e23e66fb0 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyShotgunsandSingleshotAmmo.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyShotgunsandSingleshotAmmo.hpp @@ -4,22 +4,22 @@ class Category_623 { buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; }; - class 2Rnd_shotgun_74Pellets { + class 2Rnd_12Gauge_Buck { type = "trade_items"; buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; }; - class 2Rnd_shotgun_74Slug { + class 2Rnd_12Gauge_Slug { type = "trade_items"; buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; }; - class 8Rnd_B_Beneli_74Slug { + class 8Rnd_12Gauge_Slug { type = "trade_items"; buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; }; - class 8Rnd_B_Beneli_Pellets { + class 8Rnd_12Gauge_Buck { type = "trade_items"; buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; @@ -46,22 +46,22 @@ class Category_573 { buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; }; - class 2Rnd_shotgun_74Pellets { + class 2Rnd_12Gauge_Buck { type = "trade_items"; buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; }; - class 2Rnd_shotgun_74Slug { + class 2Rnd_12Gauge_Slug { type = "trade_items"; buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; }; - class 8Rnd_B_Beneli_74Slug { + class 8Rnd_12Gauge_Slug { type = "trade_items"; buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; }; - class 8Rnd_B_Beneli_Pellets { + class 8Rnd_12Gauge_Buck { type = "trade_items"; buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralBlackMarketAmmo.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralBlackMarketAmmo.hpp index 52cd0a353..f3ac93723 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralBlackMarketAmmo.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralBlackMarketAmmo.hpp @@ -4,7 +4,7 @@ class Category_527 { buy[] = {3,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class 8Rnd_B_Beneli_74Slug { + class 8Rnd_12Gauge_Slug { type = "trade_items"; buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; @@ -14,7 +14,7 @@ class Category_527 { buy[] = {1,"ItemGoldBar"}; sell[] = {5,"ItemSilverBar10oz"}; }; - class 8Rnd_B_Beneli_Pellets { + class 8Rnd_12Gauge_Buck { type = "trade_items"; buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralShotgunsandSingleshotAmmo.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralShotgunsandSingleshotAmmo.hpp index ed725117d..8c1ca868f 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralShotgunsandSingleshotAmmo.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralShotgunsandSingleshotAmmo.hpp @@ -4,22 +4,22 @@ class Category_649 { buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; }; - class 2Rnd_shotgun_74Pellets { + class 2Rnd_12Gauge_Buck { type = "trade_items"; buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; }; - class 2Rnd_shotgun_74Slug { + class 2Rnd_12Gauge_Slug { type = "trade_items"; buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; }; - class 8Rnd_B_Beneli_74Slug { + class 8Rnd_12Gauge_Slug { type = "trade_items"; buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; }; - class 8Rnd_B_Beneli_Pellets { + class 8Rnd_12Gauge_Buck { type = "trade_items"; buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; @@ -46,22 +46,22 @@ class Category_613 { buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; }; - class 2Rnd_shotgun_74Pellets { + class 2Rnd_12Gauge_Buck { type = "trade_items"; buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; }; - class 2Rnd_shotgun_74Slug { + class 2Rnd_12Gauge_Slug { type = "trade_items"; buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; }; - class 8Rnd_B_Beneli_74Slug { + class 8Rnd_12Gauge_Slug { type = "trade_items"; buy[] = {2,"ItemSilverBar"}; sell[] = {1,"ItemSilverBar"}; }; - class 8Rnd_B_Beneli_Pellets { + class 8Rnd_12Gauge_Buck { type = "trade_items"; 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 96eb9318f..7965db382 100644 --- a/Server Files/SQL/1.0.6_Updates.sql +++ b/Server Files/SQL/1.0.6_Updates.sql @@ -38,4 +38,27 @@ UPDATE object_data SET Inventory = REPLACE(Inventory, 'ItemSeaBassCooked', 'Fish UPDATE `Traders_DATA` SET `item` = '["FishCookedTuna",1]' WHERE `item` = '["ItemTunaCooked",1]'; UPDATE character_data SET Backpack = REPLACE(Backpack, 'ItemTunaCooked', 'FishCookedTuna') WHERE INSTR(Backpack, 'ItemTunaCooked') > 0; UPDATE character_data SET Inventory = REPLACE(Inventory, 'ItemTunaCooked', 'FishCookedTuna') WHERE INSTR(Inventory, 'ItemTunaCooked') > 0; -UPDATE object_data SET Inventory = REPLACE(Inventory, 'ItemTunaCooked', 'FishCookedTuna') WHERE INSTR(Inventory, 'ItemTunaCooked') > 0; \ No newline at end of file +UPDATE object_data SET Inventory = REPLACE(Inventory, 'ItemTunaCooked', 'FishCookedTuna') WHERE INSTR(Inventory, 'ItemTunaCooked') > 0; + +-- ---------------------------- +-- Updated shotgun ammo names from 1.8.7 +-- ---------------------------- +UPDATE `Traders_DATA` SET `item` = '["2Rnd_12Gauge_Slug",1]' WHERE `item` = '["2Rnd_shotgun_74slug",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, '2Rnd_shotgun_74slug', '2Rnd_12Gauge_Slug') WHERE INSTR(Backpack, '2Rnd_shotgun_74slug') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, '2Rnd_shotgun_74slug', '2Rnd_12Gauge_Slug') WHERE INSTR(Inventory, '2Rnd_shotgun_74slug') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, '2Rnd_shotgun_74slug', '2Rnd_12Gauge_Slug') WHERE INSTR(Inventory, '2Rnd_shotgun_74slug') > 0; + +UPDATE `Traders_DATA` SET `item` = '["2Rnd_12Gauge_Buck",1]' WHERE `item` = '["2Rnd_shotgun_74Pellets",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, '2Rnd_shotgun_74Pellets', '2Rnd_12Gauge_Buck') WHERE INSTR(Backpack, '2Rnd_shotgun_74Pellets') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, '2Rnd_shotgun_74Pellets', '2Rnd_12Gauge_Buck') WHERE INSTR(Inventory, '2Rnd_shotgun_74Pellets') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, '2Rnd_shotgun_74Pellets', '2Rnd_12Gauge_Buck') WHERE INSTR(Inventory, '2Rnd_shotgun_74Pellets') > 0; + +UPDATE `Traders_DATA` SET `item` = '["8Rnd_12Gauge_Slug",1]' WHERE `item` = '["8Rnd_B_Beneli_74Slug",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, '8Rnd_B_Beneli_74Slug', '8Rnd_12Gauge_Slug') WHERE INSTR(Backpack, '8Rnd_B_Beneli_74Slug') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, '8Rnd_B_Beneli_74Slug', '8Rnd_12Gauge_Slug') WHERE INSTR(Inventory, '8Rnd_B_Beneli_74Slug') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, '8Rnd_B_Beneli_74Slug', '8Rnd_12Gauge_Slug') WHERE INSTR(Inventory, '8Rnd_B_Beneli_74Slug') > 0; + +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