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 MagazineWells support #6604

Merged
merged 9 commits into from
Oct 13, 2018
Merged

Add MagazineWells support #6604

merged 9 commits into from
Oct 13, 2018

Conversation

dedmen
Copy link
Contributor

@dedmen dedmen commented Sep 29, 2018

No description provided.

@dedmen
Copy link
Contributor Author

dedmen commented Sep 29, 2018 •
edited
Loading

Should HuntIR fit in russian VOG launcher too?
https://gist.github.com/dedmen/15e96189bd4c8edc148b136686275865#file-rhs-0-4-6-magazine-wells-L45

@PabstMirror
Copy link
Contributor

Could make a vog version of the huntIR (seperate magazine)

@PabstMirror PabstMirror added this to the 3.13.0 milestone Sep 30, 2018
@PabstMirror PabstMirror added kind/enhancement Release Notes: **IMPROVED:** target/next-cba labels Sep 30, 2018
@dedmen dedmen mentioned this pull request Oct 1, 2018
Closed
2 tasks
PabstMirror
PabstMirror approved these changes Oct 13, 2018
View reviewed changes
Copy link
Contributor

@PabstMirror PabstMirror left a comment

Choose a reason for hiding this comment

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

Ready for CBA 3.9

@PabstMirror
Copy link
Contributor

I guess we could also cleanup some of the magazine[] arrays.
Although I don't understand some of them like

    class arifle_MXM_F: arifle_MX_Base_F {
        magazines[] = {
            "30Rnd_65x39_caseless_mag",
            "30Rnd_65x39_caseless_mag_Tracer",
            "ACE_30Rnd_65x39_caseless_mag_Tracer_Dim",
            "ACE_30Rnd_65x47_Scenar_mag",
            "ACE_30Rnd_65_Creedmor_mag"

@Drofseh
Copy link
Contributor

Drofseh commented Oct 13, 2018

I guess we could also cleanup some of the magazine[] arrays.
Although I don't understand some of them like

    class arifle_MXM_F: arifle_MX_Base_F {
        magazines[] = {
            "30Rnd_65x39_caseless_mag",
            "30Rnd_65x39_caseless_mag_Tracer",
            "ACE_30Rnd_65x39_caseless_mag_Tracer_Dim",
            "ACE_30Rnd_65x47_Scenar_mag",
            "ACE_30Rnd_65_Creedmor_mag"

I don't understand that either, I don't think the MX should shoot 6.5 Creedmoor or 6.5x47 Lapua (Scenar)

@PabstMirror PabstMirror merged commit 9b6aa4c into acemod:master Oct 13, 2018
dedmen
dedmen commented Oct 13, 2018
View reviewed changes
addons/concertina_wire/XEH_PREP.hpp Outdated
@@ -6,3 +6,4 @@ PREP(handleDamage);
PREP(handleInit);
PREP(handleKilled);
PREP(vehicleDamage);
x
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Wat

@Blutze
Copy link
Contributor

Blutze commented Oct 13, 2018

The magazines themselves also have the mass and inventory icons, potentially even 3d models, of normal 6.5x39mm Bohemia 30 rounders. Always thought they are just there as a showcase for those particular ACE ammo types, and advanced ballistics in general.

Something I noticed missing in the CBA code: Why is the SiG 556 (dmr_03) not getting any magwells? Shouldn't it be AR-10/SR-25, with the vanilla 20 rounders?

@Drofseh
Copy link
Contributor

Drofseh commented Oct 13, 2018

I'm really not sure what to do with srifle_DMR_03_F.
The SIG 556 is a 5.56x45 rifle, but in game it's using 7.62x51.

CBA discussion here: CBATeam/CBA_A3#108 (comment)

@PabstMirror PabstMirror modified the milestones: 3.13.0, 3.12.4 Nov 9, 2018
BaerMitUmlaut pushed a commit that referenced this pull request Aug 5, 2019
@dedmen @PabstMirror
Add MagazineWells support (#6604)
720bb3f 
* Add MagazineWells to ballistics

* Add HuntIR wells

* Add Vanilla wells

* New CBA magwells

* indent

* test

* Revert "test"

This reverts commit 00f689f.

* Fix huntIR configs

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

@PabstMirror PabstMirror PabstMirror approved these changes

@Drofseh Drofseh Drofseh left review comments

Assignees
No one assigned
Labels
kind/enhancement Release Notes: **IMPROVED:**
Projects
None yet
Milestone
3.12.4
Development

Successfully merging this pull request may close these issues.
4 participants
@dedmen @PabstMirror @Drofseh @Blutze