Merge branch 'master' into validate-capacitors

MegaMek · Feb 5, 2025 · f0c8646 · f0c8646
2 parents 3df22a2 + 4dedacb
commit f0c8646
Show file tree

Hide file tree

Showing 53 changed files with 1,377 additions and 869 deletions.
diff --git a/.gitignore b/.gitignore
@@ -95,7 +95,8 @@ megamek/userdata/**
 /megamek/apidocs/
 #End MegaMek Other Outputs
 
-/megamek/docs/mm-revision.txt
 /megamek/MegaMek.l4j.ini
 OfficialUnitList.txt
 equipment.txt
+.github/copilot-instructions.md
+*.iml
diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,7 @@ allprojects {
 
 subprojects {
     group = 'org.megamek'
-    version = '0.50.03-SNAPSHOT'
+    version = '0.50.04-SNAPSHOT'
 }
 
 // A properties_local.gradle file can be used to override any of the above options. For instance,

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/megamek/build.gradle b/megamek/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'checkstyle'
     id 'com.palantir.git-version' version '3.1.0'
     id 'edu.sc.seis.launch4j' version '3.0.6'
-    id "io.sentry.jvm.gradle" version '4.11.0'
+    id "io.sentry.jvm.gradle" version '5.1.0'
     id 'jacoco'
     id 'java'
     id 'org.ec4j.editorconfig' version '0.1.0'
@@ -150,8 +150,19 @@ task copyFiles(type: Copy) {
     include "sentry.properties"
     include "*.ini"
     exclude "**/*.psd"
+
     // No need to copy the files that are going to be zipped
     exclude { it.file.isDirectory() && (it.file in file(unitFiles).listFiles()) }
+
+    // User Config Files
+    exclude "${mmconf}/clientsettings.xml"
+    exclude "${mmconf}/gameoptions.xml"
+    exclude "${mmconf}/megameklab.properties"
+    exclude "${mmconf}/megameklab.properties.bak"
+    exclude "${mmconf}/mhq.preferences"
+    exclude "${mmconf}/mm.preferences"
+    exclude "${mmconf}/mml.preferences"
+
     exclude "${rats}/**"
     include "${userdata}/"
 

diff --git a/...images/hexes/minimap/defaultminimap.theme → ...k/data/images/hexes/minimap/default.theme b/...images/hexes/minimap/defaultminimap.theme → ...k/data/images/hexes/minimap/default.theme
diff --git a/megamek/data/mekfiles/dropships/TRO3057R/IS/Condor (2801).blk b/megamek/data/mekfiles/dropships/TRO3057R/IS/Condor (2801).blk
@@ -123,7 +123,7 @@ Medium Laser
 </Aft Equipment>
 
 <Hull Equipment>
-MASH Core Component
+MASH Equipment:SIZE:1
 </Hull Equipment>
 
 <structural_integrity>

diff --git a/megamek/data/mekfiles/dropships/TRO3057R/IS/Condor (3035)Dove.blk b/megamek/data/mekfiles/dropships/TRO3057R/IS/Condor (3035)Dove.blk
@@ -122,16 +122,7 @@ Medium Laser
 </Aft Equipment>
 
 <Hull Equipment>
-MASH Core Component
-MASH Operation Theater
-MASH Operation Theater
-MASH Operation Theater
-MASH Operation Theater
-MASH Operation Theater
-MASH Operation Theater
-MASH Operation Theater
-MASH Operation Theater
-MASH Operation Theater
+MASH Equipment:SIZE:10
 </Hull Equipment>
 
 <structural_integrity>

diff --git a/megamek/data/mekfiles/dropships/TRO3057R/IS/Condor (3054).blk b/megamek/data/mekfiles/dropships/TRO3057R/IS/Condor (3054).blk
@@ -124,7 +124,7 @@ Medium Laser
 </Aft Equipment>
 
 <Hull Equipment>
-MASH Core Component
+MASH Equipment:SIZE:1
 </Hull Equipment>
 
 <structural_integrity>

