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

fix: stops bays from loading BA and protomek ammunition #6220

Merged
merged 2 commits into from
Nov 29, 2024

Conversation

Scoppio
Copy link
Collaborator

@Scoppio Scoppio commented Nov 25, 2024

Adds an extra filter when loading munitions which discard BA/Protomek exclusive ammo types for the BayMunitionsChoicePanel.

All the other stuff changed is non-functional, just for better name or type expression and to remove some odities of "very-old-code (tm)"

Fixes: #6069

Copy link

codecov bot commented Nov 25, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (master@61d2def). Learn more about missing BASE report.
Report is 10 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff            @@
##             master    #6220   +/-   ##
=========================================
  Coverage          ?   29.01%           
  Complexity        ?    13984           
=========================================
  Files             ?     2649           
  Lines             ?   268130           
  Branches          ?    47724           
=========================================
  Hits              ?    77801           
  Misses            ?   186442           
  Partials          ?     3887           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Scoppio Scoppio self-assigned this Nov 25, 2024
Comment on lines +260 to +263
// A Bay should not load BA nor Protomek exclusive ammo/weapons
if (ammoType.hasFlag(F_BATTLEARMOR) || ammoType.hasFlag(F_PROTOMEK)) {
return false;
}
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This is the only code newly added.

@HammerGS HammerGS merged commit 08eff6d into MegaMek:master Nov 29, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Dropships can load BA SRM/LRM Rounds
2 participants