From 03d764fc87370a7dc024b9065b019ed21107c95e Mon Sep 17 00:00:00 2001 From: Jérémy Zurcher Date: Tue, 14 Oct 2014 11:17:59 +0200 Subject: Pawn,Unit add boolean canAssistAttackWithoutLos() and UnitType.ARTILLERY --- core/src/ch/asynk/tankontank/engine/Pawn.java | 1 + core/src/ch/asynk/tankontank/game/Factory.java | 2 ++ core/src/ch/asynk/tankontank/game/Unit.java | 9 ++++++++- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'core/src/ch/asynk/tankontank') diff --git a/core/src/ch/asynk/tankontank/engine/Pawn.java b/core/src/ch/asynk/tankontank/engine/Pawn.java index aa6e6664..ef91544b 100644 --- a/core/src/ch/asynk/tankontank/engine/Pawn.java +++ b/core/src/ch/asynk/tankontank/engine/Pawn.java @@ -53,6 +53,7 @@ public abstract class Pawn implements Drawable, Disposable public abstract boolean canRotate(); public abstract boolean canAttack(); public abstract boolean canAttack(Pawn other); + public abstract boolean canAssistAttackWithoutLos(); public abstract void move(int cost); public abstract void rotate(Orientation o); diff --git a/core/src/ch/asynk/tankontank/game/Factory.java b/core/src/ch/asynk/tankontank/game/Factory.java index 3f1e80af..ac4d671a 100644 --- a/core/src/ch/asynk/tankontank/game/Factory.java +++ b/core/src/ch/asynk/tankontank/game/Factory.java @@ -73,6 +73,7 @@ public class Factory implements Board.TileBuilder, Disposable u = new Unit(Army.GE, ut, 3, 11, 1, pawnAtlas, "ge-tiger", "head"); break; case GE_WESPE: + ut = Unit.UnitType.ARTILLERY; u = new Unit(Army.GE, ut, 5, 8, 1, pawnAtlas, "ge-wespe", "head"); break; case US_AT_GUN: @@ -90,6 +91,7 @@ public class Factory implements Board.TileBuilder, Disposable u = new Unit(Army.US, utHq, 3, 10, 2, pawnAtlas, "us-pershing-hq", "head"); break; case US_PRIEST: + ut = Unit.UnitType.ARTILLERY; u = new Unit(Army.US, ut, 5, 8, 1, pawnAtlas, "us-priest", "head"); break; case US_SHERMAN: diff --git a/core/src/ch/asynk/tankontank/game/Unit.java b/core/src/ch/asynk/tankontank/game/Unit.java index b559489a..6798aed9 100644 --- a/core/src/ch/asynk/tankontank/game/Unit.java +++ b/core/src/ch/asynk/tankontank/game/Unit.java @@ -17,7 +17,8 @@ public class Unit extends HeadedPawn HARD_TARGET, HARD_TARGET_HQ, INFANTRY, - AT_GUN + AT_GUN, + ARTILLERY } public int rng; @@ -137,6 +138,12 @@ public class Unit extends HeadedPawn return (!hasMoved && !hasFired); } + @Override + public boolean canAssistAttackWithoutLos() + { + return (type == UnitType.ARTILLERY); + } + @Override public boolean canAttack(Pawn other) { -- cgit v1.2.3