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 JR for APEX #388

Merged
merged 1 commit into from
Jul 12, 2016
Merged

Update JR for APEX #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
284 changes: 283 additions & 1 deletion addons/jr/cfgweapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
class CfgWeapons {

class Rifle_Base_F;
class Rifle;

class Rifle_Base_F : Rifle {
class WeaponSlotsInfo;
};

class Rifle_Long_Base_F : Rifle_Base_F {
class WeaponSlotsInfo;
Expand Down Expand Up @@ -295,6 +299,11 @@ class CfgWeapons {
iconScale = 0.2;
class compatibleItems: compatibleItems {
muzzle_snds_h = 1;
muzzle_snds_h_khk_F = 1;
muzzle_snds_h_snd_F = 1;
muzzle_snds_65_TI_blk_F = 1;
muzzle_snds_65_TI_hex_F = 1;
muzzle_snds_65_TI_ghex_F = 1;
};
};
class CowsSlot: asdg_OpticRail1913 {
Expand All @@ -315,6 +324,11 @@ class CfgWeapons {
iconScale = 0.2;
class compatibleItems: compatibleItems {
muzzle_snds_h = 1;
muzzle_snds_h_khk_F = 1;
muzzle_snds_h_snd_F = 1;
muzzle_snds_65_TI_blk_F = 1;
muzzle_snds_65_TI_hex_F = 1;
muzzle_snds_65_TI_ghex_F = 1;
};
};
class CowsSlot: asdg_OpticRail1913 {
Expand All @@ -335,6 +349,11 @@ class CfgWeapons {
iconScale = 0.2;
class compatibleItems: compatibleItems {
muzzle_snds_h = 1;
muzzle_snds_h_khk_F = 1;
muzzle_snds_h_snd_F = 1;
muzzle_snds_65_TI_blk_F = 1;
muzzle_snds_65_TI_hex_F = 1;
muzzle_snds_65_TI_ghex_F = 1;
};
};
class CowsSlot: asdg_OpticRail1913 {
Expand Down Expand Up @@ -414,6 +433,11 @@ class CfgWeapons {
iconScale = 0.2;
class compatibleItems: compatibleItems {
muzzle_snds_h = 1;
muzzle_snds_h_khk_F = 1;
muzzle_snds_h_snd_F = 1;
muzzle_snds_65_TI_blk_F = 1;
muzzle_snds_65_TI_hex_F = 1;
muzzle_snds_65_TI_ghex_F = 1;
};
};
class CowsSlot: asdg_OpticRail1913 {
Expand All @@ -434,6 +458,11 @@ class CfgWeapons {
iconScale = 0.2;
class compatibleItems: compatibleItems {
muzzle_snds_h = 1;
muzzle_snds_h_khk_F = 1;
muzzle_snds_h_snd_F = 1;
muzzle_snds_65_TI_blk_F = 1;
muzzle_snds_65_TI_hex_F = 1;
muzzle_snds_65_TI_ghex_F = 1;
};
};
class CowsSlot: asdg_OpticRail1913 {
Expand All @@ -458,6 +487,11 @@ class CfgWeapons {
iconScale = 0.2;
class compatibleItems: compatibleItems {
muzzle_snds_h = 1;
muzzle_snds_h_khk_F = 1;
muzzle_snds_h_snd_F = 1;
muzzle_snds_65_TI_blk_F = 1;
muzzle_snds_65_TI_hex_F = 1;
muzzle_snds_65_TI_ghex_F = 1;
};
};
class CowsSlot: asdg_OpticRail1913 {
Expand All @@ -478,6 +512,11 @@ class CfgWeapons {
iconScale = 0.2;
class compatibleItems: compatibleItems {
muzzle_snds_h = 1;
muzzle_snds_h_khk_F = 1;
muzzle_snds_h_snd_F = 1;
muzzle_snds_65_TI_blk_F = 1;
muzzle_snds_65_TI_hex_F = 1;
muzzle_snds_65_TI_ghex_F = 1;
};
};
class CowsSlot: asdg_OpticRail1913 {
Expand All @@ -502,6 +541,11 @@ class CfgWeapons {
iconScale = 0.2;
class compatibleItems: compatibleItems {
muzzle_snds_h = 1;
muzzle_snds_h_khk_F = 1;
muzzle_snds_h_snd_F = 1;
muzzle_snds_65_TI_blk_F = 1;
muzzle_snds_65_TI_hex_F = 1;
muzzle_snds_65_TI_ghex_F = 1;
};
};
class CowsSlot: asdg_OpticRail1913 {
Expand Down Expand Up @@ -612,4 +656,242 @@ class CfgWeapons {
};
};

class LMG_03_base_F : Rifle_Long_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
/*
class MuzzleSlot : asdg_MuzzleSlot_762MG { //unfortunately there's no muzzle proxy so these attachments won't show up (2016-06-20)
iconPosition[] = {0.1, 0.5};
iconScale = 0.2;
};
*/
class CowsSlot: asdg_OpticRail1913_short_MG {
iconPosition[] = {0.57, 0.28};
iconScale = 0.15;
};
class PointerSlot: asdg_FrontSideRail {
iconPosition[] = {0.38, 0.42};
iconScale = 0.2;
};
};
};

class DMR_07_base_F : Rifle_Long_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
class MuzzleSlot : asdg_MuzzleSlot_762 {
iconPosition[] = {0, 0.45};
iconScale = 0.2;
class compatibleItems: compatibleItems {
muzzle_snds_h = 1;
muzzle_snds_h_khk_F = 1;
muzzle_snds_h_snd_F = 1;
muzzle_snds_65_TI_blk_F = 1;
muzzle_snds_65_TI_hex_F = 1;
muzzle_snds_65_TI_ghex_F = 1;
};
};
class CowsSlot : asdg_OpticRail1913_short {
iconPosition[] = {0.45, 0.28};
iconScale = 0.2;
};
};
};

class SMG_05_base_F : Rifle_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
class MuzzleSlot : asdg_MuzzleSlot_9MM_SMG {
iconPosition[] = {0, 0.45};
iconScale = 0.2;
};
class CowsSlot : asdg_OpticRail1913_short {
iconPosition[] = {0.45, 0.28};
iconScale = 0.2;
};
};
};
/*
class arifle_AKS_base_F : Rifle_Base_F {
class WeaponSlotsInfo {
class CowsSlot : asdg_OpticSideMount {};
class MuzzleSlot : asdg_MuzzleSlot_545R {};
};
};
*/
class arifle_AK12_base_F : Rifle_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
class MuzzleSlot : asdg_MuzzleSlot_762R {
iconPosition[] = {0, 0.45};
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.45, 0.28};
iconScale = 0.2;
};
class PointerSlot: asdg_FrontSideRail {
iconPosition[] = {0.35, 0.45};
iconScale = 0.2;
};
};
};

