[entity] Small fixes

leek-wars · May 19, 2023 · b4e9c3b · b4e9c3b
1 parent 9146fd9
commit b4e9c3b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/com/leekwars/generator/fight/Fight.java b/src/main/java/com/leekwars/generator/fight/Fight.java
@@ -164,6 +164,7 @@ public void startFight(boolean drawCheckLife) throws Exception {
 			// Build AI after the fight is ready (static init)
 			var ai = EntityAI.build(this.generator, (AIFile) entity.getAIFile(), entity);
 			entity.setAI(ai);
+			((EntityAI) ai).setFight(this);
 			((EntityAI) ai).init();
 			((EntityAI) ai).getRandom().seed(state.getSeed());
 
@@ -267,14 +268,14 @@ public void startTurn() throws Exception {
 		state.getActions().log(new ActionEntityTurn(current));
 		Log.i(TAG, "Start turn of " + current.getName());
 
-		current.applyCoolDown();
 		current.startTurn();
 
 		if (!current.isDead()) {
 
 			var ai = (EntityAI) current.getAI();
 			if (ai != null) {
 				if (ai.isValid()) {
+					// System.out.println("Run " + current.getName() + " ai...");
 					long startTime = System.nanoTime();
 					ai.runTurn(state.getOrder().getTurn());
 					long endTime = System.nanoTime();

diff --git a/src/main/java/com/leekwars/generator/fight/entity/EntityAI.java b/src/main/java/com/leekwars/generator/fight/entity/EntityAI.java
@@ -133,7 +133,7 @@ public static EntityAI build(Generator generator, AIFile file, Entity entity) {
 			return new EntityAI(entity, (LeekLog) entity.getLogs());
 		}
 
-		Log.i(TAG, "Compile AI " + file.getPath() + "...");
+		Log.i(TAG, "Compile AI " + file.getPath() + " (id " + file.getId() + ")...");
 		try {
 			file.setJavaClass("AI_" + file.getId());
 			file.setRootClass("com.leekwars.generator.fight.entity.EntityAI");

diff --git a/src/main/java/com/leekwars/generator/scenario/EntityInfo.java b/src/main/java/com/leekwars/generator/scenario/EntityInfo.java
@@ -111,6 +111,7 @@ public Entity createEntity(Generator generator, Scenario scenario, Fight fight)
 		entity.setId(id);
 		entity.setName(name);
 		entity.setLevel(level);
+		entity.setTotalLife(life);
 		entity.setLife(life);
 		entity.setStrength(strength);
 		entity.setAgility(agility);