diff --git a/megamek/data/mekfiles/dropships/TRO3057R/IS/Condor (3079).blk b/megamek/data/mekfiles/dropships/TRO3057R/IS/Condor (3079).blk
@@ -119,7 +119,7 @@ ISERMediumLaser
 </Aft Equipment>
 
 <Hull Equipment>
-MASH Core Component
+MASH Equipment:SIZE:1
 </Hull Equipment>
 
 <structural_integrity>

diff --git a/megamek/data/mekfiles/dropships/TRO3057R/IS/Seeker (2815M).blk b/megamek/data/mekfiles/dropships/TRO3057R/IS/Seeker (2815M).blk
@@ -115,7 +115,7 @@ Medium Laser
 </Aft Equipment>
 
 <Hull Equipment>
-MASH Core Component
+MASH Equipment:SIZE:1
 </Hull Equipment>
 
 <structural_integrity>

diff --git a/megamek/data/mekfiles/dropships/TRO3057R/IS/Seeker (3054).blk b/megamek/data/mekfiles/dropships/TRO3057R/IS/Seeker (3054).blk
@@ -118,7 +118,7 @@ Medium Laser
 </Aft Equipment>
 
 <Hull Equipment>
-MASH Core Component
+MASH Equipment:SIZE:1
 </Hull Equipment>
 
 <structural_integrity>

diff --git a/megamek/data/mekfiles/jumpships/3057R/IS/Magellan Jumpship (2960).blk b/megamek/data/mekfiles/jumpships/3057R/IS/Magellan Jumpship (2960).blk
@@ -143,7 +143,7 @@ ISAMS Ammo:24
 </Aft Right Side Equipment>
 
 <Hull Equipment>
-MASH Core Component
+MASH Equipment:SIZE:1
 ISMobileHPG
 </Hull Equipment>
 

diff --git a/megamek/data/mekfiles/vehicles/3039u/MASH Truck (ICE).blk b/megamek/data/mekfiles/vehicles/3039u/MASH Truck (ICE).blk
@@ -56,11 +56,7 @@ Wheeled
 </armor>
 
 <Body Equipment>
-MASH core component
-MASH Operation Theater
-MASH Operation Theater
-MASH Operation Theater
-MASH Operation Theater
+MASH Equipment:SIZE:5
 </Body Equipment>
 
 <Front Equipment>

diff --git a/megamek/data/mekfiles/vehicles/3039u/MASH Truck.blk b/megamek/data/mekfiles/vehicles/3039u/MASH Truck.blk
@@ -57,11 +57,7 @@ Wheeled
 </armor>
 
 <Body Equipment>
-MASH core component
-MASH Operation Theater
-MASH Operation Theater
-MASH Operation Theater
-MASH Operation Theater
+MASH Equipment:SIZE:5
 </Body Equipment>
 
 <Front Equipment>

diff --git a/megamek/data/mekfiles/vehicles/3075/Saxon APC (MASH).blk b/megamek/data/mekfiles/vehicles/3075/Saxon APC (MASH).blk
@@ -61,8 +61,7 @@ Hover
 </armor>
 
 <Body Equipment>
-MASH core component
-MASH Operation Theater
+MASH Equipment:SIZE:2
 IS Ammo MG - Full
 </Body Equipment>
 

diff --git a/megamek/data/mekfiles/vehicles/XTRs/Primitives III/Carter MERV.blk b/megamek/data/mekfiles/vehicles/XTRs/Primitives III/Carter MERV.blk
@@ -64,10 +64,9 @@ cargobay:2.0:1:1
 </armor>
 
 <Body Equipment>
-MASH Operation Theater
+MASH Equipment:SIZE:2
 Paramedic Equipment
 ISOffRoadChassis
-MASH Core Component
 </Body Equipment>
 
 <Front Equipment>

