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

JAM - Add 1.92 vanilla mag wells #1133

Merged
merged 2 commits into from
May 1, 2019
Merged

JAM - Add 1.92 vanilla mag wells #1133

merged 2 commits into from
May 1, 2019

Conversation

PabstMirror
Copy link
Contributor

@PabstMirror PabstMirror commented Apr 30, 2019 •
edited by commy2
Loading

close #1132

@PabstMirror
Copy link
Contributor Author

vanilla:

launch_NLAW_F - ["NLAW"]
launch_RPG32_F - ["RPG32"]
launch_Titan_base - ["Titan_Long"]
launch_Titan_short_base - ["Titan_Short"]
DMR_01_base_F - ["Rahim_762x54"]
EBR_base_F - ["M14_762x51"]
GM6_base_F - []
LRR_base_F - ["M320_408"]
hgun_ACPC2_F - ["ACPC2_45ACP"]
hgun_P07_F - ["Pistol_9x21"]
hgun_Pistol_heavy_01_F - ["PistolHeavy_01_45ACP"]
hgun_Pistol_heavy_02_F - ["Cylinder_45ACP"]
hgun_Rook40_F - ["Pistol_9x21"]
arifle_Katiba_Base_F - ["Katiba_65x39"]
mk20_base_F - ["STANAG_556x45"]
arifle_MX_Base_F - ["MX_65x39","MX_65x39_Large"]
SDAR_base_F - ["STANAG_556x45"]
Tavor_base_F - ["STANAG_556x45"]
DMR_02_base_F - ["MAR10_338"]
DMR_03_base_F - ["M14_762x51"]
DMR_04_base_F - ["ASP1_127x54"]
DMR_05_base_F - ["Cyrus_93"]
DMR_06_base_F - ["M14_762x51"]
launch_RPG7_F - ["RPG7"]
arifle_AK12_base_F - ["AK_762x39"]
arifle_AKM_base_F - ["AK_762x39"]
arifle_AKS_base_F - ["AK_545x39"]
arifle_ARX_base_F - ["Katiba_65x39"]
arifle_CTAR_base_F - ["CTAR_580x42","CTAR_580x42_Large"]
arifle_CTARS_base_F - ["CTAR_580x42","CTAR_580x42_Large"]
arifle_SPAR_01_base_F - ["STANAG_556x45","STANAG_556x45_Large"]
arifle_SPAR_02_base_F - ["STANAG_556x45","STANAG_556x45_Large"]

cba:

UGL_F - ["CBA_40mm_M203","CBA_40mm_EGLM"]
launch_NLAW_F - ["NLAW"]
launch_RPG32_F - ["RPG32"]
launch_Titan_base - ["Titan_Long"]
launch_Titan_short_base - ["Titan_Short"]
DMR_01_base_F - ["Rahim_762x54","CBA_762x54R_SVD"]
EBR_base_F - ["M14_762x51","CBA_762x51_M14"]
GM6_base_F - []
LRR_base_F - ["M320_408"]
LMG_Mk200_F - ["CBA_65x39_Mk200"]
LMG_Zafir_F - ["CBA_762x54R_LINKS"]
hgun_ACPC2_F - ["ACPC2_45ACP"]
hgun_P07_F - ["Pistol_9x21"]
hgun_Pistol_heavy_01_F - ["PistolHeavy_01_45ACP"]
hgun_Pistol_heavy_02_F - ["Cylinder_45ACP"]
hgun_Rook40_F - ["Pistol_9x21"]
arifle_Katiba_Base_F - ["Katiba_65x39","CBA_65x39_Katiba"]
mk20_base_F - ["STANAG_556x45","CBA_556x45_STANAG","CBA_556x45_STANAG_L","CBA_556x45_STANAG_XL","CBA_556x45_STANAG_2D"]
arifle_MX_Base_F - ["MX_65x39","MX_65x39_Large","CBA_65x39_MX"]
SDAR_base_F - ["STANAG_556x45","CBA_556x45_STANAG"]
Tavor_base_F - ["STANAG_556x45","CBA_556x45_STANAG","CBA_556x45_STANAG_L","CBA_556x45_STANAG_XL","CBA_556x45_STANAG_2D"]
SMG_01_Base - ["CBA_45ACP_Glock_Full"]
SMG_02_base_F - ["CBA_9x19_ScorpionEvo3"]
DMR_02_base_F - ["MAR10_338"]
DMR_03_base_F - ["M14_762x51","CBA_762x51_MkI_EMR"]
DMR_04_base_F - ["ASP1_127x54"]
DMR_05_base_F - ["Cyrus_93"]
DMR_06_base_F - ["M14_762x51","CBA_762x51_M14"]
MMG_01_base_F - ["CBA_93x64_LINKS"]
MMG_02_base_F - ["CBA_338NM_LINKS"]
SMG_03_TR_BASE - ["CBA_57x28_P90"]
launch_RPG7_F - ["RPG7","CBA_RPG7"]
LMG_03_base_F - ["CBA_556x45_MINIMI"]
arifle_AK12_base_F - ["AK_762x39","CBA_762x39_AK","CBA_762x39_RPK"]
arifle_AKM_base_F - ["AK_762x39","CBA_762x39_AK","CBA_762x39_RPK"]
arifle_AKS_base_F - ["AK_545x39","CBA_545x39_AK","CBA_545x39_RPK"]
arifle_ARX_base_F - ["Katiba_65x39","CBA_65x39_Katiba"]
arifle_CTAR_base_F - ["CTAR_580x42","CTAR_580x42_Large","CBA_580x42_TYPE95","CBA_580x42_TYPE95_XL"]
arifle_CTARS_base_F - ["CTAR_580x42","CTAR_580x42_Large","CBA_580x42_TYPE95","CBA_580x42_TYPE95_XL"]
arifle_SPAR_01_base_F - ["STANAG_556x45","CBA_556x45_STANAG","CBA_556x45_STANAG_L","CBA_556x45_STANAG_XL","CBA_556x45_STANAG_2D","CBA_556x45_STANAG_2D_XL"]
arifle_SPAR_02_base_F - ["STANAG_556x45_Large","CBA_556x45_STANAG","CBA_556x45_STANAG_L","CBA_556x45_STANAG_XL","CBA_556x45_STANAG_2D","CBA_556x45_STANAG_2D_XL"]
arifle_SPAR_03_base_F - ["CBA_762x51_HK417","CBA_762x51_HK417_L","CBA_762x51_HK417_XL"]
SMG_05_base_F - ["CBA_9x19_MP5"]
launch_MRAWS_base_F - ["CBA_Carl_Gustaf"]

