diff --git a/README.md b/README.md index 04ae98928..e0604808c 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,7 @@ Included Custom Addons * P99 Projekt by SyNcRoNiCzZ - http://www.armaholic.com/page.php?id=9985 * FAMAS Pack by SyNcRoNiCzZ - http://www.armaholic.com/page.php?id=8867 * FHQ Remington Weapon Pack by Alwarren - http://www.armaholic.com/page.php?id=17971 +* RH PDW pack by Robert Hammer - http://www.armaholic.com/page.php?id=12214 -------------------------- Included Custom Islands diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp index c38164616..182ed6400 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp @@ -44,8 +44,8 @@ AmmoCZ[] = { {Loot_MAGAZINE, 3, 20Rnd_762x51_B_SCAR}, // Submachine guns - {Loot_MAGAZINE, 3, 20Rnd_9x19_EVO}, - {Loot_MAGAZINE, 3, 20Rnd_9x19_EVOSD}, + {Loot_MAGAZINE, 3, 30Rnd_9x19_MP5}, + {Loot_MAGAZINE, 3, 30Rnd_9x19_MP5SD}, {Loot_MAGAZINE, 3, 20Rnd_B_765x17_Ball}, // Pistols @@ -114,6 +114,7 @@ AmmoUS[] = {Loot_MAGAZINE, 6, 30Rnd_9x19_UZI_SD}, // Assault rifles + {Loot_MAGAZINE, 6, 30Rnd_6x35_KAC}, {Loot_MAGAZINE, 10, 30Rnd_556x45_Stanag}, {Loot_MAGAZINE, 8, 30Rnd_556x45_StanagSD}, {Loot_MAGAZINE, 6, ACR_30Rnd_680x43}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/CrashSite.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/CrashSite.hpp index 0ad2e83b1..e2e47b82e 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/CrashSite.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/CrashSite.hpp @@ -127,7 +127,7 @@ CrashSiteEUPile[] = {Loot_GROUP, 5, ToolsMilitary}, {Loot_MAGAZINE, 10, FoodMRE}, {Loot_GROUP, 15, AmmoEU}, - {Loot_MAGAZINE, 3, 5Rnd_127x99_as50}, + {Loot_MAGAZINE, 3, 5Rnd_127x99_as50_CP}, {Loot_GROUP, 10, MedicalLow} }; diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp index 42d8cdeba..2e9228cf6 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp @@ -66,6 +66,7 @@ weaponsUS[] = {Loot_WEAPON, 3, PDW_SD_DZ}, // Assault Rifles + {Loot_WEAPON, 6, KAC_PDW_DZ}, {Loot_WEAPON, 6, M16A2_DZ}, {Loot_WEAPON, 6, M16A4_ACOG_DZ}, {Loot_WEAPON, 6, M4A1_DZ}, diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/6x35.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/6x35.hpp new file mode 100644 index 000000000..7e9f8c307 --- /dev/null +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/6x35.hpp @@ -0,0 +1,17 @@ +class 30Rnd_6x35_KAC: CA_Magazine +{ + scope = public; + displayName = $STR_DZ_MAG_30RND_KACPDW_NAME; + descriptionShort = $STR_DZ_MAG_30RND_KACPDW_DESC; + picture = "\RH_pdw\inv\m_30pdw_ca.paa"; + model = "\RH_pdw\RH_pdw_mag.p3d"; + ammo = "B_6x35_Ball"; + count = 30; + initSpeed = 930; + lastroundstracer = 0; + + class ItemActions + { + COMBINE_MAG + }; +}; \ 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 a41bb4a49..c4edab429 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/Magazines.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/Magazines.hpp @@ -12,6 +12,7 @@ #include "45ACP.hpp" //Colt M1911, Revolver #include "545x39.hpp" //AK74, RPK74 #include "556x45.hpp" //M249, STANAG, G36 +#include "6x35.hpp" //KAC PDW #include "762x39.hpp" //AK47, SA58 #include "762x51.hpp" //M240, FN FAL, DMR, M24 #include "762x54r.hpp" //PK, SVD, Mosin diff --git a/SQF/dayz_code/Configs/CfgRecoils.hpp b/SQF/dayz_code/Configs/CfgRecoils.hpp index 76b731bdc..ca6bc3337 100644 --- a/SQF/dayz_code/Configs/CfgRecoils.hpp +++ b/SQF/dayz_code/Configs/CfgRecoils.hpp @@ -9,4 +9,7 @@ class CfgRecoils Mosin_Nagant_CarbineRecoilProne[] = {0,0,0,0.0500,0.12,0.3,0.1000,0,0}; MP7Recoil[] = {0,0.005,0.005,0.005,0.007,0.006,0.09,0.002,-0.0015,0.1,0,0}; + RH_pdwassaultRiflesBase[] = {0,0.005,0.005,0.005,0.01,0.011,0.09,0.005,-0.0005,0.14,0,0}; + RH_pdwassaultRiflesBaseProne[] = {0,0.005,0.005,0.005,0.01,0.009,0.075,0.005,-0.0003,0.13,0,0}; + RH_PDWRecoil[] = {0,0.005,0.005,0.005,0.01,0.011,0.09,0.005,-0.0004,0.13,0,0}; }; \ 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 22eaa2a16..ba5cbfb28 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Ammunition.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Ammunition.hpp @@ -43,6 +43,7 @@ class Category_21 { //Assault Rifle Ammo class Category_22 { + class 30Rnd_6x35_KAC {type = "trade_items";buy[] = {4,"ItemSilverBar"};sell[] = {2,"ItemSilverBar"};}; class 30Rnd_556x45_Stanag {type = "trade_items";buy[] = {4,"ItemSilverBar"};sell[] = {2,"ItemSilverBar"};}; class 30Rnd_556x45_StanagSD {type = "trade_items";buy[] = {4,"ItemSilverBar10oz"};sell[] = {2,"ItemSilverBar10oz"};}; class 30Rnd_556x45_G36 {type = "trade_items";buy[] = {4,"ItemSilverBar"};sell[] = {2,"ItemSilverBar"};}; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp index b2cc846e4..402d1eb67 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp @@ -417,13 +417,17 @@ class Category_16 { class ACR_SNOW_NV_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {14,"ItemGoldBar"};}; class ACR_SNOW_NV_GL_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {16,"ItemGoldBar"};}; class ACR_SNOW_NV_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {18,"ItemGoldBar"};}; - class ACR_SNOW_NV_GL_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};}; + class ACR_SNOW_NV_GL_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};}; + class KAC_PDW_DZ {type = "trade_weapons";buy[] = {4,"ItemGoldBar"};sell[] = {2,"ItemGoldBar"};}; + class KAC_PDW_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; + class KAC_PDW_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; + class KAC_PDW_ACOG_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {6,"ItemGoldBar"};}; }; //Sniper Rifles class Category_17 { - class M4SPR {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {6,"ItemGoldBar"};}; class CZ550_DZ {type = "trade_weapons";buy[] = {6,"ItemGoldBar"};sell[] = {3,"ItemGoldBar"};}; + class M4SPR_DZE {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {6,"ItemGoldBar"};}; class CZ750_DZ {type = "trade_weapons";buy[] = {2,"ItemGoldBar10oz"};sell[] = {6,"ItemGoldBar"};}; 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"};}; @@ -431,7 +435,7 @@ class Category_17 { class M24_des_EP1 {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"};}; - class VSS_vintorez {type = "trade_weapons";buy[] = {3,"ItemGoldBar10oz"};sell[] = {4,"ItemGoldBar"};}; + class VSS_vintorez_DZE {type = "trade_weapons";buy[] = {3,"ItemGoldBar10oz"};sell[] = {4,"ItemGoldBar"};}; // iron sights class SVD_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {6,"ItemGoldBar"};}; // iron sights and ghillie diff --git a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp index b73ae4637..d9df56afb 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp @@ -80,7 +80,8 @@ class CfgWeapons #include "Rifles\M4A1.hpp" //Famas #include "Rifles\Famas.hpp" - #include "Rifles\ACR.hpp" + #include "Rifles\ACR.hpp" + #include "Rifles\KACPDW.hpp" class M14_EP1; #include "Rifles\M14.hpp" diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/KACPDW.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/KACPDW.hpp new file mode 100644 index 000000000..dcc039f40 --- /dev/null +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/KACPDW.hpp @@ -0,0 +1,155 @@ +class KAC_PDW_DZ: Rifle +{ + scope = public; + displayName = $STR_DZ_WPN_KACPDW_NAME; + descriptionShort = $STR_DZ_WPN_KACPDW_DESC; + model = "\RH_pdw\RH_pdw.p3d"; + picture = "\RH_pdw\inv\w_pdw_iron_ca.paa"; + handAnim[] = {"OFP2_ManSkeleton","\RH_pdw\Anim\RH_PDW.rtm"}; + distanceZoomMin = 100; + distanceZoomMax = 100; + magazines[] = {"30Rnd_6x35_KAC"}; + modes[] = {"Single","FullAuto"}; + dexterity = 2.4; + drySound[] = {"Ca\sounds\Weapons\rifles\dry",0.000316228,1,10}; + class Single: Mode_SemiAuto + { + reloadTime = 0.0857; + recoil = "RH_PDWRecoil"; + recoilProne = "RH_pdwassaultRiflesBaseProne"; + dispersion = 0.0025; + aiRateOfFire = 1; + aiRateOfFireDistance = 300; + minRange = 0; + minRangeProbab = 0.7; + midRange = 150; + midRangeProbab = 0.5; + maxRange = 300; + maxRangeProbab = 0.05; + begin1[] = {"\RH_pdw\sound\pdw_fire1",1.77828,1,1000}; + soundBegin[] = {"begin1",1}; + }; + class FullAuto: Mode_FullAuto + { + reloadTime = 0.0857; + recoil = "RH_PDWRecoil"; + recoilProne = "RH_pdwassaultRiflesBaseProne"; + dispersion = 0.0025; + aiRateOfFire = 0.2; + aiRateOfFireDistance = 50; + minRange = 0; + minRangeProbab = 0.8; + midRange = 25; + midRangeProbab = 0.7; + maxRange = 70; + maxRangeProbab = 0.05; + begin1[] = {"\RH_pdw\sound\pdw_fire1",1.77828,1,1000}; + soundBegin[] = {"begin1",1}; + }; + class Library + { + libTextDesc = "The Knight's Armament Company 6x35mm PDW is an experimental personal defense weapon designed by KAC, firing a new 6mm cartridge optimized for short barrel weapons."; + }; + + class Attachments + { + Attachment_CCO = "KAC_PDW_CCO_DZ"; + Attachment_Holo = "KAC_PDW_HOLO_DZ"; + Attachment_ACOG = "KAC_PDW_ACOG_DZ"; + }; +}; + +class KAC_PDW_CCO_DZ: KAC_PDW_DZ +{ + displayName = $STR_DZ_WPN_KACPDW_CCO_NAME; + picture = "\RH_pdw\inv\w_pdw_aim_ca.paa"; + model = "\RH_pdw\RH_pdw_aim.p3d"; + dexterity = 2.2; + + class Attachments {}; + + class ItemActions + { + class RemoveCCO + { + text = $STR_DZ_ATT_CCO_RMVE; + script = "; ['Attachment_CCO',_id,'KAC_PDW_DZ'] call player_removeAttachment"; + }; + }; +}; + +class KAC_PDW_HOLO_DZ: KAC_PDW_DZ +{ + displayName = $STR_DZ_WPN_KACPDW_HOLO_NAME; + picture = "\RH_pdw\inv\w_pdw_eotech_ca.paa"; + model = "\RH_pdw\RH_pdw_eotech.p3d"; + dexterity = 2.1; + + class Attachments {}; + + class ItemActions + { + class RemoveHolo + { + text = $STR_DZ_ATT_HOLO_RMVE; + script = "; ['Attachment_Holo',_id,'KAC_PDW_DZ'] call player_removeAttachment"; + }; + }; +}; + +class KAC_PDW_ACOG_DZ: KAC_PDW_DZ +{ + displayName = $STR_DZ_WPN_KACPDW_ACOG_NAME; + picture = "\RH_pdw\inv\w_pdw_acog_ca.paa"; + model = "\RH_pdw\RH_pdw_acog.p3d"; + modelOptics = "\RH_pdw\fnc_acog_ta31rco.p3d"; + dexterity = 2.1; + + class OpticsModes + { + class ACOG + { + opticsID = 1; + useModelOptics = true; + opticsFlare = true; + opticsDisablePeripherialVision = true; + opticsZoomMin = 0.0623; + opticsZoomMax = 0.0623; + opticsZoomInit = 0.0623; + distanceZoomMin = 300; + distanceZoomMax = 300; + memoryPointCamera = "opticView"; + visionMode[] = {"Normal"}; + opticsPPEffects[] = {"OpticsCHAbera3","OpticsBlur3"}; + cameraDir = ""; + }; + + class Iron + { + opticsID = 2; + useModelOptics = false; + opticsFlare = false; + opticsDisablePeripherialVision = false; + opticsZoomMin = 0.25; + opticsZoomMax = 1.1; + opticsZoomInit = 0.5; + distanceZoomMin = 100; + distanceZoomMax = 100; + memoryPointCamera = "eye"; + visionMode[] = {}; + opticsPPEffects[] = {}; + cameraDir = ""; + }; + }; + + class Attachments {}; + + class ItemActions + { + class RemoveACOG + { + text = $STR_DZ_ATT_ACOG_RMVE; + script = "; ['Attachment_ACOG',_id,'KAC_PDW_DZ'] call player_removeAttachment"; + }; + }; +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/cfgAmmo.hpp b/SQF/dayz_code/Configs/cfgAmmo.hpp index 102183dce..f45c92d91 100644 --- a/SQF/dayz_code/Configs/cfgAmmo.hpp +++ b/SQF/dayz_code/Configs/cfgAmmo.hpp @@ -512,6 +512,14 @@ class CfgAmmo airFriction = -0.0009324; }; + //KAC PDW + class B_556x45_Ball; + class B_6x35_Ball: B_556x45_Ball + { + airfriction = -0.0015; + hit = 8.5; + }; + //mosin nagant /*class Mosin_762 : BulletBase { diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 9b9e36cbf..2245b8c21 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -12042,7 +12042,25 @@ Remington XM2010, silenced Sniper Rifle with a night vision scope. <br/>Caliber: .300 Remington XM2010, schallgedämpftes Scharfschützengewehr mit einem Nachtsichtvisier. <br/>Kaliber: .300 + + + + KAC PDW + + + KAC PDW CCO + + + KAC PDW Holo + + + KAC PDW ACOG + + KAC PDW, short barrel rifle <br/>Caliber: 6x35mm + KAC PDW, Kurzlaufgewehr <br/>Kaliber: 6x35mm + + @@ -12585,6 +12603,21 @@ Kaliber: .300 SD<br/>Patronen: 5<br/>Eingesetzt in: XM2010 SD Kalibr: .300 SD<br/>Nábojů: 5<br/>Pro: XM2010 SD Kaliber: .300 SD <br/> Töltények: 5 <br/> Hozzá tartozó fegyver: XM2010 SD + + + 30Rnd. KAC PDW mag. + 30п. KAC PDW маг. + + + Caliber: 6x35mm<br/>Rounds: 30<br/>Used in: KAC PDW + Calibre : 6x35mm<br/>Munitions : 30<br/>Utilisé avec : KACPDW + Calibre: 6x35mm<br/>Cartuchos: 30<br/>Usado en: KAC PDW + Calibro: 6x35mm<br/>Munizioni: 30<br/>Usato in: KAC PDW + Kaliber: 6x35mm<br/>Naboje: 30<br/>Uzywany w: KAC PDW + Патрон: 6x35mm <br/>Количество: 30<br/>Исп. в: KAC PDW + Kaliber: 6x35mm<br/>Patronen: 30<br/>Eingesetzt in: KAC PDW + Kalibr: 6x35mm<br/>Nábojů: 30<br/>Pro: KAC PDW + Kaliber: 6x35mm <br/> Töltények: 30<br/> Hozzá tartozó fegyver: KAC PDW