Refined objective handling and enhanced scenario highlights

IllianiBird · IllianiBird · commit 2af86faf9a87 · 2025-01-22T21:58:43.000-06:00
Added strategic objective consideration to StratCon rule evaluations, ensuring attached unit modifiers and turning points trigger when applicable. Improved ScenarioTableModel by visually distinguishing objectives and turning points using specific icons and custom HTML styling.
diff --git a/MekHQ/src/mekhq/campaign/stratcon/StratconRulesManager.java b/MekHQ/src/mekhq/campaign/stratcon/StratconRulesManager.java
@@ -686,23 +686,25 @@ private static void determineIfTurningPointScenario(AtBContract contract, Stratc
             return;
         }
 
+        boolean isObjective = scenario.isStrategicObjective();
+
         if (template == null || !template.getStratConScenarioType().isResupply()) {
             ContractCommandRights commandRights = contract.getCommandRights();
             switch (commandRights) {
                 case INTEGRATED -> {
                     scenario.setTurningPoint(true);
-                    if (randomInt(3) == 0) {
+                    if (randomInt(3) == 0 || isObjective) {
                         setAttachedUnitsModifier(scenario, contract);
                     }
                 }
                 case HOUSE, LIAISON -> {
-                    if (randomInt(3) == 0) {
+                    if (randomInt(3) == 0 || isObjective) {
                         scenario.setTurningPoint(true);
                         setAttachedUnitsModifier(scenario, contract);
                     }
                 }
                 case INDEPENDENT -> {
-                    if (randomInt(3) == 0) {
+                    if (randomInt(3) == 0 || isObjective) {
                         scenario.setTurningPoint(true);
                     }
                 }
diff --git a/MekHQ/src/mekhq/gui/model/ScenarioTableModel.java b/MekHQ/src/mekhq/gui/model/ScenarioTableModel.java
@@ -36,6 +36,7 @@
 import java.util.Objects;
 import java.util.ResourceBundle;
 
+import static mekhq.campaign.mission.enums.ScenarioStatus.CURRENT;
 import static mekhq.utilities.ReportingUtilities.CLOSING_SPAN_TAG;
 import static mekhq.utilities.ReportingUtilities.spanOpeningWithCustomColor;
 
@@ -114,16 +115,30 @@ public Object getValueAt(int row, int col) {
         if (col == COL_NAME) {
             if (campaign.getCampaignOptions().isUseStratCon()) {
                 if (scenario instanceof AtBScenario) {
+                    if (scenario.getStatus() != CURRENT) {
+                        return scenario.getName();
+                    }
+
                     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);
+
+                        String colorblindHelper = isTurningPoint ? " \u26A0" : "";
+
+                        boolean isObjective = stratconScenario.isStrategicObjective();
+                        openingSpan = isObjective
+                            ? spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorNegativeHexColor())
+                            : openingSpan;
+                        colorblindHelper += isObjective ? " \u26A1" : "";
+
+                        String closingSpan = isTurningPoint || isObjective ? CLOSING_SPAN_TAG : "";
+
+                        return String.format("<html>%s%s%s%s</html", openingSpan,
+                            scenario.getName(), closingSpan, colorblindHelper);
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -686,23 +686,25 @@ private static void determineIfTurningPointScenario(AtBContract contract, Stratc`
`686`	`686`	`return;`
`687`	`687`	`}`
`688`	`688`
	`689`	`+ boolean isObjective = scenario.isStrategicObjective();`
	`690`	`+`
`689`	`691`	`if (template == null \|\| !template.getStratConScenarioType().isResupply()) {`
`690`	`692`	`ContractCommandRights commandRights = contract.getCommandRights();`
`691`	`693`	`switch (commandRights) {`
`692`	`694`	`case INTEGRATED -> {`
`693`	`695`	`scenario.setTurningPoint(true);`
`694`		`- if (randomInt(3) == 0) {`
	`696`	`+ if (randomInt(3) == 0 \|\| isObjective) {`
`695`	`697`	`setAttachedUnitsModifier(scenario, contract);`
`696`	`698`	`}`
`697`	`699`	`}`
`698`	`700`	`case HOUSE, LIAISON -> {`
`699`		`- if (randomInt(3) == 0) {`
	`701`	`+ if (randomInt(3) == 0 \|\| isObjective) {`
`700`	`702`	`scenario.setTurningPoint(true);`
`701`	`703`	`setAttachedUnitsModifier(scenario, contract);`
`702`	`704`	`}`
`703`	`705`	`}`
`704`	`706`	`case INDEPENDENT -> {`
`705`		`- if (randomInt(3) == 0) {`
	`707`	`+ if (randomInt(3) == 0 \|\| isObjective) {`
`706`	`708`	`scenario.setTurningPoint(true);`
`707`	`709`	`}`
`708`	`710`	`}`