Infantry refactor #3944
Merged
Infantry refactor #3944
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # megamek/src/megamek/common/Infantry.java
# Conflicts: # megamek/src/megamek/common/BattleArmor.java # megamek/src/megamek/common/BattleForceElement.java # megamek/src/megamek/common/Infantry.java
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| @@ -827,7 +827,7 @@ | |||
|
|
|||
| String infSquadNum = entityTag.getAttribute(INF_SQUAD_NUM); | |||
| if (!infSquadNum.isBlank()) { | |||
| inf.setSquadN(Integer.parseInt(infSquadNum)); | |||
| inf.setSquadCount(Integer.parseInt(infSquadNum)); | |||
Check notice
Code scanning / CodeQL
Missing catch of NumberFormatException
NickAragua
reviewed
Oct 24, 2022
| /** | ||
| * Infantry only have critical slots for field gun ammo | ||
| */ | ||
| // Infantry only have critical slots for field gun ammo | ||
| private static final int[] NUM_OF_SLOTS = { 20, 20 }; | ||
| private static final String[] LOCATION_ABBRS = { "MEN", "FGUN" }; |
There was a problem hiding this comment.
Since we're polishing this, can we change the "MEN" location to "troopers" or "soldiers" or something?
There was a problem hiding this comment.
I like troopers myself. But agree with the men part.
There was a problem hiding this comment.
Sure, done. I was afraid this would break things but at least loading a damaged CI from a MUL is compatible across this change.
NickAragua
approved these changes
Oct 27, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When there, why not improve.
Removes unnecessary comments (for overrides mostly), improves a few method and field names, makes use of methods and improves the way some things are represented in the code.
The real changes are in Infantry, the changes in the other files adapt to changed method names.
This should be merged together with the adaptations for MML and MHQ.