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

Reworked AtB Morale, Rebranding it as MekHQ Morale #4859

Merged
merged 3 commits into from
Sep 26, 2024

Conversation

IllianiCBT
Copy link
Collaborator

Reworked AtB Morale removing some of the rough edges, adding full documentation, and better integrating it into StratCon.

It is my hope this revised system will remove some instances of the 'one bad roll' death spirals that the old system suffered from.

Reworked AtB Morale removing some of the rough edges, adding full documentation, and better integrating it into StratCon.

It is my hope this revised system will remove some instances of the 'one bad roll' death spirals that the old system suffered from.
@IllianiCBT IllianiCBT added AtB UX User experience labels Sep 19, 2024
@IllianiCBT IllianiCBT self-assigned this Sep 19, 2024
AtBMoraleLevel.VERY_HIGH.toolTipText=The unit is dedicated to their cause.
AtBMoraleLevel.UNBREAKABLE.text=Unbreakable
AtBMoraleLevel.UNBREAKABLE.toolTipText=The unit's trust in their leadership and dedication to their cause is nigh-on unbreakable, and they look forward to fighting their enemies.
AtBMoraleLevel.ROUTED.text=Routed
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I opted to rename the levels for three reasons:

  • to add distance from official morale rules, so there can be no confusion that this is unofficial
  • to better reflect how we're currently using these morale levels, as not just a measurement of enemy mental wellbeing, but also material capacity to fight back.
  • with some of the other user-facing terminology changes, this helps give the illusion of fighting a persistent enemy

@codecov-commenter
Copy link

codecov-commenter commented Sep 19, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 10.45%. Comparing base (dcf55ed) to head (2821393).
Report is 61 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##             master    #4859    +/-   ##
==========================================
  Coverage     10.45%   10.45%            
- Complexity     5978     6011    +33     
==========================================
  Files           953      953            
  Lines        132333   132712   +379     
  Branches      19206    19308   +102     
==========================================
+ Hits          13833    13881    +48     
- Misses       117172   117487   +315     
- Partials       1328     1344    +16     

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

Copy link
Member

@HammerGS HammerGS left a comment

Choose a reason for hiding this comment

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

Tested and seems to work

@HammerGS
Copy link
Member

Has conflicting files.

# Conflicts:
#	MekHQ/src/mekhq/campaign/Campaign.java
#	MekHQ/src/mekhq/campaign/mission/AtBContract.java
@IllianiCBT IllianiCBT merged commit 6fd4a31 into MegaMek:master Sep 26, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
AtB UX User experience
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants