Merge branch 'master' into carry_objects-scenario-v2

megamek/build.gradle

@@ -5,7 +5,7 @@ plugins {
     id 'edu.sc.seis.launch4j' version '3.0.6'
     id 'jacoco'
     id 'java'
-    id "io.sentry.jvm.gradle" version '4.9.0'
+    id "io.sentry.jvm.gradle" version '4.10.0'
     id 'com.palantir.git-version' version '3.1.0'
 }
 
@@ -34,23 +34,23 @@ sourceSets {
 }
 
 dependencies {
-    implementation 'com.fasterxml.jackson.core:jackson-core:2.17.1'
-    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.1'
-    implementation 'com.formdev:flatlaf:3.4.1'
-    implementation 'com.formdev:flatlaf-extras:3.4.1'
+    implementation 'com.fasterxml.jackson.core:jackson-core:2.17.2'
+    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.2'
+    implementation 'com.formdev:flatlaf:3.5'
+    implementation 'com.formdev:flatlaf-extras:3.5'
     implementation 'com.sun.mail:jakarta.mail:2.0.1'
     implementation 'com.thoughtworks.xstream:xstream:1.4.20'
     implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
     implementation 'org.apache.commons:commons-collections4:4.5.0-M2'
-    implementation 'org.apache.commons:commons-lang3:3.14.0'
+    implementation 'org.apache.commons:commons-lang3:3.15.0'
     implementation 'org.apache.commons:commons-text:1.12.0'
     implementation 'org.apache.logging.log4j:log4j-api:2.23.1'
     implementation 'org.apache.logging.log4j:log4j-core:2.23.1'
     implementation 'org.freemarker:freemarker:2.3.33'
 
     runtimeOnly 'org.glassfish.jaxb:jaxb-runtime:4.0.5'
 
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
 
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
     testImplementation 'org.mockito:mockito-core:5.12.0'
@@ -77,9 +77,7 @@ ext {
     log = "logs"
     mmconf = "mmconf"
     userdata = 'userdata'
-    distributionDir = "${buildDir}/distributions"
     fileStagingDir = "${buildDir}/files"
-    mmRepoDir = "${buildDir}/repo"
     atlasedImages = "${fileStagingDir}/atlasedImages.txt"
     scriptsDir = "${projectDir}/scripts"
     scriptTemplate = "${scriptsDir}/startScriptTemplate.txt"
@@ -129,6 +127,7 @@ task equipmentList(type: JavaExec, dependsOn: jar) {
 
 task copyFiles(type: Copy) {
     description = 'Stages files that are to be copied into the distribution.'
+    group = 'build'
 
     dependsOn officialUnitList
     dependsOn equipmentList
@@ -141,20 +140,14 @@ task copyFiles(type: Copy) {
     include "SubmitBug.html"
     include "license.txt"
     include "sentry.properties"
-    include "MegaMek.l4j.ini"
+    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()) }
     exclude "${rats}/**"
     include "${userdata}/"
 
     into fileStagingDir
-
-    inputs.dir "${data}"
-    inputs.dir "${docs}"
-    inputs.dir "${mmconf}"
-    inputs.files 'license.txt', 'SubmitBug.html', 'sentry.properties', 'MegaMek.l4j.ini'
-    outputs.dir fileStagingDir
 }
 
 task createImageAtlases(type: JavaExec, dependsOn: copyFiles) {
@@ -213,7 +206,7 @@ task stageFiles {
 
 task createStartScripts (type: CreateStartScripts) {
     description = 'Create shell script for generic distribution.'
-    applicationName = 'mm'
+    applicationName = 'megamek'
     mainClass = application.mainClass
     outputDir = startScripts.outputDir
     classpath = jar.outputs.files + files(project.sourceSets.main.runtimeClasspath.files)
@@ -239,13 +232,12 @@ distributions {
         contents {
             from ("${buildDir}/launch4j") {
                 include '*.exe'
-                include '*.ini'
             }
             from(jar) {
                 into "${lib}"
             }
             from(createStartScripts.outputs.files) {
-                include "mm*"
+                include "megamek*"
             }
             from(jar)
             from fileStagingDir

megamek/data/scenarios/Test Setups/DS_LOS.mms

@@ -0,0 +1,15 @@
+MMSVersion: 2
+name: Grounded DS Test
+planet: None
+description: A grounded DS on a small map for use in range/LOS/FoV testing
+
+map: AGoAC Maps/16x17 Grassland 2.board
+
+factions:
+- name: Test Player
+
+  units:
+  - fullname: Intruder (3056)
+    at: [ 10, 9 ]
+    altitude: 0
+

megamek/docs/history.txt

@@ -56,6 +56,18 @@ MEGAMEK VERSION HISTORY:
 + PR #5791: Added much-needed whitespace to some menu items of the board right click menu
 + PR #5798: Fix Reflective armor not appearing in MML dropdown
 + Fix #5803: Removes a number of duplicated infantry weapons
++ Fix #5795: Terrain altitude rules and line of sight are now implemented for Low Altitude maps 
++ Fix #5790: The combat computer heat report message is now clearer, indicating that the heat bonus has already been applied in the reported values
++ Fix #5740: Lobby copy-paste will now also work for units that have no model name
++ Fix #5789: Prevent errors with showing the firing arcs
++ Fix #5793: Units are no longer able to be unloaded without regard for the bay door limits
++ Fix #5611: Prevent NPE when removing forces from Force that exists but is not registered yet (when quickly closing MM after an MHQ scenario start)
++ Fix #5691: Prevent NPE when cancelling unit loading during carrier deployment (e.g. Space Station and loading ASFs)
++ Fix #5705: Prevent NPE when maneuvering Land-Air Meks as ASFs
++ Fix #5796: Prevent NPE when units are ineligible for Physical Attack phase due to having loaded onto a transport this round
++ Fix #5818: correct issue with minimap autodisplay using wrong function
++ PR #5822: Implement RFE 5361: enhance Princess handling of hazardous terrain
++ Issues #2577, #897, #353: Implement placeable/carryable cargo objects (for mechs and protomechs only at the moment)
 
 0.49.20 (2024-06-28 2100 UTC) (THIS IS THE LAST VERSION TO SUPPORT JAVA 11)
 + PR #5281, #5327, #5308, #5336, #5318, #5383, #5369, #5384, #5455, #5505, #5541: Code internals: preparatory work for supporting game types such as SBF, code cleanup for string drawing, superclass change for BoardView,

megamek/i18n/megamek/client/messages.properties

@@ -559,6 +559,7 @@ BoardView1.Tooltip.ZZ=ZZ
 
 #Buildings and Bridges
 BoardView1.Tooltip.Hex=Hex: {0} - Level: {1}
+BoardView1.Tooltip.HexAlt=Hex: {0} - Altitude: {1}
 BoardView1.Tooltip.Building={1} <BR>Height: {0}, CF: {2}<BR>Armor: {3}; Basement: {4}
 BoardView1.Tooltip.BuildingLine=Height: {0}; CF: {1} Armor: {2}
 BoardView1.Tooltip.BldgBasementCollapsed=<BR><I><FONT COLOR=RED>(collapsed)</FONT><I>

megamek/i18n/megamek/common/report-messages.properties

@@ -627,7 +627,7 @@
 5020=Adding <data> heat due to extreme temperatures...
 5021=Adding <data> heat due to flawed cooling system...
 5025=Subtracting <data> heat due to extreme temperatures...
-5026=Subtracting <data> heat due to combat computer...
+5026=(Includes <data> heat due to combat computer.)
 5027=Subtracting <data> heat due to RISC Emergency Coolant System...
 5030=Adding <data> heat from a fire...
 5032=Adding <data> heat from magma...

megamek/i18n/megamek/common/report-messages_de.properties

@@ -615,3 +615,4 @@
 7100=<data> hat die BV-Anteil Siegbedingung mit <data>% erreicht. 
 7105=<data> hat die BV-Zerst\u00f6rt Siegbedingung mit <data>% erreicht.
 7200=<data> hat alle Siegbedingungen erreicht.
+5026=(Einschließlich <data> Hitze für den Combat Computer.)