Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update for newest JR / 1.64 UBC #4208

Merged
merged 3 commits into from
Sep 23, 2016
Merged

Update for newest JR / 1.64 UBC #4208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92c01fc
Update flashsuppressor JR configs for pistols
PabstMirror Aug 4, 2016
a7d7979
Merge branch 'master' into pistol_JRs
PabstMirror Sep 22, 2016
e72165d
Update for newest JR / 1.64 UBC
PabstMirror Sep 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions addons/ai/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class CfgWeapons {
};

class Rifle_Base_F: Rifle {};
class Rifle_Short_Base_F: Rifle_Base_F {};
class Rifle_Long_Base_F: Rifle_Base_F {};

// MX
Expand Down Expand Up @@ -470,7 +471,7 @@ class CfgWeapons {
};

// PD2000
class pdw2000_base_F: Rifle_Base_F {
class pdw2000_base_F: Rifle_Short_Base_F {
aiDispersionCoefY = 18.0;
aiDispersionCoefX = 12.0;

Expand All @@ -484,7 +485,7 @@ class CfgWeapons {
};

// Vector
class SMG_01_Base: Rifle_Base_F {
class SMG_01_Base: Rifle_Short_Base_F {
aiDispersionCoefY = 18.0;
aiDispersionCoefX = 12.0;

Expand Down
7 changes: 4 additions & 3 deletions addons/ballistics/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ class CfgWeapons {
class MMG_01_base_F;
class MMG_02_base_F;
class Rifle_Base_F;
class Rifle_Long_Base_F;
class Rifle_Short_Base_F: Rifle_Base_F {};
class Rifle_Long_Base_F: Rifle_Base_F {};
class MuzzleSlot;

/* Long Rifles */
Expand Down Expand Up @@ -189,8 +190,8 @@ class CfgWeapons {
dispersion = 0.0008727; // radians. Equal to 3 MOA.
};
};
class pdw2000_base_F: Rifle_Base_F {};
class SMG_01_Base: Rifle_Base_F {};
class pdw2000_base_F: Rifle_Short_Base_F {};
class SMG_01_Base: Rifle_Short_Base_F {};
class SMG_02_base_F: Rifle_Base_F {};

/* Pistols */
Expand Down
161 changes: 16 additions & 145 deletions addons/flashsuppressors/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ class asdg_MuzzleSlot_762: asdg_MuzzleSlot { // for 7.62x51 universal mount supp
ACE_muzzle_mzls_B = 1;
};
};
class asdg_MuzzleSlot_65: asdg_MuzzleSlot_762 { // for 6.5 weapons, mostly to deal with BIS vanilla compatibility
class compatibleItems: compatibleItems {
ACE_muzzle_mzls_H = 1;
ACE_muzzle_mzls_B = 0;
};
};
class asdg_MuzzleSlot_93x64: asdg_MuzzleSlot { // for 9.3x64 universal mount suppressors
class compatibleItems {
ACE_muzzle_mzls_93mmg = 1;
Expand All @@ -19,6 +25,11 @@ class asdg_MuzzleSlot_9MM_SMG: asdg_MuzzleSlot { // for 9x19mm universal mount S
ACE_muzzle_mzls_smg_02 = 1;
};
};
class asdg_MuzzleSlot_9MM: asdg_MuzzleSlot { // for 9x19mm universal mount pistol suppressors
class compatibleItems {
ACE_muzzle_mzls_smg_02 = 1;
};
};
class asdg_MuzzleSlot_556: asdg_MuzzleSlot { // for 5.56x45 universal mount suppressors
class compatibleItems {
ACE_muzzle_mzls_L = 1;
Expand All @@ -29,12 +40,16 @@ class asdg_MuzzleSlot_45ACP_SMG: asdg_MuzzleSlot { // for .45ACP universal mount
ACE_muzzle_mzls_smg_01 = 1;
};
};
class asdg_MuzzleSlot_45ACP: asdg_MuzzleSlot { // for .45ACP universal mount pistol suppressors
class compatibleItems {
ACE_muzzle_mzls_smg_01 = 1;
};
};
class asdg_MuzzleSlot_762MG: asdg_MuzzleSlot { // for 7.62, 6.5 and 5.56 universal mount MG suppressors
class compatibleItems {
ACE_muzzle_mzls_B = 1;
};
};

class MuzzleSlot;

class CfgWeapons {
Expand All @@ -44,100 +59,6 @@ class CfgWeapons {
class WeaponSlotsInfo;
};

/* MX */
class arifle_MX_Base_F: Rifle_Base_F {
class WeaponSlotsInfo;
};

class arifle_MXC_F: arifle_MX_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: asdg_MuzzleSlot_762 {
class compatibleItems: compatibleItems {
ACE_muzzle_mzls_H = 1;
ACE_muzzle_mzls_B = 0;
};
};
};
};
class arifle_MX_F: arifle_MX_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: asdg_MuzzleSlot_762 {
class compatibleItems: compatibleItems {
ACE_muzzle_mzls_H = 1;
ACE_muzzle_mzls_B = 0;
};
};
};
};
class arifle_MX_GL_F: arifle_MX_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: asdg_MuzzleSlot_762 {
class compatibleItems: compatibleItems {
ACE_muzzle_mzls_H = 1;
ACE_muzzle_mzls_B = 0;
};
};
};
};
class arifle_MX_SW_F: arifle_MX_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: asdg_MuzzleSlot_762MG {
class compatibleItems: compatibleItems {
ACE_muzzle_mzls_H = 1;
ACE_muzzle_mzls_B = 0;
};
};
};
};
class arifle_MXM_F: arifle_MX_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: asdg_MuzzleSlot_762 {
class compatibleItems: compatibleItems {
ACE_muzzle_mzls_H = 1;
ACE_muzzle_mzls_B = 0;
};
};
};
};