diff --git a/megamek/data/mekfiles/vehicles/XTRs/RetroTech/White Tip Submarine.blk b/megamek/data/mekfiles/vehicles/XTRs/RetroTech/White Tip Submarine.blk
@@ -89,7 +89,7 @@ IS Ammo LRTorpedo-10
 IS Ammo LRTorpedo-10
 Communications Equipment (7 ton)
 FieldKitchen
-MASH Core Component
+MASH Equipment:SIZE:1
 </Body Equipment>
 
 <Front Equipment>

diff --git a/megamek/docs/history.txt b/megamek/docs/history.txt
@@ -1,6 +1,8 @@
 MEGAMEK VERSION HISTORY:
 ----------------
-0.50.03-SNAPSHOT
+0.50.04-SNAPSHOT
+
+0.50.03 (2025-02-02 2030 UTC)
 + PR #6335: default the directory filter to Select All in Advanced Board Search 
 + PR #6335: cleanup duplicate boards
 + PR #6328: Building type enum
@@ -24,7 +26,7 @@ MEGAMEK VERSION HISTORY:
 + PR #6407: Feature: ACAR formations reintroduced
 + Data #6408: Grabbing the Bull by the horns adding Taurian infantry
 + Fix #6385: Incorrect TMM bonus for WiGE
-+ Fix #6395:
++ Fix #6395:  Add knowledge of smoke zero damage to princess
 + PR #6409: Campaign Options IIC - MegaMek Portion
 + PR #6415: fixes an error where force consolidation would not set the correct owner of the force
 + PR #6411: Don't load mml scratch files into unit cache
@@ -51,6 +53,30 @@ MEGAMEK VERSION HISTORY:
 + Fix #6444: fix issue where closing window closes the unit display
 + PR #6450: Allow the print-unit-list code to run with MegaMekLab.jar
 + PR #6453: Change keys List from ArrayList to thread-safe Vector
++ Fix #5870: princess engaging targets outside visual range in heavy fog
++ PR #6446: feature: added sensor range on minimap, added facing arrow on minimap
++ Fix #3837: illegal stacking in buildings after skid and failed accidental charge
++ Fix #6421: NullPointerException in LobbyMekCellFormatter.java
++ PR #6446: feature: added sensor range on minimap, added facing arrow on minimap
++ Fix #3837: illegal stacking in buildings after skid and failed accidental charge
++ fix #6421: fix npe issue
++ PR #6459: feature: quick and simple hazard check for hex
++ Fix #6451: Bot command display hotkey text and description missing in key bind menu
++ Fix #6464: defaultminimap renamed to default, fixed error when persisting selected theme
++ PR #6462: Convert from StringBuilder to Logger
++ PR #6468: Fix NPE clicking on board with no unit selected
++ PR #6469: Fix: removes a double call for next-unit
++ PR #6470: Fix: minimap summary npe fix
++ PR #6471: Feat: Mini-Map Improvements (Hex Border options, facing arrows, sensor range)
++ PR #6474: makes Princess move way more than she otherwise would on no-contact
++ PR #6478: fix: a couple of signs in the wrong place on the scoring equation
++ PR #6477: Fix 5590: princess firing on 13s due to intervening trees, etc
++ PR #6479: fix: removes an argument and early exit from hyperaggression
++ PR #6481: Fix 5590 part 2: stop Princess choosing zero damage attacks completely
++ PR #6488: Fix MML #1705 - update drone remote systems unit availability
++ PR #6487: Update MASH equipment to use size values
++ PR #6485: Fix: fixes html tags showing on tooltips
++ PR #6484: Fix: stop dropShadow from being calculated for force display tree
 
 0.50.02 (2024-12-30 2130 UTC)
 + PR #6183: New GM Commands, princess commands on map menu, graphics for some explosions

diff --git a/megamek/i18n/megamek/client/bot/messages.properties b/megamek/i18n/megamek/client/bot/messages.properties
@@ -1,3 +1,6 @@
 BotClient.Hi=Hi, I'm a bot client\!
 BotClient.HowAbout=How about a nice game of chess?
 BotClient.Bye=Dave, this conversation can serve no purpose anymore. Goodbye.
