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

Add magazines with different tracer colors for some vanilla weapons #6658

Merged
merged 14 commits into from
Mar 12, 2019

Conversation

xrufix
Copy link
Contributor

@xrufix xrufix commented Nov 3, 2018

When merged this pull request will:
Adds the following magazines:

calibre rounds / shape tracer (reload, mixed, every) color (green, red, yellow) /w image
5.56x45 150 Drum r, e g, y no
5.56x45 200 Belt m, e g no
5.8x42 30 r, e r, y no
5.8x42 100 Drum r, e r, y no
6.5 mx 30 r, e g, y yes
6.5 mx 100 Stick r, e g, y yes
6.5 kat. 30 r, e r, y yes
6.5 case 200 Belt m, e g, y yes
7.62x51 20 e g, y no
7.62x54 150 Belt m, e r, y no
9.3x64 150 Belt m r, y no
.338 NM 130 Belt m g, y no

All Magazines are added to the same CBA & Vanilla Magazine Wells as their vanilla base classes.

@PabstMirror PabstMirror added this to the Ongoing milestone Nov 3, 2018
@Drofseh
Copy link
Contributor

Drofseh commented Nov 3, 2018

cool, I like seeing more ace tracer stuff!
Having an inventory image that has the colour on it would be nice as well.

@xrufix
Copy link
Contributor Author

xrufix commented Nov 4, 2018

Thanks for the suggestion, I added this to the ToDo list

@xrufix xrufix changed the title WIP: Add magazines with different tracer colors for some vanilla weapons Add magazines with different tracer colors for some vanilla weapons Nov 12, 2018
@xrufix
Copy link
Contributor Author

xrufix commented Nov 12, 2018

Not WIP anymore. I would like to have this merged and work on UI later.

Is dependend on next CBA release because of magazine wells.

@xrufix
Copy link
Contributor Author

xrufix commented Jan 21, 2019

Any news here?
Should I use Vanilla magwells where possible?

@dedmen
Copy link
Contributor

dedmen commented Jan 22, 2019

Should probably add to both CBA and Vanilla magwells.

@xrufix
Copy link
Contributor Author

xrufix commented Jan 27, 2019

Added magazines to Vanilla MagazineWells as well.

<English>.338 NM 130Rnd Belt Mixed (Green)</English>
<German>.338 NM 130 Schuss Gurt gemischt (grün)</German>
</Key>
<Key ID="STR_ACE_Tracers_130Rnd_338_Mag_green_description">
Copy link
Contributor

Choose a reason for hiding this comment

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

these are duplicates of vanilla string

        <Key ID="str_a3_cfgmagazines_130rnd_338_mag1">
          <Original>Caliber: .338 Norma Magnum&lt;br /&gt;Rounds: 130&lt;br /&gt;Used in: SPMG</Original>

I think we can just drop the description for all these and just use inheritance

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed in 8711f42

// 5.56mm
class 150Rnd_556x45_Drum_Mag_F;
class ACE_150Rnd_556x45_Drum_green : 150Rnd_556x45_Drum_Mag_F {
ammo = "B_556x45_Ball_tracer_green";
Copy link
Contributor

Choose a reason for hiding this comment

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

should also add
displaynameshort="$STR_A3_tracer_dns"; to all tracers

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I do not think this is necessary. I checked Arma's config and all of the base classes I use have the correct displaynameshort configured, so it can be inherited.

optionals/tracers/stringtable.xml Outdated Show resolved Hide resolved
optionals/tracers/stringtable.xml Outdated Show resolved Hide resolved
optionals/tracers/stringtable.xml Outdated Show resolved Hide resolved
optionals/tracers/stringtable.xml Outdated Show resolved Hide resolved
optionals/tracers/stringtable.xml Outdated Show resolved Hide resolved
@PabstMirror PabstMirror merged commit 129cc26 into acemod:master Mar 12, 2019
BaerMitUmlaut pushed a commit that referenced this pull request Aug 5, 2019
…6658)

* Add magazines for some vanilla weapons with different tracer colors

* Removed obsolete comment

* unified naming of tracer magazines

* Add CfgMagazineWells

* Add 5.8mm mags

* Add Minimi boxes

* Added 5.56 Drum mags

* Add Katiba and 7.62x51 mags

* Remove magazine macro to make config easier to read and edit.

* Add pictures available in arma files

* Add magazines to vanilla magazinWells

* Fix wrong base class for Katiba tracer mags

* Removed duplicate strings

* delete blank lines in stringtable
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/enhancement Release Notes: **IMPROVED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants