diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp index 6cba5f079..bc85eccd2 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp @@ -121,6 +121,8 @@ AmmoUS[] = // Submachine guns {Loot_MAGAZINE, 6, 30Rnd_9x19_UZI}, {Loot_MAGAZINE, 6, 30Rnd_9x19_UZI_SD}, + {Loot_MAGAZINE, 5, 33Rnd_45ACP_KRISS}, + {Loot_MAGAZINE, 5, 33Rnd_45ACP_KRISSSD}, // Assault rifles {Loot_MAGAZINE, 6, 30Rnd_6x35_KAC}, @@ -156,7 +158,7 @@ AmmoUS[] = AmmoEU[] = { // Pistols - {Loot_MAGAZINE, 8, 7nd_9x17_PPK}, + {Loot_MAGAZINE, 8, 7Rnd_9x17_PPK}, {Loot_MAGAZINE, 8, 8Rnd_9x19_P38}, {Loot_MAGAZINE, 8, 15Rnd_9x19_P226}, {Loot_MAGAZINE, 8, 20Rnd_9x19_M93R}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp index 821869b5f..1e978150d 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp @@ -71,7 +71,7 @@ weaponsUS[] = // Submachine Guns {Loot_WEAPON, 3, PDW_DZ}, - {Loot_WEAPON, 3, PDW_SD_DZ}, + {Loot_WEAPON, 3, Kriss_DZ}, // Assault Rifles {Loot_WEAPON, 6, KAC_PDW_DZ}, diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/10x22.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/10x22.hpp index 1aebdf66d..7e6e7b69c 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/10x22.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/10x22.hpp @@ -9,16 +9,17 @@ class 15Rnd_10x22_p99: CA_Magazine count = 15; initSpeed = 408; descriptionShort = $STR_DZ_MAG_15RND_P99_DESC; + + class ItemActions + { + COMBINE_MAG + }; }; -class 15Rnd_10x22_p99_sd: CA_Magazine + +class 15Rnd_10x22_p99_sd: 15Rnd_10x22_p99 { - scope = 2; displayName = $STR_DZ_MAG_15RND_P99SD_NAME; picture = "\dayz_epoch_c\icons\magazines\mag_sd.paa"; - model = "\C1987_P99\mag.p3d"; - type = 16; ammo = "B_10x22_SD"; - count = 15; - initSpeed = 408; - descriptionShort = $STR_DZ_MAG_15RND_P99SD_DESC; + descriptionShort = $STR_DZ_MAG_15RND_P99SD_DESC; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/22lfB.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/22lfB.hpp index be7a41f1b..27e49bb16 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/22lfB.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/22lfB.hpp @@ -7,6 +7,7 @@ class 10Rnd_22lfB_RUGERMK2: CA_Magazine model = "\RH_de\mags\mag_mk2.p3d"; ammo = "B_22lfB_Ball"; count = 10; + type = 16; class ItemActions { diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/45ACP.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/45ACP.hpp index 2f89cf987..b47c677d9 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/45ACP.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/45ACP.hpp @@ -51,7 +51,13 @@ class 15Rnd_45ACP_USP: 7Rnd_45ACP_1911 descriptionShort = $STR_DZ_MAG_15RND_USP_45ACP_DESC; model = "\RH_de\mags\mag_usp.p3d"; picture = "\RH_de\inv\m_usp.paa"; - count = 15; + count = 15; + + class ItemActions + { + delete ReloadMag; + COMBINE_MAG + }; }; class 15Rnd_45ACP_USPSD: 15Rnd_45ACP_USP { @@ -70,4 +76,21 @@ class 7Rnd_45ACP_1911SD: 15Rnd_45ACP_USPSD picture = "\RH_de\inv\m_colt.paa"; ammo = "B_45ACP_SD"; count = 7; +}; + +class 33Rnd_45ACP_KRISS: 15Rnd_45ACP_USP +{ + displayName = $STR_DZ_MAG_33RND_45ACP_KRISS_NAME; + descriptionShort = $STR_DZ_MAG_33RND_KRISS_45ACP_DESC; + model = "\RH_smg\mags\mag_kriss30.p3d"; + picture = "\RH_smg\inv\m_kriss30.paa"; + count = 33; + type = 256; +}; +class 33Rnd_45ACP_KRISSSD: 33Rnd_45ACP_KRISS +{ + displayName = $STR_DZ_MAG_33RND_45ACP_KRISSSD_NAME; + descriptionShort = $STR_DZ_MAG_33RND_KRISSSD_45ACP_DESC; + picture = "\RH_smg\inv\m_kriss30.paa"; + ammo = "B_45ACP_SD"; }; \ 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 6e8f1d16a..b277fe425 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Ammunition.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Ammunition.hpp @@ -40,6 +40,8 @@ class Category_20 { class 64Rnd_9x19_SD_Bizon {type = "trade_items";buy[] = {4,"ItemSilverBar10oz"};sell[] = {2,"ItemSilverBar10oz"};}; class 40Rnd_46x30_mp7 {type = "trade_items";buy[] = {2,"ItemSilverBar10oz"};sell[] = {1,"ItemSilverBar10oz"};}; class 40Rnd_46x30_sd_mp7 {type = "trade_items";buy[] = {4,"ItemSilverBar10oz"};sell[] = {2,"ItemSilverBar10oz"};}; + class 33Rnd_45ACP_KRISS {type = "trade_items";buy[] = {1,"ItemGoldBar"};sell[] = {5,"ItemSilverBar10oz"};}; + class 33Rnd_45ACP_KRISSSD {type = "trade_items";buy[] = {2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; }; //Single-shot/Shotgun Ammo diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp index 753c090fc..ebdedcec0 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp @@ -112,6 +112,12 @@ class Category_14 { class MP7_ACOG_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {1,"ItemGoldBar10oz"};}; class MP7_ACOG_SD_FL_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {11,"ItemGoldBar"};}; class MP7_ACOG_SD_MFL_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {12,"ItemGoldBar"};}; + class Kriss_DZ {type = "trade_weapons";buy[] = {8,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; + class Kriss_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {8,"ItemGoldBar"};}; + class Kriss_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {6,"ItemGoldBar"};}; + class Kriss_CCO_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {1,"ItemGoldBar10oz"};}; + class Kriss_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {6,"ItemGoldBar"};}; + class Kriss_Holo_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {1,"ItemGoldBar10oz"};}; }; //Single-shot/Shotguns diff --git a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp index 033650dcc..6374547b2 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp @@ -157,6 +157,7 @@ class CfgWeapons class MP5A5; class MP5SD; #include "Rifles\MP5.hpp" + #include "Rifles\Kriss.hpp" #include "Rifles\CZScorpion.hpp" #include "Rifles\MP7.hpp" diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Kriss.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Kriss.hpp new file mode 100644 index 000000000..2e11973d5 --- /dev/null +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Kriss.hpp @@ -0,0 +1,196 @@ +class Kriss_DZ: MP5_DZ +{ + displayName = $STR_DZ_WPN_KRISS_NAME; + descriptionShort = $STR_DZ_WPN_KRISS_DESC; + model = "\RH_smg\RH_kriss.p3d"; + picture = "\RH_smg\inv\kriss.paa"; + magazines[] = {"33Rnd_45ACP_KRISS"}; + handAnim[] = {"OFP2_ManSkeleton","\RH_smg\Anim\NORRN_RH_Kris1.rtm"}; + reloadMagazineSound[] = {"\RH_smg\Sound\kriss_reload.wss",0.056234,1,25}; + modes[] = {"Single","FullAuto"}; + + class Single: Mode_SemiAuto + { + begin1[] = {"\RH_smg\sound\kriss.wss",1.778279,1,900}; + soundBegin[] = {"begin1",1}; + }; + + delete Burst; + + class FullAuto: Mode_FullAuto + { + begin1[] = {"\RH_smg\sound\kriss.wss",1.778279,1,900}; + soundBegin[] = {"begin1",1}; + }; + + class FlashLight + { + color[] = {0.9,0.9,0.7,0.9}; + ambient[] = {0.1,0.1,0.1,1.0}; + position = "flash dir"; + direction = "flash"; + angle = 30; + scale[] = {1,1,0.5}; + brightness = 0.1; + }; + + class Attachments + { + Attachment_CCO = "Kriss_CCO_DZ"; + Attachment_Holo = "Kriss_Holo_DZ"; + Attachment_Sup45 = "Kriss_SD_DZ"; + }; +}; + +class Kriss_CCO_DZ: Kriss_DZ +{ + displayname = $STR_DZ_WPN_KRISS_CCO_NAME; + model = "\RH_smg\RH_krissaim.p3d"; + picture = "\RH_smg\inv\krissaim.paa"; + opticsDisablePeripherialVision = 1; + distanceZoomMin = 100; + distanceZoomMax = 100; + + class Attachments + { + Attachment_Sup45 = "Kriss_CCO_SD_DZ"; + }; + + class ItemActions + { + class RemoveCCO + { + text = $STR_DZ_ATT_CCO_RMVE; + script = "; ['Attachment_CCO',_id,'Kriss_DZ'] call player_removeAttachment"; + }; + }; +}; + +class Kriss_Holo_DZ: Kriss_DZ +{ + displayname = $STR_DZ_WPN_KRISS_HOLO_NAME; + model = "\RH_smg\RH_krisseot.p3d"; + picture = "\RH_smg\inv\krisseot.paa"; + opticsDisablePeripherialVision = 1; + distanceZoomMin = 100; + distanceZoomMax = 100; + + class Attachments + { + Attachment_Sup45 = "Kriss_Holo_SD_DZ"; + }; + + class ItemActions + { + class RemoveHolo + { + text = $STR_DZ_ATT_HOLO_RMVE; + script = "; ['Attachment_Holo',_id,'Kriss_DZ'] call player_removeAttachment"; + }; + }; +}; + +class Kriss_SD_DZ: MP5_SD_DZ +{ + displayName = $STR_DZ_WPN_KRISS_SD_NAME; + descriptionShort = $STR_DZ_WPN_KRISS_SD_DESC; + model = "\RH_smg\RH_krisssd.p3d"; + picture = "\RH_smg\inv\krisssd.paa"; + handAnim[] = {"OFP2_ManSkeleton","\RH_smg\Anim\NORRN_RH_Kris.rtm"}; + magazines[] = {"33Rnd_45ACP_KRISSSD"}; + fireLightDuration = 0.0; + fireLightIntensity = 0.0; + modes[] = {"Single","FullAuto"}; + + class Single: Mode_SemiAuto + { + begin1[] = {"\RH_smg\sound\umpsd.wss",1.778279,1,50}; + soundBegin[] = {"begin1",1}; + }; + + delete Burst; + + class FullAuto: Mode_FullAuto + { + begin1[] = {"\RH_smg\sound\umpsd.wss",1.778279,1,50}; + soundBegin[] = {"begin1",1}; + }; + + class FlashLight + { + color[] = {0.9,0.9,0.7,0.9}; + ambient[] = {0.1,0.1,0.1,1.0}; + position = "flash dir"; + direction = "flash"; + angle = 30; + scale[] = {1,1,0.5}; + brightness = 0.1; + }; + + class Attachments + { + Attachment_CCO = "Kriss_CCO_SD_DZ"; + Attachment_Holo = "Kriss_Holo_SD_DZ"; + }; + + class ItemActions + { + class RemoveSuppressor + { + text = $STR_ATTACHMENT_RMVE_Silencer; + script = "; ['Attachment_Sup45',_id,'Kriss_DZ'] call player_removeAttachment"; + }; + }; +}; + +class Kriss_CCO_SD_DZ: Kriss_SD_DZ +{ + displayname = $STR_DZ_WPN_KRISS_CCO_SD_NAME; + model = "\RH_smg\RH_krisssdaim.p3d"; + picture = "\RH_smg\inv\krisssdaim.paa"; + opticsDisablePeripherialVision = 1; + distanceZoomMin = 100; + distanceZoomMax = 100; + + class Attachments {}; + + class ItemActions + { + class RemoveCCO + { + text = $STR_DZ_ATT_CCO_RMVE; + script = "; ['Attachment_CCO',_id,'Kriss_SD_DZ'] call player_removeAttachment"; + }; + class RemoveSuppressor + { + text = $STR_ATTACHMENT_RMVE_Silencer; + script = "; ['Attachment_Sup45',_id,'Kriss_CCO_DZ'] call player_removeAttachment"; + }; + }; +}; + +class Kriss_Holo_SD_DZ: Kriss_SD_DZ +{ + displayname = $STR_DZ_WPN_KRISS_HOLO_SD_NAME; + model = "\RH_smg\RH_krisssdeot.p3d"; + picture = "\RH_smg\inv\krisssdeot.paa"; + opticsDisablePeripherialVision = 1; + distanceZoomMin = 100; + distanceZoomMax = 100; + + class Attachments {}; + + class ItemActions + { + class RemoveHolo + { + text = $STR_DZ_ATT_HOLO_RMVE; + script = "; ['Attachment_Holo',_id,'Kriss_SD_DZ'] call player_removeAttachment"; + }; + class RemoveSuppressor + { + text = $STR_ATTACHMENT_RMVE_Silencer; + script = "; ['Attachment_Sup45',_id,'Kriss_Holo_DZ'] call player_removeAttachment"; + }; + }; +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MP5.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MP5.hpp index 37c558fc4..82a332420 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MP5.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MP5.hpp @@ -5,7 +5,7 @@ class MP5_DZ : MP5A5 magazines[] = { - 30Rnd_9x19_MP5, + 30Rnd_9x19_MP5 }; class Attachments diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 599869485..a434fdc22 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -12337,7 +12337,49 @@ Magpul PDR Holo + + + + + KRISS + + + KRISS CCO + + KRISS Holo + + + KRISS SD + + + KRISS CCO SD + + + KRISS Holo SD + + + Maschinenpistole <br/>Kaliber: .45 ACP + Submachine gun <br/>Caliber: .45 ACP + Fucile mitragliatore <br/>Calibro: .45 ACP + Metralleta <br/>Calibre: .45 ACP + Pistolet-mitrailleur <br/>Calibre: .45 ACP + Samopal <br/>Kalibr: .45 ACP + Пистолет-пулемет <br/>Патрон: .45 ACP + Pistolet maszynowy <br/>Kaliber: .45 ACP + Géppisztoly <br/> Kaliber: .45 ACP + + + Silenced submachine gun <br/>Caliber: .45 ACP SD + Schallgedämpfte Maschinenpistole <br/>Kaliber: .45 ACP SD + Fucile mitragliatore con silenziatore <br/>Calibro: .45 ACP SD + Metralleta con silenciador <br/>Calibre: .45 ACP SD + Pistolet-mitrailleur à silencieux <br/>Calibre: .45 ACP SD + Samopal s tlumičem <br/>Kalibr: .45 ACP SD + Пистолет-пулемет с ПБС <br/>Патрон: .45 ACP SD + Pistolet maszynowy z tłumikiem <br/>Kaliber: .45 ACP SD + Hangtompítós géppisztoly <br/> Kaliber: .45 ACP SD + @@ -13284,7 +13326,37 @@ Kaliber: 20x102mm<br/>Patronen: 3<br/>Eingesetzt in: Anzio 20mm Kalibr: 20x102mm<br/>Nábojů: 3<br/>Pro: Anzio 20mm Kaliber: 20x102mm<br/> Töltények: 3<br/> Hozzá tartozó fegyver: Anzio 20mm - + + + 33Rnd. KRISS mag. + 33п. KRISS маг. + + + Caliber: .45 ACP<br/>Rounds: 33<br/>Used in: KRISS + Calibre : .45 ACP<br/>Munitions : 33<br/>Utilisé avec: KRISS + Calibre: .45 ACP<br/>Cartuchos: 33<br/>Usado en: KRISS + Calibro: .45 ACP<br/>Munizioni: 33<br/>Usato in: KRISS + Kaliber: .45 ACP<br/>Naboje: 33<br/>Uzywany w: KRISS + Патрон: .45 ACP <br/>Количество: 33<br/>Исп. в: KRISS + Kaliber: .45 ACP<br/>Patronen: 33<br/>Eingesetzt in: KRISS + Kalibr: .45 ACP<br/>Nábojů: 33<br/>Pro: KRISS + Kaliber: .45 ACP <br/> Töltények: 33<br/> Hozzá tartozó fegyver: KRISS + + + 33Rnd. KRISS SD mag. + 33п. KRISS SD маг. + + + Caliber: .45 ACP SD<br/>Rounds: 33<br/>Used in: KRISS SD + Calibre : .45 ACP SD<br/>Munitions : 33<br/>Utilisé avec: KRISS SD + Calibre: .45 ACP SD<br/>Cartuchos: 33<br/>Usado en: KRISS SD + Calibro: .45 ACP SD<br/>Munizioni: 33<br/>Usato in: KRISS SD + Kaliber: .45 ACP SD<br/>Naboje: 33<br/>Uzywany w: KRISS SD + Патрон: .45 ACP SD <br/>Количество: 33<br/>Исп. в: KRISS SD + Kaliber: .45 ACP SD<br/>Patronen: 33<br/>Eingesetzt in: KRISS SD + Kalibr: .45 ACP SD<br/>Nábojů: 33<br/>Pro: KRISS SD + Kaliber: .45 ACP SD <br/> Töltények: 33<br/> Hozzá tartozó fegyver: KRISS SD +