Merge branch 'master' into feature/kill-command

MegaMek · Nov 8, 2024 · ffe5736 · ffe5736
2 parents b797123 + 001bcc4
commit ffe5736
Show file tree

Hide file tree

Showing 31 changed files with 1,153 additions and 178 deletions.
diff --git a/megamek/data/scenarios/Kell Hounds/LoweringTheBoom/LoweringTheBoom.mms b/megamek/data/scenarios/Kell Hounds/LoweringTheBoom/LoweringTheBoom.mms
@@ -40,6 +40,9 @@ map:
       terrain: water
       newlevel: 3
 
+options:
+  file: gameoptions3025.xml
+
 factions:
 
 - name: Thirtieth Marik Militia
@@ -134,6 +137,8 @@ messages:
       as many Meks as possible.
 
       Be careful! Some of your Meks have already sustained damage.
+
+      *This game uses basic game rules.*
     image: loweringboom_map.png
     trigger:
       type: gamestart

diff --git a/megamek/data/scenarios/Kell Hounds/LoweringTheBoom/LoweringTheBoomReverse.mms b/megamek/data/scenarios/Kell Hounds/LoweringTheBoom/LoweringTheBoomReverse.mms
@@ -40,6 +40,9 @@ map:
       terrain: water
       newlevel: 3
 
+options:
+  file: gameoptions3025.xml
+
 factions:
 
   - name: Kell Hounds, First Battalion
@@ -124,6 +127,8 @@ messages:
       escape from this edge with as many Meks as possible.
 
       Some of their Meks have already sustained damage.
+
+      *This game uses basic game rules.*
     image: loweringboom_map_reverse.png
     trigger:
       type: and