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

Add Contact DLC JointRails #1181

Merged
merged 9 commits into from
Jul 26, 2019
Merged

Add Contact DLC JointRails #1181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
230133b
Add Contact DLC JointRails
dedmen Jul 25, 2019
b5f4e79
Merge branch 'ContactJR' of https://github.com/dedmen/CBA_A3 into Con…
commy2 Jul 25, 2019
0bb442c
add enoch jr
commy2 Jul 25, 2019
010b30e
capitalization fix 1
commy2 Jul 25, 2019
26b6720
capitalization fix 2
commy2 Jul 25, 2019
205c0b1
add contact jr
commy2 Jul 25, 2019
4965a7f
delete a thing that does not belong
commy2 Jul 25, 2019
895729c
Merge branch 'master' of https://github.com/CBATeam/CBA_A3 into Conta…
commy2 Jul 26, 2019
7604117
fix some scope errors, trim superfluous dummy classes
commy2 Jul 26, 2019
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
2 changes: 0 additions & 2 deletions addons/jam/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ class CfgPatches {
url = "$STR_CBA_URL";
units[] = {};
weapons[] = {};
magazines[] = {};
ammo[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"cba_common"};
version = VERSION;
Expand Down
26 changes: 26 additions & 0 deletions addons/jr/cfgweapons.hpp → addons/jr/Cfgweapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -971,4 +971,30 @@ class CfgWeapons {
};
};
};

// Contact DLC dummies
class acc_flashlight;
class acc_flashlight_broken: acc_flashlight {
scope = 1; // Optional protected class inheriting from a public base class.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

aren't we hiding the vanilla stuff? or is it already hidden.

Also you renamed file from cfgweapons -> Cfgweapons. But shouldn't it be CfgWeapons?

Copy link
Contributor

@commy2 commy2 Jul 26, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

aren't we hiding the vanilla stuff? or is it already hidden.

These classes are all protected in Contact. But if I inherit when they don't exist, they would get public from their base classes.

Also you renamed file from cfgweapons -> Cfgweapons. But shouldn't it be CfgWeapons?

Fixed on master

};

class acc_pointer_IR;
class acc_pointer_IR_broken: acc_pointer_IR {
scope = 1;
};

class optic_Aco;
class optic_Aco_broken: optic_Aco {
scope = 1;
};

class optic_Hamr;
class optic_Hamr_broken: optic_Hamr {
scope = 1;
};

class optic_MRCO;
class optic_MRCO_broken: optic_MRCO {
scope = 1;
};
};
26 changes: 24 additions & 2 deletions addons/jr/jr_classes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ class asdg_FrontSideRail: asdg_SlotInfo { // Laser / flashlight rail
iconPicture = "\a3\weapons_f\Data\ui\attachment_side";
class compatibleItems {
acc_flashlight = 1;
acc_flashlight_broken = 1; // Contact
acc_pointer_IR = 1;
acc_pointer_IR_broken = 1; // Contact
};
};

Expand All @@ -46,6 +48,8 @@ class asdg_UnderSlot: asdg_SlotInfo { // Base under barrel slot
bipod_03_F_blk = 1;
bipod_03_F_oli = 1;
bipod_01_F_khk = 1;
bipod_02_F_arid = 1; // Enoch
bipod_02_F_lush = 1; // Enoch
};
};

Expand All @@ -62,6 +66,7 @@ class asdg_PistolUnderRail: asdg_SlotInfo { // under rail for handguns
class asdg_PistolOpticMount: asdg_OpticRail { // common handgun optic mount
class compatibleItems {
optic_MRD = 1;
optic_MRD_black = 1; // Enoch
};
};

Expand All @@ -71,9 +76,11 @@ class asdg_PistolOpticRail1913: asdg_OpticRail { // MIL-STD-1913 handgun optic r
class compatibleItems {
optic_Yorris = 1;
optic_Holosight = 1;
optic_Holosight_smg = 1;
optic_Holosight_blk_F = 1;
optic_Holosight_khk_F = 1;
optic_Holosight_arid_F = 1; // Enoch
optic_Holosight_lush_F = 1; // Enoch
optic_Holosight_smg = 1;
optic_Holosight_smg_blk_F = 1;
optic_Holosight_smg_khk_F = 1;
};
Expand All @@ -88,23 +95,35 @@ class asdg_OpticRail1913: asdg_OpticRail { // the "medium" rail, long enough to
optic_SOS = 1;
optic_SOS_khk_F = 1;
optic_MRCO = 1;
optic_MRCO_broken = 1; // Contact
optic_Arco = 1;
optic_Arco_ghex_F = 1;
optic_Arco_blk_F = 1;
optic_Arco_AK_arid_F = 1; // Enoch
optic_Arco_AK_blk_F = 1; // Enoch
optic_Arco_AK_lush_F = 1; // Enoch
optic_Arco_arid_F = 1; // Enoch
optic_Arco_lush_F = 1; // Enoch
optic_aco = 1;
optic_ACO_grn = 1;
optic_Aco_broken = 1; // Contact
optic_aco_smg = 1;
optic_ACO_grn_smg = 1;
optic_hamr = 1;
optic_Hamr_khk_F = 1;
optic_Hamr_broken = 1; // Contact
optic_Holosight = 1;
optic_Holosight_smg = 1;
optic_Holosight_blk_F = 1;
optic_Holosight_khk_F = 1;
optic_Holosight_arid_F = 1; // Enoch
optic_Holosight_lush_F = 1; // Enoch
optic_Holosight_smg = 1;
optic_Holosight_smg_blk_F = 1;
optic_Holosight_smg_khk_F = 1;
optic_DMS = 1;
optic_DMS_ghex_F = 1;
optic_DMS_weathered_F = 1; // Enoch
optic_DMS_weathered_Kir_F = 1; // Enoch
optic_LRPS = 1;
optic_LRPS_ghex_F = 1;
optic_LRPS_tna_F = 1;
Expand Down Expand Up @@ -182,6 +201,8 @@ class asdg_MuzzleSlot_762: asdg_MuzzleSlot { // for 7.62x51 universal mount supp
muzzle_snds_B = 1;
muzzle_snds_B_khk_F = 1;
muzzle_snds_B_snd_F = 1;
muzzle_snds_B_arid_F = 1;
muzzle_snds_B_lush_F = 1;
};
};

Expand All @@ -193,6 +214,7 @@ class asdg_MuzzleSlot_65: asdg_MuzzleSlot_762 { // for 6.5 weapons, mostly to de
muzzle_snds_65_TI_blk_F = 1;
muzzle_snds_65_TI_hex_F = 1;
muzzle_snds_65_TI_ghex_F = 1;
muzzle_tma_65 = 1; // Enoch
};
};

Expand Down