From 4359aa3cc1b4720b7694cabdf1c9d77a782d5cc8 Mon Sep 17 00:00:00 2001 From: A Man Date: Thu, 16 Apr 2020 12:46:53 +0200 Subject: [PATCH] Add G3 Thx @helion4 --- SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp | 1 + .../Configs/CfgLoot/Groups/Weapons.hpp | 1 + .../Configs/CfgMagazines/Magazines/762x51.hpp | 8 +++ .../CfgServerTrader/Category/Ammunition.hpp | 1 + .../CfgServerTrader/Category/Weapons.hpp | 1 + .../Configs/CfgWeapons/CfgWeapons.hpp | 3 +- .../Configs/CfgWeapons/Rifles/G3.hpp | 53 +++++++++++++++++++ SQF/dayz_code/stringtable.xml | 26 ++++++++- 8 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 SQF/dayz_code/Configs/CfgWeapons/Rifles/G3.hpp diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp index 88ea8163c..9de684e1b 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp @@ -197,6 +197,7 @@ AmmoEU[] = // Battle rifles {Loot_MAGAZINE, 4, 20Rnd_762x51_FNFAL}, + {Loot_MAGAZINE, 4, 20Rnd_762x51_G3}, {Loot_MAGAZINE, 5, 20Rnd_762x51_B_SCAR}, {Loot_MAGAZINE, 3, 20Rnd_762x51_SB_SCAR}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp index 149eab708..1f358f912 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp @@ -148,6 +148,7 @@ weaponsEU[] = {Loot_WEAPON, 1, RSASS_DZ}, {Loot_WEAPON, 4, FNFAL_DZ}, {Loot_WEAPON, 3, FN_FAL_ANPVS4_DZE}, //FNFAL_ANPVS4_DZ is NV only _DZE is toggleable with attachment support + {Loot_WEAPON, 4, G3_DZ}, {Loot_WEAPON, 1, BAF_AS50_scoped_DZ}, // High value weapon, low spawn chance. {Loot_WEAPON, 1, Barrett_MRAD_Sniper_DZ}, // High value weapon, low spawn chance. diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x51.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x51.hpp index c8ebe558b..a048f1362 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x51.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/762x51.hpp @@ -12,6 +12,14 @@ class 20Rnd_762x51_FNFAL : CA_Magazine }; }; +class 20Rnd_762x51_G3 : 20Rnd_762x51_FNFAL +{ + picture = "\z\addons\dayz_epoch_w\g3\data\m_g3_CA.paa"; + model = "\z\addons\dayz_epoch_w\g3\h4g3_mag.p3d"; + displayName = $STR_DZ_MAG_20RND_G3_NAME; + descriptionShort = $STR_DZ_MAG_20RND_G3_DESC; +}; + class 20Rnd_762x51_DMR : CA_Magazine { model = "\dayz_equip\models\mag20.p3d"; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Ammunition.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Ammunition.hpp index d76c321ec..26cd918f5 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Ammunition.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Ammunition.hpp @@ -87,6 +87,7 @@ class Category_22 { class 20Rnd_9x39_Groza9SD {type = "trade_items";buy[] = {3,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; class 20Rnd_9x39_SP5_VSS {type = "trade_items";buy[] = {3,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; class 20Rnd_762x51_FNFAL {type = "trade_items";buy[] = {1,"ItemGoldBar"};sell[] = {5,"ItemSilverBar10oz"};}; + class 20Rnd_762x51_G3 {type = "trade_items";buy[] = {1,"ItemGoldBar"};sell[] = {5,"ItemSilverBar10oz"};}; class ACR_30Rnd_680x43 {type = "trade_items";buy[] = {1,"ItemGoldBar"};sell[] = {5,"ItemSilverBar10oz"};}; class ACR_30Rnd_680x43_SD {type = "trade_items";buy[] = {2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; class 20Rnd_762x51_DMR {type = "trade_items";buy[] = {8,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp index 8864aa2be..94eb9ba7a 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp @@ -461,6 +461,7 @@ 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 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"};}; class FNFAL_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {12,"ItemGoldBar"};}; diff --git a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp index b302bee17..55b80dd58 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp @@ -50,6 +50,7 @@ class CfgWeapons class FN_FAL; class FN_FAL_ANPVS4; #include "Rifles\FNFAL.hpp" + #include "Rifles\G3.hpp" class G36C : Rifle { @@ -90,7 +91,7 @@ class CfgWeapons #include "Rifles\HK417.hpp" #include "Rifles\MK14.hpp" #include "Rifles\MK17.hpp" - #include "Rifles\M110.hpp" + #include "Rifles\M110.hpp" #include "Rifles\CZ805.hpp" diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G3.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G3.hpp new file mode 100644 index 000000000..6be18b4fa --- /dev/null +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G3.hpp @@ -0,0 +1,53 @@ +class G3_DZ: FNFAL_DZ +{ + scope = public; + model = "\z\addons\dayz_epoch_w\g3\h4g3.p3d"; + picture = "\z\addons\dayz_epoch_w\g3\data\w_g3_ca.paa"; + displayName = $STR_DZ_WPN_G3_NAME; + descriptionShort = $STR_DZ_WPN_G3_DESC; + magazines[] = {20Rnd_762x51_G3}; + UiPicture = "\CA\weapons\data\Ico\i_regular_CA.paa"; + fireLightDuration = 0.000; + fireLightIntensity = 0.000; + drySound[] = {"Ca\sounds\Weapons\rifles\dry",db-50,1,10}; + reloadMagazineSound[] = {"ca\sounds\weapons\rifles\reload-m16-3",db-25,1,25}; + distanceZoomMin = 50; + distanceZoomMax = 50; + //handAnim[]={"OFP2_ManSkeleton","\Ca\weapons\data\Anim\HKMP5.rtm"}; + modes[] = {Single, FullAuto}; + class Single : Mode_SemiAuto + { + begin1[] = {"Ca\Sounds_E\Weapons_E\FNFAL\FNFAL_single_1", db5, 1,1500}; + begin2[] = {"Ca\Sounds_E\Weapons_E\FNFAL\FNFAL_single_2", db5, 1,1500}; + soundBegin[] = {begin1,0.5, begin2,0.5}; + reloadTime = 0.07; + recoil = "recoil_single_primary_1outof10"; + recoilProne = "recoil_single_primary_prone_1outof10"; + dispersion = 0.003; + minRange = 2; + minRangeProbab = 0.25; + midRange = 20; + midRangeProbab = 0.7; + maxRange = 50; + maxRangeProbab = 0.05; + }; + class FullAuto : Mode_FullAuto + { + begin1[] = {"Ca\Sounds_E\Weapons_E\FNFAL\FNFAL_single_1", db5, 1,1500}; + begin2[] = {"Ca\Sounds_E\Weapons_E\FNFAL\FNFAL_single_2", db5, 1,1500}; + soundBegin[] = {begin1,0.5, begin2,0.5}; + soundContinuous = 0; + reloadTime = 0.1; + ffCount = 1; + recoil = "recoil_auto_primary_1outof10"; + recoilProne = "recoil_auto_primary_prone_1outof10"; + aiRateOfFire = 0.001; + dispersion = 0.003; //0.007; + minRange = 0; + minRangeProbab = 0.20; + midRange = 7; + midRangeProbab = 0.7; + maxRange = 15; + maxRangeProbab = 0.05; + }; +}; \ No newline at end of file diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index c6f22d7ff..fee1df474 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -13410,6 +13410,15 @@ Géppisztoly <br/> Kaliber: 9x19mm Parabellum + + + G3 + + + Assault Rifle <br/>Caliber: 7.62x51mm + Sturmgewehr <br/>Kaliber: 7.62x51mm + + @@ -14803,7 +14812,7 @@ Calibre: .408 Chey Tac <br/>Cargas: 5 <br/>Uso: M200 Chey Tac Calibre: .408 Chey Tac <br/>Munitions: 5 <br/>Utilisé avec: M200 Chey Tac Kalibr: .408 Chey Tac <br/>Nábojů: 5 <br/>Pro: M200 Chey Tac - Патрон: 5.56x45мм <br/>Количество: 5 <br/>Используется в: M200 Chey Tac + Патрон: .408 Chey Tac <br/>Количество: 5 <br/>Используется в: M200 Chey Tac Kaliber: .408 Chey Tac <br/>Naboje: 5 <br/>Używane w: M200 Chey Tac Kaliber: .408 Chey Tac <br/> Töltények: 5 <br/> Hozzá tartozó fegyver: M200 Chey Tac @@ -14852,6 +14861,21 @@ Kalibr: 9x19mm Parabellum<br/>Nábojů: 32<br/>Pro: Sten MK Kaliber: 9x19mm Parabellum<br/> Töltények: 32<br/> Hozzá tartozó fegyver: Sten MK + + 20Rnd. G3 mag. + 20п. G3 маг. + + + Caliber: 7.62x51mm<br/>Rounds: 20<br/>Used in: G3 + Calibre: 7.62x51mm<br/>Munitions : 20<br/>Utilisé avec: G3 + Calibre: 7.62x51mm<br/>Cartuchos: 20<br/>Usado en: G3 + Calibro: 7.62x51mm<br/>Munizioni: 20<br/>Usato in: G3 + Kaliber: 7.62x51mm<br/>Naboje: 20<br/>Uzywany w: G3 + Патрон: 7.62x51мм<br/>Количество: 20<br/>Исп. в: G3 + Kaliber: 7.62x51mm<br/>Patronen: 20<br/>Eingesetzt in: G3 + Kalibr: 7.62x51mm<br/>Nábojů: 20<br/>Pro: G3 + Kaliber: 7.62x51mm<br/> Töltények: 20 <br/> Hozzá tartozó fegyver: G3 +