Merge pull request #5296 from IllianiCBT/briefing_modifierNames

Simplified Modifier Briefing Text in `AtBScenarioModifier`
MegaMek · Dec 12, 2024 · 97d8a43 · 97d8a43
2 parents 0559fcc + 3b9715f
commit 97d8a43
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/MekHQ/src/mekhq/campaign/mission/atb/AtBScenarioModifier.java b/MekHQ/src/mekhq/campaign/mission/atb/AtBScenarioModifier.java
@@ -18,16 +18,6 @@
  */
 package mekhq.campaign.mission.atb;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
-
 import jakarta.xml.bind.JAXBContext;
 import jakarta.xml.bind.JAXBElement;
 import jakarta.xml.bind.Marshaller;
@@ -47,6 +37,15 @@
 import mekhq.campaign.mission.ScenarioObjective;
 import mekhq.utilities.MHQXMLUtility;
 
+import javax.xml.namespace.QName;
+import javax.xml.transform.Source;
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * Data structure representing a scenario modifier for dynamic AtB scenarios
  *
@@ -367,7 +366,7 @@ public void processModifier(AtBDynamicScenario scenario, Campaign campaign, Even
         if (eventTiming == getEventTiming()) {
             if ((getAdditionalBriefingText() != null) && !getAdditionalBriefingText().isBlank()) {
                 AtBScenarioModifierApplicator.appendScenarioBriefingText(scenario,
-                        String.format("%s: %s", getModifierName(), getAdditionalBriefingText()));
+                        getAdditionalBriefingText());
             }
 
             if (getForceDefinition() != null) {

diff --git a/MekHQ/src/mekhq/campaign/stratcon/StratconRulesManager.java b/MekHQ/src/mekhq/campaign/stratcon/StratconRulesManager.java
@@ -1582,9 +1582,8 @@ private static void applyFacilityModifiers(StratconScenario scenario, StratconTr
                     continue;
                 }
 
-                modifier.setAdditionalBriefingText(
-                        "(from " + facility.getDisplayableName() + ") " +
-                                modifier.getAdditionalBriefingText());
+                modifier.setAdditionalBriefingText('(' + facility.getDisplayableName() + ") "
+                    + modifier.getAdditionalBriefingText());
                 scenario.getBackingScenario().addScenarioModifier(modifier);
             }
         }