Armor rework, part 1b #5116
Merged
Armor rework, part 1b #5116
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
…gamek into SJuliez-additional-name-field
This was referenced Feb 2, 2024
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| @@ -47,11 +47,11 @@ | |||
| if (aero.hasPatchworkArmor()) { | |||
| int armorcost = 0; | |||
| for (int loc = 0; loc < aero.locations(); loc++) { | |||
| armorcost += aero.getArmorWeight(loc) * EquipmentType.getArmorCost(aero.getArmorType(loc)); | |||
| armorcost += aero.getArmorWeight(loc) * ArmorType.forEntity(aero, loc).getCost(); | |||
Check failure
Code scanning / CodeQL
Implicit narrowing conversion in compound assignment High
| @@ -57,11 +57,11 @@ | |||
| if (fighter.hasPatchworkArmor()) { | |||
| int armorcost = 0; | |||
| for (int loc = 0; loc < fighter.locations(); loc++) { | |||
| armorcost += fighter.getArmorWeight(loc) * EquipmentType.getArmorCost(fighter.getArmorType(loc)); | |||
| armorcost += fighter.getArmorWeight(loc) * ArmorType.forEntity(fighter, loc).getCost(); | |||
Check failure
Code scanning / CodeQL
Implicit narrowing conversion in compound assignment High
NickAragua
approved these changes
Feb 4, 2024
| @@ -293,7 +307,7 @@ private static ArmorType createClanFerroFibrous() { | |||
| armor.setInternalName("Clan Ferro-Fibrous"); | |||
| armor.addLookupName("Clan Ferro-Fibrous Armor"); | |||
| armor.addLookupName("Clan Ferro Fibre"); | |||
| armor.tonnage = TONNAGE_VARIABLE; | |||
There was a problem hiding this comment.
Is there a reason we're removing setting the tonnage?
There was a problem hiding this comment.
It's not used. Armor tonnage is determined by the number of points of armor on the unit and calculated by points per ton or weight per point depending on unit type.
HammerGS
added a commit
that referenced
this pull request
Feb 4, 2024
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.
Continuation of #5101.
Removes armor names array from EquipmentType.
Moves armor cost calculations from EquipmentType to ArmorType.
Splits protomech armor from standard armor due to differences in cost.