@commy2 commy2 added this to the 3.11 milestone Apr 30, 2019
@commy2 commy2 added the Task label Apr 30, 2019
@commy2 commy2 merged commit ab4f3a7 into master May 1, 2019
@commy2 commy2 deleted the 192magwells branch May 1, 2019 03:37
dedmen
dedmen reviewed May 2, 2019
View reviewed changes
addons/jam/CfgWeapons.hpp
@@ -6,76 +6,73 @@ class CfgWeapons {
class Rifle_Short_Base_F;

class mk20_base_F: Rifle_Base_F {
magazineWell[] = {"CBA_556x45_STANAG", "CBA_556x45_STANAG_L", "CBA_556x45_STANAG_XL", "CBA_556x45_STANAG_2D"};
magazineWell[] = {"STANAG_556x45", "CBA_556x45_STANAG", "CBA_556x45_STANAG_L", "CBA_556x45_STANAG_XL", "CBA_556x45_STANAG_2D"};
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe we should just use += ?
Currently we also break any mod that gets loaded before CBA and tries to add magwells.

Copy link
Contributor

Choose a reason for hiding this comment

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

Can you even += with all the inheritance going on?

Copy link
Contributor

Choose a reason for hiding this comment

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

Sure. If a subclass just uses = that will not be of any use. But that would also break our = in the base class so that doesn't matter.
Just need to make sure that requiredAddons is correct, which is already correct.

Copy link
Contributor

Choose a reason for hiding this comment

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

+= also fails horribly if the magazineWell token is inherited. I guess I will have to check all classes, but thankfully I have the config dumps.

Copy link
Contributor

Choose a reason for hiding this comment

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

wasn't += built to work with inheritance? so that you can just add elements instead of overwriting..

Copy link
Contributor

Choose a reason for hiding this comment

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

No. It breaks for inherited tokens, but it works for different config patches adding to the same class.

Copy link
Contributor

@commy2 commy2 May 3, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

It even breaks in funny ways like adding the same array element twice overwriting the old ones. It goes completely bonkers. It is a terrible idea to rely on it for this stuff, but whatever rocks their boat. I will quickly eat something and then do what we need to in CBA and ACE PRs. Gimme a minute.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@commy2 commy2 commy2 approved these changes

@dedmen dedmen dedmen left review comments

Assignees
No one assigned
Labels
Task
Projects
None yet
Milestone
3.11
Development

Successfully merging this pull request may close these issues.

Magazine wells 1.92 compatibility
3 participants
@PabstMirror @dedmen @commy2