Merged
Conversation
This will automatically account for variable size.
|
Build scan available at https://gradle.com/s/gnawhypye4cim |
neoancient
requested review from
AaronGullickson,
NickAragua,
SJuliez,
Windchild292 and
sixlettervariables
NickAragua
approved these changes
Jun 15, 2020
| MiscType.theaters=theaters | ||
| MiscType.theater=theater No newline at end of file | ||
| MiscType.theater=theater | ||
| MiscType.tons=tons |
Member
There was a problem hiding this comment.
Did we really not have a token for "ton" and "tons?
Member
Author
There was a problem hiding this comment.
We might. I didn'tcheck because I thought the advantages of keeping this in one place were worth the possibility of duplication.
Member
|
That poor MiscType class, heh. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This builds on #1902 by using the size field in Mounted to consolidate cargo, liquid cargo, communications gear, ladders, and BA mission equipment to one MiscType each. This allows BA mission equipment in any arbitrary size (in 1 kg lots) and liquid cargo as a single equipment mount rather than a multiple of single-ton mounts with a possible half-ton. Because cargo and communications equipment size determine the number of critical slots on a mech, the slot count has been changed to query Mounted instead of the EquipmentType, which accounts for most of the changes. There are also some changes in MtfFile that allocate any additional critical slots needed after the size has been set, and the code that sets the size has been moved to the correct place.