Skip to content

Commit

Permalink
usmc2000, sf work
Browse files Browse the repository at this point in the history 
new HK417 for uksf marksman with sound,usmc breacher fixes, removing
suppressors and making duplicate suppressor class for precise
whitelisting instead of blanket blacklisting
  • Loading branch information
Hobbnob committed Apr 7, 2019
1 parent 5e8e497 commit be3f9f6
Show file tree
Hide file tree
Showing 8 changed files with 215 additions and 127 deletions.
38 changes: 2 additions & 36 deletions @twc_config_public/addons/twc_units_90/2000.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2403,50 +2403,16 @@
{
"Throw",
"Put",
"TWC_CUP_smg_MP5SD6_clean",
"TWC_UK3CB_BAF_L119A1_CQB_ACOG",
"UK3CB_BAF_L105A2"
};
respawnweapons[]=
{
"Throw",
"Put",
"TWC_CUP_smg_MP5SD6_clean",
"TWC_UK3CB_BAF_L119A1_CQB_ACOG",
"UK3CB_BAF_L105A2"
};
magazines[]=
{
"UK3CB_BAF_9_15Rnd",
"UK3CB_BAF_9_15Rnd",
"CUP_30Rnd_9x19_MP5",
"CUP_30Rnd_9x19_MP5",
"CUP_30Rnd_9x19_MP5",
"CUP_30Rnd_9x19_MP5",
"CUP_30Rnd_9x19_MP5",
"CUP_30Rnd_9x19_MP5",
"CUP_30Rnd_9x19_MP5",
"CUP_30Rnd_9x19_MP5",
"HandGrenade",
"HandGrenade",
"SmokeShell",
"B_IR_Grenade"
};
Respawnmagazines[]=
{
"UK3CB_BAF_9_15Rnd",
"UK3CB_BAF_9_15Rnd",
"CUP_30Rnd_9x19_MP5",
"CUP_30Rnd_9x19_MP5",
"CUP_30Rnd_9x19_MP5",
"CUP_30Rnd_9x19_MP5",
"CUP_30Rnd_9x19_MP5",
"CUP_30Rnd_9x19_MP5",
"CUP_30Rnd_9x19_MP5",
"CUP_30Rnd_9x19_MP5",
"HandGrenade",
"HandGrenade",
"SmokeShell",
"B_IR_Grenade"
};
};


Expand Down
43 changes: 37 additions & 6 deletions @twc_config_public/addons/twc_units_90/weapons.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,36 @@ class cfgWeapons
};


class UK3CB_BAF_L119A1_CQB;
class TWC_UK3CB_BAF_L119A1_CQB_ACOG: UK3CB_BAF_L119A1_CQB
{
recoil = "twc_rifle_556";
recoilProne = "twc_rifle_556_prone";
class LinkedItems
{
class LinkedItemsOptic
{
slot="asdg_OpticRail_UK3CB_BAF_L85";
item="rhsusf_acc_acog2_usmc";
};
};
class WeaponSlotsInfo
{
class asdg_OpticRail_UK3CB_BAF_L85: asdg_OpticRail1913 {
class compatibleItems {
rhsusf_acc_acog2_usmc = 1;
};
};
class asdg_MuzzleSlot_UK3CB_BAF_L85: asdg_MuzzleSlot_556_3CB {
class compatibleItems {
twc_acc_rotex5_grey = 1;
};
};
allowedslots[] = {901};
mass = 70;
};
};

class UK3CB_BAF_L119A1_FG;
class TWC_UK3CB_BAF_L119A1_FG_ACOG: UK3CB_BAF_L119A1_FG
{
Expand All @@ -35,7 +65,7 @@ class cfgWeapons
class LinkedItemsMuzzleSlot
{
slot="asdg_MuzzleSlot_UK3CB_BAF_L85";
item="UK3CB_BAF_Silencer_L85";
item="uk3cb_baf_sffh";
};
};
class WeaponSlotsInfo
Expand All @@ -47,7 +77,8 @@ class cfgWeapons
};
class asdg_MuzzleSlot_UK3CB_BAF_L85: asdg_MuzzleSlot_556_3CB {
class compatibleItems {
UK3CB_BAF_Silencer_L85 = 1;
twc_acc_rotex5_grey = 1;
uk3cb_baf_sffh = 1;
};
};
allowedslots[] = {901};
Expand All @@ -70,7 +101,7 @@ class cfgWeapons
class LinkedItemsMuzzleSlot
{
slot="asdg_MuzzleSlot_UK3CB_BAF_L85";
item="UK3CB_BAF_Silencer_L85";
item="uk3cb_baf_sffh";
};
};
class WeaponSlotsInfo
Expand All @@ -82,15 +113,15 @@ class cfgWeapons
};
class asdg_MuzzleSlot_UK3CB_BAF_L85: asdg_MuzzleSlot_556_3CB {
class compatibleItems {
UK3CB_BAF_Silencer_L85 = 1;
twc_acc_rotex5_grey = 1;
uk3cb_baf_sffh = 1;
};
};
allowedslots[] = {901};
mass = 105;
};
};

