Add conditions to card targeting

src/main/java/nomadrealms/context/game/GameState.java

@@ -56,6 +56,10 @@ public GameState(String name, Queue<InputEvent> uiEventChannel, MapGenerationStr
 		world = new World(this, mapGenerationStrategy);
 	}
 
+	public World world() {
+		return world;
+	}
+
 	public void render(RenderingEnvironment re) {
 		re.camera.update();
 		world.renderMap(re);

src/main/java/nomadrealms/context/game/actor/HasTooltip.java

@@ -1,10 +1,9 @@
 package nomadrealms.context.game.actor;
 
-import nomadrealms.context.game.event.Target;
 import nomadrealms.render.ui.content.UIContent;
 import nomadrealms.render.ui.custom.tooltip.TooltipDeterminer;
 
-public interface HasTooltip extends Target {
+public interface HasTooltip {
 
 	/**
 	 * Double dispatch method for creating the tooltip.

src/main/java/nomadrealms/context/game/card/GameCard.java

@@ -5,6 +5,7 @@
 import static nomadrealms.context.game.card.target.TargetType.NONE;
 
 import nomadrealms.context.game.actor.structure.factory.StructureType;
+import nomadrealms.context.game.card.condition.EmptyCondition;
 import nomadrealms.context.game.card.expression.AndExpression;
 import nomadrealms.context.game.card.expression.BuryAnySeedExpression;
 import nomadrealms.context.game.card.expression.CardExpression;
@@ -21,16 +22,19 @@
 import nomadrealms.context.game.card.expression.TeleportNoTargetExpression;
 import nomadrealms.context.game.card.query.actor.ActorsOnTilesQuery;
 import nomadrealms.context.game.card.query.actor.SelfQuery;
+import nomadrealms.context.game.card.query.actor.TargetQuery;
+import nomadrealms.context.game.card.query.actor.TargetTypeCast;
 import nomadrealms.context.game.card.query.card.LastResolvedCardQuery;
 import nomadrealms.context.game.card.query.tile.PreviousTileQuery;
 import nomadrealms.context.game.card.query.tile.TilesInRadiusQuery;
 import nomadrealms.context.game.card.target.TargetingInfo;
+import nomadrealms.context.game.world.map.area.Tile;
 import nomadrealms.context.game.world.map.tile.factory.TileType;
 import nomadrealms.render.particle.spawner.ParticleSpawner;
 
 /**
- * An enum of all the cards that can be played in the game. Each card has a
- * title, description, expression, and targeting info.
+ * An enum of all the cards that can be played in the game. Each card has a title, description, expression, and
+ * targeting info.
  *
  * @author Lunkle
  */
@@ -41,7 +45,8 @@ public enum GameCard implements Card {
 			"move",
 			"Move to target hexagon",
 			new MoveExpression(10),
-			new TargetingInfo(HEXAGON, 1)),
+			new TargetingInfo(HEXAGON, 1,
+					new EmptyCondition(new ActorsOnTilesQuery(new TargetTypeCast<Tile>(new TargetQuery()))))),
 	ATTACK(
 			"Attack",
 			"big_punch",
@@ -53,7 +58,8 @@ public enum GameCard implements Card {
 			"move",
 			"Move to target hexagon.",
 			new MoveExpression(10),
-			new TargetingInfo(HEXAGON, 2)),
+			new TargetingInfo(HEXAGON, 2,
+					new EmptyCondition(new ActorsOnTilesQuery(new TargetTypeCast<Tile>(new TargetQuery()))))),
 	UNSTABLE_TELEPORT(
 			"Unstable Teleport",
 			"teleport",
@@ -130,7 +136,7 @@ public enum GameCard implements Card {
 	private final TargetingInfo targetingInfo;
 
 	private GameCard(String name, String artwork, String description, CardExpression expression,
-					 TargetingInfo targetingInfo) {
+	                 TargetingInfo targetingInfo) {
 		this.title = name;
 		this.artwork = artwork;
 		this.description = description;
@@ -139,7 +145,7 @@ private GameCard(String name, String artwork, String description, CardExpression
 	}
 
 	private GameCard(String name, String artwork, String description, CardExpression expression, ParticleSpawner onResolve,
-					 TargetingInfo targetingInfo) {
+	                 TargetingInfo targetingInfo) {
 		this.title = name;
 		this.artwork = artwork;
 		this.description = description;

src/main/java/nomadrealms/context/game/card/condition/Condition.java

@@ -0,0 +1,11 @@
+package nomadrealms.context.game.card.condition;
+
+import nomadrealms.context.game.actor.cardplayer.CardPlayer;
+import nomadrealms.context.game.event.Target;
+import nomadrealms.context.game.world.World;
+
+public interface Condition {
+
+	public boolean test(World world, Target target, CardPlayer source);
+
+}

src/main/java/nomadrealms/context/game/card/condition/EmptyCondition.java

@@ -0,0 +1,20 @@
+package nomadrealms.context.game.card.condition;
+
+import nomadrealms.context.game.actor.cardplayer.CardPlayer;
+import nomadrealms.context.game.card.query.Query;
+import nomadrealms.context.game.event.Target;
+import nomadrealms.context.game.world.World;
+
+public class EmptyCondition implements Condition {
+
+	private final Query<?> query;
+
+	public EmptyCondition(Query<?> query) {
+		this.query = query;
+	}
+
+	public boolean test(World world, Target target, CardPlayer source) {
+		return query.find(world, source, target).isEmpty();
+	}
+
+}

src/main/java/nomadrealms/context/game/card/condition/NotCondition.java

@@ -0,0 +1,19 @@
+package nomadrealms.context.game.card.condition;
+
+import nomadrealms.context.game.actor.cardplayer.CardPlayer;
+import nomadrealms.context.game.event.Target;
+import nomadrealms.context.game.world.World;
+
+public class NotCondition implements Condition {
+
+	private final Condition condition;
+
+	public NotCondition(Condition condition) {
+		this.condition = condition;
+	}
+
+	public boolean test(World world, Target target, CardPlayer source) {
+		return !condition.test(world, target, source);
+	}
+
+}

src/main/java/nomadrealms/context/game/card/expression/DamageActorsExpression.java

@@ -23,7 +23,7 @@ public DamageActorsExpression(Query<Actor> actors, int amount) {
 
 	@Override
 	public List<Effect> effects(World world, Target target, CardPlayer source) {
-		List<Actor> result = actors.find(world, source);
+		List<Actor> result = actors.find(world, source, target);
 		return result.stream()
 				.map(actor -> new DamageEffect(actor, source, amount))
 				.collect(Collectors.toList());

src/main/java/nomadrealms/context/game/card/expression/SurfaceCardExpression.java

@@ -24,7 +24,7 @@ public SurfaceCardExpression(Query<WorldCard> query, int delay) {
 
 	@Override
 	public List<Effect> effects(World world, Target target, CardPlayer source) {
-		List<WorldCard> cards = query.find(world, source);
+		List<WorldCard> cards = query.find(world, source, target);
 		return singletonList(new SurfaceCardEffect(cards, source));
 	}
 

src/main/java/nomadrealms/context/game/card/expression/TeleportNoTargetExpression.java

@@ -25,7 +25,7 @@ public TeleportNoTargetExpression(Query<Tile> tile, int delay) {
 
 	@Override
 	public List<Effect> effects(World world, Target target, CardPlayer source) {
-		List<Tile> tiles = tile.find(world, source);
+		List<Tile> tiles = tile.find(world, source, target);
 		if (tiles.isEmpty()) {
 			return emptyList();
 		}

src/main/java/nomadrealms/context/game/card/query/Query.java

@@ -3,6 +3,7 @@
 import java.util.List;
 
 import nomadrealms.context.game.actor.cardplayer.CardPlayer;
+import nomadrealms.context.game.event.Target;
 import nomadrealms.context.game.world.World;
 
 /**
@@ -13,6 +14,6 @@
  */
 public interface Query<T> {
 
-	public List<T> find(World world, CardPlayer source);
+	public List<T> find(World world, CardPlayer source, Target target);
 
 }

src/main/java/nomadrealms/context/game/card/query/actor/ActorsOnTilesQuery.java

@@ -3,11 +3,13 @@
 import static java.util.stream.Collectors.toList;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Stream;
 
 import nomadrealms.context.game.actor.Actor;
 import nomadrealms.context.game.actor.cardplayer.CardPlayer;
 import nomadrealms.context.game.card.query.Query;
+import nomadrealms.context.game.event.Target;
 import nomadrealms.context.game.world.World;
 import nomadrealms.context.game.world.map.area.Tile;
 
@@ -26,13 +28,11 @@ public ActorsOnTilesQuery(Query<Tile> tileQuery) {
 	}
 
 	@Override
-	public List<Actor> find(World world, CardPlayer source) {
-		List<Tile> tiles = tileQuery.find(world, source);
-		// TODO: Tiles need to store the actors on them for efficiency. Once we have that, we can optimize this.
-		Stream<CardPlayer> stream = world.actors.stream()
-				.filter(CardPlayer.class::isInstance)
-				.map(CardPlayer.class::cast)
-				.filter(actor -> tiles.contains(actor.tile()));
+	public List<Actor> find(World world, CardPlayer source, Target target) {
+		List<Tile> tiles = tileQuery.find(world, source, target);
+		Stream<Actor> stream = tiles.stream()
+				.map(Tile::actor)
+				.filter(Objects::nonNull);
 		if (excludeSource) {
 			stream = stream.filter(actor -> actor != source);
 		}

src/main/java/nomadrealms/context/game/card/query/actor/SelfQuery.java

@@ -6,6 +6,7 @@
 
 import nomadrealms.context.game.actor.cardplayer.CardPlayer;
 import nomadrealms.context.game.card.query.Query;
+import nomadrealms.context.game.event.Target;
 import nomadrealms.context.game.world.World;
 
 /**
@@ -17,7 +18,7 @@
 public class SelfQuery implements Query<CardPlayer> {
 
 	@Override
-	public List<CardPlayer> find(World world, CardPlayer source) {
+	public List<CardPlayer> find(World world, CardPlayer source, Target target) {
 		return singletonList(source);
 	}
 

src/main/java/nomadrealms/context/game/card/query/actor/TargetQuery.java

@@ -0,0 +1,25 @@
+package nomadrealms.context.game.card.query.actor;
+
+import static java.util.Collections.singletonList;
+
+import java.util.List;
+
+import nomadrealms.context.game.actor.cardplayer.CardPlayer;
+import nomadrealms.context.game.card.query.Query;
+import nomadrealms.context.game.event.Target;
+import nomadrealms.context.game.world.World;
+
+/**
+ * A query expression that can be used by card expressions and intents to find {@link CardPlayer CardPlayers} in the
+ * game world.
+ *
+ * @author Lunkle
+ */
+public class TargetQuery implements Query<Target> {
+
+	@Override
+	public List<Target> find(World world, CardPlayer source, Target target) {
+		return singletonList(target);
+	}
+
+}

src/main/java/nomadrealms/context/game/card/query/actor/TargetTypeCast.java

@@ -0,0 +1,25 @@
+package nomadrealms.context.game.card.query.actor;
+
+import static java.util.stream.Collectors.toList;
+
+import java.util.List;
+
+import nomadrealms.context.game.actor.cardplayer.CardPlayer;
+import nomadrealms.context.game.card.query.Query;
+import nomadrealms.context.game.event.Target;
+import nomadrealms.context.game.world.World;
+
+public class TargetTypeCast<T extends Target> implements Query<T> {
+
+	private final Query<Target> query;
+
+	public TargetTypeCast(Query<Target> query) {
+		this.query = query;
+	}
+
+	@Override
+	public List<T> find(World world, CardPlayer source, Target target) {
+		return query.find(world, source, target).stream().map(t -> (T) t).collect(toList());
+	}
+
+}

src/main/java/nomadrealms/context/game/card/query/card/LastResolvedCardQuery.java

@@ -8,6 +8,7 @@
 import nomadrealms.context.game.actor.cardplayer.CardPlayer;
 import nomadrealms.context.game.card.WorldCard;
 import nomadrealms.context.game.card.query.Query;
+import nomadrealms.context.game.event.Target;
 import nomadrealms.context.game.world.World;
 
 /**
@@ -25,8 +26,8 @@ public LastResolvedCardQuery(Query<CardPlayer> player) {
 	}
 
 	@Override
-	public List<WorldCard> find(World world, CardPlayer source) {
-		return player.find(world, source).stream()
+	public List<WorldCard> find(World world, CardPlayer source, Target target) {
+		return player.find(world, source, target).stream()
 				.map(CardPlayer::lastResolvedCard)
 				.filter(Objects::nonNull)
 				.collect(toList());

src/main/java/nomadrealms/context/game/card/query/tile/PreviousTileQuery.java

@@ -7,12 +7,12 @@
 
 import nomadrealms.context.game.actor.cardplayer.CardPlayer;
 import nomadrealms.context.game.card.query.Query;
+import nomadrealms.context.game.event.Target;
 import nomadrealms.context.game.world.World;
 import nomadrealms.context.game.world.map.area.Tile;
 
 /**
- * A query expression that can be used by card expressions and intents to find {@link Tile Tiles} in the game
- * world.
+ * A query expression that can be used by card expressions and intents to find {@link Tile Tiles} in the game world.
  *
  * @author Lunkle
  */
@@ -25,8 +25,8 @@ public PreviousTileQuery(Query<CardPlayer> player) {
 	}
 
 	@Override
-	public List<Tile> find(World world, CardPlayer source) {
-		return player.find(world, source).stream()
+	public List<Tile> find(World world, CardPlayer source, Target target) {
+		return player.find(world, source, target).stream()
 				.map(CardPlayer::previousTile)
 				.filter(Objects::nonNull)
 				.collect(toList());

src/main/java/nomadrealms/context/game/card/query/tile/TilesInRadiusQuery.java

@@ -11,6 +11,7 @@
 
 import nomadrealms.context.game.actor.cardplayer.CardPlayer;
 import nomadrealms.context.game.card.query.Query;
+import nomadrealms.context.game.event.Target;
 import nomadrealms.context.game.world.World;
 import nomadrealms.context.game.world.map.area.Tile;
 
@@ -23,7 +24,7 @@ public TilesInRadiusQuery(int radius) {
 	}
 
 	@Override
-	public List<Tile> find(World world, CardPlayer source) {
+	public List<Tile> find(World world, CardPlayer source, Target target) {
 		Tile startTile = source.tile();
 		if (startTile == null) {
 			return emptyList();

src/main/java/nomadrealms/context/game/card/target/TargetingInfo.java

@@ -1,13 +1,20 @@
 package nomadrealms.context.game.card.target;
 
+import java.util.Arrays;
+import java.util.List;
+
+import nomadrealms.context.game.card.condition.Condition;
+
 public class TargetingInfo {
 
-	private TargetType targetType;
-	private int range;
+	private final TargetType targetType;
+	private final int range;
+	private final List<Condition> conditions;
 
-	public TargetingInfo(TargetType targetType, int range) {
+	public TargetingInfo(TargetType targetType, int range, Condition... conditions) {
 		this.targetType = targetType;
 		this.range = range;
+		this.conditions = Arrays.asList(conditions);
 	}
 
 	public TargetType targetType() {
@@ -18,4 +25,8 @@ public int range() {
 		return range;
 	}
 
+	public List<Condition> conditions() {
+		return conditions;
+	}
+
 }

src/main/java/nomadrealms/context/game/world/map/generation/overworld/structure/StructureGenerationStep.java

@@ -41,7 +41,6 @@ public StructureGenerationStep(Zone zone, MapGenerationStrategy strategy) {
 
 	@Override
 	public void generate(Zone[][] surrounding, MapGenerationStrategy strategy) {
-		System.out.println("Generating structures...");
 		for (ChunkCoordinate[] chunkRow : zone.coord().chunkCoordinates()) {
 			for (ChunkCoordinate chunk : chunkRow) {
 				for (TileCoordinate[] tileRow : chunk.tileCoordinates()) {