diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp index 9f9867b64..85ae9f4ab 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp @@ -70,12 +70,12 @@ weaponsUS[] = // Bolt action rifles and shotguns {Loot_WEAPON, 5, Remington870_DZ}, - {Loot_WEAPON, 5, AA12_PMC}, + {Loot_WEAPON, 5, AA12_DZ}, // Sniper Rifles {Loot_WEAPON, 5, M4SPR_DZE}, {Loot_WEAPON, 4, M40A3_DZ}, - {Loot_WEAPON, 4, M24_des_EP1}, + {Loot_WEAPON, 4, M24_Des_DZ}, {Loot_WEAPON, 4, M24_DZ}, {Loot_WEAPON, 3, DMR_DZ}, {Loot_WEAPON, 3, MK14_Sniper_DZ}, @@ -253,7 +253,7 @@ pistols[] = { // Residential spawns {Loot_WEAPON, 1, DesertEagle_DZ}, {Loot_WEAPON, 5, Colt_Revolver_DZ}, {Loot_WEAPON, 5, Revolver_DZ}, - {Loot_WEAPON, 1, revolver_gold_EP1}, + {Loot_WEAPON, 1, Revolver_Gold_DZ}, {Loot_WEAPON, 2, Colt_Anaconda_DZ}, {Loot_WEAPON, 1, Colt_Anaconda_Gold_DZ}, {Loot_WEAPON, 2, Colt_Bull_DZ}, diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp index 97ec9663c..e271f9cbb 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp @@ -145,7 +145,8 @@ class 2Rnd_12Gauge_Buck : 8Rnd_12Gauge_Buck class 20Rnd_B_AA12_74Slug : CA_Magazine { model = "\z\addons\dayz_epoch_w\magazine\dze_AA12_mag.p3d"; - displayName = $STR_DZ_MAG_20Rnd_B_AA12_74Slug_NAME; + displayName = $STR_DZ_MAG_20Rnd_B_AA12_74Slug_NAME; + descriptionShort = $STR_DZ_MAG_20RND_12GAUGE_SLUG_DESC; cartridgeName = "12Gauge_Slug"; class ItemActions @@ -157,7 +158,8 @@ class 20Rnd_B_AA12_74Slug : CA_Magazine class 20Rnd_B_AA12_Pellets : CA_Magazine { model = "\z\addons\dayz_epoch_w\magazine\dze_AA12_mag.p3d"; - displayName = $STR_DZ_MAG_20Rnd_B_AA12_Pellets_NAME; + displayName = $STR_DZ_MAG_20Rnd_B_AA12_Pellets_NAME; + descriptionShort = $STR_DZ_MAG_20RND_12GAUGE_BUCK_DESC; cartridgeName = "12Gauge_Pellets"; class ItemActions @@ -170,6 +172,7 @@ class 20Rnd_B_AA12_HE : CA_Magazine { model = "\z\addons\dayz_epoch_w\magazine\dze_AA12_mag.p3d"; displayName = $STR_DZ_MAG_20Rnd_B_AA12_HE_NAME; + descriptionShort = $STR_DZ_MAG_20RND_12GAUGE_HE_DESC; cartridgeName = "19mm_HE"; class ItemActions @@ -201,6 +204,7 @@ class 8Rnd_B_Saiga12_Pellets: CA_Magazine }; }; +//USAS 12 Ammo class 20Rnd_B_Usas12_74Slug: 8Rnd_B_Saiga12_74Slug { displayName = $STR_DZ_MAG_20RND_USAS12_SLUG_NAME; descriptionShort = $STR_DZ_MAG_20RND_USAS12_SLUG_DESC; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/BlackMarket.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/BlackMarket.hpp index 7092034f0..8009aa8bd 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/BlackMarket.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/BlackMarket.hpp @@ -3,9 +3,9 @@ class Category_11 { class MeleeBaseballbatBarbed {type = "trade_weapons";buy[] = {-2,"ItemSilverBar"};sell[] = {2,"ItemSilverBar"};}; class MeleeBaseballbatNails {type = "trade_weapons";buy[] = {-2,"ItemSilverBar"};sell[] = {2,"ItemSilverBar"};}; class Saiga12K_DZ {type = "trade_weapons";buy[] = {3,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; - class AA12_PMC {type = "trade_weapons";buy[] = {8,"ItemGoldBar"};sell[] = {5,"ItemGoldBar"};}; + class AA12_DZ {type = "trade_weapons";buy[] = {8,"ItemGoldBar"};sell[] = {5,"ItemGoldBar"};}; class USAS12_DZ {type = "trade_weapons";buy[] = {7,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; - class revolver_gold_EP1 {type = "trade_weapons";buy[] = {5,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};}; + class Revolver_Gold_DZ {type = "trade_weapons";buy[] = {5,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};}; class Colt_Anaconda_Gold_DZ {type = "trade_weapons";buy[] = {9,"ItemGoldBar10oz"};sell[] = {5,"ItemGoldBar10oz"};}; class SVD_Gold_DZ {type = "trade_weapons";buy[] = {1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; class AKS_GOLD {type = "trade_weapons";buy[] = {-8,"ItemGoldBar10oz"};sell[] = {4,"ItemGoldBar10oz"};}; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp index 8d4e68089..60ee19ce5 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp @@ -641,7 +641,7 @@ class Category_17 { class M24_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {6,"ItemGoldBar"};}; class M24_Gh_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {7,"ItemGoldBar"};}; // desert camo - class M24_des_EP1 {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {6,"ItemGoldBar"};}; + class M24_Des_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {6,"ItemGoldBar"};}; class M40A3_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {6,"ItemGoldBar"};}; class M40A3_Gh_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {7,"ItemGoldBar"};}; // iron sights diff --git a/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/BlackMarket.hpp b/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/BlackMarket.hpp index b1f6ce46e..6b4086b34 100644 --- a/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/BlackMarket.hpp +++ b/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/BlackMarket.hpp @@ -3,9 +3,9 @@ class Category_11 { class MeleeBaseballbatBarbed {type = "trade_weapons";buy[] = {-1,"worth"};sell[] = {2,"worth"};}; class MeleeBaseballbatNails {type = "trade_weapons";buy[] = {-1,"worth"};sell[] = {2,"worth"};}; class Saiga12K_DZ {type = "trade_weapons";buy[] = {300,"worth"};sell[] = {100,"worth"};}; - class AA12_PMC {type = "trade_weapons";buy[] = {800,"worth"};sell[] = {500,"worth"};}; + class AA12_DZ {type = "trade_weapons";buy[] = {800,"worth"};sell[] = {500,"worth"};}; class USAS12_DZ {type = "trade_weapons";buy[] = {700,"worth"};sell[] = {400,"worth"};}; - class revolver_gold_EP1 {type = "trade_weapons";buy[] = {5000,"worth"};sell[] = {2000,"worth"};}; + class Revolver_Gold_DZ {type = "trade_weapons";buy[] = {5000,"worth"};sell[] = {2000,"worth"};}; class Colt_Anaconda_Gold_DZ {type = "trade_weapons";buy[] = {9000,"worth"};sell[] = {5000,"worth"};}; class SVD_Gold_DZ {type = "trade_weapons";buy[] = {10000,"worth"};sell[] = {5000,"worth"};}; class AKS_GOLD {type = "trade_weapons";buy[] = {-1,"worth"};sell[] = {4000,"worth"};}; diff --git a/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Weapons.hpp b/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Weapons.hpp index 8c9f29761..901598d66 100644 --- a/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Weapons.hpp @@ -641,7 +641,7 @@ class Category_17 { class M24_DZ {type = "trade_weapons";buy[] = {1000,"worth"};sell[] = {600,"worth"};}; class M24_Gh_DZ {type = "trade_weapons";buy[] = {-1,"worth"};sell[] = {700,"worth"};}; // desert camo - class M24_des_EP1 {type = "trade_weapons";buy[] = {1000,"worth"};sell[] = {600,"worth"};}; + class M24_Des_DZ {type = "trade_weapons";buy[] = {1000,"worth"};sell[] = {600,"worth"};}; class M40A3_DZ {type = "trade_weapons";buy[] = {1000,"worth"};sell[] = {600,"worth"};}; class M40A3_Gh_DZ {type = "trade_weapons";buy[] = {-1,"worth"};sell[] = {700,"worth"};}; // iron sights diff --git a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp index 881e9f24a..03d2a5221 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp @@ -200,6 +200,7 @@ class CfgWeapons #include "Rifles\Remington870.hpp" #include "Rifles\Saiga12.hpp" #include "Rifles\Usas12.hpp" + #include "Rifles\AA12.hpp" #include "Rifles\Crossbow.hpp" #include "Rifles\L115A3.hpp" #include "Rifles\MSR.hpp" diff --git a/SQF/dayz_code/Configs/CfgWeapons/Pistols/Revolver.hpp b/SQF/dayz_code/Configs/CfgWeapons/Pistols/Revolver.hpp index f85d1ca44..332bbbfe1 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Pistols/Revolver.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Pistols/Revolver.hpp @@ -1,4 +1,10 @@ -class Revolver_DZ : revolver_EP1 +class Revolver_DZ: revolver_EP1 +{ + magazines[] = {6Rnd_45ACP}; +}; + +class revolver_gold_EP1; +class Revolver_Gold_DZ: revolver_gold_EP1 { magazines[] = {6Rnd_45ACP}; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AA12.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AA12.hpp new file mode 100644 index 000000000..8eec2ba72 --- /dev/null +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AA12.hpp @@ -0,0 +1,4 @@ +class AA12_PMC; +class AA12_DZ: AA12_PMC { + magazines[] = {"20Rnd_B_AA12_Pellets","20Rnd_B_AA12_74Slug","20Rnd_B_AA12_HE"}; +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS.hpp index 391bfdb53..7ecc12d31 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS.hpp @@ -8,4 +8,7 @@ class AKS_Silver_DZ: AKM_DZ { displayName = $STR_DZ_WPN_AKS_SILVER_NAME; model = "\RH_aks\RH_aks47s.p3d"; picture = "\RH_aks\inv\aks47s.paa"; -}; \ No newline at end of file +}; + +class AK_47_S; +class AKS_DZ: AK_47_S {}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M24.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M24.hpp index a3c2043e2..9cd17c250 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M24.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M24.hpp @@ -30,4 +30,12 @@ class M24_Gh_DZ : M24_DZ script = "; ['Attachment_Ghillie',_id,'M24_DZ'] call player_removeAttachment"; }; }; +}; + +class M24_des_EP1; +class M24_DES_DZ : M24_des_EP1 +{ + displayName = $STR_DZ_WPN_M24_DESERT_NAME; + + magazines[] = {5Rnd_762x51_M24}; }; \ No newline at end of file diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 3e2a96e49..a629658e2 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -2332,8 +2332,8 @@ Ostrá jehla - Nails - Nägel + Box of nails + Schachtel mit Nägeln Гвозди Clavos Clous @@ -15348,6 +15348,10 @@ M24 (Камуфляж) M24 Tarn + + M24 Desert + M24 Wüstentarn + M40A3 @@ -18401,12 +18405,12 @@ 2 patrony Slug - Caliber: 12 gauge <br/>Rounds: 2 <br/>Used in: M1014, Remington 870, Double-barreled Shotgun - Патрон: 12-й калибр <br/>Количество: 2 <br/>Используется в: M1014, Ремингтон 870, Двустволках - Calibre: 12 gauge <br/>Rondas: 2 <br/>Usada en: M1014, Remington 870, Escopeta de doble cañon - Calibre: 12<br/>Munitions: 2<br/>Pour: M1014, Remington 870, Fusil à 2 coups - Ráže: 12 <br/>Munice: 2 <br/>Pro: M1014, Remington 870, Dvouhlavňová brokovnice - Kaliber: 12 Flintenlaufgeschoss<br/>2 Schuss<br/>Verwendet in: M1014, Remington 870, Doppelläufige Schrotflinte + Caliber: 12 Slug<br/>Rounds: 2 <br/>Used in: Double-barreled Shotgun + Патрон: 12-й калибр <br/>Количество: 2 <br/>Используется в: Двустволках + Calibre: 12 Slug <br/>Rondas: 2 <br/>Usada en: Escopeta de doble cañon + Calibre: 12 Slug<br/>Munitions: 2<br/>Pour:Fusil à 2 coups + Ráže: 12 Slug<br/>Munice: 2 <br/>Pro: Dvouhlavňová brokovnice + Kaliber: 12 Slug<br/>Patronen: 2<br/>Verwendet in: Doppelläufige Schrotflinte 2Rnd. 12Cal. Pellets @@ -18417,12 +18421,12 @@ 2Rnd. 12Cal. Schrot - Caliber: 12 gauge <br/>Rounds: 2<br/>Used in: M1014, Remington 870, Double-barreled Shotgun + Caliber: 12 Buckshot <br/>Rounds: 2<br/>Used in: M1014, Remington 870, Double-barreled Shotgun Патрон: 12-й калибр <br/>Количество: 2 <br/>Используется в: M1014, Ремингтон 870, Двустволках - Calibre: 12 gauge <br/>Rondas: 2<br/>Usada en: M1014, Remington 870, Escopeta de doble cañon - Calibre: 12<br/>Munitions: 2<br/>Pour: M1014, Remington 870, Fusil à 2 coups - Ráže: 12<br/>Munice: 2<br/>Pro: M1014, Remington 870, Dvouhlavňová brokovnice - Kaliber 12 Schrotmunition<br/>2<br/>Verwendet in: M1014, Remington 870, Doppelläufige Schrotflinte + Calibre: 12 Buckshot <br/>Rondas: 2<br/>Usada en: M1014, Remington 870, Escopeta de doble cañon + Calibre: 12 Buckshot<br/>Munitions: 2<br/>Pour: M1014, Remington 870, Fusil à 2 coups + Ráže: 12 Buckshot<br/>Munice: 2<br/>Pro: M1014, Remington 870, Dvouhlavňová brokovnice + Kaliber: 12 Schrot<br/>Patronen: 2<br/>Verwendet in: M1014, Remington 870, Doppelläufige Schrotflinte 8Rnd. 12 Cal. Slug @@ -18437,7 +18441,7 @@ Calibre: 12 gauge <br/>Rondas: 8 <br/>Usada en: M1014, Remington 870 Calibre: 12<br/>Munitions: 8<br/>Pour: M1014, Remington 870 Ráže: 12 <br/>Munice: 8 <br/>Pro: M1014, Remington 870 - Kaliber 12 Flintenlaufgeschoss<br/>8 Schuss<br/>Verwendet in: M1014, Remington 870 + Kaliber: 12 Slug<br/>Patronen: 8<br/>Verwendet in: M1014, Remington 870 8Rnd. 12Cal. Pellets @@ -18448,12 +18452,12 @@ 8Rnd. 12Cal. Schrot - Caliber: 12 gauge <br/>Rounds: 8<br/>Used in: M1014, Remington 870 + Caliber: 12 Buckshot <br/>Rounds: 8<br/>Used in: M1014, Remington 870 Патрон: 12-й калибр <br/>Количество: 8 <br/>Используется в: M1014, Ремингтон 870 - Calibre: 12 gauge <br/>Rondas: 8<br/>Usada en: M1014, Remington 870 - Calibre: 12<br/>Munitions: 8<br/>Pour: M1014, Remington 870 - Ráže: 12<br/>Munice: 8<br/>Pro: M1014, Remington 870 - Kaliber 12 Schrotmunition<br/>8<br/>Verwendet in: M1014, Remington 870 + Calibre: 12 Buckshot <br/>Rondas: 8<br/>Usada en: M1014, Remington 870 + Calibre: 12 Buckshot<br/>Munitions: 8<br/>Pour: M1014, Remington 870 + Ráže: 12 Buckshot<br/>Munice: 8<br/>Pro: M1014, Remington 870 + Kaliber: 12 Schrot<br/>Patronen: 8<br/>Verwendet in: M1014, Remington 870 Kaliber: 9x19mm Parabellum <br/>Patronen: 30 <br/>Verwendet in: MP5, Scorpion Evo 3 @@ -19154,19 +19158,29 @@ Kaliber: 9x39mm <br/> Töltények: 10<br/> Hozzá tartozó fegyver: VSS Vintorez, AS VAL - 20Rnd. 12 Cal. Slug. - 20 Schuss Kal. 12 Flintenlaufgeschoss - 20п. 12к (пуля) + 20Rnd. AA-12 Slug + 20п. AA-12 (пуля) - 20Rnd. 12 Cal. Pellets. - 20 Schuss Kal. 12 Schrot - 20п. 12к (дробь) + 20Rnd. AA-12 Pellets + 20п. AA-12 (дробь) - 20Rnd. 19mm HE. - 20п. 19мм HE + 20Rnd. AA-12 HE. + 20п. AA-12 HE + + Caliber: 12 Slug <br/>Rounds: 20 <br/>Used in: AA-12 + Kaliber 12 Slug <br/>Patronen: 20<br/>Verwendet in: AA-12 + + + Caliber: 12 Buckshot <br/>Rounds: 20<br/>Used in: AA-12 + Kaliber 12 Schrot <br/>Patronen: 20<br/>Verwendet in: AA-12 + + + Caliber: 12 HE <br/>Rounds: 20<br/>Used in: AA-12 + Kaliber: 12 HE <br/>Patronen: 20<br/>Verwendet in: AA-12 + 10Rnd. CZ 750 mag. 10п. CZ 750 маг. @@ -32219,6 +32233,18 @@ Potato patch Kartoffelbeet + + + Hemp plant patch + Hanfpflanzenbeet + + + Tobacco plant patch + Tabakpflanzenbeet + + + Tea plant patch + Teepflanzenbeet