Display Advanced Medical Injuries in UI

[WeaverThree]

The numerical hit counter in the force display in the TO&E and the injuries column in the Personnel tab were both only showing "hits" from when advanced medical is turned off. This fixes them so they work with both systems. Are there any other places I need to hit with this?

[codecov-commenter]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 10.44%. Comparing base (c2c2f4b) to head (fb4b93d).
Report is 61 commits behind head on master.

Additional details and impacted files

@@             Coverage Diff              @@
##             master    #5017      +/-   ##
============================================
- Coverage     10.46%   10.44%   -0.03%     
+ Complexity     6022     6015       -7     
============================================
  Files           950      950              
  Lines        133437   133511      +74     
  Branches      19383    19400      +17     
============================================
- Hits          13967    13948      -19     
- Misses       118124   118217      +93     
  Partials       1346     1346              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[HammerGS]

This has picked up conflicts.

[IllianiCBT]

Just a thought while you fix these conflicts, it might be useful to have fatigue displayed in the TO&E, too.

You'll want something that looks like this:

if ((campaign.getCampaignOptions().isUseFatigue()) && (person.getEffectiveFatigue(campaign) > 0)) {
        int effectiveFatigue = person.getEffectiveFatigue(campaign);
        ++ colored text code ++
}

[WeaverThree]

Not sure why that was a conflict, it was in a separate part of the file.

It doesn't look great unless you expand the panel, but then, neither do their names.

[IllianiCBT]

Could we perhaps arrange it so that its...

Name
Veterancy and Role
Injuries/Hits and Fatigue

...I don't know if that would look better.

[WeaverThree]

Now it's like this:

[HammerGS]

Now it's like this:

I prefer this.

[IllianiCBT]

LGTM