PhrancisGame now takes an ECSGame as input and constructs from that

Cardshifter · Oct 6, 2014 · 2ce7c53 · 2ce7c53
1 parent 2c90f59
commit 2ce7c53
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 14 deletions.
diff --git a/cardshifter-console/src/main/java/com/cardshifter/console/Main.java b/cardshifter-console/src/main/java/com/cardshifter/console/Main.java
@@ -9,11 +9,12 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Scanner;
 
-import org.apache.log4j.PropertyConfigurator;
-
+import net.zomis.cardshifter.ecs.base.ECSGame;
 import net.zomis.cardshifter.ecs.main.ConsoleControllerECS;
 import net.zomis.cardshifter.ecs.usage.PhrancisGame;
 
+import org.apache.log4j.PropertyConfigurator;
+
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.ParameterException;
 import com.cardshifter.core.Game;
@@ -42,7 +43,7 @@ else if (options.isLua()) {
 				startLuaGame(options);
 			}
 			else {
-				new ConsoleControllerECS(PhrancisGame.createGame()).play(input);
+				new ConsoleControllerECS(PhrancisGame.createGame(new ECSGame())).play(input);
 			}
 		}
 	}

diff --git a/cardshifter-core/src/main/java/net/zomis/cardshifter/ecs/base/ECSGame.java b/cardshifter-core/src/main/java/net/zomis/cardshifter/ecs/base/ECSGame.java
@@ -92,10 +92,11 @@ public Entity getEntity(int entity) {
 		return entities.get(entity);
 	}
 
-	// TODO: Player component, Zone component for a zone
-	// TODO: Actions ++ copy actions. List<Target(s)> ("deal 1 damage to up to three targets and then give up to three targets +1/+1 until end of turn"), Set<ActionOptions>. choose one, choose two
-	// TODO: Network inform when a component on an entity is changed (DataChangedEvent? Aspect-oriented? onChange method? ResMap?)
-	// TODO: Implement the standard Phrancis game
-	// TODO: Enchantments
+	public void setRandomSeed(long seed) {
+		random.setSeed(seed);
+	}
+
+	// TODO: copy actions. Set<ActionOptions>. choose one, choose two
+	// TODO: More Hearthstone-like features. Enchantments, effects, battlecry, deathrattle, etc.
 
 }
diff --git a/cardshifter-core/src/main/java/net/zomis/cardshifter/ecs/main/ConsoleControllerECS.java b/cardshifter-core/src/main/java/net/zomis/cardshifter/ecs/main/ConsoleControllerECS.java
@@ -155,6 +155,6 @@ private String indent(final int amount) {
 	}
 
 	public static void main(String[] args) {
-		new ConsoleControllerECS(PhrancisGame.createGame()).play(new Scanner(System.in, StandardCharsets.UTF_8.name()));
+		new ConsoleControllerECS(PhrancisGame.createGame(new ECSGame())).play(new Scanner(System.in, StandardCharsets.UTF_8.name()));
 	}
 }
diff --git a/cardshifter-core/src/main/java/net/zomis/cardshifter/ecs/usage/PhrancisGame.java b/cardshifter-core/src/main/java/net/zomis/cardshifter/ecs/usage/PhrancisGame.java
@@ -50,8 +50,7 @@ public enum PhrancisResources implements ECSResource {
 
 	private static final int CARDS_OF_EACH_TYPE = 3;
 
-	public static ECSGame createGame() {
-		ECSGame game = new ECSGame();
+	public static ECSGame createGame(ECSGame game) {
 
 		PhaseController phaseController = new PhaseController();
 		game.newEntity().addComponent(phaseController);

diff --git a/cardshifter-core/src/test/java/net/zomis/cardshifter/ecs/PhrancisTest.java b/cardshifter-core/src/test/java/net/zomis/cardshifter/ecs/PhrancisTest.java
@@ -59,7 +59,9 @@ public class PhrancisTest {
 	@Before
 	public void before() {
 		PropertyConfigurator.configure(PhrancisTest.class.getResourceAsStream("log4j.properties"));
-		game = PhrancisGame.createGame();
+		game = new ECSGame();
+		game.setRandomSeed(42);
+		PhrancisGame.createGame(game);
 		game.startGame();
 		phase = ComponentRetriever.singleton(game, PhaseController.class);
 	}

diff --git a/cardshifter-fx/src/main/java/com/cardshifter/fx/FXMLGameController.java b/cardshifter-fx/src/main/java/com/cardshifter/fx/FXMLGameController.java
@@ -78,7 +78,7 @@ public void acceptAIChoice(AIComponent aiChoice) {
 	}
 
 	public void initializeGame() {
-		game = PhrancisGame.createGame();
+		game = PhrancisGame.createGame(new ECSGame());
 		phases = ComponentRetriever.singleton(game, PhaseController.class);
 
 		if (!aiIsLoaded) {

diff --git a/cardshifter-server/src/main/java/com/cardshifter/server/model/TCGGame.java b/cardshifter-server/src/main/java/com/cardshifter/server/model/TCGGame.java
@@ -54,7 +54,7 @@ public class TCGGame extends ServerGame {
 
 	public TCGGame(Server server, int id) {
 		super(server, id);
-		game = PhrancisGame.createGame();
+		game = PhrancisGame.createGame(new ECSGame());
 		game.getEvents().registerHandlerAfter(this, ResourceValueChange.class, this::broadcast);
 		game.getEvents().registerHandlerAfter(this, ZoneChangeEvent.class, this::zoneChange);
 		game.getEvents().registerHandlerAfter(this, EntityRemoveEvent.class, this::remove);