diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp index 7dda46f71..0e2ece197 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp @@ -175,14 +175,11 @@ weaponsEU[] = {Loot_WEAPON, 5, HK416_DZ}, {Loot_WEAPON, 5, HK416C_DZ}, {Loot_WEAPON, 5, HK417_DZ}, - {Loot_WEAPON, 5, HK417C_DZ}, - {Loot_WEAPON, 5, SCAR_L_CQC_CCO_SD}, - {Loot_WEAPON, 5, SCAR_L_CQC}, - {Loot_WEAPON, 5, SCAR_L_CQC_Holo}, - {Loot_WEAPON, 5, SCAR_L_CQC_EGLM_Holo}, - {Loot_WEAPON, 5, SCAR_L_STD_EGLM_RCO}, - {Loot_WEAPON, 5, SCAR_L_STD_HOLO}, - {Loot_WEAPON, 5, SCAR_L_STD_Mk4CQT}, + {Loot_WEAPON, 5, HK417C_DZ}, + {Loot_WEAPON, 5, MK16_DZ}, + {Loot_WEAPON, 5, MK16_CCO_SD_DZ}, + {Loot_WEAPON, 5, MK16_Holo_SD_DZ}, + {Loot_WEAPON, 5, MK16_ACOG_SD_DZ}, {Loot_WEAPON, 3, SCAR_H_CQC_CCO}, {Loot_WEAPON, 3, SCAR_H_CQC_CCO_SD}, {Loot_WEAPON, 3, SCAR_H_STD_EGLM_Spect}, diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp index da4eaff55..2631c35ec 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp @@ -330,13 +330,20 @@ class Category_16 { class HK416C_GL_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {6,"ItemGoldBar"};}; class HK416C_ACOG_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {6,"ItemGoldBar"};}; class HK416C_GL_ACOG_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {8,"ItemGoldBar"};}; - class SCAR_L_CQC {type = "trade_weapons";buy[] = {7,"ItemGoldBar"};sell[] = {3,"ItemGoldBar"};}; - class SCAR_L_CQC_CCO_SD {type = "trade_weapons";buy[] = {2,"ItemGoldBar10oz"};sell[] = {8,"ItemGoldBar"};}; - class SCAR_L_CQC_Holo {type = "trade_weapons";buy[] = {8,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; - class SCAR_L_CQC_EGLM_Holo {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {5,"ItemGoldBar"};}; - class SCAR_L_STD_EGLM_RCO {type = "trade_weapons";buy[] = {2,"ItemGoldBar10oz"};sell[] = {7,"ItemGoldBar"};}; - class SCAR_L_STD_HOLO {type = "trade_weapons";buy[] = {8,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; - class SCAR_L_STD_Mk4CQT {type = "trade_weapons";buy[] = {8,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; + class MK16_DZ {type = "trade_weapons";buy[] = {4,"ItemGoldBar"};sell[] = {2,"ItemGoldBar"};}; + class MK16_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; + class MK16_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; + class MK16_CCO_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {8,"ItemGoldBar"};}; + class MK16_Holo_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {8,"ItemGoldBar"};}; + class MK16_GL_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; + class MK16_GL_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {6,"ItemGoldBar"};}; + class MK16_GL_CCO_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {1,"ItemGoldBar10oz"};}; + class MK16_GL_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {6,"ItemGoldBar"};}; + class MK16_GL_Holo_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {1,"ItemGoldBar10oz"};}; + class MK16_ACOG_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {6,"ItemGoldBar"};}; + class MK16_GL_ACOG_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {8,"ItemGoldBar"};}; + class MK16_ACOG_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {1,"ItemGoldBar10oz"};}; + class MK16_GL_ACOG_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {12,"ItemGoldBar"};}; class L85A2_DZ {type = "trade_weapons";buy[] = {4,"ItemGoldBar"};sell[] = {2,"ItemGoldBar"};}; class L85A2_FL_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {3,"ItemGoldBar"};}; class L85A2_MFL_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; diff --git a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp index 402dc87af..2cc23a03f 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp @@ -81,7 +81,7 @@ class CfgWeapons }; #include "Rifles\G36.hpp" #include "Rifles\G36C.hpp" - #include "Rifles\MG36.hpp" + #include "Rifles\MG36.hpp" class M4A1; class M4A1_AIM_SD_camo; @@ -99,6 +99,7 @@ class CfgWeapons //CTAR-21 #include "Rifles\CTAR21.hpp" #include "Rifles\Masada.hpp" + #include "Rifles\MK16.hpp" class M14_EP1; #include "Rifles\M14.hpp" diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MK16.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MK16.hpp new file mode 100644 index 000000000..73508d157 --- /dev/null +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MK16.hpp @@ -0,0 +1,430 @@ +#define MK16_ACOG modelOptics = "\Ca\weapons_E\SCAR\ACOG_TA31_optic_4x.p3d";\ +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 = "";\ + };\ +} + +#define MK16_Laser irLaserPos = "laser pos";\ + irLaserEnd = "laser dir";\ + irDistance = 5 + +#define MK16_M203 muzzles[] = {this, M203Muzzle};\ +handAnim[] = {"OFP2_ManSkeleton","\RH_mgswp\Anim\RH_scargl.rtm"} + +class MK16_DZ : M4A1 +{ + model = "\RH_mgswp\RH_Scarl.p3d"; + picture = "\RH_mgswp\inv\scarl.paa"; + handAnim[] = {"OFP2_ManSkeleton","\RH_mgswp\anim\RH_M4cs.rtm"}; + reloadMagazineSound[] = {"\RH_mgswp\sound\scar_Reload",0.0316228,1,20}; + displayName = $STR_DZ_WPN_MK16_NAME; + descriptionShort = $STR_DZ_WPN_MK16_DESC; + weaponInfoType = "RscWeaponZeroing"; + discreteDistance[] = {100,200,300,400,500,600}; + discreteDistanceInitIndex = 2; + bullet1[] = {"ca\sounds\weapons\shells\small_shell_metal_04",0.17782794,1,15}; + bullet2[] = {"ca\sounds\weapons\shells\small_shell_metal_03",0.17782794,1,15}; + bullet3[] = {"ca\sounds\weapons\shells\small_shell_metal_02",0.17782794,1,15}; + bullet4[] = {"ca\sounds\weapons\shells\small_shell_metal_01",0.17782794,1,15}; + bullet5[] = {"ca\sounds\weapons\shells\small_shell_dirt_07",0.31622776,1,15}; + bullet6[] = {"ca\sounds\weapons\shells\small_shell_dirt_09",0.31622776,1,15}; + bullet7[] = {"ca\sounds\weapons\shells\small_shell_dirt_10",0.31622776,1,15}; + bullet8[] = {"ca\sounds\weapons\shells\small_shell_dirt_12",0.31622776,1,15}; + bullet9[] = {"ca\sounds\weapons\shells\small_shell_soft_05",0.17782794,1,15}; + bullet10[] = {"ca\sounds\weapons\shells\small_shell_soft_09",0.17782794,1,15}; + bullet11[] = {"ca\sounds\weapons\shells\small_shell_soft_10",0.17782794,1,15}; + bullet12[] = {"ca\sounds\weapons\shells\small_shell_soft_13",0.17782794,1,15}; + soundBullet[] = {"bullet1",0.083,"bullet2",0.083,"bullet3",0.083,"bullet4",0.083,"bullet5",0.083,"bullet6",0.083,"bullet7",0.083,"bullet8",0.083,"bullet9",0.083,"bullet10",0.083,"bullet11",0.083,"bullet12",0.083}; + modes[] = {"Single","FullAuto"}; + + class Single: Mode_SemiAuto + { + begin1[] = {"ca\sounds_E\weapons_E\SCAR\SCAR_single_shot_v2a",2.5118864,1,1200}; + soundBegin[] = {"begin1",1}; + dispersion = 0.0025; + reloadtime = 0.096; + recoil = "recoil_single_primary_4outof10"; + recoilProne = "recoil_single_primary_prone_3outof10"; + aiRateOfFire = 1; + aiRateOfFireDistance = 300; + minRange = 0; + minRangeProbab = 0.7; + midRange = 150; + midRangeProbab = 0.5; + maxRange = 300; + maxRangeProbab = 0.03; + }; + class FullAuto: Mode_FullAuto + { + begin1[] = {"ca\sounds_E\weapons_E\SCAR\SCAR_single_shot_v2a",2.5118864,1,1200}; + soundBegin[] = {"begin1",1}; + dispersion = 0.0025; + reloadtime = 0.096; + recoil = "recoil_single_primary_4outof10"; + recoilProne = "recoil_single_primary_prone_3outof10"; + aiRateOfFire = 0.2; + aiRateOfFireDistance = 50; + minRange = 0; + minRangeProbab = 0.8; + midRange = 20; + midRangeProbab = 0.7; + maxRange = 50; + maxRangeProbab = 0.02; + }; + + magazines[] = + { + 30Rnd_556x45_Stanag, + 30Rnd_556x45_G36, + 100Rnd_556x45_BetaCMag, + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE + }; + + class Attachments + { + Attachment_CCO = "MK16_CCO_DZ"; + Attachment_Holo = "MK16_Holo_DZ"; + Attachment_ACOG = "MK16_ACOG_DZ"; + Attachment_M203 = "MK16_GL_DZ"; + }; +}; + +class MK16_CCO_DZ : MK16_DZ +{ + model = "\RH_mgswp\RH_scarL_aim.p3d"; + picture = "\RH_mgswp\inv\scarl_aim.paa"; + handAnim[] = {}; + displayName = $STR_DZ_WPN_MK16_CCO_NAME; + MK16_Laser; + + class Attachments + { + Attachment_M203 = "MK16_GL_CCO_DZ"; + }; + + class ItemActions + { + class RemoveCCO + { + text = $STR_DZ_ATT_CCO_RMVE; + script = "; ['Attachment_CCO',_id,'MK16_DZ'] call player_removeAttachment"; + }; + }; +}; + +class MK16_Holo_DZ : MK16_DZ +{ + model = "\RH_mgswp\RH_Scarl_eotech.p3d"; + picture = "\RH_mgswp\inv\scarl_eotech.paa"; + displayName = $STR_DZ_WPN_MK16_HOLO_NAME; + MK16_Laser; + + class Attachments + { + Attachment_M203 = "MK16_GL_Holo_DZ"; + }; + + class ItemActions + { + class RemoveHolo + { + text = $STR_DZ_ATT_HOLO_RMVE; + script = "; ['Attachment_Holo',_id,'MK16_DZ'] call player_removeAttachment"; + }; + }; +}; + +class MK16_ACOG_DZ : MK16_DZ +{ + model = "\RH_mgswp\RH_Scarl_acog.p3d"; + picture = "\RH_mgswp\inv\scarl_acog.paa"; + displayName = $STR_DZ_WPN_MK16_ACOG_NAME; + + MK16_Laser; + MK16_ACOG; + + class Attachments + { + Attachment_M203 = "MK16_GL_ACOG_DZ"; + }; + + class ItemActions + { + class RemoveACOG + { + text = $STR_DZ_ATT_ACOG_RMVE; + script = "; ['Attachment_ACOG',_id,'MK16_DZ'] call player_removeAttachment"; + }; + }; +}; + +class MK16_GL_DZ : MK16_DZ +{ + model = "\RH_mgswp\RH_Scarl_gl.p3d"; + picture = "\RH_mgswp\inv\Scarl_gl.paa"; + displayName = $STR_DZ_WPN_MK16_GL_NAME; + + MK16_M203; + + class Attachments + { + Attachment_CCO = "MK16_GL_CCO_DZ"; + Attachment_Holo = "MK16_GL_Holo_DZ"; + Attachment_ACOG = "MK16_GL_ACOG_DZ"; + }; + + class ItemActions + { + class RemoveGL + { + text = $STR_DZ_ATT_M203_RMVE; + script = "; ['Attachment_M203',_id,'MK16_DZ'] call player_removeAttachment"; + }; + }; +}; + +class MK16_GL_CCO_DZ : MK16_GL_DZ +{ + model = "\RH_mgswp\RH_Scarl_gl_aim.p3d"; + picture = "\RH_mgswp\inv\Scarl_gl_aim.paa"; + displayName = $STR_DZ_WPN_MK16_GL_CCO_NAME; + + MK16_Laser; + MK16_M203; + + class Attachments {}; + + class ItemActions + { + class RemoveCCO + { + text = $STR_DZ_ATT_CCO_RMVE; + script = "; ['Attachment_CCO',_id,'MK16_GL_DZ'] call player_removeAttachment"; + }; + class RemoveGL + { + text = $STR_DZ_ATT_M203_RMVE; + script = "; ['Attachment_M203',_id,'MK16_CCO_DZ'] call player_removeAttachment"; + }; + }; +}; + +class MK16_GL_Holo_DZ : MK16_GL_DZ +{ + model = "\RH_mgswp\RH_Scarl_gl_eotech.p3d"; + picture = "\RH_mgswp\inv\Scarl_gl_eotech.paa"; + displayName = $STR_DZ_WPN_MK16_GL_HOLO_NAME; + + MK16_Laser; + MK16_M203; + + class Attachments {}; + + class ItemActions + { + class RemoveHolo + { + text = $STR_DZ_ATT_HOLO_RMVE; + script = "; ['Attachment_Holo',_id,'MK16_GL_DZ'] call player_removeAttachment"; + }; + class RemoveGL + { + text = $STR_DZ_ATT_M203_RMVE; + script = "; ['Attachment_M203',_id,'MK16_Holo_DZ'] call player_removeAttachment"; + }; + }; +}; + +class MK16_GL_ACOG_DZ : MK16_GL_DZ +{ + model = "\RH_mgswp\RH_Scarl_gl_acog.p3d"; + picture = "\RH_mgswp\inv\Scarl_gl_acog.paa"; + displayName = $STR_DZ_WPN_MK16_GL_ACOG_NAME; + + MK16_Laser; + MK16_M203; + MK16_ACOG; + + class Attachments + { + Attachment_Sup556 = "MK16_GL_ACOG_SD_DZ"; + }; + + class ItemActions + { + class RemoveACOG + { + text = $STR_DZ_ATT_ACOG_RMVE; + script = "; ['Attachment_ACOG',_id,'MK16_GL_DZ'] call player_removeAttachment"; + }; + class RemoveGL + { + text = $STR_DZ_ATT_M203_RMVE; + script = "; ['Attachment_M203',_id,'MK16_ACOG_DZ'] call player_removeAttachment"; + }; + }; +}; + +//SD - No SD weapon model without a scope available +class MK16_CCO_SD_DZ : MK16_DZ +{ + model = "\RH_mgswp\RH_scarL_sd_aim.p3d"; + picture = "\RH_mgswp\inv\scarl_sd_aim.paa"; + displayName = $STR_DZ_WPN_MK16_CCO_SD_NAME; + descriptionShort = $STR_DZ_WPN_MK16SD_DESC; + modes[] = {"Single","FullAuto"}; + + MK16_Laser; + + class Single: Mode_SemiAuto + { + begin1[] = {"\RH_mgswp\sound\scarl_sd",1.0,1,110}; + soundBegin[] = {"begin1",1}; + }; + class FullAuto: Mode_FullAuto + { + begin1[] = {"\RH_mgswp\sound\scarl_sd",1.0,1,110}; + soundBegin[] = {"begin1",1}; + }; + + magazines[] = + { + 30Rnd_556x45_StanagSD, + 30Rnd_556x45_G36SD + }; + + class Attachments + { + Attachment_M203 = "MK16_GL_CCO_SD_DZ"; + }; + class ItemActions {}; +}; + +class MK16_Holo_SD_DZ : MK16_CCO_SD_DZ +{ + model = "\RH_mgswp\RH_Scarl_sd_eotech.p3d"; + picture = "\RH_mgswp\inv\scarl_sd_eotech.paa"; + displayName = $STR_DZ_WPN_MK16_HOLO_SD_NAME; + + MK16_Laser; + + class Attachments + { + Attachment_M203 = "MK16_GL_Holo_SD_DZ"; + }; + class ItemActions {}; +}; + +class MK16_ACOG_SD_DZ : MK16_CCO_SD_DZ +{ + model = "\RH_mgswp\RH_Scarl_sd_acog.p3d"; + picture = "\RH_mgswp\inv\scarl_sd_acog.paa"; + displayName = $STR_DZ_WPN_MK16_ACOG_SD_NAME; + + MK16_Laser; + MK16_ACOG; + + class Attachments + { + Attachment_M203 = "MK16_GL_ACOG_SD_DZ"; + }; + class ItemActions {}; +}; + +class MK16_GL_CCO_SD_DZ : MK16_CCO_SD_DZ +{ + model = "\RH_mgswp\RH_Scarl_sd_gl_aim.p3d"; + picture = "\RH_mgswp\inv\Scarl_sd_gl_aim.paa"; + displayName = $STR_DZ_WPN_MK16_GL_CCO_SD_NAME; + + MK16_Laser; + MK16_M203; + + class Attachments {}; + class ItemActions + { + class RemoveGL + { + text = $STR_DZ_ATT_M203_RMVE; + script = "; ['Attachment_M203',_id,'MK16_CCO_SD_DZ'] call player_removeAttachment"; + }; + }; +}; + +class MK16_GL_Holo_SD_DZ : MK16_CCO_SD_DZ +{ + model = "\RH_mgswp\RH_Scarl_sd_gl_eotech.p3d"; + picture = "\RH_mgswp\inv\Scarl_sd_gl_eotech.paa"; + displayName = $STR_DZ_WPN_MK16_GL_HOLO_SD_NAME; + + MK16_Laser; + MK16_M203; + + class Attachments {}; + class ItemActions + { + class RemoveGL + { + text = $STR_DZ_ATT_M203_RMVE; + script = "; ['Attachment_M203',_id,'MK16_Holo_SD_DZ'] call player_removeAttachment"; + }; + }; +}; + +class MK16_GL_ACOG_SD_DZ : MK16_CCO_SD_DZ +{ + model = "\RH_mgswp\RH_Scarl_sd_gl_acog.p3d"; + picture = "\RH_mgswp\inv\Scarl_sd_gl_acog.paa"; + displayName = $STR_DZ_WPN_MK16_GL_ACOG_SD_NAME; + + MK16_Laser; + MK16_M203; + MK16_ACOG; + + class Attachments {}; + class ItemActions + { + class RemoveGL + { + text = $STR_DZ_ATT_M203_RMVE; + script = "; ['Attachment_M203',_id,'MK16_ACOG_SD_DZ'] call player_removeAttachment"; + }; + }; +}; + +#undef MK16_ACOG +#undef MK16_Laser +#undef MK16_M203 \ No newline at end of file diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 45e0285b3..462b094d5 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -12859,6 +12859,62 @@ Schallgedämpftes Sturmgewehr <br/>Kaliber: 7.62x51mm + + + MK 16 + + + MK 16 M203 + + + MK 16 CCO + + + MK 16 CCO SD + MK 16 CCO ПБС + + + MK 16 M203 CCO + + + MK 16 M203 CCO SD + MK 16 M203 CCO ПБС + + + MK 16 Holo + + + MK 16 Holo SD + MK 16 Holo ПБС + + + MK 16 M203 Holo + + + MK 16 M203 Holo SD + MK 16 M203 Holo ПБС + + + MK 16 ACOG + + + MK 16 M203 ACOG + + + MK 16 ACOG SD + + + MK 16 M203 ACOG SD + + + Assault Rifle <br/>Caliber: 5.56x45mm + Sturmgewehr <br/>Kaliber: 5.56x45mm + + + Silenced Assault Rifle <br/>Caliber: 5.56x45mm SD + Schallgedämpftes Sturmgewehr <br/>Kaliber: 5.56x45mm SD + +