Skip to content

Commit

Permalink
joint rails - enoch attachment classes compatibility - Variant A (#1184)
Browse files Browse the repository at this point in the history 
* joint rails - enoch attachment classes compatibility

* don't overwrite vanilla magazine base classes

* don't overwrite vanilla magazine base classes
  • Loading branch information
@commy2
commy2 committed Jul 27, 2019
2 parents b6df6ac + 35f39a8 commit 6fcd51e
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 163 deletions.
150 changes: 40 additions & 110 deletions addons/jr/CfgWeapons.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@ class CfgWeapons {

class srifle_EBR_F: EBR_base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: asdg_MuzzleSlot_762 {
iconPosition[] = {0.05,0.38};
iconScale = 0.2;
};
class CowsSlot: asdg_OpticRail1913 {
iconPosition[] = {0.5,0.3};
iconScale = 0.2;
Expand Down Expand Up @@ -87,10 +83,6 @@ class CfgWeapons {

class srifle_DMR_01_F: DMR_01_base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: asdg_MuzzleSlot_762 {
iconPosition[] = {0,0.45};
iconScale = 0.2;
};
class CowsSlot: asdg_OpticRail1913 {
iconPosition[] = {0.45,0.38};
iconScale = 0.2;
Expand Down Expand Up @@ -137,10 +129,6 @@ class CfgWeapons {

class srifle_DMR_03_F: DMR_03_base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: asdg_MuzzleSlot_762 {
iconPosition[] = {0.12,0.431};
iconScale = 0.15;
};
class CowsSlot: asdg_OpticRail1913 {
iconPosition[] = {0.5,0.36};
iconScale = 0.15;
Expand Down Expand Up @@ -208,10 +196,6 @@ class CfgWeapons {

class srifle_DMR_06_camo_F: DMR_06_base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: asdg_MuzzleSlot_762 {
iconPosition[] = {0.06,0.4};
iconScale = 0.15;
};
class CowsSlot: asdg_OpticRail1913_short {
iconPosition[] = {0.52,0.36};
iconScale = 0.15;
Expand All @@ -225,15 +209,6 @@ class CfgWeapons {

class LMG_Mk200_F: Rifle_Long_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: asdg_MuzzleSlot_762MG {
iconPosition[] = {0.1,0.5};
iconScale = 0.2;
class compatibleItems: compatibleItems {
muzzle_snds_h = 1;
muzzle_snds_h_khk_F = 1;
muzzle_snds_h_snd_F = 1;
};
};
class CowsSlot: asdg_OpticRail1913_short_MG {
iconPosition[] = {0.6,0.45};
iconScale = 0.2;
Expand Down Expand Up @@ -323,10 +298,6 @@ class CfgWeapons {

class arifle_Katiba_F: arifle_Katiba_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: asdg_MuzzleSlot_65 {
iconPosition[] = {0,0.45};
iconScale = 0.2;
};
class CowsSlot: asdg_OpticRail1913 {
iconPosition[] = {0.45,0.28};
iconScale = 0.2;
Expand All @@ -340,10 +311,6 @@ class CfgWeapons {

class arifle_Katiba_C_F: arifle_Katiba_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: asdg_MuzzleSlot_65 {
iconPosition[] = {0.1,0.45};
iconScale = 0.2;
};
class CowsSlot: asdg_OpticRail1913 {
iconPosition[] = {0.45,0.28};
iconScale = 0.2;
Expand All @@ -357,10 +324,6 @@ class CfgWeapons {

class arifle_Katiba_GL_F: arifle_Katiba_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: asdg_MuzzleSlot_65 {
iconPosition[] = {0,0.45};
iconScale = 0.2;
};
class CowsSlot: asdg_OpticRail1913 {
iconPosition[] = {0.45,0.28};
iconScale = 0.2;
Expand All @@ -378,10 +341,6 @@ class CfgWeapons {

class arifle_Mk20_F: mk20_base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: asdg_MuzzleSlot_556 {
iconPosition[] = {0,0.36};
iconScale = 0.2;
};
class CowsSlot: asdg_OpticRail1913 {
iconPosition[] = {0.45,0.25};
iconScale = 0.2;
Expand All @@ -395,10 +354,6 @@ class CfgWeapons {

class arifle_Mk20C_F: mk20_base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: asdg_MuzzleSlot_556 {
iconPosition[] = {0.1,0.36};
iconScale = 0.2;
};
class PointerSlot: asdg_FrontSideRail {
iconPosition[] = {0.35,0.35};
iconScale = 0.25;
Expand All @@ -412,10 +367,6 @@ class CfgWeapons {

class arifle_Mk20_GL_F: mk20_base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: asdg_MuzzleSlot_556 {
iconPosition[] = {0.1,0.36};
iconScale = 0.2;
};
class PointerSlot: asdg_FrontSideRail {
iconPosition[] = {0.35,0.35};
iconScale = 0.25;
Expand All @@ -433,35 +384,19 @@ class CfgWeapons {

class arifle_MXC_F: arifle_MX_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: asdg_MuzzleSlot_65 {
iconPosition[] = {0,0.4};
iconScale = 0.2;
};
class CowsSlot: asdg_OpticRail1913 {
iconPosition[] = {0.5,0.3};
iconScale = 0.2;
};
class PointerSlot: asdg_FrontSideRail {
iconPosition[] = {0.2,0.4};
iconScale = 0.25;
};
};
};

class arifle_MX_F: arifle_MX_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: asdg_MuzzleSlot_65 {
iconPosition[] = {0,0.45};
iconScale = 0.2;
};
class CowsSlot: asdg_OpticRail1913 {
iconPosition[] = {0.5,0.35};
iconScale = 0.2;
};
class PointerSlot: asdg_FrontSideRail {
iconPosition[] = {0.2,0.45};
iconScale = 0.25;
};
class UnderBarrelSlot: asdg_UnderSlot {
iconPosition[] = {0.2,0.7};
iconScale = 0.2;
Expand All @@ -471,35 +406,19 @@ class CfgWeapons {

class arifle_MX_GL_F: arifle_MX_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: asdg_MuzzleSlot_65 {
iconPosition[] = {0,0.45};
iconScale = 0.2;
};
class CowsSlot: asdg_OpticRail1913 {
iconPosition[] = {0.5,0.35};
iconScale = 0.2;
};
class PointerSlot: asdg_FrontSideRail {
iconPosition[] = {0.2,0.45};
iconScale = 0.25;
};
};
};

class arifle_MX_SW_F: arifle_MX_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: asdg_MuzzleSlot_65 {
iconPosition[] = {0,0.45};
iconScale = 0.2;
};
class CowsSlot: asdg_OpticRail1913 {
iconPosition[] = {0.5,0.35};
iconScale = 0.2;
};
class PointerSlot: asdg_FrontSideRail {
iconPosition[] = {0.2,0.45};
iconScale = 0.25;
};
class UnderBarrelSlot: asdg_UnderSlot {
iconPosition[] = {0.2,0.7};
iconScale = 0.2;
Expand All @@ -509,18 +428,10 @@ class CfgWeapons {

class arifle_MXM_F: arifle_MX_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: asdg_MuzzleSlot_65 {
iconPosition[] = {0,0.4};
iconScale = 0.2;
};
class CowsSlot: asdg_OpticRail1913 {
iconPosition[] = {0.5,0.35};
iconScale = 0.2;
};
class PointerSlot: asdg_FrontSideRail {
iconPosition[] = {0.2,0.45};
iconScale = 0.25;
};
class UnderBarrelSlot: asdg_UnderSlot {
iconPosition[] = {0.2,0.7};
iconScale = 0.2;
Expand All @@ -534,10 +445,6 @@ class CfgWeapons {

class arifle_TRG21_F: Tavor_base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: asdg_MuzzleSlot_556 {
iconPosition[] = {0,0.4};
iconScale = 0.2;
};
class CowsSlot: asdg_OpticRail1913_short {
iconPosition[] = {0.45,0.28};
iconScale = 0.2;
Expand All @@ -551,10 +458,6 @@ class CfgWeapons {

class arifle_TRG20_F: Tavor_base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: asdg_MuzzleSlot_556 {
iconPosition[] = {0.1,0.4};
iconScale = 0.2;
};
class CowsSlot: asdg_OpticRail1913_short {
iconPosition[] = {0.45,0.28};
iconScale = 0.2;
Expand Down Expand Up @@ -681,32 +584,59 @@ class CfgWeapons {
};
*/
class arifle_AK12_base_F: Rifle_Base_F {
class WeaponSlotsInfo;
};

class arifle_AK12_F: arifle_AK12_base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: asdg_MuzzleSlot_762R {
iconPosition[] = {0,0.35};
class PointerSlot: asdg_FrontSideRail {
iconPosition[] = {0.3,0.35};
iconScale = 0.2;
class compatibleItems: compatibleItems {
muzzle_snds_B = 1;
muzzle_snds_B_khk_F = 1;
muzzle_snds_B_snd_F = 1;
};
};
class CowsSlot: asdg_OpticRail1913 {
iconPosition[] = {0.5,0.25};
};
};

class arifle_AK12_lush_F: arifle_AK12_base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class PointerSlot: asdg_FrontSideRail {
iconPosition[] = {0.3,0.35};
iconScale = 0.2;
};
};
};

class arifle_AK12_arid_F: arifle_AK12_base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class PointerSlot: asdg_FrontSideRail {
iconPosition[] = {0.3,0.35};
iconScale = 0.2;
};
};
};

class arifle_AK12_F: arifle_AK12_base_F {
class arifle_AK12_GL_base_F: arifle_AK12_base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class UnderBarrelSlot: asdg_UnderSlot {
iconPosition[] = {0.35,0.7};
iconScale = 0.3;
class PointerSlot: asdg_FrontSideRail {
iconPosition[] = {0.3,0.35};
iconScale = 0.2;
};
};
};

class arifle_AK12U_base_F: arifle_AK12_base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class PointerSlot: asdg_FrontSideRail {
iconPosition[] = {0.3,0.35};
iconScale = 0.2;
};
};
};

class arifle_RPK12_base_F: arifle_AK12_base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
class PointerSlot: asdg_FrontSideRail {
iconPosition[] = {0.3,0.35};
iconScale = 0.2;
};
};
};
Expand Down
63 changes: 10 additions & 53 deletions addons/jr/jr_prep/CfgWeapons.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ class CfgWeapons {

class LMG_Mk200_F: Rifle_Long_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
delete MuzzleSlot;
delete CowsSlot;
delete PointerSlot;
delete UnderBarrelSlot;
Expand All @@ -85,57 +84,7 @@ class CfgWeapons {

class arifle_MXC_F: arifle_MX_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
delete MuzzleSlot;
delete CowsSlot;
delete PointerSlot;
};
};

class arifle_MXM_F: arifle_MX_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
delete MuzzleSlot;
};
};

class arifle_MX_SW_F: arifle_MX_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
delete MuzzleSlot;
};
};

class arifle_Katiba_Base_F: Rifle_Base_F {
class WeaponSlotsInfo;
};

class arifle_Katiba_C_F: arifle_Katiba_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
delete MuzzleSlot;
};
};

class mk20_base_F: Rifle_Base_F {
class WeaponSlotsInfo;
};

class arifle_Mk20C_F: mk20_base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
delete MuzzleSlot;
};
};

class arifle_Mk20_GL_F: mk20_base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
delete MuzzleSlot;
};
};

class Tavor_base_F: Rifle_Base_F {
class WeaponSlotsInfo;
};

class arifle_TRG20_F: Tavor_base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
delete MuzzleSlot;
};
};

Expand Down Expand Up @@ -174,9 +123,17 @@ class CfgWeapons {
};
*/
class arifle_AK12_base_F: Rifle_Base_F {
class WeaponSlotsInfo;
};

class arifle_AK12U_base_F: arifle_AK12_base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
delete PointerSlot;
};
};

class arifle_RPK12_base_F: arifle_AK12_base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
delete MuzzleSlot;
delete CowsSlot;
delete PointerSlot;
};
};
Expand Down

0 comments on commit 6fcd51e

Please sign in to comment.