diff options
Diffstat (limited to 'core/src/ch/asynk')
5 files changed, 13 insertions, 13 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java index 64a9e19..a756819 100644 --- a/core/src/ch/asynk/tankontank/game/Map.java +++ b/core/src/ch/asynk/tankontank/game/Map.java @@ -318,7 +318,7 @@ public abstract class Map extends Board implements MoveToAnimationCb, ObjectiveS case EXIT: initMove(unit); movePawn(unit, move, notifyDoneAnimation(unit), this); - ctrl.player.unitEscape(unit); + ctrl.player.unitWithdraw(unit); r = moveableUnits.size(); break; case SET: diff --git a/core/src/ch/asynk/tankontank/game/Player.java b/core/src/ch/asynk/tankontank/game/Player.java index d5eba9b..d9048bf 100644 --- a/core/src/ch/asynk/tankontank/game/Player.java +++ b/core/src/ch/asynk/tankontank/game/Player.java @@ -20,7 +20,7 @@ public class Player public UnitList units; public UnitList casualties; public UnitList reinforcement; - public UnitList escaped; + public UnitList withdrawed; public int actionCount; public int lostEngagementCount; @@ -32,7 +32,7 @@ public class Player this.units = new UnitList(n); this.casualties = new UnitList(n); this.reinforcement = new UnitList(n); - this.escaped = new UnitList(n); + this.withdrawed = new UnitList(n); this.turn = 0; this.apSpent = 0; this.actionPoints = 0; @@ -54,7 +54,7 @@ public class Player public String getStats() { - return String.format("%s\n%4d\n%4d\n%4d\n%4d\n%4d", getName(), actionCount, unitsLeft(), casualties.size(), wonEngagementCount, lostEngagementCount); + return String.format("%s\n%4d\n%4d\n%4d\n%4d\n%4d\n%4d", getName(), actionCount, unitsLeft(), withdrawed(), casualties(), wonEngagementCount, lostEngagementCount); } public boolean is(Army army) @@ -87,9 +87,9 @@ public class Player return casualties.size(); } - public int escaped() + public int withdrawed() { - return escaped.size(); + return withdrawed.size(); } public void addUnit(Unit unit) @@ -120,10 +120,10 @@ public class Player casualties.add(unit); } - public void unitEscape(Unit unit) + public void unitWithdraw(Unit unit) { units.remove(unit); - escaped.add(unit); + withdrawed.add(unit); } public int getAp() diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleCounterAttack.java b/core/src/ch/asynk/tankontank/game/battles/BattleCounterAttack.java index 1c31609..bcc08f2 100644 --- a/core/src/ch/asynk/tankontank/game/battles/BattleCounterAttack.java +++ b/core/src/ch/asynk/tankontank/game/battles/BattleCounterAttack.java @@ -42,7 +42,7 @@ public class BattleCounterAttack extends BattleCommon if (ctrl.opponent.unitsLeft() == 0) return ctrl.player; - if (gePlayer.escaped() >= 3) + if (gePlayer.withdrawed() >= 3) return gePlayer; if ((ctrl.player.getTurnDone() < 9) || (ctrl.opponent.getTurnDone() < 9)) diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleStabToTheFlank.java b/core/src/ch/asynk/tankontank/game/battles/BattleStabToTheFlank.java index 2f5b7b8..5e910d4 100644 --- a/core/src/ch/asynk/tankontank/game/battles/BattleStabToTheFlank.java +++ b/core/src/ch/asynk/tankontank/game/battles/BattleStabToTheFlank.java @@ -49,11 +49,11 @@ public class BattleStabToTheFlank extends BattleCommon int usPoints = gePlayer.casualties(); usPoints += ctrl.map.objectives.count(Army.US); - int escaped = usPlayer.escaped(); - if (escaped == 0) + int withdrawed = usPlayer.withdrawed(); + if (withdrawed == 0) gePoints += 1; else - usPoints += escaped; + usPoints += withdrawed; if (usPoints > gePoints) return usPlayer; diff --git a/core/src/ch/asynk/tankontank/game/hud/Statistics.java b/core/src/ch/asynk/tankontank/game/hud/Statistics.java index 93486c8..9517b8c 100644 --- a/core/src/ch/asynk/tankontank/game/hud/Statistics.java +++ b/core/src/ch/asynk/tankontank/game/hud/Statistics.java @@ -33,7 +33,7 @@ public class Statistics extends Patch this.stats2 = new Label(font); this.okBtn = new Bg(atlas.findRegion("ok")); this.visible = false; - this.header.write("\nActions\nUnits Left\nCasualties\nWon Attacks\nLost Attacks"); + this.header.write("\nActions\nUnits Left\nUnits Withrawed\nCasualties\nWon Attacks\nLost Attacks"); } public void updatePosition() |