+
+FireControl.LoadAmmo.CauseMiss={} tried to load {} with ammo {} but this would have caused it to miss; skipping.
+FireControl.LoadAmmo.FailureToLoad={} tried to load {} with ammo {} but failed somehow.
diff --git a/megamek/i18n/megamek/client/messages.properties b/megamek/i18n/megamek/client/messages.properties
@@ -1312,6 +1312,9 @@ CommonSettingsDialog.main=Main
 CommonSettingsDialog.audio=Audio
 CommonSettingsDialog.miniMap=Mini Map
 CommonSettingsDialog.mmSymbol=Use StratOps unit symbols in the Minimap
+CommonSettingsDialog.drawFacingArrowsOnMiniMap=Draw unit facing arrows on the minimap
+CommonSettingsDialog.drawSensorRangeOnMiniMap=Draw unit's active sensor range on the minimap
+CommonSettingsDialog.paintBordersOnMiniMap=Draw the hex borders on the minimap
 CommonSettingsDialog.mouseWheelZoom=Mouse wheel zooms map.
 CommonSettingsDialog.mouseWheelZoomFlip=Flip mouse wheel zoom direction.
 CommonSettingsDialog.moveDefaultClimbMode.tooltip=Sets the default climb mode. false = Go Thru, true = Climb Up
@@ -2015,6 +2018,8 @@ KeyBinds.cmdNames.pause=Pause the Game
 KeyBinds.cmdDesc.pause=Pauses the game. Works only when only Princess players with active units remain.
 KeyBinds.cmdNames.unpause=Unpause the Game
 KeyBinds.cmdDesc.unpause=Unpauses the game
+KeyBinds.cmdNames.toggleBotCommandsDisplay=Show Bot Commands
+KeyBinds.cmdDesc.toggleBotCommandsDisplay=Show the Bot Command window to give in-game strategic commands to Princess.
 
 #Key Bindings Overlay
 KeyBindingsDisplay.fixedBinds=Toggle Unit Display and Minimap: Mouse Button 4\nZoom: Mouse Wheel\nTurn / Torso twist: Shift + Left-Click\nLine of Sight tool: Ctrl + Left-Click (two hexes)\nRuler tool: Alt + Left-Click (two hexes)
@@ -2446,7 +2451,9 @@ Minimap.menu.ShowHeightTotal=Total T
 Minimap.menu.ShowSymbols=Show Symbols
 Minimap.menu.ShowSymbolsNoSymbols=No Symbols N
 Minimap.menu.ShowSymbolsSymbols=Symbols S
-
+Minimap.menu.ToggleShowSensorRange=Toggle Sensors
+Minimap.menu.ToggleDrawFacingArrows=Toggle Facing Arrows
+Minimap.menu.ToggleDrawHexBorder=Toggle Draw Hex Border
 
 #Mini round report display
 MiniReportDisplay.Damage=Damage

diff --git a/megamek/mmconf/defaultKeyBinds.xml b/megamek/mmconf/defaultKeyBinds.xml
@@ -505,4 +505,11 @@
         <isRepeatable>false</isRepeatable>
     </KeyBind>
 
+    <KeyBind>
+        <command>toggleBotCommandsDisplay</command> <!-- Ctrl+Shift-G -->
+        <keyCode>71</keyCode>
+        <modifier>192</modifier>
+        <isRepeatable>false</isRepeatable>
+    </KeyBind>
+
 </KeyBindings>
diff --git a/megamek/src/megamek/SuiteConstants.java b/megamek/src/megamek/SuiteConstants.java
@@ -29,7 +29,7 @@ protected SuiteConstants() {
 
     // region General Constants
     public static final String PROJECT_NAME = "MegaMek Suite";
-    public static final Version VERSION = new Version("0.50.03-SNAPSHOT");
+    public static final Version VERSION = new Version("0.50.04-SNAPSHOT");
     public static final Version LAST_MILESTONE = new Version("0.49.19.1");
     public static final int MAXIMUM_D6_VALUE = 6;