From 2641b4fe77267cdf42458bc3190c7ffd100edc0a Mon Sep 17 00:00:00 2001 From: A Man Date: Tue, 25 Feb 2020 20:04:46 +0100 Subject: [PATCH] Add DZ versions of a few M4s - M4A1 CCO and M4A1 Holo Camo have attachemnt support for a silencer now --- .../Configs/CfgLoot/Groups/Weapons.hpp | 7 +- .../CfgServerTrader/Category/Bandit.hpp | 8 +- .../Configs/CfgServerTrader/Category/Hero.hpp | 12 ++- .../CfgServerTrader/Category/Weapons.hpp | 7 -- .../Configs/CfgWeapons/CfgWeapons.hpp | 1 + .../Configs/CfgWeapons/Rifles/M16A2.hpp | 5 +- .../Configs/CfgWeapons/Rifles/M4A1.hpp | 74 ++++++++++++++++++- .../Configs/CfgWeapons/Rifles/M4A3.hpp | 23 ++++++ 8 files changed, 119 insertions(+), 18 deletions(-) create mode 100644 SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A3.hpp diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp index 2702bfdee..2161a0ce7 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp @@ -79,10 +79,9 @@ weaponsUS[] = {Loot_WEAPON, 6, M16A2_DZ}, {Loot_WEAPON, 6, M16A4_ACOG_DZ}, {Loot_WEAPON, 6, M4A1_DZ}, - {Loot_WEAPON, 6, M4A1_AIM_SD_camo}, - {Loot_WEAPON, 6, M4A1_HWS_GL_camo}, - {Loot_WEAPON, 6, M4A3_CCO_EP1}, - {Loot_WEAPON, 6, M4A1_HWS_GL_SD_Camo}, + {Loot_WEAPON, 6, M4A1_Camo_CCO_DZ}, + {Loot_WEAPON, 6, M4A1_Camo_Holo_GL_DZ}, + {Loot_WEAPON, 6, M4A3_DES_CCO_DZ}, {Loot_WEAPON, 6, ACR_WDL_DZ}, {Loot_WEAPON, 6, ACR_BL_DZ}, diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Bandit.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Bandit.hpp index 0ebc87edb..df80a9668 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Bandit.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Bandit.hpp @@ -116,8 +116,12 @@ class Category_7 { class Category_8 { //Holo SD desert camo class G36_C_SD_camo {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {5,"ItemGoldBar"};}; - //CCO SD green camo - class M4A1_AIM_SD_camo {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {5,"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"};}; 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 bbb54524c..73e4c5851 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Hero.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Hero.hpp @@ -116,8 +116,16 @@ class Category_2 { class Category_3 { //Holo SD desert camo class G36_C_SD_camo {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {5,"ItemGoldBar"};}; - //CCO SD green camo - class M4A1_AIM_SD_camo {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {5,"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/Weapons.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp index bbb979bb7..e866ef122 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp @@ -249,13 +249,6 @@ class Category_16 { class M4A1_GL_ACOG_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {12,"ItemGoldBar"};}; class M4A1_GL_ACOG_SD_FL_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {13,"ItemGoldBar"};}; class M4A1_GL_ACOG_SD_MFL_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {14,"ItemGoldBar"};}; - //GL Holo Green Camo - class M4A1_HWS_GL_camo {type = "trade_weapons";buy[] = {8,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; - class M4A1_HWS_GL_SD_Camo {type = "trade_weapons";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};}; - //CCO FL Desert Camo - class M4A3_CCO_EP1 {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {5,"ItemGoldBar"};}; - class M4A3_RCO_GL_EP1 {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {5,"ItemGoldBar"};}; - class M4A1_Aim_camo {type = "trade_weapons";buy[] = {6,"ItemGoldBar"};sell[] = {3,"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"};}; diff --git a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp index 5f2637313..dd41ba8cb 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp @@ -78,6 +78,7 @@ class CfgWeapons class M4A1; class M4A1_AIM_SD_camo; #include "Rifles\M4A1.hpp" + #include "Rifles\M4A3.hpp" //Famas #include "Rifles\Famas.hpp" #include "Rifles\ACR.hpp" diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A2.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A2.hpp index 528c675b1..a2e1fd74c 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A2.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A2.hpp @@ -35,7 +35,7 @@ class M16A2_GL_DZ : M16A2GL }; }; //ice apo resistance mod m16 -class ice_apo_weapons_M16_DZE : M16A2 { +class M16A2_Rusty_DZ : M16A2 { class FlashLight { color[] = {0.9, 0.9, 0.7, 0.9}; ambient[] = {0.1, 0.1, 0.1, 1.0}; @@ -62,4 +62,5 @@ class ice_apo_weapons_M16_DZE : M16A2 { class Library { libTextDesc = "This M16 rifle is in a very bad shape."; }; -}; \ No newline at end of file +}; + diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp index 2ae2b9ff8..c5cfb551e 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp @@ -1560,7 +1560,7 @@ class M4A1_GL_ACOG_SD_MFL_DZ : M4A1_GL_SD_MFL_DZ }; //ice apo resistance mod m4 -class ice_apo_weapons_M4_DZE : M4A1 { +class M4A1_Rusty_DZ : M4A1 { M4A1_FLASHLIGHT; scope = public; @@ -1581,6 +1581,78 @@ class ice_apo_weapons_M4_DZE : M4A1 { libTextDesc = "This M4 rifle is in a very bad shape."; }; }; + +class M4A1_AIM_camo; +class M4A1_Camo_CCO_DZ: M4A1_AIM_camo { + magazines[] = + { + 30Rnd_556x45_Stanag, + 30Rnd_556x45_G36, + 100Rnd_556x45_BetaCMag, + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE + }; + + class Attachments + { + Attachment_Sup556 = "M4A1_Camo_CCO_SD_DZ"; + }; +}; + +class M4A1_Camo_CCO_SD_DZ: M4A1_AIM_SD_camo { + magazines[] = + { + 30Rnd_556x45_StanagSD, + 30Rnd_556x45_G36SD + }; + + class Attachments {}; + class ItemActions + { + class RemoveSuppressor + { + text = $STR_ATTACHMENT_RMVE_Silencer; + script = "; ['Attachment_Sup556',_id,'M4A1_Camo_CCO_DZ'] call player_removeAttachment"; + }; + }; +}; + +class M4A1_HWS_GL_camo; +class M4A1_Camo_Holo_GL_DZ: M4A1_HWS_GL_camo { + magazines[] = + { + 30Rnd_556x45_Stanag, + 30Rnd_556x45_G36, + 100Rnd_556x45_BetaCMag, + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE + }; + + class Attachments + { + Attachment_Sup556 = "M4A1_Camo_Holo_GL_SD_DZ"; + }; +}; + +class M4A1_HWS_GL_SD_Camo; +class M4A1_Camo_Holo_GL_SD_DZ: M4A1_HWS_GL_SD_Camo { + magazines[] = + { + 30Rnd_556x45_StanagSD, + 30Rnd_556x45_G36SD + }; + + class Attachments {}; + class ItemActions + { + class RemoveSuppressor + { + text = $STR_ATTACHMENT_RMVE_Silencer; + script = "; ['Attachment_Sup556',_id,'M4A1_Camo_Holo_GL_DZ'] call player_removeAttachment"; + }; + }; +}; + #undef M4A1_FLASHLIGHT #undef M4A1_MFLASHLIGHT #undef M4A1_M203 diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A3.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A3.hpp new file mode 100644 index 000000000..d273246d0 --- /dev/null +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A3.hpp @@ -0,0 +1,23 @@ +class M4A3_CCO_EP1; +class M4A3_DES_CCO_DZ: M4A3_CCO_EP1 { + magazines[] = + { + 30Rnd_556x45_Stanag, + 30Rnd_556x45_G36, + 100Rnd_556x45_BetaCMag, + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE + }; +}; + +class M4A3_RCO_GL_EP1; +class M4A3_ACOG_GL_DZ: M4A3_RCO_GL_EP1 { + magazines[] = + { + 30Rnd_556x45_Stanag, + 30Rnd_556x45_G36, + 100Rnd_556x45_BetaCMag, + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE + }; +}; \ No newline at end of file