diff --git a/README.md b/README.md index 40417263e..ec256e9e5 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,7 @@ Included Custom Addons * UH1H Search and Rescue Skin by Sam563 - https://opendayz.net/threads/uh1h-search-and-rescue-skin.22516/ * Contractor Mi-17 Pack by lennard91 - http://www.armaholic.com/page.php?id=18498 * "Heckler & Koch" MP7 by SyNcRoNiCzZ - http://www.armaholic.com/page.php?id=8379 +* P99 Projekt by SyNcRoNiCzZ - http://www.armaholic.com/page.php?id=9985 -------------------------- Included Custom Islands diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp index f4a34195e..7df93a3e5 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp @@ -6,6 +6,8 @@ weaponsRU[] = // Pistols {Loot_WEAPON, 2, Makarov_DZ}, {Loot_WEAPON, 1, Makarov_SD_DZ}, + {Loot_WEAPON, 2, P99_Silver_DZ}, + {Loot_WEAPON, 1, P99_Silver_SD_DZ}, // Bolt action rifles and shotguns {Loot_WEAPON, 5, Saiga12K}, @@ -42,6 +44,8 @@ weaponsUS[] = // Pistols {Loot_WEAPON, 1, M9_DZ}, {Loot_WEAPON, 2, M9_SD_DZ}, + {Loot_WEAPON, 2, P99_Green_DZ}, + {Loot_WEAPON, 1, P99_Green_SD_DZ}, // Bolt action rifles and shotguns {Loot_WEAPON, 5, Remington870_DZ}, @@ -82,6 +86,8 @@ weaponsEU[] = // Pistols {Loot_WEAPON, 2, G17_DZ}, {Loot_WEAPON, 1, G17_SD_DZ}, + {Loot_WEAPON, 2, P99_Black_DZ}, + {Loot_WEAPON, 1, P99_Black_SD_DZ}, // Bolt action rifles and shotguns {Loot_WEAPON, 5, LeeEnfield_DZ}, diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/10x22.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/10x22.hpp new file mode 100644 index 000000000..63244c6ee --- /dev/null +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/10x22.hpp @@ -0,0 +1,24 @@ +class 15Rnd_10x22_p99: CA_Magazine +{ + scope = 2; + displayName = $STR_DZ_MAG_15RND_P99_NAME; + picture = "\C1987_P99\equip\mag.paa"; + model = "\C1987_P99\mag.p3d"; + type = 16; + ammo = "B_10x22_Ball"; + count = 15; + initSpeed = 408; + descriptionShort = $STR_DZ_MAG_15RND_P99_DESC; +}; +class 15Rnd_10x22_p99_sd: CA_Magazine +{ + scope = 2; + displayName = $STR_DZ_MAG_15RND_P99SD_NAME; + picture = "\C1987_P99\equip\mag.paa"; + model = "\C1987_P99\mag.p3d"; + type = 16; + ammo = "B_10x22_SD"; + count = 15; + initSpeed = 408; + descriptionShort = $STR_DZ_MAG_15RND_P99SD_DESC; +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Magazines.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Magazines.hpp index 186477dd7..855f26ca6 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Magazines.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Magazines.hpp @@ -8,6 +8,7 @@ #include "9x18.hpp" //Makarov #include "9x19.hpp" //MP5, PDW, Bizon, M9, G17 +#include "10x22.hpp" //P99 #include "45ACP.hpp" //Colt M1911, Revolver #include "545x39.hpp" //AK74, RPK74 #include "556x45.hpp" //M249, STANAG, G36 diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Ammunition.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Ammunition.hpp index c4d11c224..96dcb3d3a 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Ammunition.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Ammunition.hpp @@ -10,6 +10,8 @@ class Category_19 { 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"};}; class 8Rnd_9x18_MakarovSD {type = "trade_items";buy[] = {2,"ItemSilverBar10oz"};sell[] = {1,"ItemSilverBar10oz"};}; + class 15Rnd_10x22_p99 {type = "trade_items";buy[] = {1,"ItemSilverBar10oz"};sell[] = {5,"ItemSilverBar"};}; + class 15Rnd_10x22_p99_sd {type = "trade_items";buy[] = {2,"ItemSilverBar10oz"};sell[] = {1,"ItemSilverBar10oz"};}; }; //Submachine Gun Ammo diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp index 615467d77..50a796abf 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp @@ -38,6 +38,12 @@ class Category_13 { class G17_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {22,"ItemSilverBar10oz"};}; class G17_SD_FL_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {32,"ItemSilverBar10oz"};}; class G17_SD_MFL_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {42,"ItemSilverBar10oz"};}; + class P99_Black_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar"};sell[] = {5,"ItemSilverBar10oz"};}; + class P99_Black_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {25,"ItemSilverBar10oz"};}; + class P99_Green_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar"};sell[] = {5,"ItemSilverBar10oz"};}; + class P99_Green_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {25,"ItemSilverBar10oz"};}; + class P99_Silver_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar"};sell[] = {5,"ItemSilverBar10oz"};}; + class P99_Silver_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {25,"ItemSilverBar10oz"};}; }; //Submachine Guns diff --git a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp index cab4a28b8..c0473096b 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp @@ -180,6 +180,7 @@ class CfgWeapons class M9; class M9SD; #include "Pistols\M9.hpp" + #include "Pistols\P99.hpp" class glock17_EP1; #include "Pistols\G17.hpp" diff --git a/SQF/dayz_code/Configs/CfgWeapons/Pistols/P99.hpp b/SQF/dayz_code/Configs/CfgWeapons/Pistols/P99.hpp new file mode 100644 index 000000000..3b093292a --- /dev/null +++ b/SQF/dayz_code/Configs/CfgWeapons/Pistols/P99.hpp @@ -0,0 +1,100 @@ +class P99_Black_DZ: M9 +{ + displayName = $STR_DZ_WPN_P99_NAME; + model = "\C1987_P99\P99_black.p3d"; + picture = "\C1987_P99\equip\p99_black.paa"; + soundBegin[] = {"begin1",1}; + begin1[] = {"\C1987_P99\sound\p99.wss",1.0,1}; + reloadMagazineSound[] = {"\C1987_P99\sound\p99_reload.wss",0.1,1,20}; + magazines[] = {"15Rnd_10x22_p99","15Rnd_10x22_p99_sd"}; + descriptionShort = $STR_DZ_WPN_P99_DESC; + class Library + { + libTextDesc = "The Walther P99 is a semi-automatic pistol developed by the German Company Carl Walther GmbH Sportwaffen of Ulm for law enforcement, security forces and the civilian shooting market as a replacement for the Walther P5 and the P88. The P99 and its variants are also made under license by Fabryka Broni Radom."; + }; + + class Attachments + { + Attachment_Sup9 = "P99_Black_SD_DZ"; + }; +}; + +class P99_Black_SD_DZ: M9SD +{ + displayName = $STR_DZ_WPN_P99SD_NAME; + model = "\C1987_P99\P99_black_sd.p3d"; + picture = "\C1987_P99\equip\p99_black_sd.paa"; + soundBegin[] = {"begin1",1}; + fireLightDuration = 0.0; + fireLightIntensity = 0.0; + begin1[] = {"\C1987_P99\sound\p99_sd.wss",1.0,1}; + reloadMagazineSound[] = {"\C1987_P99\sound\p99_reload.wss",0.1,1,20}; + magazines[] = {"15Rnd_10x22_p99_sd"}; + descriptionShort = $STR_DZ_WPN_P99SD_DESC; + + class ItemActions + { + class RemoveSuppressor + { + text = $STR_ATTACHMENT_RMVE_Silencer; + script = "; ['Attachment_Sup9',_id,'P99_Black_DZ'] call player_removeAttachment"; + }; + }; +}; + +class P99_Green_DZ: P99_Black_DZ +{ + displayName = $STR_DZ_WPN_P99_NAME; + model = "\C1987_P99\P99_green.p3d"; + picture = "\C1987_P99\equip\p99_green.paa"; + + class Attachments + { + Attachment_Sup9 = "P99_Green_SD_DZ"; + }; +}; + +class P99_Green_SD_DZ: P99_Black_SD_DZ +{ + displayName = $STR_DZ_WPN_P99SD_NAME; + model = "\C1987_P99\P99_green_sd.p3d"; + picture = "\C1987_P99\equip\p99_green_sd.paa"; + + class ItemActions + { + class RemoveSuppressor + { + text = $STR_ATTACHMENT_RMVE_Silencer; + script = "; ['Attachment_Sup9',_id,'P99_Green_DZ'] call player_removeAttachment"; + }; + }; +}; + +class P99_Silver_DZ: P99_Black_DZ +{ + displayName = $STR_DZ_WPN_P99_NAME; + model = "\C1987_P99\P99_silver.p3d"; + picture = "\C1987_P99\equip\p99_silver.paa"; + + class Attachments + { + Attachment_Sup9 = "P99_Silver_SD_DZ"; + }; + +}; + +class P99_Silver_SD_DZ: P99_Black_SD_DZ +{ + displayName = $STR_DZ_WPN_P99SD_NAME; + model = "\C1987_P99\P99_silver_sd.p3d"; + picture = "\C1987_P99\equip\p99_silver_sd.paa"; + + class ItemActions + { + class RemoveSuppressor + { + text = $STR_ATTACHMENT_RMVE_Silencer; + script = "; ['Attachment_Sup9',_id,'P99_Silver_DZ'] call player_removeAttachment"; + }; + }; +}; diff --git a/SQF/dayz_code/Configs/cfgAmmo.hpp b/SQF/dayz_code/Configs/cfgAmmo.hpp index 78e79053f..c8cf95189 100644 --- a/SQF/dayz_code/Configs/cfgAmmo.hpp +++ b/SQF/dayz_code/Configs/cfgAmmo.hpp @@ -362,6 +362,27 @@ class CfgAmmo visiblefire = 16; }; + //P99 + class B_10x22_Ball: BulletBase + { + cartridge = "FxCartridge_Small"; + cost = 5; + typicalSpeed = 344; + airFriction = -0.0017; + hit = 8.5; + }; + class B_10x22_SD: BulletBase + { + cartridge = "FxCartridge_Small"; + visibleFire = 0.035; + audibleFire = 0.035; + visibleFireTime = 2; + cost = 1; + typicalSpeed = 265; + airFriction = -0.000955; + hit = 7.5; + }; + //MP7 class B_46x30_Ball: BulletBase { diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 3724610a7..4e63df216 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -11785,8 +11785,26 @@ Пистолет-пулемет с ПБС <br/>Патрон: 9х19 мм Pistolet maszynowy z tłumikiem <br/>Kaliber: 4.6x30mm Hangtompítós géppisztoly <br/> Kaliber: 4.6x30mm - - + + + + + + P99 + P99 + + + P99 SD + P99 SD + + + Semi-automatic Pistol <br/>Caliber: 10x22mm + Halbautomatische Pistole <br/>Kaliber: 10x22mm + + + Silenced Semi-automatic Pistol <br/>Caliber: 10x22mm SD + Schallgedämpfte halbautomatische Pistole <br/>Kaliber: 10x22mm SD + @@ -12184,6 +12202,40 @@ Kalibr: 4.6x30mm SD<br/>Nábojů: 40<br/>Pro: MP7 SD Caliber: 4.6x30mm SD<br/>Rounds: 40<br/>Used in: MP7 SD Caliber: 4.6x30mm SD<br/>Rounds: 40<br/>Used in: MP7 SD + + + 15Rnd. P99 mag. + 15п. P99 маг. + + + 15Rnd. P99 SD mag. + 15п. P99 SD маг. + + + Caliber: 10x22mm<br/>Rounds: 15<br/>Used in: P99 + Calibre : 10x22mm<br/>Munitions : 15<br/>Utilisé avec : P99 + Calibre: 10x22mm<br/>Cartuchos: 15<br/>Usado en: P99 + Calibro: 10x22mm<br/>Munizioni: 15<br/>Usato in: P99 + Caliber: 10x22mm<br/>Rounds: 15<br/>Used in: P99 + Kaliber: 10x22mm<br/>Naboje: 15<br/>Uzywany w: P99 + Патрон: 10x22 мм<br/>Количество: 15<br/>Исп. в: P99 + Kaliber: 10x22mm<br/>Patronen: 15<br/>Eingesetzt in: P99 + Kalibr: 10x22mm<br/>Nábojů: 15<br/>Pro: P99 + Caliber: 10x22mm<br/>Rounds: 15<br/>Used in: P99 + Caliber: 10x22mm<br/>Rounds: 15<br/>Used in: P99 + + + Caliber: 10x22mm SD<br/>Rounds: 15<br/>Used in: P99 SD + Calibre : 10x22mm SD<br/>Munitions : 15<br/>Utilisé avec : P99 SD + Calibre: 10x22mm SD<br/>Cartuchos: 15<br/>Usado en: P99 SD + Calibro: 10x22mm SD<br/>Munizioni: 15<br/>Usato in: P99 SD + Caliber: 10x22mm SD<br/>Rounds: 15<br/>Used in: P99 SD + Kaliber: 10x22mm SD<br/>Naboje: 15<br/>Uzywany w: P99 SD + Патрон: 10x22 мм SD<br/>Количество: 15<br/>Исп. в: P99 SD + Kaliber: 10x22mm SD<br/>Patronen: 15<br/>Eingesetzt in: P99 SD + Kalibr: 10x22mm SD<br/>Nábojů: 15<br/>Pro: P99 SD + Caliber: 10x22mm SD<br/>Rounds: 15<br/>Used in: P99 SD + Caliber: 10x22mm SD<br/>Rounds: 15<br/>Used in: P99 SD