Skip to content

Commit

Permalink
Merge pull request #281 from CBATeam/asdg_jointmuzzles
Browse files Browse the repository at this point in the history 
Add JM support for MX, Katiba, Rahim, Mk200, fixes #252
  • Loading branch information
@Killswitch00
Killswitch00 committed Feb 28, 2016
2 parents d07ff00 + fc7a0e9 commit fcf3ce6
Show file tree
Hide file tree
Showing 2 changed files with 94 additions and 0 deletions.
69 changes: 69 additions & 0 deletions addons/jr/cfgweapons.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ 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 @@ -193,6 +197,10 @@ 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 CowsSlot: asdg_OpticRail1913_short_MG {
iconPosition[] = {0.6, 0.45};
iconScale = 0.2;
Expand All @@ -210,6 +218,11 @@ class CfgWeapons {

class LMG_Zafir_F: Rifle_Long_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
/* class MuzzleSlot : asdg_MuzzleSlot_762MG { //this would work but there is no sound config for a suppressed variant
iconPosition[] = {0.05, 0.4};
iconScale = 0.2;
};
*/
class CowsSlot: asdg_OpticRail1913_short_MG {
iconPosition[] = {0.6, 0.35};
iconScale = 0.15;
Expand Down Expand Up @@ -277,6 +290,13 @@ class CfgWeapons {

class arifle_Katiba_F : arifle_Katiba_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
class MuzzleSlot : asdg_MuzzleSlot_762 {
iconPosition[] = {0, 0.45};
iconScale = 0.2;
class compatibleItems: compatibleItems {
muzzle_snds_h = 1;
};
};
class CowsSlot: asdg_OpticRail1913 {
iconPosition[] = {0.45, 0.28};
iconScale = 0.2;
Expand All @@ -290,6 +310,13 @@ class CfgWeapons {

class arifle_Katiba_C_F : arifle_Katiba_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
class MuzzleSlot : asdg_MuzzleSlot_762 {
iconPosition[] = {0.1, 0.45};
iconScale = 0.2;
class compatibleItems: compatibleItems {
muzzle_snds_h = 1;
};
};
class CowsSlot: asdg_OpticRail1913 {
iconPosition[] = {0.45, 0.28};
iconScale = 0.2;
Expand All @@ -303,6 +330,13 @@ class CfgWeapons {

class arifle_Katiba_GL_F : arifle_Katiba_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
class MuzzleSlot : asdg_MuzzleSlot_762 {
iconPosition[] = {0, 0.45};
iconScale = 0.2;
class compatibleItems: compatibleItems {
muzzle_snds_h = 1;
};
};
class CowsSlot: asdg_OpticRail1913 {
iconPosition[] = {0.45, 0.28};
iconScale = 0.2;
Expand Down Expand Up @@ -375,6 +409,13 @@ class CfgWeapons {

class arifle_MXC_F : arifle_MX_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
class MuzzleSlot : asdg_MuzzleSlot_762 {
iconPosition[] = {0, 0.4};
iconScale = 0.2;
class compatibleItems: compatibleItems {
muzzle_snds_h = 1;
};
};
class CowsSlot: asdg_OpticRail1913 {
iconPosition[] = {0.5, 0.3};
iconScale = 0.2;
Expand All @@ -388,6 +429,13 @@ class CfgWeapons {

class arifle_MX_F : arifle_MX_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
class MuzzleSlot : asdg_MuzzleSlot_762 {
iconPosition[] = {0, 0.45};
iconScale = 0.2;
class compatibleItems: compatibleItems {
muzzle_snds_h = 1;
};
};
class CowsSlot: asdg_OpticRail1913 {
iconPosition[] = {0.5, 0.35};
iconScale = 0.2;
Expand All @@ -405,6 +453,13 @@ class CfgWeapons {

class arifle_MX_GL_F : arifle_MX_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
class MuzzleSlot : asdg_MuzzleSlot_762 {
iconPosition[] = {0, 0.45};
iconScale = 0.2;
class compatibleItems: compatibleItems {
muzzle_snds_h = 1;
};
};
class CowsSlot: asdg_OpticRail1913 {
iconPosition[] = {0.5, 0.35};
iconScale = 0.2;
Expand All @@ -418,6 +473,13 @@ class CfgWeapons {

class arifle_MX_SW_F : arifle_MX_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
class MuzzleSlot : asdg_MuzzleSlot_762MG {
iconPosition[] = {0, 0.45};
iconScale = 0.2;
class compatibleItems: compatibleItems {
muzzle_snds_h = 1;
};
};
class CowsSlot: asdg_OpticRail1913 {
iconPosition[] = {0.5, 0.35};
iconScale = 0.2;
Expand All @@ -435,6 +497,13 @@ class CfgWeapons {

class arifle_MXM_F : arifle_MX_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
class MuzzleSlot : asdg_MuzzleSlot_762 {
iconPosition[] = {0, 0.4};
iconScale = 0.2;
class compatibleItems: compatibleItems {
muzzle_snds_h = 1;
};
};
class CowsSlot: asdg_OpticRail1913 {
iconPosition[] = {0.5, 0.35};
iconScale = 0.2;
Expand Down
25 changes: 25 additions & 0 deletions addons/jr_prep/config.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ class CfgWeapons {

class LMG_Mk200_F: Rifle_Long_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
delete MuzzleSlot;
delete CowsSlot;
delete PointerSlot;
delete UnderBarrelSlot;
Expand All @@ -66,6 +67,7 @@ class CfgWeapons {

class LMG_Zafir_F: Rifle_Long_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {
delete MuzzleSlot;
delete CowsSlot;
delete PointerSlot;
};
Expand All @@ -77,11 +79,34 @@ 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 Tavor_base_F: Rifle_Base_F {
class WeaponSlotsInfo;
};
Expand Down

0 comments on commit fcf3ce6

Please sign in to comment.