class arifle_AK12_F : arifle_AK12_base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
class UnderBarrelSlot : asdg_UnderSlot {
iconPosition[] = {0.2, 0.8};
iconScale = 0.3;
};
};
};

class arifle_SPAR_01_base_F : Rifle_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
class MuzzleSlot : asdg_MuzzleSlot_556 {
iconPosition[] = {0, 0.45};
iconScale = 0.2;
};
class CowsSlot: asdg_OpticRail1913 {
iconPosition[] = {0.45, 0.28};
iconScale = 0.2;
};
class PointerSlot: asdg_FrontSideRail {
iconPosition[] = {0.35, 0.45};
iconScale = 0.2;
};
};
};

class arifle_SPAR_01_blk_F : arifle_SPAR_01_base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
class UnderBarrelSlot : asdg_UnderSlot {
iconPosition[] = {0.2, 0.8};
iconScale = 0.3;
};
};
};
class arifle_SPAR_01_khk_F : arifle_SPAR_01_base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
class UnderBarrelSlot : asdg_UnderSlot {
iconPosition[] = {0.2, 0.8};
iconScale = 0.3;
};
};
};
class arifle_SPAR_01_snd_F : arifle_SPAR_01_base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
class UnderBarrelSlot : asdg_UnderSlot {
iconPosition[] = {0.2, 0.8};
iconScale = 0.3;
};
};
};