class UK3CB_BAF_L119A1_CQB;
class TWC_UK3CB_BAF_L119A1_CQB_EOTECH: UK3CB_BAF_L119A1_CQB
{
recoil = "twc_rifle_556";
Expand All @@ -112,7 +143,7 @@ class cfgWeapons
};
class asdg_MuzzleSlot_UK3CB_BAF_L85: asdg_MuzzleSlot_556_3CB {
class compatibleItems {
UK3CB_BAF_Silencer_L85 = 1;
twc_acc_rotex5_grey = 1;
};
};
allowedslots[] = {901};
Expand Down
2 changes: 1 addition & 1 deletion @twc_config_public/addons/twc_units_marines/marinesbackpacks.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
};
class TransportMagazines
{
maga_nc(rhsusf_200rnd_556x45_mixed_box,4);
maga_nc(rhs_200rnd_556x45_T_SAW,4);
};
};

Expand Down
52 changes: 28 additions & 24 deletions @twc_config_public/addons/twc_units_marines/usmarines2000.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -452,15 +452,17 @@ magazines[]=
{
"rhsusf_mag_7x45acp_MHP",
"rhsusf_mag_7x45acp_MHP",
"rhsusf_8Rnd_00Buck",
"rhsusf_8Rnd_00Buck",
"rhsusf_8Rnd_00Buck",
"rhsusf_8Rnd_00Buck",
"rhsusf_8Rnd_00Buck",
"rhsusf_8Rnd_Slug",
"rhsusf_8Rnd_Slug",
"rhsusf_8Rnd_Slug",
"rhsusf_8Rnd_Slug",
"UK3CB_BAF_12G_Pellets",
"UK3CB_BAF_12G_Pellets",
"UK3CB_BAF_12G_Pellets",
"UK3CB_BAF_12G_Pellets",
"UK3CB_BAF_12G_Pellets",
"UK3CB_BAF_12G_Slugs",
"UK3CB_BAF_12G_Slugs",
"UK3CB_BAF_12G_Slugs",
"UK3CB_BAF_12G_Slugs",
"UK3CB_BAF_12G_Slugs",
"UK3CB_BAF_12G_Slugs",
"HandGrenade",
"HandGrenade",
"SmokeShell",
Expand All @@ -470,15 +472,17 @@ Respawnmagazines[]=
{
"rhsusf_mag_7x45acp_MHP",
"rhsusf_mag_7x45acp_MHP",
"rhsusf_8Rnd_00Buck",
"rhsusf_8Rnd_00Buck",
"rhsusf_8Rnd_00Buck",
"rhsusf_8Rnd_00Buck",
"rhsusf_8Rnd_00Buck",
"rhsusf_8Rnd_Slug",
"rhsusf_8Rnd_Slug",
"rhsusf_8Rnd_Slug",
"rhsusf_8Rnd_Slug",
"UK3CB_BAF_12G_Pellets",
"UK3CB_BAF_12G_Pellets",
"UK3CB_BAF_12G_Pellets",
"UK3CB_BAF_12G_Pellets",
"UK3CB_BAF_12G_Pellets",
"UK3CB_BAF_12G_Slugs",
"UK3CB_BAF_12G_Slugs",
"UK3CB_BAF_12G_Slugs",
"UK3CB_BAF_12G_Slugs",
"UK3CB_BAF_12G_Slugs",
"UK3CB_BAF_12G_Slugs",
"HandGrenade",
"HandGrenade",
"SmokeShell",
Expand Down Expand Up @@ -525,18 +529,18 @@ respawnweapons[]=
};
magazines[]=
{
"rhsusf_200rnd_556x45_mixed_box",
"rhsusf_200rnd_556x45_mixed_box",
"rhsusf_200rnd_556x45_mixed_box",
"rhs_200rnd_556x45_T_SAW",
"rhs_200rnd_556x45_T_SAW",
"rhs_200rnd_556x45_T_SAW",
"HandGrenade",
"SmokeShell",
"SmokeShell"
};
Respawnmagazines[]=
{
"rhsusf_200rnd_556x45_mixed_box",
"rhsusf_200rnd_556x45_mixed_box",
"rhsusf_200rnd_556x45_mixed_box",
"rhs_200rnd_556x45_T_SAW",
"rhs_200rnd_556x45_T_SAW",
"rhs_200rnd_556x45_T_SAW",
"HandGrenade",
"SmokeShell",
"SmokeShell"
Expand Down
1 change: 1 addition & 0 deletions @twc_config_public/addons/twc_units_modern/config.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ class CfgPatches {
"a3_characters_f_beta",
"a3_characters_f_gamma",
"A3_Data_F",
"cup_weapons_m16",
"cup_wheeledvehicles_uphmmwv",
"rhsusf_c_Caiman",
"rhsusf_c_Cougar",
Expand Down
4 changes: 2 additions & 2 deletions @twc_config_public/addons/twc_units_modern/modern.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2620,14 +2620,14 @@ class Modern_British_crewchief:Modern_British_HeliPilot
{
"Throw",
"Put",
"twc_l129a1_spotter",
"TWC_HK417_scope_bipod",
"rhsusf_weap_glock17g4"
};
respawnweapons[]=
{
"Throw",
"Put",
"twc_l129a1_spotter",
"TWC_HK417_scope_bipod",
"rhsusf_weap_glock17g4"
};
magazines[]=
Expand Down
Loading

0 comments on commit be3f9f6

Please sign in to comment.