From 3a0d535e8c885064a2c2f8e5dff1d36ebd35cc08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Tue, 18 Nov 2014 16:27:57 +0100 Subject: Map,StatePromote: state does everything, TODO burn 1 AP down --- core/src/ch/asynk/tankontank/game/Map.java | 7 ------- core/src/ch/asynk/tankontank/game/states/StatePromote.java | 4 +++- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java index 970e750..7682893 100644 --- a/core/src/ch/asynk/tankontank/game/Map.java +++ b/core/src/ch/asynk/tankontank/game/Map.java @@ -196,13 +196,6 @@ public abstract class Map extends Board pawn.reset(); } - public void promote(Pawn pawn, Pawn with) - { - removePawn(pawn); - setPawnOnto(with, pawn.getTile(), pawn.getOrientation()); - activatedPawns.add(with); - } - public int movePawn(Pawn pawn, Orientation o) { possiblePaths.orientation = o; diff --git a/core/src/ch/asynk/tankontank/game/states/StatePromote.java b/core/src/ch/asynk/tankontank/game/states/StatePromote.java index 70cb875..cf628d9 100644 --- a/core/src/ch/asynk/tankontank/game/states/StatePromote.java +++ b/core/src/ch/asynk/tankontank/game/states/StatePromote.java @@ -10,8 +10,10 @@ public class StatePromote extends StateCommon ctrl.hud.actionButtons.hide(); Unit unit = ctrl.player.promote(selectedUnit); if (unit != null) { + // TODO this must burn 1 AP down !!!!! ctrl.hud.notify(unit + " has been promoted"); - map.promote(selectedUnit, unit); + selectedUnit.promote(); + unit.degrade(); } done(); } -- cgit v1.1-2-g2b99