class arifle_SPAR_02_base_F : Rifle_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
class MuzzleSlot : asdg_MuzzleSlot_556 {
iconPosition[] = {0, 0.45};
iconScale = 0.2;
};
class CowsSlot: asdg_OpticRail1913 {
iconPosition[] = {0.45, 0.28};
iconScale = 0.2;
};
class PointerSlot: asdg_FrontSideRail {
iconPosition[] = {0.35, 0.45};
iconScale = 0.2;
};
class UnderBarrelSlot : asdg_UnderSlot {
iconPosition[] = {0.2, 0.8};
iconScale = 0.3;
};
};
};

class arifle_SPAR_03_base_F : Rifle_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
class MuzzleSlot : asdg_MuzzleSlot_762 {
iconPosition[] = {0, 0.45};
iconScale = 0.2;
};
class CowsSlot: asdg_OpticRail1913_long {
iconPosition[] = {0.45, 0.28};
iconScale = 0.2;
};
class PointerSlot: asdg_FrontSideRail {
iconPosition[] = {0.35, 0.45};
iconScale = 0.2;
};
class UnderBarrelSlot : asdg_UnderSlot {
iconPosition[] = {0.2, 0.8};
iconScale = 0.3;
};
};
};

class arifle_CTAR_base_F : Rifle_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
class MuzzleSlot : asdg_MuzzleSlot_58 {
iconPosition[] = {0, 0.45};
iconScale = 0.2;
};
class CowsSlot: asdg_OpticRail1913 {
iconPosition[] = {0.45, 0.28};
iconScale = 0.2;
};
class PointerSlot: asdg_FrontSideRail {
iconPosition[] = {0.35, 0.45};
iconScale = 0.2;
};
};
};

class arifle_CTARS_base_F : Rifle_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
class MuzzleSlot : asdg_MuzzleSlot_58 {
iconPosition[] = {0, 0.45};
iconScale = 0.2;
};
class CowsSlot: asdg_OpticRail1913 {
iconPosition[] = {0.45, 0.28};
iconScale = 0.2;
};
class PointerSlot: asdg_FrontSideRail {
iconPosition[] = {0.35, 0.45};
iconScale = 0.2;
};
};
};

class arifle_ARX_base_F : Rifle_Base_F {
class WeaponSlotsInfo : WeaponSlotsInfo {
class MuzzleSlot : asdg_MuzzleSlot_762 {
iconPosition[] = {0, 0.45};
iconScale = 0.2;
class compatibleItems: compatibleItems {
muzzle_snds_h = 1;
muzzle_snds_h_khk_F = 1;
muzzle_snds_h_snd_F = 1;
muzzle_snds_65_TI_blk_F = 1;
muzzle_snds_65_TI_hex_F = 1;
muzzle_snds_65_TI_ghex_F = 1;
};
};
class CowsSlot: asdg_OpticRail1913 {
iconPosition[] = {0.45, 0.28};
iconScale = 0.2;
};
class PointerSlot: asdg_FrontSideRail {
iconPosition[] = {0.35, 0.45};
iconScale = 0.2;
};
class UnderBarrelSlot : asdg_UnderSlot {
iconPosition[] = {0.2, 0.8};
iconScale = 0.3;
};
};
};

};
2 changes: 1 addition & 1 deletion addons/jr/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class CfgPatches {
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"A3_Weapons_F","A3_Weapons_F_Mark","CBA_jr_prep"};
requiredAddons[] = {"A3_Weapons_F","A3_Weapons_F_Mark","A3_Weapons_F_Exp","CBA_jr_prep"};
version = VERSION;
authors[] = {"Robalo"};
};
Expand Down
Loading