From 3f774ee9d45cb8cbf7001431a8c43a01d8e7aa9f Mon Sep 17 00:00:00 2001 From: A Man Date: Tue, 25 Feb 2020 21:35:06 +0100 Subject: [PATCH] Add DZ version for a few G36s - move G36 camo with SD attachment support to hero and bandit - also add MG36 DZ version - add back G36A SD with attachment support --- .../Configs/CfgLoot/Groups/Weapons.hpp | 8 +++--- .../CfgServerTrader/Category/Bandit.hpp | 10 ++++++- .../Configs/CfgServerTrader/Category/Hero.hpp | 6 ++++- .../CfgServerTrader/Category/Weapons.hpp | 9 +++---- .../Configs/CfgWeapons/CfgWeapons.hpp | 1 + .../Configs/CfgWeapons/Rifles/G36.hpp | 15 ++++++----- .../Configs/CfgWeapons/Rifles/G36C.hpp | 27 +++++++++++++++++++ .../Configs/CfgWeapons/Rifles/MG36.hpp | 25 +++++++++++++++++ SQF/dayz_code/stringtable.xml | 22 ++++++++++++++- 9 files changed, 104 insertions(+), 19 deletions(-) create mode 100644 SQF/dayz_code/Configs/CfgWeapons/Rifles/MG36.hpp diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp index 2161a0ce7..ae43e135c 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp @@ -132,9 +132,9 @@ weaponsEU[] = // Assault Rifles {Loot_WEAPON, 5, G36A_Camo_DZ}, {Loot_WEAPON, 5, G36C_DZ}, - {Loot_WEAPON, 5, G36C_camo}, + {Loot_WEAPON, 5, G36C_Camo_DZ}, {Loot_WEAPON, 5, G36K_Camo_DZ}, - {Loot_WEAPON, 5, G36_C_SD_camo}, + {Loot_WEAPON, 5, G36C_Camo_Holo_SD_DZ}, {Loot_WEAPON, 5, m8_compact}, {Loot_WEAPON, 5, m8_sharpshooter}, {Loot_WEAPON, 5, m8_holo_sd}, @@ -155,8 +155,8 @@ weaponsEU[] = // Machine Guns {Loot_WEAPON, 6, M8_SAW}, {Loot_WEAPON, 4, L110A1_DZ}, - {Loot_WEAPON, 4, MG36_camo}, - {Loot_WEAPON, 4, MG36}, + {Loot_WEAPON, 4, MG36_Camo_DZ}, + {Loot_WEAPON, 4, MG36_DZ}, {Loot_WEAPON, 3, Mk48_DZ}, {Loot_WEAPON, 5, BAF_L86A2_ACOG} }; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Bandit.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Bandit.hpp index df80a9668..ddde3d21a 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Bandit.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Bandit.hpp @@ -115,13 +115,21 @@ class Category_7 { //Weapons class Category_8 { //Holo SD desert camo - class G36_C_SD_camo {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {5,"ItemGoldBar"};}; + class G36C_Camo_Holo_SD_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {5,"ItemGoldBar"};}; + class G36A_Camo_DZ {type = "trade_weapons";buy[] = {6,"ItemGoldBar"};sell[] = {3,"ItemGoldBar"};}; + class G36A_Camo_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {7,"ItemGoldBar"};}; + class G36K_Camo_DZ {type = "trade_weapons";buy[] = {6,"ItemGoldBar"};sell[] = {3,"ItemGoldBar"};}; + class G36K_Camo_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {7,"ItemGoldBar"};}; //CCO green camo class M4A1_Camo_CCO_DZ {type = "trade_weapons";buy[] = {6,"ItemGoldBar"};sell[] = {3,"ItemGoldBar"};}; class M4A1_Camo_CCO_SD_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {5,"ItemGoldBar"};}; //GL Holo Green Camo class M4A1_Camo_Holo_GL_DZ {type = "trade_weapons";buy[] = {8,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; class M4A1_Camo_Holo_GL_SD_DZ {type = "trade_weapons";buy[] = {12,"ItemGoldBar"};sell[] = {6,"ItemGoldBar"};}; + //CCO FL Desert Camo + class M4A3_DES_CCO_DZ {type = "trade_weapons";buy[] = {6,"ItemGoldBar"};sell[] = {3,"ItemGoldBar"};}; + //ACOG GL Grey + class M4A3_ACOG_GL_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {5,"ItemGoldBar"};}; class FNFAL_ANPVS4_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {1,"ItemGoldBar10oz"};}; // FN_FAL_ANPVS4_DZE has toggleable night vision class FN_FAL_ANPVS4_DZE {type = "trade_weapons";buy[] = {3,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};}; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Hero.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Hero.hpp index 73e4c5851..b4b8cb3bc 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Hero.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Hero.hpp @@ -115,7 +115,11 @@ class Category_2 { //Weapons class Category_3 { //Holo SD desert camo - class G36_C_SD_camo {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {5,"ItemGoldBar"};}; + class G36C_Camo_Holo_SD_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {5,"ItemGoldBar"};}; + class G36A_Camo_DZ {type = "trade_weapons";buy[] = {6,"ItemGoldBar"};sell[] = {3,"ItemGoldBar"};}; + class G36A_Camo_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {7,"ItemGoldBar"};}; + class G36K_Camo_DZ {type = "trade_weapons";buy[] = {6,"ItemGoldBar"};sell[] = {3,"ItemGoldBar"};}; + class G36K_Camo_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {7,"ItemGoldBar"};}; //CCO green camo class M4A1_Camo_CCO_DZ {type = "trade_weapons";buy[] = {6,"ItemGoldBar"};sell[] = {3,"ItemGoldBar"};}; class M4A1_Camo_CCO_SD_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {5,"ItemGoldBar"};}; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp index e866ef122..1d8138418 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp @@ -171,10 +171,7 @@ class Category_16 { class G36C_Holo_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {8,"ItemGoldBar"};}; class G36C_ACOG_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {1,"ItemGoldBar10oz"};}; //Iron sight desert camo - class G36C_camo {type = "trade_weapons";buy[] = {6,"ItemGoldBar"};sell[] = {3,"ItemGoldBar"};}; - class G36A_Camo_DZ {type = "trade_weapons";buy[] = {6,"ItemGoldBar"};sell[] = {3,"ItemGoldBar"};}; - class G36K_Camo_DZ {type = "trade_weapons";buy[] = {6,"ItemGoldBar"};sell[] = {3,"ItemGoldBar"};}; - class G36K_Camo_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {7,"ItemGoldBar"};}; + class G36C_Camo_DZ {type = "trade_weapons";buy[] = {4,"ItemGoldBar"};sell[] = {2,"ItemGoldBar"};}; class M16A2_DZ {type = "trade_weapons";buy[] = {2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; class M16A2_GL_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {3,"ItemGoldBar"};}; class M16A4_DZ {type = "trade_weapons";buy[] = {4,"ItemGoldBar"};sell[] = {2,"ItemGoldBar"};}; @@ -493,8 +490,8 @@ class Category_18 { class UK59_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {5,"ItemGoldBar"};}; class PKM_DZ {type = "trade_weapons";buy[] = {3,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};}; class M8_SAW {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {6,"ItemGoldBar"};}; - class MG36 {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {6,"ItemGoldBar"};}; - class MG36_camo {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {6,"ItemGoldBar"};}; + class MG36_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {6,"ItemGoldBar"};}; + class MG36_Camo_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {6,"ItemGoldBar"};}; class L110A1_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {5,"ItemGoldBar"};}; class L110A1_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {7,"ItemGoldBar"};}; class L110A1_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {7,"ItemGoldBar"};}; diff --git a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp index dd41ba8cb..36b2701a2 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp @@ -74,6 +74,7 @@ class CfgWeapons }; #include "Rifles\G36.hpp" #include "Rifles\G36C.hpp" + #include "Rifles\MG36.hpp" class M4A1; class M4A1_AIM_SD_camo; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp index dd6e89899..c6c2c90f0 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp @@ -188,21 +188,24 @@ class G36A_Camo_DZ : G36K_Camo_DZ dispersion = 0.0007; }; - class Attachments {}; + class Attachments + { + Attachment_Sup556 = "G36A_Camo_SD_DZ"; + }; }; -/*class G36A_Camo_SD_DZ : G36K_Camo_SD_DZ +class G36A_Camo_SD_DZ : G36K_Camo_SD_DZ { model = "z\addons\dayz_communityweapons\g36\g36a_camo_sd"; - picture = "\z\addons\dayz_communityweapons\g36\data\w_g36a_camo_sd_ca.paa"; - displayName = $STR_DZ_WPN_G36K_CAMO_SD_NAME; + picture = "\dayz_epoch_c\icons\weapons\G36A_Camo_SD.paa"; + displayName = $STR_DZ_WPN_G36A_CAMO_SD_NAME; class ItemActions { class RemoveSuppressor { text = $STR_ATTACHMENT_RMVE_Silencer; - script = "; ['Attachment_Sup556',_id,'G36K_Camo_DZ'] call player_removeAttachment"; + script = "; ['Attachment_Sup556',_id,'G36A_Camo_DZ'] call player_removeAttachment"; }; }; -};*/ \ No newline at end of file +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp index 38bf040e0..bee0fc31e 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp @@ -223,4 +223,31 @@ class G36C_ACOG_SD_DZ : G36C_SD_DZ }; }; +class G36C_camo; +class G36C_Camo_DZ : G36C_camo +{ + displayName = $STR_DZ_WPN_G36C_CAMO_NAME; + + magazines[] = + { + 30Rnd_556x45_G36, + 100Rnd_556x45_BetaCMag, + 30Rnd_556x45_Stanag, + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE + }; +}; + +class G36_C_SD_camo; +class G36C_Camo_Holo_SD_DZ : G36_C_SD_camo +{ + displayName = $STR_DZ_WPN_G36C_CAMO_HOLO_SD_NAME; + + magazines[] = + { + 30Rnd_556x45_G36SD, + 30Rnd_556x45_StanagSD + }; +}; + #undef G36C_ACOG \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MG36.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MG36.hpp new file mode 100644 index 000000000..555dfbf45 --- /dev/null +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MG36.hpp @@ -0,0 +1,25 @@ +class MG36; +class MG36_DZ: MG36 { + displayName = $STR_DZ_WPN_MG36_NAME; + magazines[] = + { + 100Rnd_556x45_BetaCMag, + 30Rnd_556x45_G36, + 30Rnd_556x45_Stanag, + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE + }; +}; + +class MG36_camo; +class MG36_Camo_DZ: MG36_camo { + displayName = $STR_DZ_WPN_MG36_CAMO_NAME; + magazines[] = + { + 100Rnd_556x45_BetaCMag, + 30Rnd_556x45_G36, + 30Rnd_556x45_Stanag, + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE + }; +}; \ No newline at end of file diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 1c5ceb60f..8d5b0e5e7 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -11160,6 +11160,14 @@ G36C ACOG SD G36C ACOG ПБС + + G36C Camo + G36C Tarn + + + G36C Camo Holo SD + G36C Tarn Holo SD + @@ -12291,7 +12299,19 @@ Anti-materiel sniper rifle<br/>Caliber: 20x102mm Panzerbrechendes Scharfschützengewehr <br/>Kaliber: 20x102mm - + + + + + MG36 + MG36 + MG36 + + + MG36 Camo + MG36 (камуфляж) + MG36 Tarn +