diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp index 84a41ce25..87922fde6 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp @@ -134,10 +134,10 @@ weaponsEU[] = weaponsCZ[] = { // Pistols - {Loot_WEAPON, 2, CZ_75_P_07_DUTY}, - {Loot_WEAPON, 2, CZ_75_D_COMPACT}, - {Loot_WEAPON, 2, CZ_75_SP_01_PHANTOM}, - {Loot_WEAPON, 1, CZ_75_SP_01_PHANTOM_SD}, + {Loot_WEAPON, 2, CZ75P_DZ}, + {Loot_WEAPON, 2, CZ75D_DZ}, + {Loot_WEAPON, 2, CZ75SP_DZ}, + {Loot_WEAPON, 1, CZ75SP_SD_DZ}, // Sniper Rifles {Loot_WEAPON, 3, CZ750_DZ}, diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x19.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x19.hpp index a98057a61..1165ebd67 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x19.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/9x19.hpp @@ -195,4 +195,36 @@ class 64Rnd_9x19_SD_Bizon : CA_Magazine { COMBINE_MAG }; +}; + +/* CZ75 */ + +class 18Rnd_9x19_Phantom : 15Rnd_9x19_M9 +{ + descriptionShort = $STR_DZ_MAG_18RND_CZ75_DESC; + displayName = $STR_DZ_MAG_18Rnd_9x19_CZ75_NAME; + count = 18; + initSpeed = 400; + cartridgeName = "9x19"; + + class ItemActions + { + delete ReloadMag; + COMBINE_MAG + }; +}; + +class 18Rnd_9x19_PhantomSD : 15Rnd_9x19_M9SD +{ + descriptionShort = $STR_DZ_MAG_18RND_CZ75_SD_DESC; + displayName = $STR_DZ_MAG_18Rnd_9x19_SD_CZ75_NAME; + count = 18; + cartridgeName = "9x19_SD"; + initSpeed = 320; + + class ItemActions + { + delete ReloadMag; + COMBINE_MAG + }; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Ammunition.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Ammunition.hpp index 1b31a96c7..82dc8b192 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Ammunition.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Ammunition.hpp @@ -4,6 +4,8 @@ class Category_19 { class 15Rnd_9x19_M9SD {type = "trade_items";buy[] = {2,"ItemSilverBar10oz"};sell[] = {1,"ItemSilverBar10oz"};}; class 17Rnd_9x19_glock17 {type = "trade_items";buy[] = {1,"ItemSilverBar10oz"};sell[] = {5,"ItemSilverBar"};}; class 17Rnd_9x19_glock17SD {type = "trade_items";buy[] = {2,"ItemSilverBar10oz"};sell[] = {1,"ItemSilverBar10oz"};}; + class 18Rnd_9x19_Phantom {type = "trade_items";buy[] = {1,"ItemSilverBar10oz"};sell[] = {5,"ItemSilverBar"};}; + class 18Rnd_9x19_PhantomSD {type = "trade_items";buy[] = {2,"ItemSilverBar10oz"};sell[] = {1,"ItemSilverBar10oz"};}; class 6Rnd_45ACP {type = "trade_items";buy[] = {2,"ItemSilverBar"};sell[] = {1,"ItemSilverBar"};}; class 7Rnd_45ACP_1911 {type = "trade_items";buy[] = {2,"ItemSilverBar"};sell[] = {1,"ItemSilverBar"};}; class 8Rnd_9x18_Makarov {type = "trade_items";buy[] = {2,"ItemSilverBar"};sell[] = {1,"ItemSilverBar"};}; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp index 3d2b20a1b..0db8be25d 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp @@ -28,6 +28,10 @@ class Category_13 { class Makarov_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {21,"ItemSilverBar10oz"};}; class M9_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar"};sell[] = {5,"ItemSilverBar10oz"};}; class M9_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {25,"ItemSilverBar10oz"};}; + class CZ75P_DZ {type = "trade_weapons";buy[] = {5,"ItemSilverBar10oz"};sell[] = {2,"ItemSilverBar10oz"};}; + class CZ75D_DZ {type = "trade_weapons";buy[] = {5,"ItemSilverBar10oz"};sell[] = {2,"ItemSilverBar10oz"};}; + class CZ75SP_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar"};sell[] = {5,"ItemSilverBar10oz"};}; + class CZ75SP_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {25,"ItemSilverBar10oz"};}; class G17_DZ {type = "trade_weapons";buy[] = {5,"ItemSilverBar10oz"};sell[] = {2,"ItemSilverBar10oz"};}; class G17_FL_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {12,"ItemSilverBar10oz"};}; class G17_MFL_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {22,"ItemSilverBar10oz"};}; diff --git a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp index f34749d74..dfa08b46d 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp @@ -193,8 +193,7 @@ class CfgWeapons class revolver_EP1; #include "Pistols\Revolver.hpp" - - + #include "Pistols\CZ75.hpp" /* MELEE */ diff --git a/SQF/dayz_code/Configs/CfgWeapons/Pistols/CZ75.hpp b/SQF/dayz_code/Configs/CfgWeapons/Pistols/CZ75.hpp new file mode 100644 index 000000000..89510ccda --- /dev/null +++ b/SQF/dayz_code/Configs/CfgWeapons/Pistols/CZ75.hpp @@ -0,0 +1,41 @@ +class CZ_75_P_07_DUTY; +class CZ75P_DZ: CZ_75_P_07_DUTY { + displayName = $STR_DZ_WPN_CZ75P_NAME; + descriptionShort = $STR_DZ_WPN_CZ75_DESC; + magazines[] = {"18Rnd_9x19_Phantom","18Rnd_9x19_PhantomSD"}; +}; + +class CZ_75_D_COMPACT; +class CZ75D_DZ: CZ_75_D_COMPACT { + displayName = $STR_DZ_WPN_CZ75D_NAME; + descriptionShort = $STR_DZ_WPN_CZ75_DESC; + magazines[] = {"18Rnd_9x19_Phantom","18Rnd_9x19_PhantomSD"}; +}; + +class CZ_75_SP_01_PHANTOM; +class CZ75SP_DZ: CZ_75_SP_01_PHANTOM { + displayName = $STR_DZ_WPN_CZ75SP_NAME; + descriptionShort = $STR_DZ_WPN_CZ75_DESC; + magazines[] = {"18Rnd_9x19_Phantom","18Rnd_9x19_PhantomSD"}; + + class Attachments + { + Attachment_Sup9 = "CZ75SP_SD_DZ"; + }; +}; + +class CZ_75_SP_01_PHANTOM_SD; +class CZ75SP_SD_DZ: CZ_75_SP_01_PHANTOM_SD { + displayName = $STR_DZ_WPN_CZ75SP_SD_NAME; + descriptionShort = $STR_DZ_WPN_CZ75_DESC; + magazines[] = {"18Rnd_9x19_PhantomSD"}; + + class ItemActions + { + class RemoveSuppressor + { + text = $STR_ATTACHMENT_RMVE_Silencer; + script = "; ['Attachment_Sup9',_id,'CZ75SP_DZ'] call player_removeAttachment"; + }; + }; +}; \ No newline at end of file diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 51641e40a..4849231b4 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -11535,10 +11535,27 @@ CZ 750 S1M1 - Sniper rifle <br/>Caliber: 762x51mm - Снайперская винтовка <br/>Патрон: 762x51mm - Scharfschützengewehr <br/>Kaliber: 762x51mm + Sniper rifle <br/>Caliber: 7.62x51mm + Снайперская винтовка <br/>Патрон: 7.62x51mm + Scharfschützengewehr <br/>Kaliber: 7.62x51mm + + + CZ 75P + + + CZ 75D + + + CZ 75SP + + + CZ 75SP SD + + + Semi-automatic Pistol <br/>Caliber: 9x19mm + Halbautomatische Pistole <br/>Kaliber: 9x19mm + @@ -18132,15 +18149,33 @@ 10Rnd. CZ 750 mag. 10п. CZ 750 маг. + + 18Rnd. CZ 75 mag. + 18п. CZ 75 маг. + + + 18Rnd. CZ 75 SD mag. + 18п. CZ 75 SD маг. + - Caliber: 762x51mm<br/>Rounds: 10<br/>Used in: CZ 750 - Калибр: 762x51мм<br/>Патронов: 10<br/>Используется в: CZ 750 - Kaliber: 762x51mm<br/>Schuss: 10<br/>Verwendet in: CZ 750 + Caliber: 7.62x51mm<br/>Rounds: 10<br/>Used in: CZ 750 + Калибр: 7.62x51мм<br/>Патронов: 10<br/>Используется в: CZ 750 + Kaliber: 7.62x51mm<br/>Schuss: 10<br/>Verwendet in: CZ 750 - Caliber: 762x51mm<br/>Rounds: 200<br/>Used in: Jackal L2A1, Jackal MK19 - Калибр: 762x51мм<br/>Патронов: 200<br/>Используется в: Jackal L2A1, Jackal MK19 - Kaliber: 762x51mm<br/>Schuss: 200<br/>Verwendet in: Jackal L2A1, Jackal MK19 + Caliber: 7.62x51mm<br/>Rounds: 200<br/>Used in: Jackal L2A1, Jackal MK19 + Калибр: 7.62x51мм<br/>Патронов: 200<br/>Используется в: Jackal L2A1, Jackal MK19 + Kaliber: 7.62x51mm<br/>Schuss: 200<br/>Verwendet in: Jackal L2A1, Jackal MK19 + + + Caliber: 9x19mm<br/>Rounds: 18<br/>Used in: CZ 75 + Калибр: 9x19мм<br/>Патронов: 18<br/>Используется в: CZ 75 + Kaliber: 9x19mm<br/>Schuss: 18<br/>Verwendet in: CZ 75 + + + Caliber: 9x19mm SD<br/>Rounds: 18<br/>Used in: CZ 75SP SD + Калибр: 9x19мм SD<br/>Патронов: 18<br/>Используется в: CZ 75SP SD + Kaliber: 9x19mm SD<br/>Schuss: 18<br/>Verwendet in: CZ 75SP SD Satchel Charge