From a34c377e53061db4d2affe8bda13d12fb1038911 Mon Sep 17 00:00:00 2001 From: Jérémy Zurcher Date: Tue, 14 Oct 2014 11:16:06 +0200 Subject: Board: add simpler buildPossibleTargetsFrom() based on enemy units --- core/src/ch/asynk/tankontank/game/Map.java | 5 +++-- core/src/ch/asynk/tankontank/game/states/StateAttack.java | 2 +- core/src/ch/asynk/tankontank/game/states/StateSelect.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'core/src/ch/asynk/tankontank/game') diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java index d1dfcb43..fdf7e8b0 100644 --- a/core/src/ch/asynk/tankontank/game/Map.java +++ b/core/src/ch/asynk/tankontank/game/Map.java @@ -208,9 +208,10 @@ public abstract class Map extends Board return buildPossibleMovesFrom(pawn, hex, possibleMoves); } - public int buildPossibleTargets(Pawn pawn, GridPoint2 hex) + public int buildPossibleTargets(Pawn pawn, GridPoint2 hex, Iterator foes) { - return buildPossibleTargetsFrom(pawn, hex, possibleTargets); + // return buildPossibleTargetsFrom(pawn, hex, possibleTargets); + return buildPossibleTargetsFrom(pawn, hex, foes, possibleTargets); } public int buildMoveAssists(Pawn pawn, GridPoint2 hex) diff --git a/core/src/ch/asynk/tankontank/game/states/StateAttack.java b/core/src/ch/asynk/tankontank/game/states/StateAttack.java index 7c4d6b2f..bbf54d1d 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateAttack.java +++ b/core/src/ch/asynk/tankontank/game/states/StateAttack.java @@ -19,7 +19,7 @@ public class StateAttack extends StateCommon // use selectedHex and selectedPawn from.set(selectedHex); map.showPossibleTargets(false); - map.buildPossibleTargets(selectedPawn, from); + map.buildPossibleTargets(selectedPawn, from, ctrl.otherPlayer().unitIterator()); map.showPossibleTargets(true); if (to.x != -1) { // quick fire -> replay touchUp diff --git a/core/src/ch/asynk/tankontank/game/states/StateSelect.java b/core/src/ch/asynk/tankontank/game/states/StateSelect.java index 0ae3465b..5dc5e686 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateSelect.java +++ b/core/src/ch/asynk/tankontank/game/states/StateSelect.java @@ -53,7 +53,7 @@ public class StateSelect extends StateCommon if (hasPawn() && (!isEnemy || ctrl.cfg.showEnemyPossibilities)) { int moves = map.buildPossibleMoves(selectedPawn, selectedHex); - int targets = map.buildPossibleTargets(selectedPawn, selectedHex); + int targets = map.buildPossibleTargets(selectedPawn, selectedHex, ctrl.otherPlayer().unitIterator()); int assists = map.buildMoveAssists(selectedPawn, selectedHex); showPossibleTargetsMovesAssists(selectedPawn); ctrl.hud.show( -- cgit v1.2.3