Beast mounted infantry

megamek/i18n/megamek/client/messages.properties

@@ -498,6 +498,7 @@ BoardView1.Tooltip.HotLoaded=Hot-Loaded
 BoardView1.Tooltip.HotLoadedParens=(Hot-Loaded)
 BoardView1.Tooltip.Immobile=Immobile
 BoardView1.Tooltip.InfSpec=Specialization: {0}
+BoardView1.Tooltip.InfUWDuration=Rounds of Air: {0}
 BoardView1.Tooltip.Internals=Internal: {0}
 BoardView1.Tooltip.Jammed=Jammed by Enemy ECM
 BoardView1.Tooltip.JumpBoosters=Jump Boosters
@@ -2468,6 +2469,7 @@ MovementDisplay.ConfirmPilotingRoll=You must make the following piloting\nskill
 MovementDisplay.ConfirmSprint=Are you sure you want to sprint?
 MovementDisplay.ConfirmSuperchargerRoll=The movement you have selected will require a roll of {0} or higher\nto avoid Supercharger failure. Do you wish to proceed?
 MovementDisplay.ConfirmLandingGearDamage=Landing in a rough or rubble hex will damage the landing ger.\n\nAre you sure you want to land here?
+MovementDisplay.ConfirmMountSuffocation=This unit will be destroyed if it does not surface for air this round.\nDo you wish to proceed?
 MovementDisplay.DFADialog.message=To Hit: {0} ({1}%)   ({2})\nDamage to Target: {3} (in 5pt clusters){4}\nDamage to Self: {5} (in 5pt clusters) (using Kick table)
 MovementDisplay.DFADialog.title=D.F.A. {0}?
 MovementDisplay.Done=Done
@@ -3795,6 +3797,7 @@ WeaponAttackAction.TeNonAeroAirborne=targeting non-aerospace airborne unit
 WeaponAttackAction.PutOutInferno=target is inferno fire
 WeaponAttackAction.SensorShadow=Target in Sensor Shadow
 WeaponAttackAction.SquadTarget=infantry squad target
+WeaponAttackAction.MountSize=mount size
 WeaponAttackAction.TeGroundAttack=target making air-to-ground attack
 WeaponAttackAction.TeSuperheavyMech=target is superheavy mech
 WeaponAttackAction.TeLargeSupportUnit=target is large support unit
@@ -4073,6 +4076,7 @@ GeneralInfoMapSet.over=Over:
 GeneralInfoMapSet.vehicle.mpL1=Cruise:
 GeneralInfoMapSet.vehicle.mpL2=Flank:
 GeneralInfoMapSet.curMoveL=Currently:
+GeneralInfoMapSet.uwCounterL=Rounds of Air Remaining:
 GeneralInfoMapSet.currentSensorsL=Current Sensors:
 GeneralInfoMapSet.capacity=capacity
 GeneralInfoMapSet.heatL=Heat:

megamek/i18n/megamek/common/messages.properties

@@ -577,6 +577,7 @@ TROView.BAModularTurret=Configurable Turret Mount
 TROView.Foot=Foot
 TROView.Mechanized=Mechanized
 TROView.MechanizedSCUBA=Mechanized SCUBA
+TROView.BeastMounted=Beast-Mounted
 TROView.InfantryNote.FieldGuns=%d %s with %d rounds of ammo each. Each gun requires %d soldiers to operate.
 TROView.InfantryNote.SingleFieldGun=1 %s with %d rounds of ammo. Requires %d soldiers to operate.
 TROView.InfantryNote.SCUBA=Weapon range is halved (round down) underwater.
@@ -590,6 +591,9 @@ TROView.InfantryNote.CamoArmor=+3/+2/+1 to-hit modifier to attackers if unit doe
 TROView.InfantryNote.IRArmor=Non-infantry units suffer a +1/+1/+2 to-hit modifier for S/M/L ranges.
 TROView.InfantryNote.ECMArmor=Invisible to standard/light active probes.
 TROView.InfantryNote.Augmented=Cybernetically enhanced infantry:
+TROView.InfantryNote.MountInfantryDamage.format=+%dD6 damage vs. infantry
+TROView.InfantryNote.MountVehicleDamage.format=+%d damage vs. Vehicles/'Mechs
+TROView.InfantryNote.MountSizeMod.format=%d attacker to-hit
 MovementType.None=None
 MovementType.Biped=Biped
 MovementType.Quad=Quad
@@ -622,4 +626,8 @@ MiscType.ton=ton
 
 PilotingSPA.EnvSpec.RainSpec=Rain Specialist
 PilotingSPA.EnvSpec.SnowSpec=Snow Specialist
-PilotingSPA.EnvSpec.WindSpec=Wind Specialist
+PilotingSPA.EnvSpec.WindSpec=Wind Specialist
+
+BeastSize.large=Large
+BeastSize.very_large=Very Large
+BeastSize.monstrous=Monstrous

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

@@ -209,6 +209,7 @@
 2404=<data> (<data>) takes additional damage from beginning and ending movement in a magma hex!
 2405=<data> (<data>) is damaged by the extreme heat of liquid magma!
 2410=<data> (<data>) breaks through ice from below
+2412=<data> (<data>) runs out of air and is destroyed.
 2415=<data> collapes due to nuclear explosion ground zero.
 2420=<data> (<data>) automatically avoids the skid.
 2425=<data> (<data>) needs <data> to avoid the skid (<data>), rolls <data>.

megamek/src/megamek/client/ui/swing/DeploymentDisplay.java

