From 1130a85d1c83d5fa9622d03e3d5d741c05b4f49d Mon Sep 17 00:00:00 2001 From: AirwavesMan Date: Sat, 16 Jan 2021 08:53:49 +0100 Subject: [PATCH] Add 3 new Desert Eagle versions and the SCAR-H AK Models made by Robert Hammer --- .../Configs/CfgLoot/Groups/Weapons.hpp | 1 + .../CfgServerTrader/Category/Weapons.hpp | 4 + .../CfgServerTraderZSC/Category/Weapons.hpp | 4 + .../Configs/CfgWeapons/CfgWeapons.hpp | 1 + .../CfgWeapons/Pistols/DesertEagle.hpp | 21 +++ .../Configs/CfgWeapons/Rifles/AKM.hpp | 3 + .../Configs/CfgWeapons/Rifles/SCARAK.hpp | 163 ++++++++++++++++++ SQF/dayz_code/stringtable.xml | 73 +++++--- 8 files changed, 248 insertions(+), 22 deletions(-) create mode 100644 SQF/dayz_code/Configs/CfgWeapons/Rifles/SCARAK.hpp diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp index 85ae9f4ab..15a52a847 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp @@ -44,6 +44,7 @@ weaponsRU[] = {Loot_WEAPON, 6, Groza9_DZ}, {Loot_WEAPON, 6, Groza1_DZ}, {Loot_WEAPON, 6, VAL_DZ}, + {Loot_WEAPON, 6, SCAR_H_AK_DZ}, // Machine Guns {Loot_WEAPON, 3, RPK74_DZ}, diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp index 60ee19ce5..0cfa9430f 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp @@ -465,6 +465,10 @@ class Category_16 { class AK107_GL_PSO1_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {7,"ItemGoldBar"};}; class AN94_DZ {type = "trade_weapons";buy[] = {2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; class AN94_GL_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {3,"ItemGoldBar"};}; + class SCAR_H_AK_DZ {type = "trade_weapons";buy[] = {8,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; + class SCAR_H_AK_CCO_DZ {type = "trade_weapons";buy[] = {-8,"ItemGoldBar"};sell[] = {6,"ItemGoldBar"};}; + class SCAR_H_AK_HOLO_DZ {type = "trade_weapons";buy[] = {-8,"ItemGoldBar"};sell[] = {6,"ItemGoldBar"};}; + class SCAR_H_AK_ACOG_DZ {type = "trade_weapons";buy[] = {-8,"ItemGoldBar"};sell[] = {8,"ItemGoldBar"};}; class G3_DZ {type = "trade_weapons";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};}; class FNFAL_DZ {type = "trade_weapons";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};}; class FNFAL_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {12,"ItemGoldBar"};}; diff --git a/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Weapons.hpp b/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Weapons.hpp index 901598d66..07ffc05d7 100644 --- a/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Weapons.hpp @@ -465,6 +465,10 @@ class Category_16 { class AK107_GL_PSO1_DZ {type = "trade_weapons";buy[] = {-1,"worth"};sell[] = {700,"worth"};}; class AN94_DZ {type = "trade_weapons";buy[] = {200,"worth"};sell[] = {100,"worth"};}; class AN94_GL_DZ {type = "trade_weapons";buy[] = {-1,"worth"};sell[] = {300,"worth"};}; + class SCAR_H_AK_DZ {type = "trade_weapons";buy[] = {800,"worth"};sell[] = {400,"worth"};}; + class SCAR_H_AK_CCO_DZ {type = "trade_weapons";buy[] = {-8,"worth"};sell[] = {600,"worth"};}; + class SCAR_H_AK_HOLO_DZ {type = "trade_weapons";buy[] = {-8,"worth"};sell[] = {600,"worth"};}; + class SCAR_H_AK_ACOG_DZ {type = "trade_weapons";buy[] = {-8,"worth"};sell[] = {800,"worth"};}; class G3_DZ {type = "trade_weapons";buy[] = {2000,"worth"};sell[] = {1000,"worth"};}; class FNFAL_DZ {type = "trade_weapons";buy[] = {2000,"worth"};sell[] = {1000,"worth"};}; class FNFAL_CCO_DZ {type = "trade_weapons";buy[] = {-1,"worth"};sell[] = {1200,"worth"};}; diff --git a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp index 03d2a5221..2d0f0a61c 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp @@ -37,6 +37,7 @@ class CfgWeapons #include "Rifles\AKS.hpp" #include "Rifles\RK95.hpp" #include "Rifles\Groza.hpp" + #include "Rifles\SCARAK.hpp" #include "Rifles\RPK.hpp" diff --git a/SQF/dayz_code/Configs/CfgWeapons/Pistols/DesertEagle.hpp b/SQF/dayz_code/Configs/CfgWeapons/Pistols/DesertEagle.hpp index 72fa1cb0f..d3ae8a69d 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Pistols/DesertEagle.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Pistols/DesertEagle.hpp @@ -11,4 +11,25 @@ class DesertEagle_DZ: Colt_Python_DZ begin2[] = {"rh_de\sound\desert_eagle_shot1", db0, 1, 1000}; soundBegin[] = {begin1,0.5, begin2,0.5}; reloadMagazineSound[] = {"Ca\Sounds_E\Weapons_E\Glock17\reload1",db0,1, 20}; +}; + +class DesertEagle_Gold_DZ: DesertEagle_DZ +{ + displayName = $STR_DZ_WPN_DESERT_EAGLE_GOLD_NAME; + model = "\RH_de\RH_deagleg.p3d"; + picture = "\RH_de\inv\deg.paa"; +}; + +class DesertEagle_Silver_DZ: DesertEagle_DZ +{ + displayName = $STR_DZ_WPN_DESERT_EAGLE_SILVER_NAME; + model = "\RH_de\RH_deagles.p3d"; + picture = "\RH_de\inv\des.paa"; +}; + +class DesertEagle_Modern_DZ: DesertEagle_DZ +{ + displayName = $STR_DZ_WPN_DESERT_EAGLE_MODERN_NAME; + model = "\RH_de\RH_deaglem.p3d"; + picture = "\RH_de\inv\dem.paa"; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKM.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKM.hpp index e6f7c9fa8..d9782472d 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKM.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKM.hpp @@ -7,6 +7,9 @@ class AKM_DZ : AK_47_M magazines[] = {30Rnd_762x39_AK47,30Rnd_762x39_SA58,60Rnd_762x39_AK47_Taped}; modes[] = {"Single","FullAuto"}; + class Single; + class FullAuto; + //iron sight zeroing weaponInfoType = "RscWeaponZeroing"; discreteDistance[] = {100,200,300,400,500,600,700,800,900,1000}; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/SCARAK.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/SCARAK.hpp new file mode 100644 index 000000000..afd9a6f68 --- /dev/null +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/SCARAK.hpp @@ -0,0 +1,163 @@ +class SCAR_H_AK_DZ: AKM_DZ +{ + displayName = $STR_DZ_WPN_SCARAK_NAME; + descriptionShort = $STR_DZ_WPN_SCARAK_DESC; + model = "\RH_mgswp\RH_scarAk.p3d"; + picture = "\RH_mgswp\inv\scarAk.paa"; + handAnim[] = {"OFP2_ManSkeleton","\RH_mgswp\anim\RH_M4cs.rtm"}; + opticsZoomMin = 0.33333; + opticsZoomMax = 1; + opticsZoomInit = "0.33333*2"; + discretefov[] = {}; + discreteInitIndex = 0; + reloadMagazineSound[] = {"\RH_mgswp\sound\scar_Reload",0.0316228,1,20}; + dexterity = "3.75/(3.6+ 0.1) + 0.5 + 0.1*(1)"; + class Single: Single + { + begin1[] = {"\RH_mgswp\sound\scarAk",1.77828,1,1000}; + soundBegin[] = {"begin1",1}; + dispersion = 0.00175; + reloadTime = 0.1; + recoil = "recoil_single_primary_5outof10"; + recoilProne = "recoil_single_primary_prone_5outof10"; + aiRateOfFire = 2; + aiRateOfFireDistance = 400; + minRange = 0; + minRangeProbab = 0.7; + midRange = 200; + midRangeProbab = 0.5; + maxRange = 400; + maxRangeProbab = 0.03; + }; + class FullAuto: FullAuto + { + begin1[] = {"\RH_mgswp\sound\scarAk",1.77828,1,1000}; + soundBegin[] = {"begin1",1}; + dispersion = 0.00175; + reloadTime = 0.1; + recoil = "recoil_auto_primary_5outof10"; + recoilProne = "recoil_auto_primary_prone_5outof10"; + aiRateOfFire = 2; + aiRateOfFireDistance = 100; + minRange = 0; + minRangeProbab = 0.8; + midRange = 20; + midRangeProbab = 0.7; + maxRange = 50; + maxRangeProbab = 0.02; + }; + + class Attachments + { + Attachment_CCO = "SCAR_H_AK_CCO_DZ"; + Attachment_Holo = "SCAR_H_AK_HOLO_DZ"; + Attachment_ACOG = "SCAR_H_AK_ACOG_DZ"; + }; +}; +class SCAR_H_AK_CCO_DZ: SCAR_H_AK_DZ +{ + displayName = $STR_DZ_WPN_SCARAK_CCO_NAME; + model = "\RH_mgswp\RH_scarAkaim.p3d"; + picture = "\RH_mgswp\inv\scarAkaim.paa"; + irDistance = 150; + dexterity = "3.75/(3.6+ 0.2+ (0.4)*1.2+ 0.1) + 0.5 + 0.1*(1)"; + weaponInfoType = "RscWeaponEmpty"; + + class ItemActions + { + class RemoveCCO + { + text = $STR_DZ_ATT_CCO_RMVE; + script = "; ['Attachment_CCO',_id,'SCAR_H_AK_DZ'] call player_removeAttachment"; + }; + }; +}; + +class SCAR_H_B_AK_CCO_DZ: SCAR_H_AK_CCO_DZ +{ + model = "\RH_mgswp\RH_scarAkBaim.p3d"; + picture = "\RH_mgswp\inv\scarAkbaim.paa"; + class ItemActions {}; +}; + +class SCAR_H_AK_HOLO_DZ: SCAR_H_AK_CCO_DZ +{ + displayName = $STR_DZ_WPN_SCARAK_HOLO_NAME; + model = "\RH_mgswp\RH_scarAkeotech.p3d"; + picture = "\RH_mgswp\inv\scarAkeotech.paa"; + dexterity = "3.75/(3.6+ 0.2+ (0.3)*1.2+ 0.1) + 0.5 + 0.1*(1)"; + + class ItemActions + { + class RemoveHolo + { + text = $STR_DZ_ATT_HOLO_RMVE; + script = "; ['Attachment_Holo',_id,'SCAR_H_AK_DZ'] call player_removeAttachment"; + }; + }; +}; + +class SCAR_H_AK_ACOG_DZ: SCAR_H_AK_CCO_DZ +{ + displayName = $STR_DZ_WPN_SCARAK_ACOG_NAME; + model = "\RH_mgswp\RH_scarAkacog.p3d"; + picture = "\RH_mgswp\inv\scarAkacog.paa"; + modelOptics = "\RH_mgswp\NWD_acog_ta31RMR"; + class OpticsModes + { + class ACOG + { + opticsID = 1; + useModelOptics = 1; + opticsPPEffects[] = {"OpticsCHAbera1","OpticsBlur1"}; + memoryPointCamera = "opticView"; + visionMode[] = {"Normal"}; + opticsFlare = 1; + opticsDisablePeripherialVision = 1; + distanceZoomMin = 189; + distanceZoomMax = 189; + cameraDir = ""; + opticsZoomMin = "0.28778/4"; + opticsZoomMax = "0.28778/4"; + opticsZoomInit = "0.28778/4"; + discretefov[] = {}; + discreteInitIndex = 0; + }; + class CQB: ACOG + { + opticsID = 2; + useModelOptics = 0; + opticsPPEffects[] = {}; + opticsFlare = 0; + opticsDisablePeripherialVision = 0; + memoryPointCamera = "eye"; + visionMode[] = {}; + opticsZoomMin = 0.33333; + opticsZoomMax = 1; + opticsZoomInit = "0.33333*2"; + discretefov[] = {}; + discreteInitIndex = 0; + }; + }; + dexterity = "3.75/(3.6+ 0.2+ (0.3)*1.2+ 0.1) + 0.5 + 0.1*(1)"; + class Single: Single + { + aiRateOfFire = 3; + aiRateOfFireDistance = 700; + minRange = 0; + minRangeProbab = 0.7; + midRange = 300; + midRangeProbab = 0.6; + maxRange = 700; + maxRangeProbab = 0.03; + }; + + class ItemActions + { + class RemoveACOG + { + text = $STR_DZ_ATT_ACOG_RMVE; + script = "; ['Attachment_ACOG',_id,'SCAR_H_AK_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 f22638078..a1581ffc2 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -18050,7 +18050,26 @@ Schallgedämpftes Scharfschützengewehr <br/>Kaliber: 7.62x51mm Бесшумная снайперская винтовка <br/>Патрон: 7.62x51mm - + + + + SCAR-H AK + + + SCAR-H AK CCO + + + SCAR-H AK Holo + + + SCAR-H AK ACOG + + + Assault Rifle <br/>Caliber: 7.62x39mm + Sturmgewehr <br/>Kaliber: 7.62x39mm + Штурмовая винтовка <br/>Патрон: 7.62x39mm + + XM8 Carbine @@ -18232,6 +18251,16 @@ Desert Eagle + + Desert Eagle Gold + + + Desert Eagle Silver + Desert Eagle Silber + + + Desert Eagle Modern + Semi-automatic Pistol <br/>Caliber: .50 AE Halbautomatische Pistole <br/>Kaliber: .50 AE @@ -18328,9 +18357,9 @@ 60п. АК-47М маг. - Caliber: 7.62x39mm <br/>Rounds: 60, duct-taped <br/>Used in: AK-47M, SA-58, RPK - Kaliber: 7.62x39mm <br/>Patronen: 60, zusammengeklebt <br/>Verwendet in: AK-47M, SA-58, RPK - Калибр: 7.62x39mm <br/>Патронов: 60 <br/>2 магазина соединенные изолентой. <br/>Используются в: AK-47M, SA-58, РПК + Caliber: 7.62x39mm <br/>Rounds: 60, duct-taped <br/>Used in: AK-47M, SA-58, RPK, SCAR-H AK + Kaliber: 7.62x39mm <br/>Patronen: 60, zusammengeklebt <br/>Verwendet in: AK-47M, SA-58, RPK, SCAR-H AK + Калибр: 7.62x39mm <br/>Патронов: 60 <br/>2 магазина соединенные изолентой. <br/>Используются в: AK-47M, SA-58, РПК, SCAR-H AK 30Rnd. SA-58 mag. @@ -19544,26 +19573,26 @@ Kaliber: 7.62x39mm SD <br/> Töltények: 30 <br/> Hozzá tartozó fegyver: RK-95 SD - Caliber: 7.62x39mm<br/>Rounds: 30<br/>Used in: AK-47M, SA-58, RPK - Calibre: 7.62x39mm<br/>Munitions : 30<br/>Utilisé avec: AK-47M, SA-58, RPK - Calibre: 7.62x39mm<br/>Cartuchos: 30<br/>Usado en: AK-47M, SA-58, RPK - Calibro: 7.62x39mm<br/>Munizioni: 30<br/>Usato in: AK-47M, SA-58, RPK - Kaliber: 7.62x39mm<br/>Naboje: 30<br/>Uzywany w: AK-47M, SA-58, RPK - Патрон: 7.62x39мм <br/>Количество: 30<br/>Исп. в: AK-47M, SA-58, RPK - Kaliber: 7.62x39mm<br/>Patronen: 30<br/>Verwendet in: AK-47M, SA-58, RPK - Kalibr: 7.62x39mm<br/>Nábojů: 30<br/>Pro: AK-47M, SA-58, RPK - Kaliber: 7.62x39mm <br/> Töltények: 30 <br/> Hozzá tartozó fegyver: AK-47M, SA-58, RPK + Caliber: 7.62x39mm<br/>Rounds: 30<br/>Used in: AK-47M, SA-58, RPK, SCAR-H AK + Calibre: 7.62x39mm<br/>Munitions : 30<br/>Utilisé avec: AK-47M, SA-58, RPK, SCAR-H AK + Calibre: 7.62x39mm<br/>Cartuchos: 30<br/>Usado en: AK-47M, SA-58, RPK, SCAR-H AK + Calibro: 7.62x39mm<br/>Munizioni: 30<br/>Usato in: AK-47M, SA-58, RPK, SCAR-H AK + Kaliber: 7.62x39mm<br/>Naboje: 30<br/>Uzywany w: AK-47M, SA-58, RPK, SCAR-H AK + Патрон: 7.62x39мм <br/>Количество: 30<br/>Исп. в: AK-47M, SA-58, RPK, SCAR-H AK + Kaliber: 7.62x39mm<br/>Patronen: 30<br/>Verwendet in: AK-47M, SA-58, RPK, SCAR-H AK + Kalibr: 7.62x39mm<br/>Nábojů: 30<br/>Pro: AK-47M, SA-58, RPK, SCAR-H AK + Kaliber: 7.62x39mm <br/> Töltények: 30 <br/> Hozzá tartozó fegyver: AK-47M, SA-58, RPK, SCAR-H AK - Caliber: 7.62x39mm<br/>Rounds: 30<br/>Used in: AK-47M, SA-58, RPK - Calibre: 7.62x39mm<br/>Munitions : 30<br/>Utilisé avec: AK-47M, SA-58, RPK - Calibre: 7.62x39mm<br/>Cartuchos: 30<br/>Usado en: AK-47M, SA-58, RPK - Calibro: 7.62x39mm<br/>Munizioni: 30<br/>Usato in: AK-47M, SA-58, RPK - Kaliber: 7.62x39mm<br/>Naboje: 30<br/>Uzywany w: AK-47M, SA-58, RPK - Патрон: 7.62x39мм <br/>Количество: 30<br/>Исп. в: AK-47M, SA-58, RPK - Kaliber: 7.62x39mm<br/>Patronen: 30<br/>Verwendet in: AK-47M, SA-58, RPK - Kalibr: 7.62x39mm<br/>Nábojů: 30<br/>Pro: AK-47M, SA-58, RPK - Kaliber: 7.62x39mm <br/> Töltények: 30 <br/> Hozzá tartozó fegyver: AK-47M, SA-58, RPK + Caliber: 7.62x39mm<br/>Rounds: 30<br/>Used in: SA-58, AK-47M, RPK, SCAR-H AK + Calibre: 7.62x39mm<br/>Munitions : 30<br/>Utilisé avec: SA-58, AK-47M, RPK, SCAR-H AK + Calibre: 7.62x39mm<br/>Cartuchos: 30<br/>Usado en: SA-58, AK-47M, RPK, SCAR-H AK + Calibro: 7.62x39mm<br/>Munizioni: 30<br/>Usato in: SA-58, AK-47M, RPK, SCAR-H AK + Kaliber: 7.62x39mm<br/>Naboje: 30<br/>Uzywany w: SA-58, AK-47M, RPK, SCAR-H AK + Патрон: 7.62x39мм <br/>Количество: 30<br/>Исп. в: SA-58, AK-47M, RPK, SCAR-H AK + Kaliber: 7.62x39mm<br/>Patronen: 30<br/>Verwendet in: SA-58, AK-47M, RPK, SCAR-H AK + Kalibr: 7.62x39mm<br/>Nábojů: 30<br/>Pro: SA-58, AK-47M, SA-58, RPK, SCAR-H AK + Kaliber: 7.62x39mm <br/> Töltények: 30 <br/> Hozzá tartozó fegyver: SA-58, AK-47M, RPK, SCAR-H AK 20Rnd. Groza-9 mag.