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

unit tool tip updates #4078

Merged
merged 21 commits into from Jan 12, 2023
Merged

Conversation

kuronekochomusuke
Copy link
Collaborator

@kuronekochomusuke kuronekochomusuke commented Dec 29, 2022

update the unit tool tip with addition information

  • add system info to the mini armor display
  • add indicator if movement was modified:
    🔥= heat
    ☂ = planetary conditions
    🔧= damage
    💣= bomb load
    ⛨ = shields
    ⟬▮ = modular armor
  • if jump jet or jump boosters or partial wing are damage show counts for them
  • show a message for the overall status of the entity
  • show a message when unjamming a RAC
  • prompt when done moving if you have jammed weapons and did not unjam them.
  • add facing and twist

image

image

image

image

image

image

@kuronekochomusuke kuronekochomusuke added (RFE) Enhancement Requests for Enhancement GUI User Interface Unit Display Deals with the in-game unit display window labels Dec 29, 2022
@kuronekochomusuke kuronekochomusuke marked this pull request as draft December 29, 2022 16:18
@codecov
Copy link

codecov bot commented Dec 29, 2022

Codecov Report

Base: 23.02% // Head: 22.99% // Decreases project coverage by -0.02% ⚠️

Coverage data is based on head (04c628c) compared to base (3a24292).
Patch coverage: 0.21% of modified lines in pull request are covered.

Additional details and impacted files
@@             Coverage Diff              @@
##             master    #4078      +/-   ##
============================================
- Coverage     23.02%   22.99%   -0.03%     
  Complexity     4816     4816              
============================================
  Files          2275     2275              
  Lines        249526   249819     +293     
  Branches      46286    46335      +49     
============================================
+ Hits          57443    57446       +3     
- Misses       190631   190921     +290     
  Partials       1452     1452              
Impacted Files Coverage Δ
.../megamek/client/ui/swing/CommonSettingsDialog.java 0.00% <0.00%> (ø)
...k/src/megamek/client/ui/swing/MovementDisplay.java 0.00% <0.00%> (ø)
...c/megamek/client/ui/swing/tooltip/UnitToolTip.java 0.00% <0.00%> (ø)
megamek/src/megamek/common/Aero.java 8.35% <0.00%> (-0.01%) ⬇️
megamek/src/megamek/common/IBomber.java 0.00% <ø> (ø)
megamek/src/megamek/common/LandAirMech.java 0.00% <0.00%> (ø)
megamek/src/megamek/common/Mech.java 15.43% <0.00%> (-0.03%) ⬇️
megamek/src/megamek/common/VTOL.java 0.69% <0.00%> (+<0.01%) ⬆️
...ek/src/megamek/client/ui/swing/GUIPreferences.java 33.67% <25.00%> (-0.05%) ⬇️
megamek/src/megamek/common/enums/SkillLevel.java 27.77% <0.00%> (-2.84%) ⬇️
... and 5 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.

@HammerGS
Copy link
Member

These look great.

@HammerGS
Copy link
Member

Posted a teaser on the forums. There was a request

any chance of Bomb count and type on aircraft (and potentially VTOLs) would be great as well, seeing as there's no way of telling that in-game.

@kuronekochomusuke
Copy link
Collaborator Author

which VTOL has bombs? tried searching for one with a bomb bay, but did not find any.

image

@HammerGS
Copy link
Member

Seem to recall VTOL bomb is an optional rule. So if you enabled it and loaded up a VTOL that it would show.

@kuronekochomusuke
Copy link
Collaborator Author

turning on TacOps VTOL Special Attacks allowed bombs to be added

image

@HammerGS
Copy link
Member

That’s a huge improvement. Do we show what’s being carried? I.e. Dropship showing units and doors, warships shows dropships and fighters

@kuronekochomusuke
Copy link
Collaborator Author

it already show that

image

@HammerGS
Copy link
Member

Cool. It wondered if it did but not near my computer to check.

@HammerGS
Copy link
Member

Had a couple of comments on the forums.

Almost wish there was a option to put a warning message on for moving a unit with a jammed weapon and not unjamming it. I'm probably the only person forgetful enough to find such a message useful.

Does the message change if the weapon being unjammed is not a RAC?

Should we support the message with unofficial unjam UAC?

does that unjamming message change for a jammed UAC or standard AC when using rapid fire? Princess loves using rapid fire when I have both options turned on (Rapid Fire and unjamming other AC weapons)

Not sure about support around optional rules, but I think it would make sense to cover all the edge cases.

@kuronekochomusuke
Copy link
Collaborator Author

the button is Unjam RAC also
image

are there any weapons that can jam that don't get unjammed when the unofficial setting is used:?

could change the to just descriptions unjam/unjamming, if it unjams all weapon types when the unofficial setting is used.

@HammerGS
Copy link
Member

the button is Unjam RAC also image

are there any weapons that can jam that don't get unjammed when the unofficial setting is used:?

could change the to just descriptions unjam/unjamming, if it unjams all weapon types when the unofficial setting is used.

I'm a fan anything that simplifies the process and makes things clearer.

@kuronekochomusuke
Copy link
Collaborator Author

image

image

@kuronekochomusuke
Copy link
Collaborator Author

kuronekochomusuke commented Dec 30, 2022

image

@kuronekochomusuke
Copy link
Collaborator Author

kuronekochomusuke commented Dec 31, 2022

image

image

image

@SJuliez
Copy link
Member

SJuliez commented Dec 31, 2022

This looks great. However, I'm confused by what the part behind movement is showing. Maybe I'm just dense :)

@SJuliez
Copy link
Member

SJuliez commented Dec 31, 2022

Concerning the bombers it should be possible to do

if (entity instanceof IBomber)

and then cast to (IBomber) and use .getBombChoices() on that (all bomb-capable entity classes implement IBomber).

@kuronekochomusuke
Copy link
Collaborator Author

the symbols after the movement are an indicator as to why the movement is lower.

should probably make a key, since some may not be easy to interpret

@kuronekochomusuke
Copy link
Collaborator Author

should LandAirMech movement be reduced by bomb load like the other IBomber units?

should QuadMech movement be reduced by shields like BipedMech and TripodMech units?

@gsparks3
Copy link
Collaborator

gsparks3 commented Jan 1, 2023

Request: is it possible to add unit facing to the tooltip? It's essentially impossible to determine unit facing if there is more than one unit in a single hex, but a tooltip readout would make it unambiguous.

@kuronekochomusuke
Copy link
Collaborator Author

image

@kuronekochomusuke kuronekochomusuke marked this pull request as ready for review January 8, 2023 19:41
@kuronekochomusuke
Copy link
Collaborator Author

this is ready for review

Copy link
Member

@SJuliez SJuliez left a comment

Choose a reason for hiding this comment

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

A few comments/questions below, apart from those all ok.

megamek/src/megamek/client/ui/swing/MovementDisplay.java Outdated Show resolved Hide resolved
megamek/src/megamek/common/IBomber.java Outdated Show resolved Hide resolved
megamek/src/megamek/common/VTOL.java Show resolved Hide resolved
} else {
result.append("<BR>");
}
}
result.append("\n");
Copy link
Member

Choose a reason for hiding this comment

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

Why are all these \n added?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

just makes it easier to see if i did things correctly, can remove if needed

@SJuliez SJuliez merged commit 68b8350 into MegaMek:master Jan 12, 2023
@kuronekochomusuke kuronekochomusuke deleted the unitToolTipUpdates branch March 3, 2023 23:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
GUI User Interface (RFE) Enhancement Requests for Enhancement Unit Display Deals with the in-game unit display window
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants