Update UnitScrollerModel.java

This update improves the Active Unit Scroller ability to locate units that are capable to move.
triplea-game · Sep 17, 2024 · 0b2e13d · 0b2e13d
1 parent c2aba1e
commit 0b2e13d
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/...pp/game-core/src/main/java/games/strategy/triplea/ui/unit/scroller/UnitScrollerModel.java b/...pp/game-core/src/main/java/games/strategy/triplea/ui/unit/scroller/UnitScrollerModel.java
@@ -26,7 +26,18 @@ static List<Unit> getMoveableUnits(
 
     final Predicate<Unit> moveableUnitOwnedByMe =
         PredicateBuilder.of(Matches.unitIsOwnedBy(player))
-            .and(Matches.unitHasMovementLeft())
+            .and((Matches.unitHasMovementLeft())
+            // add transported units that have not landed
+            .or(Matches.unitIsBeingTransported()
+            .and(Matches.unitWasUnloadedThisTurn().negate()))
+            // including units that cannot move, that have not moved
+            // that can be transported or that can receive movement bonus
+            .or(Matches.unitCanMove().negate()
+            .and(Matches.unitHasMoved().negate())
+            .and((Matches.unitCanBeTransported()
+            .or(Matches.unitIsAirTransportable()
+            .or(Matches.unitIsLandTransportable()
+            .or(Matches.unitCanBeGivenBonusMovementByFacilitiesInItsTerritory(t, player))))))))
             // if not non combat, cannot move aa units
             .andIf(
                 movePhase == UnitScroller.MovePhase.COMBAT, Matches.unitCanMoveDuringCombatMove())