@@ -530,10 +530,12 @@ public void hexMoused(BoardViewEvent b) {
             } else if (!isAero && !isWiGE) {
                 // hovers and naval units go on the surface
                 if ((ce().getMovementMode() == EntityMovementMode.NAVAL)
-                        || (ce().getMovementMode() == EntityMovementMode.SUBMARINE)
                         || (ce().getMovementMode() == EntityMovementMode.HYDROFOIL)
                         || (ce().getMovementMode() == EntityMovementMode.HOVER)) {
                     ce().setElevation(0);
+                } else if (ce().getMovementMode().isSubmarine()) {
+                    // submarines have one level above the surface
+                    ce().setElevation(-ce().height());
                 } else if (isVTOL) {
                     // VTOLs go to elevation 1... unless set in the Lounge.
                     // or if mechanized BA, since VTOL movement is then illegal

megamek/src/megamek/client/ui/swing/MovementDisplay.java

@@ -1703,7 +1703,7 @@ && ce().getGame().getBoard().getHex(cmd.getFinalCoords())
             if (landingPath.stream().map(c -> game().getBoard().getHex(c)).filter(Objects::nonNull)
                     .anyMatch(h -> h.containsTerrain(Terrains.ROUGH) || h.containsTerrain(Terrains.RUBBLE))) {
                 ConfirmDialog nag = new ConfirmDialog(clientgui.frame,
-                        Messages.getString("MovementDisplay.areYourSure"),
+                        Messages.getString("MovementDisplay.areYouSure"),
                         Messages.getString("MovementDisplay.ConfirmLandingGearDamage"),
                         false);
                 nag.setVisible(true);
@@ -1718,6 +1718,21 @@ && ce().getGame().getBoard().getHex(cmd.getFinalCoords())
             isUsingChaff = false;
         }
 
+        if (ce() instanceof Infantry) {
+            InfantryMount mount = ((Infantry) ce()).getMount();
+            if ((mount != null) && ce().getMovementMode().isSubmarine() && (ce().underwaterRounds >= mount.getUWEndurance())
+                    && cmd.isAllUnderwater(game())) {
+                ConfirmDialog nag = new ConfirmDialog(clientgui.frame,
+                        Messages.getString("MovementDisplay.areYouSure"),
+                        Messages.getString("MovementDisplay.ConfirmMountSuffocation"),
+                        false);
+                nag.setVisible(true);
+                if (!nag.getAnswer()) {
+                    return;
+                }
+            }
+        }
+
         disableButtons();
         clientgui.getBoardView().clearMovementData();
         clientgui.getBoardView().clearMovementEnvelope();

megamek/src/megamek/client/ui/swing/tooltip/UnitToolTip.java

@@ -1316,6 +1316,17 @@ private static StringBuilder inGameValues(Entity entity, Player localPlayer, boo
             }
         }
 
+        if (entity instanceof Infantry) {
+            InfantryMount mount = ((Infantry) entity).getMount();
+            if ((mount != null) && entity.getMovementMode().isSubmarine() && (entity.underwaterRounds > 0)) {
+                String uw = "<br/>" + addToTT("InfUWDuration", NOBR, mount.getUWEndurance() - entity.underwaterRounds).toString();
+                if (entity.underwaterRounds >=mount.getUWEndurance()) {
+                    uw = guiScaledFontHTML(GUIP.getWarningColor()) + uw + "</font>";
+                }
+                result += uw;
+            }
+        }
+
         String sAeroInfo = "";
 
         if (entity.isAero()) {

megamek/src/megamek/common/Entity.java

@@ -289,6 +289,7 @@ public abstract class Entity extends TurnOrdered implements Transporter, Targeta
     public int coolFromExternal = 0;
     public int delta_distance = 0;
     public int mpUsed = 0;
+    public int underwaterRounds = 0;
     public EntityMovementType moved = EntityMovementType.MOVE_NONE;
     public EntityMovementType movedLastRound = EntityMovementType.MOVE_NONE;
     private boolean movedBackwards = false;
@@ -1947,7 +1948,7 @@ public void setElevation(int elevation) {
     /**
      * A helper function for fiddling with elevation. Takes the current hex, a
      * hex being moved to, returns the elevation the Entity will be considered
-     * to be at w/r/t it's new hex.
+     * to be at w/r/t its new hex.
      */
     public int calcElevation(Hex current, Hex next, int assumedElevation,
             boolean climb, boolean wigeEndClimbPrevious) {
@@ -1990,12 +1991,11 @@ public int calcElevation(Hex current, Hex next, int assumedElevation,
             }
             // Elevation is this height of the level above the actual surface elevation of the hex.
             retVal = nextLevel - next.getLevel();
-        } else if ((getMovementMode() == EntityMovementMode.SUBMARINE)
-                || ((getMovementMode() == EntityMovementMode.INF_UMU)
+        } else if (((getMovementMode().isSubmarine() || getMovementMode().isUMUInfantry())
                     && next.containsTerrain(Terrains.WATER) && current.containsTerrain(Terrains.WATER))
-                || (getMovementMode() == EntityMovementMode.VTOL)
-                || ((getMovementMode() == EntityMovementMode.QUAD_SWIM) && hasUMU())
-                || ((getMovementMode() == EntityMovementMode.BIPED_SWIM) && hasUMU())) {
+                || getMovementMode().isVTOL()
+                || (getMovementMode().isQuadSwim() && hasUMU())
+                || (getMovementMode().isBipedSwim() && hasUMU())) {
             retVal += current.getLevel();
             retVal -= next.getLevel();
         } else {
@@ -2350,8 +2350,8 @@ && getMovementMode() == EntityMovementMode.INF_UMU) {
             }
             // only mechs can move underwater
             if (hex.containsTerrain(Terrains.WATER)
-                && (assumedAlt < hex.getLevel()) && !(this instanceof Mech)
-                && !(this instanceof Protomech)) {
+                    && (assumedAlt < hex.getLevel()) && !(this instanceof Mech)
+                    && !(this instanceof Protomech)) {
                 return false;
             }
             // can move on the ground unless its underwater