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

JR for APEX #387

Closed
wants to merge 2 commits into from
Closed

JR for APEX #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71c1476
Apex additions
ravmustang Jun 19, 2016
74b3c45
Weapons configs for apex
ravmustang Jun 19, 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
138 changes: 138 additions & 0 deletions addons/jr/cfgweapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,5 +611,143 @@ class CfgWeapons {
};
};
};
//DP APEX ADDITIONS
class arifle_MX_khk_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;
};
class PointerSlot: asdg_FrontSideRail
{
iconPosition[] = {0.2,0.45};
iconScale = 0.25;
};
class UnderBarrelSlot: asdg_UnderSlot
{
iconPosition[] = {0.2,0.7};
iconScale = 0.2;
};
};
};
class arifle_MX_GL_khk_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;
};
class PointerSlot: asdg_FrontSideRail
{
iconPosition[] = {0.2,0.45};
iconScale = 0.25;
};
};
};
class arifle_MX_SW_khk_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;
};
class PointerSlot: asdg_FrontSideRail
{
iconPosition[] = {0.2,0.45};
iconScale = 0.25;
};
class UnderBarrelSlot: asdg_UnderSlot
{
iconPosition[] = {0.2,0.7};
iconScale = 0.2;
};
};
};
class arifle_MXM_khk_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;
};
class PointerSlot: asdg_FrontSideRail
{
iconPosition[] = {0.2,0.45};
iconScale = 0.25;
};
class UnderBarrelSlot: asdg_UnderSlot
{
iconPosition[] = {0.2,0.7};
iconScale = 0.2;
};
};
};
class srifle_GM6_ghex_F: GM6_base_F
{
class WeaponSlotsInfo: WeaponSlotsInfo
{
class CowsSlot: asdg_OpticRail1913
{
iconPosition[] = {0.55,0.3};
iconScale = 0.2;
};
};
};
class srifle_LRR_tna_F: LRR_base_F
{
class WeaponSlotsInfo: WeaponSlotsInfo
{
class CowsSlot: asdg_OpticRail1913
{
iconPosition[] = {0.6,0.35};
iconScale = 0.2;
};
};
};

};
25 changes: 25 additions & 0 deletions addons/jr/jr_classes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ class asdg_UnderSlot: asdg_SlotInfo { // Base under barrel slot
bipod_02_F_hex = 1;
bipod_03_F_blk = 1;
bipod_03_F_oli = 1;
bipod_01_F_khk = 1;//dpapexaddon
};
};

Expand Down Expand Up @@ -76,6 +77,20 @@ class asdg_OpticRail1913: asdg_OpticRail { // the "medium" rail, long enough to
optic_KHS_hex = 1;
optic_KHS_old = 1;
optic_KHS_tan = 1;
//dpapexaddon
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just // Apex will do.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the 4 spaces for indent does not fit the files current structure as I see it.... and if you guys want to use it please do and make what ever changes you need. If spaces and indents are what you are worried about when a free lance community guys helps update then im helping the wrong people.

Copy link
Member

@jonpas jonpas Jun 19, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the 4 spaces for indent does not fit the files current structure as I see it

Yes it is. You can check the diff here to see the obvious difference. You must have used an editor that displays it differently.

If spaces and indents are what you are worried about when a free lance community guys helps update then im helping the wrong people.

So you expect anyone can contribute with their own coding style? That would be an incredible mess. Every project needs to have some standard or you are asking for ugly code and a mess.
Additionally, we are free lance community guys as well, we don't get anything by maintaining and developing CBA.

optic_Arco_blk_F = 1;
optic_Arco_ghex_F = 1;
optic_DMS_ghex_F = 1;
optic_ERCO_blk_F = 1;
optic_ERCO_khk_F = 1;
optic_ERCO_snd_F = 1;
optic_Hamr_khk_F = 1;
optic_SOS_khk_F = 1;
optic_LRPS_tna_F = 1;
optic_LRPS_ghex_F = 1;
optic_Holosight_blk_F = 1;
optic_Holosight_khk_F = 1;
optic_Holosight_smg_blk_F = 1;
};
};

Expand Down Expand Up @@ -122,19 +137,29 @@ class asdg_OpticSideMount: asdg_OpticRail {
class asdg_MuzzleSlot_762: asdg_MuzzleSlot { // for 7.62x51 universal mount suppressors
class compatibleItems {
muzzle_snds_B = 1;
//dpapexaddon
muzzle_snds_B_khk_F = 1;
muzzle_snds_B_snd_F = 1;
};
};

class asdg_MuzzleSlot_556: asdg_MuzzleSlot { // for 5.56x45 universal mount suppressors
class compatibleItems {
muzzle_snds_M = 1;
//dpapexaddon
muzzle_snds_m_khk_F = 1;
muzzle_snds_m_snd_F = 1;
};
};

class asdg_MuzzleSlot_762MG: asdg_MuzzleSlot { // for 7.62, 6.5 and 5.56 universal mount MG suppressors
class compatibleItems {
muzzle_snds_H_MG = 1;
muzzle_snds_H_SW = 1;
//dpapexaddon
muzzle_snds_H_MG_blk_F = 1;
muzzle_snds_H_MG_khk_F = 1;
muzzle_snds_H_khk_F = 1;
};
};

Expand Down