/* Katiba */

class arifle_Katiba_Base_F: Rifle_Base_F {
class WeaponSlotsInfo;
};
class arifle_Katiba_F: arifle_Katiba_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: asdg_MuzzleSlot_762 {
class compatibleItems: compatibleItems {
ACE_muzzle_mzls_H = 1;
ACE_muzzle_mzls_B = 0;
};
};
};
};
class arifle_Katiba_C_F: arifle_Katiba_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: asdg_MuzzleSlot_762 {
class compatibleItems: compatibleItems {
ACE_muzzle_mzls_H = 1;
ACE_muzzle_mzls_B = 0;
};
};
};
};
class arifle_Katiba_GL_F: arifle_Katiba_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: asdg_MuzzleSlot_762 {
class compatibleItems: compatibleItems {
ACE_muzzle_mzls_H = 1;
ACE_muzzle_mzls_B = 0;
};
};
};
};


/* Other */
class LMG_Mk200_F: Rifle_Long_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
Expand All @@ -150,56 +71,6 @@ class CfgWeapons {
};
};

/* Pistols */

class Pistol;
class Pistol_Base_F: Pistol {
class WeaponSlotsInfo;
};

class hgun_P07_F: Pistol_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: MuzzleSlot {
linkProxy = "\A3\data_f\proxies\weapon_slots\MUZZLE";
compatibleItems[] += {"ACE_muzzle_mzls_smg_02"};
};
};
};

class hgun_Rook40_F: Pistol_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: MuzzleSlot {
linkProxy = "\A3\data_f\proxies\weapon_slots\MUZZLE";
compatibleItems[] += {"ACE_muzzle_mzls_smg_02"};
};
};
};

class hgun_ACPC2_F: Pistol_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: MuzzleSlot {
compatibleItems[] += {"ACE_muzzle_mzls_smg_01"};
};
};
};

class hgun_Pistol_heavy_01_F: Pistol_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: MuzzleSlot {
compatibleItems[] += {"ACE_muzzle_mzls_smg_01"};
};
};
};

/*class hgun_Pistol_heavy_02_F: Pistol_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot {
linkProxy = "\A3\data_f\proxies\weapon_slots\MUZZLE";
compatibleItems[] += {"ACE_muzzle_mzls_smg_01"};
};
};
};*/


/* Flashsuppressors */

Expand Down
7 changes: 5 additions & 2 deletions addons/realisticweights/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ class CfgWeapons {
class Rifle_Long_Base_F: Rifle_Base_F {
class WeaponSlotsInfo;
};
class Rifle_Short_Base_F: Rifle_Base_F {
class WeaponSlotsInfo;
};
class Launcher;
class Launcher_Base_F: Launcher {
class WeaponSlotsInfo;
Expand Down Expand Up @@ -176,7 +179,7 @@ class CfgWeapons {
// - SMGs ---------------------------------------------------------------------

// - CPW ------------------------------------------------------------------
class pdw2000_base_F: Rifle_Base_F {
class pdw2000_base_F: Rifle_Short_Base_F {
class WeaponSlotsInfo;
};
class hgun_PDW2000_F: pdw2000_base_F {
Expand All @@ -186,7 +189,7 @@ class CfgWeapons {
};

// - KRISS Vector ---------------------------------------------------------
class SMG_01_Base: Rifle_Base_F {
class SMG_01_Base: Rifle_Short_Base_F {
class WeaponSlotsInfo;
};
class SMG_01_F: SMG_01_Base {
Expand Down
7 changes: 4 additions & 3 deletions addons/smallarms/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ class Mode_FullAuto;

class CfgWeapons {
class Rifle_Base_F;
class Rifle_Long_Base_F;
class Rifle_Short_Base_F: Rifle_Base_F {};
class Rifle_Long_Base_F: Rifle_Base_F {};

///////////////////////////////////////////////////////////////////////////////
//////////// SMALL ARMS WEAPONS ///////////////////////////////////////////////
Expand Down Expand Up @@ -91,7 +92,7 @@ class CfgWeapons {

// SMG Vermin ////////////////////////////////////////////////////

class SMG_01_Base: Rifle_Base_F {
class SMG_01_Base: Rifle_Short_Base_F {
// http://kriss-usa.com/pdf/operatormanual/
// 1200 rpm
class Single: Mode_SemiAuto {
Expand Down Expand Up @@ -131,7 +132,7 @@ class CfgWeapons {

// SMG PDW2000 ///////////////////////////////////////////////////

class pdw2000_base_F: Rifle_Base_F {
class pdw2000_base_F: Rifle_Short_Base_F {
modes[] = {"Single", "FullAuto"}; // No burst on this thing

class Single: Mode_SemiAuto {
Expand Down