8000 Improvement: Added Faction Standing Ultimatum Events for the Onset of the FedCom Civil War and ComStar Schism. by IllianiBird · Pull Request #7296 · MegaMek/mekhq · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Improvement: Added Faction Standing Ultimatum Events for the Onset of the FedCom Civil War and ComStar Schism. #7296

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 5 commits into from
Jul 6, 2025
Merged

Improvement: Added Faction Standing Ultimatum Events for the Onset of the FedCom Civil War and ComStar Schism. #7296

merged 5 commits into from
Jul 6, 2025

Conversation

IllianiBird
Copy link
Collaborator

This PR is the final feature update for the new Faction Standing system, introducing 'ultimatum events'. These are major canonical events where the player is forced to pick between two factions. The included events are the onset of the FedCom Civil War and the ComStar Schism. These were chosen because I knew enough about them to write the events. I don't doubt others can be added - I imagine people would love if we added in the Arano Restoration as an ultimatum...

Ultimatums follow a distinct pattern. First, the player is presented with the inciting incident...

image

...then their personnel offer arguments for each side...

image

...the the player is given the ultimatum. They must choose one side or the other...

image

...finally, a news bulletin discusses the players choice giving the decision weight...

image

@IllianiBird IllianiBird requested a review from a team as a code owner July 5, 2025 06:51
@IllianiBird IllianiBird self-assigned this Jul 5, 2025
@IllianiBird IllianiBird added the Improvement to Existing Feature Used with the RFE tag to indicate an improvement to an existing feature label Jul 5, 2025
@codecov Codecov
Copy link
codecov bot commented Jul 5, 2025 •
edited
Loading

Codecov Report

Attention: Patch coverage is 0% with 128 lines in your changes missing coverage. Please review.

Project coverage is 12.69%. Comparing base (7fa0c77) to head (dd39893).
Report is 7 commits behind head on master.

Files with missing lines Patch % Lines
...actionStanding/FactionStandingUltimatumDialog.java 0.00% 49 Missing ⚠️
.../campaign/universe/factionStanding/GoingRogue.java 0.00% 35 Missing ⚠️
...erse/factionStanding/FactionStandingUltimatum.java 0.00% 30 Missing ⚠️
.../immersiveDialogs/ImmersiveDialogConfirmation.java 0.00% 8 Missing ⚠️
MekHQ/src/mekhq/campaign/Campaign.java 0.00% 4 Missing ⚠️
...e/factionStanding/FactionStandingAgitatorData.java 0.00% 1 Missing ⚠️
.../factionStanding/FactionStandingUltimatumData.java 0.00% 1 Missing ⚠️
Additional details and impacted files 
@@             Coverage Diff              @@
##             master    #7296      +/-   ##
============================================
- Coverage     12.72%   12.69%   -0.03%     
+ Complexity     7582     7575       -7     
============================================
  Files          1166     1171       +5     
  Lines        149038   149155     +117     
  Branches      22867    22888      +21     
============================================
- Hits          18959    18933      -26     
- Misses       128043   128195     +152     
+ Partials       2036     2027       -9

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@rroby1
Copy link
rroby1 commented Jul 5, 2025

The last screen shot has grammar issue in the paragraph starting with LT SG. "She reportedly told Captain .... Her". "Her" should be "she".

@IllianiBird
Copy link
Collaborator Author

Thanks for the comment, already fixed :)

@IllianiBird IllianiBird mentioned this pull request Jul 5, 2025
Merged
Sleet01
Sleet01 approved these changes Jul 6, 2025
View reviewed changes
Copy link
Collaborator
@Sleet01 Sleet01 left a comment

Choose a reason for hiding this comment

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

LGTM

@IllianiBird
Merge branch 'master' into factionStandingFedComCivilWar
aadd2ea 
# Conflicts:
#	MekHQ/src/mekhq/campaign/Campaign.java
#	MekHQ/src/mekhq/campaign/universe/factionStanding/GoingRogue.java
@IllianiBird
Merge branch 'master' into factionStandingFedComCivilWar
a8dbcc6 
# Conflicts:
#	MekHQ/src/mekhq/campaign/Campaign.java
@IllianiBird
Fixed merge weirdness
dd39893
@IllianiBird IllianiBird merged commit 406aee2 into MegaMek:master Jul 6, 2025
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Sleet01 Sleet01 Sleet01 approved these changes

Assignees

@IllianiBird IllianiBird

Labels
Improvement to Existing Feature Used with the RFE tag to indicate an improvement to an existing feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@IllianiBird @rroby1 @Sleet01
0