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.

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

Ballistics - Fix DMR_03 (SIG556) initSpeed #7567

Merged
merged 6 commits into from
Jun 13, 2020
Merged

Ballistics - Fix DMR_03 (SIG556) initSpeed #7567

merged 6 commits into from
Jun 13, 2020

Conversation

Laid3acK
Copy link
Contributor

@Laid3acK Laid3acK commented Mar 2, 2020

When merged this pull request will:

  • Fix the DMR_03_base_F initSpeed.
  • Fix the missing arifle_katiba_Base_F 30 rnd IR-Dim magazine (KH2002 Sama variants).
  • Fix the ACE_30Rnd_556x45_Stanag_Tracer_Dim picture (30 rnd magazine icon instead 20 rnd).

@PabstMirror PabstMirror added this to the 3.13.2 milestone Mar 2, 2020
@PabstMirror PabstMirror added kind/enhancement Release Notes: **IMPROVED:** kind/cleanup Release Notes: **CHANGED:** labels Mar 2, 2020
magazineWell[] += {
"CBA_762x51_M14"
}; // vanilla magazineWell[] = {"M14_762x51"};
};

class srifle_DMR_03_F: DMR_03_base_F {
initSpeed = -0.991536;
Copy link
Contributor

Choose a reason for hiding this comment

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

Explain.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

When i tested the RC, i saw that the class srifle_DMR_03_F has his own initSpeed , 940 if i remember correctly.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah, saw that. I think we should keep the value in both classes and put a comment after this line.

@commy2
Copy link
Contributor

commy2 commented Mar 2, 2020

Why all the empty lines?

@Laid3acK
Copy link
Contributor Author

Laid3acK commented Mar 2, 2020

I believed it was a part of the Coding Guidelines. I'm wrong ?

magazineWell[] += {
"CBA_762x51_M14"
}; // vanilla magazineWell[] = {"M14_762x51"};
};

class srifle_DMR_03_F: DMR_03_base_F {
initSpeed = -0.991536; // Default vanilla value 940
Copy link
Contributor

Choose a reason for hiding this comment

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

No, an explanation why this is here. And also keep the original change.

Copy link
Contributor Author

@Laid3acK Laid3acK Mar 3, 2020

Choose a reason for hiding this comment

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

I don't understand what do you mean with an explanation. There is no explanation with the old config.

And also keep the original change

Same, i don't understand my mistake.

@PabstMirror PabstMirror modified the milestones: 3.13.2, 3.13.3 Apr 18, 2020
@Laid3acK
Copy link
Contributor Author

Laid3acK commented Jun 11, 2020

Reverted to the old format for the cfgWeapons (better compatibility with third mods).
Ace 3.12.6 as reference for the weapons config.

@PabstMirror PabstMirror merged commit d8a3eab into acemod:master Jun 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/cleanup Release Notes: **CHANGED:** kind/enhancement Release Notes: **IMPROVED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants