diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp index 7df722e4d..001f558e2 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp @@ -4,7 +4,6 @@ Hunting[] = {Loot_GROUP, 10, shotgunsingleshot}, {Loot_GROUP, 1, Chainsaws}, {Loot_WEAPON, 1, DMR_Gh_DZ}, - {Loot_WEAPON, 1, RedRyder}, //Tools {Loot_GROUP, 5, ToolsSurvival}, @@ -14,7 +13,7 @@ Hunting[] = {Loot_MAGAZINE, 2, FoodNutmix}, {Loot_MAGAZINE, 1, ItemDocument}, {Loot_MAGAZINE, 1, ItemMixOil}, - {Loot_MAGAZINE, 1, 350Rnd_BB_Magazine}, + {Loot_MAGAZINE, 1, 350Rnd_BB_GUN}, //Backpacks {Loot_GROUP, 5, backpacks}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp index 92b48dfe4..da3c19a2c 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp @@ -269,7 +269,7 @@ shotgunsingleshot[] = { // Residential Spawns {Loot_WEAPON, 2, LeeEnfield_DZ}, {Loot_WEAPON, 3, MR43_DZ}, {Loot_WEAPON, 3, Crossbow_DZ}, - {Loot_WEAPON, 3, RedRyder}, + {Loot_WEAPON, 3, RedRyder_DZ}, {Loot_WEAPON, 1, CZ550_DZ}, {Loot_WEAPON, 1, Mosin_DZ} }; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Misc.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Misc.hpp index b750fb19b..dc91a15d1 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Misc.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Misc.hpp @@ -54,3 +54,16 @@ class 20Rnd_B_765x17_Ball: 10Rnd_B_765x17_Ball { displayName = "$STR_EP1_DN_20RND_B_765X17_BALL"; }; + +//Red Ryder +class 350Rnd_BB_Magazine; +class 350Rnd_BB_GUN: 350Rnd_BB_Magazine +{ + displayName = $STR_DZ_MAG_350RND_BB_GUN_NAME; + descriptionShort = $STR_DZ_MAG_350RND_BB_GUN_DESC; + + class ItemActions + { + COMBINE_MAG + }; +}; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Ammunition.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Ammunition.hpp index 4640e637b..8536e0445 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Ammunition.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Ammunition.hpp @@ -60,7 +60,7 @@ class Category_20 { class Category_21 { class 1Rnd_Bolt_Tranquilizer {type = "trade_items";buy[] = {2,"ItemSilverBar"};sell[] = {1,"ItemSilverBar"};}; class 12Rnd_Quiver_Wood {type = "trade_items";buy[] = {4,"ItemSilverBar"};sell[] = {2,"ItemSilverBar"};}; - class 350Rnd_BB_Magazine {type = "trade_items";buy[] = {2,"ItemSilverBar"};sell[] = {1,"ItemSilverBar"};}; + class 350Rnd_BB_GUN {type = "trade_items";buy[] = {2,"ItemSilverBar"};sell[] = {1,"ItemSilverBar"};}; class 2Rnd_12Gauge_Buck {type = "trade_items";buy[] = {1,"ItemSilverBar"};sell[] = {1,"ItemSilverBar"};}; class 2Rnd_12Gauge_Slug {type = "trade_items";buy[] = {1,"ItemSilverBar"};sell[] = {1,"ItemSilverBar"};}; class 8Rnd_12Gauge_Slug {type = "trade_items";buy[] = {4,"ItemSilverBar"};sell[] = {4,"ItemSilverBar"};}; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp index 0404b408e..065651f50 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp @@ -162,7 +162,7 @@ class Category_15 { class Crossbow_Scope_FL_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; class Crossbow_CCO_MFL_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; class Crossbow_Scope_MFL_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {5,"ItemGoldBar"};}; - class RedRyder {type = "trade_weapons";buy[] = {1,"ItemSilverBar10oz"};sell[] = {5,"ItemSilverBar"};}; + class RedRyder_DZ {type = "trade_weapons";buy[] = {1,"ItemSilverBar10oz"};sell[] = {5,"ItemSilverBar"};}; class MR43_DZ {type = "trade_weapons";buy[] = {1,"ItemSilverBar10oz"};sell[] = {8,"ItemSilverBar"};}; class Winchester1866_DZ {type = "trade_weapons";buy[] = {2,"ItemSilverBar10oz"};sell[] = {1,"ItemSilverBar10oz"};}; class M1014_DZ {type = "trade_weapons";buy[] = {3,"ItemGoldBar"};sell[] = {2,"ItemGoldBar"};}; diff --git a/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Ammunition.hpp b/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Ammunition.hpp index 4e5921863..4a8478647 100644 --- a/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Ammunition.hpp +++ b/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Ammunition.hpp @@ -60,7 +60,7 @@ class Category_20 { class Category_21 { class 1Rnd_Bolt_Tranquilizer {type = "trade_items";buy[] = {2,"worth"};sell[] = {1,"worth"};}; class 12Rnd_Quiver_Wood {type = "trade_items";buy[] = {4,"worth"};sell[] = {2,"worth"};}; - class 350Rnd_BB_Magazine {type = "trade_items";buy[] = {2,"worth"};sell[] = {1,"worth"};}; + class 350Rnd_BB_GUN {type = "trade_items";buy[] = {2,"worth"};sell[] = {1,"worth"};}; class 2Rnd_12Gauge_Buck {type = "trade_items";buy[] = {1,"worth"};sell[] = {1,"worth"};}; class 2Rnd_12Gauge_Slug {type = "trade_items";buy[] = {1,"worth"};sell[] = {1,"worth"};}; class 8Rnd_12Gauge_Slug {type = "trade_items";buy[] = {4,"worth"};sell[] = {4,"worth"};}; diff --git a/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Weapons.hpp b/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Weapons.hpp index bc3f23be9..f5bb4e067 100644 --- a/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Weapons.hpp @@ -162,7 +162,7 @@ class Category_15 { class Crossbow_Scope_FL_DZ {type = "trade_weapons";buy[] = {-1,"worth"};sell[] = {400,"worth"};}; class Crossbow_CCO_MFL_DZ {type = "trade_weapons";buy[] = {-1,"worth"};sell[] = {400,"worth"};}; class Crossbow_Scope_MFL_DZ {type = "trade_weapons";buy[] = {-1,"worth"};sell[] = {500,"worth"};}; - class RedRyder {type = "trade_weapons";buy[] = {10,"worth"};sell[] = {5,"worth"};}; + class RedRyder_DZ {type = "trade_weapons";buy[] = {10,"worth"};sell[] = {5,"worth"};}; class MR43_DZ {type = "trade_weapons";buy[] = {10,"worth"};sell[] = {5,"worth"};}; class Winchester1866_DZ {type = "trade_weapons";buy[] = {20,"worth"};sell[] = {10,"worth"};}; class M1014_DZ {type = "trade_weapons";buy[] = {300,"worth"};sell[] = {200,"worth"};}; diff --git a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp index 096a615f4..260344ccd 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp @@ -214,6 +214,8 @@ class CfgWeapons #include "Rifles\WA2000.hpp" #include "Rifles\BarrettMRAD.hpp" + #include "Rifles\RedRyder.hpp" + /* PISTOLS */ class M9; @@ -348,5 +350,5 @@ class CfgWeapons #include "Item\ItemKeys.hpp" #include "Item\Documents.hpp" - #include "VehicleWeapons.hpp" + #include "VehicleWeapons.hpp" }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/RedRyder.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/RedRyder.hpp new file mode 100644 index 000000000..61f77e221 --- /dev/null +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/RedRyder.hpp @@ -0,0 +1,6 @@ +class RedRyder; +class RedRyder_DZ: RedRyder { + displayName = $STR_DZ_WPN_RED_RYDER_NAME; + descriptionShort = $STR_DZ_WPN_RED_RYDER_DESC; + magazines[] = {"350Rnd_BB_GUN"}; +}; \ No newline at end of file diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Ammo/ShotgunAmmo.hpp b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Ammo/ShotgunAmmo.hpp index a27fdcfe6..ec70e946e 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Ammo/ShotgunAmmo.hpp +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Ammo/ShotgunAmmo.hpp @@ -59,6 +59,10 @@ class 350Rnd_BB_Magazine { weight = 0.06; }; +class 350Rnd_BB_GUN +{ + weight = 0.06; +}; class 8Rnd_12Gauge_Buck { weight = 0.3; diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Shotguns.hpp b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Shotguns.hpp index d074d0e96..5a2fa102b 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Shotguns.hpp +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Shotguns.hpp @@ -78,6 +78,10 @@ class RedRyder { weight = 1; }; +class RedRyder_DZ +{ + weight = 1; +}; class Saiga12K { weight = 3.5; diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index f5574ba02..87db729a2 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -18396,6 +18396,15 @@ Zwillings-M134 M134 сдвоенный + + + + Red Ryder BB + + + Red Ryder BB<br/>Caliber: 4.5mm BBs + Red Ryder BB<br/>Kaliber: 4.5mm BBs + @@ -21926,6 +21935,22 @@ Kalibr: 30x113mm<br/>Nábojů: 1200<br/>Pro: AH-64 Kaliber: 30x113mm<br/> Töltények: 1200<br/> Hozzá tartozó fegyver: AH-64 + + + 350Rnd. 4.5mm mag. + 350с. 4.5мм + + + Caliber: 4.5mm<br/>Rounds: 350<br/>Used in: Red Ryder BB + Calibre: 4.5mm<br/>Munitions : 350<br/>Utilisé avec: Red Ryder BB + Calibre: 4.5mm<br/>Cartuchos: 350<br/>Usado en: Red Ryder BB + Calibro: 4.5mm<br/>Munizioni: 350<br/>Usato in: Red Ryder BB + Kaliber: 4.5mm<br/>Naboje: 350<br/>Uzywany w: Red Ryder BB + Калибр: 4.5мм<br/>Количество: 350<br/>Исп. в: Red Ryder BB + Kaliber: 4.5mm<br/>Patronen: 350<br/>Verwendet in: Red Ryder BB + Kalibr: 4.5mm<br/>Nábojů: 350<br/>Pro: Red Ryder BB + Kaliber: 4.5mm<br/> Töltények: 350<br/> Hozzá tartozó fegyver: Red Ryder BB +