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

AbstractIcon: Force Icon Rework #113

Closed
wants to merge 50 commits into from

Conversation

Windchild292
Copy link
Owner

@Windchild292 Windchild292 commented Jun 14, 2021

This PR moves Force Icons to Abstract Icon, and divides them into three separate types. These are StandardForceIcon, LayeredForceIcon, and UnitIcon, all of which have differing functionality. Additionally, this adds LayeredForceIcon export to png, force icon TO&E icon copy/paste, and automated new day force icon operational status updates (based on a MekHQ option).

This PR also replaces the Force Icon images with the far more comprehensive and standardized Kailan pack, with full migration from the old setup and a new MekHQ extras repository containing the current pack and a pack of standard force icons created by Mjolnir06.

The full list of what this does, which I used to keep this organized:

TODO:

  • ForcePieceIconChooser: Maintain selection despite hiding the values

For reviewers:
This file is large because of the ~7k lines of migration, and almost all of the file differences are because of the Force Icon pack swapover. Code-wise most of the work is on the dialog-side, to get the three icon types (with the fourth, internal type used in LayeredForceIcon) selectable and usable.

@codecov-commenter
Copy link

codecov-commenter commented Jun 14, 2021

Codecov Report

Merging #113 (4d1cb34) into master (6370300) will decrease coverage by 0.54%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #113      +/-   ##
============================================
- Coverage     10.56%   10.02%   -0.55%     
- Complexity     3894     3912      +18     
============================================
  Files           737      752      +15     
  Lines        101590   107380    +5790     
  Branches      16576    16622      +46     
============================================
+ Hits          10738    10767      +29     
- Misses        89467    95234    +5767     
+ Partials       1385     1379       -6     
Impacted Files Coverage Δ
MekHQ/src/mekhq/campaign/universe/Systems.java 41.43% <0.00%> (-0.80%) ⬇️
MekHQ/src/mekhq/MekHQOptions.java 1.69% <0.00%> (-0.10%) ⬇️
MekHQ/src/mekhq/campaign/unit/Unit.java 19.82% <0.00%> (-0.06%) ⬇️
MekHQ/src/mekhq/campaign/Campaign.java 12.02% <0.00%> (-0.03%) ⬇️
MekHQ/src/mekhq/gui/BasicInfo.java 0.00% <0.00%> (ø)
MekHQ/src/mekhq/gui/CampaignGUI.java 0.00% <0.00%> (ø)
MekHQ/src/mekhq/gui/FileDialogs.java 0.00% <0.00%> (ø)
MekHQ/src/mekhq/gui/ForceRenderer.java 0.00% <0.00%> (ø)
MekHQ/src/mekhq/gui/CommandCenterTab.java 0.00% <0.00%> (ø)
MekHQ/src/mekhq/gui/model/CrewListModel.java 0.00% <0.00%> (ø)
... and 35 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6370300...4d1cb34. Read the comment docs.

@Windchild292 Windchild292 changed the title Force Icon Rework AbstractIcon: Force Icon Rework Sep 24, 2021
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.

2 participants