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

Move Unit Roles to Unit Files #4903

Merged
merged 13 commits into from
Nov 19, 2023
Merged

Conversation

SJuliez
Copy link
Member

@SJuliez SJuliez commented Nov 19, 2023

As the title says, this moves the unit roles into the mtf/blk files and removes the way they are currently handled as a single file. On the MML side there is an accompanying editor update.

I notice this is difficult to review because of all the unit files. If necessary I can try uploading a draft that only has the code changes.

# Conflicts:
#	megamek/data/mechfiles/mechs/3060u/Yu Huang Y-H10G.mtf
#	megamek/data/mechfiles/mechs/XTRs/Primitives IV/Xanthos XNT-2O.mtf
#	megamek/data/mechfiles/vehicles/XTRs/Primitives III/Korvin KRV-2.blk
#	megamek/src/megamek/utilities/MechCacheCSVTool.java
# Conflicts:
#	megamek/data/mechfiles/mechs/3055U/Anvil ANV-3M.mtf
#	megamek/data/mechfiles/mechs/3075/Jabberwocky ConstructionMech JAW-66D.mtf
#	megamek/data/mechfiles/mechs/3145/Davion/Antlion LK-3D.mtf
#	megamek/data/mechfiles/mechs/3145/Davion/Templar III TLR2-OD.mtf
#	megamek/data/mechfiles/mechs/3145/NTNU RS/Mangonel MNL-4S.mtf
#	megamek/data/mechfiles/mechs/3145/NTNU RS/Templar TLR1-OR.mtf
#	megamek/data/mechfiles/mechs/3145/Republic/Ares ARS-V1 Zeus.mtf
#	megamek/data/mechfiles/mechs/3145/Republic/Poseidon PSD-V2.mtf
#	megamek/data/mechfiles/mechs/XTRs/Liao/Vindicator VND-3LD (Dao).mtf
#	megamek/data/mechfiles/mechs/XTRs/Steiner/Banshee BNC-11X.mtf
#	megamek/src/megamek/common/loaders/BLKFile.java
@SJuliez SJuliez changed the title Unit roles Move Unit Roles to Unit Files Nov 19, 2023
Copy link
Member

@HammerGS HammerGS left a comment

Choose a reason for hiding this comment

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

Tested and seems to work,

Copy link
Member

@neoancient neoancient left a comment

Choose a reason for hiding this comment

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

I looked at the individual commits that had the code changes.

@HammerGS
Copy link
Member

I spotted check a bunch of units that they seemed right.

@HammerGS
Copy link
Member

Going to merge this, as I'm working on some infantry stuff and don't want to create too many conflicts.

@HammerGS HammerGS merged commit 9095aad into MegaMek:master Nov 19, 2023
4 checks passed
HammerGS added a commit that referenced this pull request Nov 19, 2023
@SJuliez SJuliez deleted the unitroles-to-file branch December 12, 2023 22:19
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.

3 participants