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

add tools to manage SP/VP; track intensity visibility #2725

Merged
merged 7 commits into from
Jul 20, 2021

Conversation

NickAragua
Copy link
Member

Adds some tools for users to manage SP/VP, including GM mode tools; shows track scenario odds in GM mode.

image

@codecov
Copy link

codecov bot commented Jun 25, 2021

Codecov Report

Merging #2725 (df520a9) into master (89903d3) will decrease coverage by 0.00%.
The diff coverage is 0.00%.

❗ Current head df520a9 differs from pull request most recent head aa86455. Consider uploading reports for the commit aa86455 to get more accurate results
Impacted file tree graph

@@             Coverage Diff              @@
##             master    #2725      +/-   ##
============================================
- Coverage     10.60%   10.60%   -0.01%     
- Complexity     3853     3856       +3     
============================================
  Files           717      718       +1     
  Lines         99774    99850      +76     
  Branches      16404    16413       +9     
============================================
+ Hits          10585    10589       +4     
- Misses        87812    87885      +73     
+ Partials       1377     1376       -1     
Impacted Files Coverage Δ
MekHQ/src/mekhq/gui/StratconTab.java 0.00% <0.00%> (ø)
...c/mekhq/gui/stratcon/CampaignManagementDialog.java 0.00% <0.00%> (ø)
MekHQ/src/mekhq/campaign/universe/Systems.java 41.43% <0.00%> (-0.80%) ⬇️
MekHQ/src/mekhq/campaign/market/UnitMarket.java 2.42% <0.00%> (-0.10%) ⬇️
...ekHQ/src/mekhq/campaign/parts/BattleArmorSuit.java 9.41% <0.00%> (-0.04%) ⬇️
MekHQ/src/mekhq/gui/StratconPanel.java 0.00% <0.00%> (ø)
MekHQ/src/mekhq/campaign/universe/RATManager.java 0.00% <0.00%> (ø)
MekHQ/src/mekhq/module/atb/AtBEventProcessor.java 0.00% <0.00%> (ø)
MekHQ/src/mekhq/gui/dialog/MassMothballDialog.java 0.00% <0.00%> (ø)
... and 10 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 89903d3...aa86455. Read the comment docs.

Copy link
Contributor

@Windchild292 Windchild292 left a comment

Choose a reason for hiding this comment

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

I'm not the biggest fan of how this is implemented, but think it in general looks okay for an alpha dialog subject to future change. Just a few comments first.

@@ -56,6 +60,8 @@
private JScrollPane expandedObjectivePanel;
private boolean objectivesCollapsed = true;

CampaignManagementDialog cmd;
Copy link
Contributor

Choose a reason for hiding this comment

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

I can see no good reason to have this always initialized and not just recreate it as required.

Copy link
Member Author

Choose a reason for hiding this comment

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

On the other hand, I don't see a reason to keep creating/destroying a bunch of buttons and whatnot.

Copy link
Contributor

Choose a reason for hiding this comment

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

That's how we handle it in MekHQ, and... permanent memory vs clearable memory regularly matters when using a weaker computer.

MekHQ/src/mekhq/gui/StratconTab.java Outdated Show resolved Hide resolved
MekHQ/src/mekhq/gui/StratconTab.java Show resolved Hide resolved
MekHQ/src/mekhq/gui/stratcon/CampaignManagementDialog.java Outdated Show resolved Hide resolved
Copy link
Contributor

@Windchild292 Windchild292 left a comment

Choose a reason for hiding this comment

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

Looks good for an initial setup, albeit with the concerns voiced previously.

@NickAragua NickAragua merged commit f5cfa3a into MegaMek:master Jul 20, 2021
@NickAragua NickAragua deleted the campaign_state_mgnt branch July 20, 2021 01:12
@HammerGS HammerGS added the StratCon Bugs relating strictly to StratCon label Apr 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
StratCon Bugs relating strictly to StratCon
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants