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

Modernizing Team #4106

Merged
merged 3 commits into from
Jan 16, 2023
Merged

Modernizing Team #4106

merged 3 commits into from
Jan 16, 2023

Conversation

SJuliez
Copy link
Member

@SJuliez SJuliez commented Jan 14, 2023

This is a refactor of Team which was full of outdated code. Changes in other classes are due to renames or removing Enumerations.

There are two
// TODO: remove from Team
in there. I'll remove this in other PRs that are already part-finished.

@codecov
Copy link

codecov bot commented Jan 14, 2023

Codecov Report

Base: 22.95% // Head: 22.96% // Increases project coverage by +0.00% 🎉

Coverage data is based on head (2d3a4cd) compared to base (7736c49).
Patch coverage: 28.00% of modified lines in pull request are covered.

❗ Current head 2d3a4cd differs from pull request most recent head f03f785. Consider uploading reports for the commit f03f785 to get more accurate results

Additional details and impacted files
@@            Coverage Diff            @@
##             master    #4106   +/-   ##
=========================================
  Coverage     22.95%   22.96%           
- Complexity     4817     4822    +5     
=========================================
  Files          2282     2276    -6     
  Lines        250311   250219   -92     
  Branches      46367    46348   -19     
=========================================
+ Hits          57462    57464    +2     
+ Misses       191398   191303   -95     
- Partials       1451     1452    +1     
Impacted Files Coverage Δ
...k/src/megamek/client/ui/swing/MovementDisplay.java 0.00% <0.00%> (ø)
...gamek/client/ui/swing/lobby/TeamOverviewPanel.java 0.00% <0.00%> (ø)
megamek/src/megamek/common/Game.java 9.75% <0.00%> (+0.36%) ⬆️
megamek/src/megamek/common/Player.java 13.46% <ø> (+0.20%) ⬆️
...c/megamek/common/battlevalue/AeroBVCalculator.java 0.00% <0.00%> (ø)
.../common/battlevalue/CombatVehicleBVCalculator.java 0.00% <0.00%> (ø)
...rc/megamek/common/battlevalue/MekBVCalculator.java 0.00% <0.00%> (ø)
...gamek/common/battlevalue/ProtoMekBVCalculator.java 0.00% <0.00%> (ø)
megamek/src/megamek/server/GameManager.java 0.22% <0.00%> (-0.01%) ⬇️
...rc/megamek/server/commands/CheckBVTeamCommand.java 0.00% <0.00%> (ø)
... and 44 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

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.

Two minor changes requested

@@ -202,7 +202,7 @@ public void updateTable(Game game) {
int hiddenBv = 0;
boolean[] unitCritical = { false, false, false, false, false };
boolean[] unitWarnings = { false, false, false, false, false };
for (Player teamMember: team.getPlayersVector()) {
for (Player teamMember: team.players()) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
for (Player teamMember: team.players()) {
for (Player teamMember : team.players()) {

if (ObserverTeam == null) {
cacheObserverStatus();
/** Adds the given player to this team. */
public void addPlayer(Player player) {
Copy link
Contributor

Choose a reason for hiding this comment

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

nullable annotation

@SJuliez
Copy link
Member Author

SJuliez commented Jan 15, 2023

Done.

@Windchild292 Windchild292 merged commit 8b191ba into MegaMek:master Jan 16, 2023
@SJuliez SJuliez deleted the Team_Refact branch January 16, 2023 20:33
HammerGS added a commit to SJuliez/megamek that referenced this pull request May 25, 2024
MegaMek
+ Fix 5476: Update SV armor slots to 2 or 1 for Rating E or F respectively

MegaMekLab
+ Fix #MegaMek#1514: Fix Atrocious table shading render speed

MekHQ
+ PR MegaMek#4106: Use tabs in customize scenario dialog
+ PR MegaMek#4105: Updated Post-Scenario Logging for Prisoners
+ PR MegaMek#4104: Fixed Post-Scenario Tracking System's Handling of Multiple Personnel in autoAwards
+ PR MegaMek#4102: Fixed Award Tier Count Calculations in PersonViewPanel
+ PR MegaMek#4093: Added Negotiation and Scrounge Skill Settings for Administrator Personnel
+ PR MegaMek#4054: Added Life Paths Campaign Options Tab, Added Education Module
            Very Important to read the documentation on this feature (See Docs folder)
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