From 7f1b60094b5d351c58194feabad1fef903d1d3be Mon Sep 17 00:00:00 2001 From: Jérémy Zurcher Date: Mon, 21 Dec 2015 19:46:54 +0100 Subject: Map0Hex: isObjective(Tile) -> isObjectiveFor(Tile,Pawn) : says no if already owned --- core/src/ch/asynk/rustanddust/game/map/Map0Hex.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'core/src/ch/asynk/rustanddust/game/map') diff --git a/core/src/ch/asynk/rustanddust/game/map/Map0Hex.java b/core/src/ch/asynk/rustanddust/game/map/Map0Hex.java index 0d288297..41270d1c 100644 --- a/core/src/ch/asynk/rustanddust/game/map/Map0Hex.java +++ b/core/src/ch/asynk/rustanddust/game/map/Map0Hex.java @@ -4,6 +4,7 @@ import com.badlogic.gdx.graphics.Texture; import ch.asynk.rustanddust.RustAndDust; import ch.asynk.rustanddust.engine.Tile; +import ch.asynk.rustanddust.engine.Pawn; import ch.asynk.rustanddust.engine.Board; import ch.asynk.rustanddust.engine.Faction; import ch.asynk.rustanddust.engine.SelectedTile; @@ -76,9 +77,12 @@ public abstract class Map0Hex extends Board implements ObjectiveSet.ObjectiveCb public void hexExitHide(Hex hex) { enableOverlayOn(hex, Hex.EXIT, false); } @Override - public boolean isObjective(Tile tile) + public boolean isObjectiveFor(Tile tile, Pawn pawn) { - return objectives.containsKey(tile); + if (!objectives.containsKey(tile)) + return false; + + return (objectives.get(tile).faction() != pawn.getFaction()); } @Override -- cgit v1.2.3