Adjusted randomness and highlighted turning points in scenarios

IllianiBird · IllianiBird · commit fea135d501b9 · 2025-01-22T21:42:37.000-06:00
Updated the random chance for setting attached unit modifiers and turning points in Stratcon rules to trigger more frequently. Improved the ScenarioTableModel to visually highlight scenarios that are turning points when StratCon is enabled by using custom HTML styling.
diff --git a/MekHQ/src/mekhq/campaign/stratcon/StratconRulesManager.java b/MekHQ/src/mekhq/campaign/stratcon/StratconRulesManager.java
@@ -691,18 +691,18 @@ private static void determineIfTurningPointScenario(AtBContract contract, Stratc
             switch (commandRights) {
                 case INTEGRATED -> {
                     scenario.setTurningPoint(true);
-                    if (randomInt(4) == 0) {
+                    if (randomInt(3) == 0) {
                         setAttachedUnitsModifier(scenario, contract);
                     }
                 }
                 case HOUSE, LIAISON -> {
-                    if (randomInt(4) == 0) {
+                    if (randomInt(3) == 0) {
                         scenario.setTurningPoint(true);
                         setAttachedUnitsModifier(scenario, contract);
                     }
                 }
                 case INDEPENDENT -> {
-                    if (randomInt(4) == 0) {
+                    if (randomInt(3) == 0) {
                         scenario.setTurningPoint(true);
                     }
                 }
diff --git a/MekHQ/src/mekhq/gui/model/ScenarioTableModel.java b/MekHQ/src/mekhq/gui/model/ScenarioTableModel.java
@@ -36,6 +36,9 @@
 import java.util.Objects;
 import java.util.ResourceBundle;
 
+import static mekhq.utilities.ReportingUtilities.CLOSING_SPAN_TAG;
+import static mekhq.utilities.ReportingUtilities.spanOpeningWithCustomColor;
+
 /**
  * A table model for displaying scenarios
  */
@@ -109,6 +112,22 @@ public Object getValueAt(int row, int col) {
         }
 
         if (col == COL_NAME) {
+            if (campaign.getCampaignOptions().isUseStratCon()) {
+                if (scenario instanceof AtBScenario) {
+                    StratconScenario stratconScenario = ((AtBScenario) scenario).getStratconScenario(campaign);
+
+                    if (stratconScenario != null) {
+                        boolean isTurningPoint = stratconScenario.isTurningPoint();
+                        String openingSpan = isTurningPoint
+                            ? spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorWarningHexColor())
+                            : "";
+                        String closingSpan = isTurningPoint ? CLOSING_SPAN_TAG : "";
+                        return String.format("<html>%s%s%s</html", openingSpan,
+                            scenario.getName(), closingSpan);
+                    }
+                }
+            }
+
             return scenario.getName();
         } else if (col == COL_STATUS) {
             return scenario.getStatus();

Original file line number	Diff line number	Diff line change
`@@ -691,18 +691,18 @@ private static void determineIfTurningPointScenario(AtBContract contract, Stratc`
`691`	`691`	`switch (commandRights) {`
`692`	`692`	`case INTEGRATED -> {`
`693`	`693`	`scenario.setTurningPoint(true);`
`694`		`- if (randomInt(4) == 0) {`
	`694`	`+ if (randomInt(3) == 0) {`
`695`	`695`	`setAttachedUnitsModifier(scenario, contract);`
`696`	`696`	`}`
`697`	`697`	`}`
`698`	`698`	`case HOUSE, LIAISON -> {`
`699`		`- if (randomInt(4) == 0) {`
	`699`	`+ if (randomInt(3) == 0) {`
`700`	`700`	`scenario.setTurningPoint(true);`
`701`	`701`	`setAttachedUnitsModifier(scenario, contract);`
`702`	`702`	`}`
`703`	`703`	`}`
`704`	`704`	`case INDEPENDENT -> {`
`705`		`- if (randomInt(4) == 0) {`
	`705`	`+ if (randomInt(3) == 0) {`
`706`	`706`	`scenario.setTurningPoint(true);`
`707`	`707`	`}`
`708`	`708`	`}`