t

src/main/java/com/leekwars/generator/Data.java

@@ -1,5 +1,6 @@
 package com.leekwars.generator;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.net.http.HttpClient;
@@ -24,24 +25,27 @@ public class Data {
 	public static List<LocalDate> fullmoon = new ArrayList<>();
 
 	public static void checkData(String api) {
-		Log.i(TAG, "Check api: " + api);
+
+		new File("data").mkdir();
+
+		System.out.println("Check api: " + api);
 		// File weaponsFile = new File("data/weapons.json");
-		Log.i(TAG, "Load weapons from API...");
+		System.out.println("Load weapons from API...");
 		JSONObject weapons = JSON.parseObject(get(api + "weapon/get-all", "")).getJSONObject("weapons");
 		Util.writeFile(weapons.toJSONString(), "data/weapons.json");
 
 		// File chipsFile = new File("data/chips.json");
-		Log.i(TAG, "Load chips from API...");
+		System.out.println("Load chips from API...");
 		JSONObject chips = JSON.parseObject(get(api + "chip/get-all", "")).getJSONObject("chips");
 		Util.writeFile(chips.toJSONString(), "data/chips.json");
 
 		// File summonsFile = new File("data/summons.json");
-		Log.i(TAG, "Load summons from API...");
+		System.out.println("Load summons from API...");
 		JSONObject summons = JSON.parseObject(get(api + "summon/get-templates", "")).getJSONObject("summon_templates");
 		Util.writeFile(summons.toJSONString(), "data/summons.json");
 
 		// File fullmoonFile = new File("data/fullmoon.json");
-		Log.i(TAG, "Load fullmoon from API...");
+		System.out.println("Load fullmoon from API...");
 		JSONArray f = JSON.parseArray(get(api + "fight/fullmoon", ""));
 		for (var d : f) {
 			var dateUTC = ZonedDateTime.of(LocalDateTime.parse((String) d), ZoneOffset.UTC);
@@ -50,6 +54,11 @@ public static void checkData(String api) {
 		}
 		// System.out.println("full moon = " + fullmoon);
 		Util.writeFile(f.toJSONString(), "data/fullmoon.json");
+
+		// TODO
+		System.out.println("Load components from API...");
+		JSONObject components = JSON.parseObject(get(api + "component/get-all/dfgdfgzegktyrtytm", ""));
+		Util.writeFile(components.toJSONString(), "data/components.json");
 	}
 
     private static String get(String url, String urlParameters) {

src/main/java/com/leekwars/generator/FightConstants.java

@@ -22,6 +22,7 @@ public enum FightConstants implements ILeekConstant {
 	ENTITY_BULB(2, Type.INT),
 	ENTITY_TURRET(3, Type.INT),
 	ENTITY_CHEST(4, Type.INT),
+	ENTITY_MOB(5, Type.INT),
 
 	// Constants
 	EFFECT_TARGET_ALLIES(Effect.TARGET_ALLIES, Type.INT),
@@ -109,8 +110,10 @@ public enum FightConstants implements ILeekConstant {
 	EFFECT_KILL_TO_TP(Effect.TYPE_KILL_TO_TP, Type.INT),
 	EFFECT_RAW_HEAL(Effect.TYPE_RAW_HEAL, Type.INT),
 	EFFECT_CRITICAL_TO_HEAL(Effect.TYPE_CRITICAL_TO_HEAL, Type.INT),
+	EFFECT_ADD_STATE(Effect.TYPE_ADD_STATE, Type.INT),
 
 	STATE_UNHEALABLE(EntityState.UNHEALABLE.ordinal(), Type.INT),
+	STATE_INVINCIBLE(EntityState.INVINCIBLE.ordinal(), Type.INT),
 
 	// Résultats attaque
 	USE_CRITICAL(2, Type.INT),
@@ -159,6 +162,9 @@ public enum FightConstants implements ILeekConstant {
 	WEAPON_UNSTABLE_DESTROYER(226, Type.INT),
 	WEAPON_SWORD(277, Type.INT),
 	WEAPON_HEAVY_SWORD(278, Type.INT),
+	WEAPON_ODACHI(408, Type.INT),
+	WEAPON_EXCALIBUR(409, Type.INT),
+	WEAPON_SCYTHE(410, Type.INT),
 
 	// Messages
 	MESSAGE_HEAL(1, Type.INT),
@@ -316,6 +322,7 @@ public enum FightConstants implements ILeekConstant {
 	FIGHT_TYPE_FARMER(Fight.TYPE_FARMER, Type.INT),
 	FIGHT_TYPE_TEAM(Fight.TYPE_TEAM, Type.INT),
 	FIGHT_TYPE_BATTLE_ROYALE(Fight.TYPE_BATTLE_ROYALE, Type.INT),
+	FIGHT_TYPE_BOSS(Fight.TYPE_BOSS, Type.INT),
 
 	FIGHT_CONTEXT_TEST(Fight.CONTEXT_TEST, Type.INT),
 	FIGHT_CONTEXT_GARDEN(Fight.CONTEXT_GARDEN, Type.INT),

src/main/java/com/leekwars/generator/FightFunctions.java

@@ -123,6 +123,10 @@ public class FightFunctions {
 			new CallableVersion(Type.compound(Type.array(Type.array(Type.INT_OR_REAL)), Type.NULL), new Type[] { Type.INT_OR_NULL }),
 			new CallableVersion(Type.array(Type.array(Type.INT_OR_REAL))),
 		});
+		method("getStates", "Entity", 25, true, new CallableVersion[] {
+			new CallableVersion(Type.compound(Type.array(Type.INT), Type.NULL), new Type[] { Type.INT_OR_NULL }),
+			new CallableVersion(Type.array(Type.INT)),
+		});
 		method("getLevel", "Entity", 15, true, new CallableVersion[] {
 			new CallableVersion(Type.INT_OR_NULL, new Type[] { Type.INT_OR_NULL }),
 			new CallableVersion(Type.INT),
@@ -132,7 +136,11 @@ public class FightFunctions {
 			new CallableVersion(Type.INT),
 		});
 		method("getCores", "Entity", 15, true, new CallableVersion[] {
-			new CallableVersion(Type.INT, new Type[] { Type.INT }),
+			new CallableVersion(Type.INT_OR_NULL, new Type[] { Type.INT_OR_NULL }),
+			new CallableVersion(Type.INT),
+		});
+		method("getRAM", "Entity", 15, true, new CallableVersion[] {
+			new CallableVersion(Type.INT_OR_NULL, new Type[] { Type.INT_OR_NULL }),
 			new CallableVersion(Type.INT),
 		});
 		method("getTeamName", "Entity", 15, true, new CallableVersion[] {

src/main/java/com/leekwars/generator/Generator.java

@@ -11,6 +11,8 @@
 import com.leekwars.generator.chips.Chip;
 import com.leekwars.generator.chips.ChipType;
 import com.leekwars.generator.chips.Chips;
+import com.leekwars.generator.component.Component;
+import com.leekwars.generator.component.Components;
 import com.leekwars.generator.leek.RegisterManager;
 import com.leekwars.generator.weapons.Weapon;
 import com.leekwars.generator.weapons.Weapons;
@@ -47,6 +49,7 @@ public Generator() {
 		loadWeapons();
 		loadChips();
 		loadSummons();
+		loadComponents();
 	}
 
 	/**
@@ -204,6 +207,7 @@ private void loadChips() {
 			JSONObject chips = JSON.parseObject(Util.readFile("data/chips.json"));
 			for (String id : chips.keySet()) {
 				JSONObject chip = chips.getJSONObject(id);
+				// System.out.println("New chip " + chip.getString("name") + " " + id + " " + chip.getInteger("template"));
 				Chips.addChip(new Chip(Integer.parseInt(id), chip.getInteger("cost"), chip.getInteger("min_range"),
 						chip.getInteger("max_range"), chip.getJSONArray("effects"), chip.getByte("launch_type"),
 						chip.getByte("area"), chip.getBoolean("los"), chip.getInteger("cooldown"),
@@ -231,6 +235,20 @@ private void loadSummons() {
 		}
 	}
 
+	private void loadComponents() {
+		try {
+			Log.start(TAG, "- Loading components... ");
+			JSONObject components = JSON.parseObject(Util.readFile("data/components.json"));
+			for (String id : components.keySet()) {
+				JSONObject component = components.getJSONObject(id);
+				Components.addComponent(new Component(Integer.parseInt(id), component.getString("name"), component.getString("stats"), component.getInteger("template")));
+			}
+			Log.end(components.size() + " components loaded.");
+		} catch (Exception e) {
+			exception(e);
+		}
+	}
+
 	public void setCache(boolean cache) {
 		this.use_leekscript_cache = cache;
 	}

src/main/java/com/leekwars/generator/Util.java

@@ -145,6 +145,7 @@ public void run() {
 
 	public static void writeFile(String data, String file) {
 		File f = new File(file);
+		System.out.println("Write file " + f.getAbsolutePath());
 		try {
 			PrintWriter out = new PrintWriter(f);
 			out.append(data);

src/main/java/com/leekwars/generator/action/Actions.java

@@ -96,9 +96,10 @@ public void addEntity(Entity entity, boolean critical) {
 
 		object.put("team", entity.getTeam() + 1);
 		object.put("name", entity.getName());
-		object.put("cellPos", entity.getCell().getId());
+		object.put("cellPos", entity.getCell() != null ? entity.getCell().getId() : null);
 		object.put("farmer", entity.getFarmer());
 		object.put("type", entity.getType());
+		object.put("orientation", entity.getOrientation());
 
 		object.put("summon", entity.isSummon());
 		if (entity.isSummon()) {
@@ -116,16 +117,26 @@ public void addMap(Map map) {
 			Cell c = map.getCell(i);
 			if (c != null && !c.isWalkable() && c.getObstacleSize() > 0) {
 
-				JSONArray obstacle = new JSONArray();
-				obstacle.add(c.getObstacle());
-				obstacle.add(c.getObstacleSize());
+				if (map.getId() != 0) {
+					obstacles.put(String.valueOf(c.getId()), c.getObstacle());
+				} else {
+					JSONArray obstacle = new JSONArray();
+					obstacle.add(c.getObstacle());
+					obstacle.add(c.getObstacleSize());
 
-				obstacles.put(String.valueOf(c.getId()), map.isCustom() ? obstacle : c.getObstacleSize());
+					obstacles.put(String.valueOf(c.getId()), map.isCustom() ? obstacle : c.getObstacleSize());
+				}
 			}
 		}
+		if (map.getId() != 0) {
+			this.map.put("id", map.getId());
+		}
 		this.map.put("obstacles", obstacles);
 		this.map.put("type", map.getType());
 		this.map.put("width", map.getWidth());
 		this.map.put("height", map.getWidth());
+		if (map.getPattern() != null) {
+			this.map.put("pattern", map.getPattern());
+		}
 	}
 }

src/main/java/com/leekwars/generator/area/Area.java

@@ -5,6 +5,7 @@
 import com.leekwars.generator.attack.Attack;
 import com.leekwars.generator.maps.Cell;
 import com.leekwars.generator.maps.Map;
+import com.leekwars.generator.state.Entity;
 
 public abstract class Area {
 
@@ -23,6 +24,8 @@ public abstract class Area {
 	public final static int TYPE_SQUARE_1 = 11;
 	public final static int TYPE_SQUARE_2 = 12;
 	public final static int TYPE_FIRST_IN_LINE = 13;
+	public final static int TYPE_ENEMIES = 14;
+	public final static int TYPE_ALLIES = 15;
 
 	protected int mId;
 	protected Attack mAttack;
@@ -31,7 +34,7 @@ public Area(Attack attack) {
 		mAttack = attack;
 	}
 
-	public abstract List<Cell> getArea(Map map, Cell launchCell, Cell targetCell);
+	public abstract List<Cell> getArea(Map map, Cell launchCell, Cell targetCell, Entity caster);
 
 	protected boolean isAvailable(Cell c, List<Cell> cells_to_ignore) {
 		if (c.isWalkable())
@@ -68,6 +71,10 @@ else if (type == Area.TYPE_SQUARE_2)
 			return new AreaSquare2(attack);
 		else if (type == Area.TYPE_FIRST_IN_LINE)
 			return new AreaFirstInLine(attack);
+		else if (type == Area.TYPE_ALLIES)
+			return new AreaAllies(attack);
+		else if (type == Area.TYPE_ENEMIES)
+			return new AreaEnemies(attack);
 		return null;
 	}
 }

src/main/java/com/leekwars/generator/area/AreaAllies.java

@@ -0,0 +1,30 @@
+package com.leekwars.generator.area;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.leekwars.generator.attack.Attack;
+import com.leekwars.generator.maps.Cell;
+import com.leekwars.generator.maps.Map;
+import com.leekwars.generator.state.Entity;
+
+public class AreaAllies extends Area {
+
+	public AreaAllies(Attack attack) {
+		super(attack);
+	}
+
+	@Override
+	public List<Cell> getArea(Map map, Cell launchCell, Cell targetCell, Entity caster) {
+		var cells = new ArrayList<Cell>();
+		if (caster != null) {
+			for (var entity : map.getState().getEntities().values()) {
+				if (entity.getTeam() == caster.getTeam() && entity.getName().contains("crystal")) continue;
+				if (entity.getCell() != null && entity.getTeam() == caster.getTeam()) {
+					cells.add(entity.getCell());
+				}
+			}
+		}
+		return cells;
+	}
+}

src/main/java/com/leekwars/generator/area/AreaEnemies.java

@@ -0,0 +1,29 @@
+package com.leekwars.generator.area;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.leekwars.generator.attack.Attack;
+import com.leekwars.generator.maps.Cell;
+import com.leekwars.generator.maps.Map;
+import com.leekwars.generator.state.Entity;
+
+public class AreaEnemies extends Area {
+
+	public AreaEnemies(Attack attack) {
+		super(attack);
+	}
+
+	@Override
+	public List<Cell> getArea(Map map, Cell launchCell, Cell targetCell, Entity caster) {
+		var cells = new ArrayList<Cell>();
+		if (caster != null) {
+			for (var entity : map.getState().getEntities().values()) {
+				if (entity.getCell() != null && entity.getTeam() != caster.getTeam()) {
+					cells.add(entity.getCell());
+				}
+			}
+		}
+		return cells;
+	}
+}

src/main/java/com/leekwars/generator/area/AreaFirstInLine.java

@@ -7,6 +7,7 @@
 import com.leekwars.generator.maps.Cell;
 import com.leekwars.generator.maps.Map;
 import com.leekwars.generator.maps.Pathfinding;
+import com.leekwars.generator.state.Entity;
 
 public class AreaFirstInLine extends Area {
 
@@ -15,7 +16,7 @@ public AreaFirstInLine(Attack attack) {
 	}
 
 	@Override
-	public List<Cell> getArea(Map map, Cell launchCell, Cell targetCell) {
+	public List<Cell> getArea(Map map, Cell launchCell, Cell targetCell, Entity caster) {
 		List<Cell> cells = new ArrayList<>();
 		Cell cell = map.getFirstEntity(launchCell, targetCell, mAttack.getMinRange(), mAttack.getMaxRange());
 		if (cell != null) {

src/main/java/com/leekwars/generator/area/AreaLaserLine.java

@@ -6,6 +6,7 @@
 import com.leekwars.generator.attack.Attack;
 import com.leekwars.generator.maps.Cell;
 import com.leekwars.generator.maps.Map;
+import com.leekwars.generator.state.Entity;
 
 public class AreaLaserLine extends Area {
 
@@ -14,7 +15,7 @@ public AreaLaserLine(Attack attack) {
 	}
 
 	@Override
-	public List<Cell> getArea(Map map, Cell launchCell, Cell targetCell) {
+	public List<Cell> getArea(Map map, Cell launchCell, Cell targetCell, Entity caster) {
 
 		ArrayList<Cell> cells = new ArrayList<Cell>();
 		int dx = 0, dy = 0;

src/main/java/com/leekwars/generator/area/AreaSingleCell.java

@@ -6,6 +6,7 @@
 import com.leekwars.generator.attack.Attack;
 import com.leekwars.generator.maps.Cell;
 import com.leekwars.generator.maps.Map;
+import com.leekwars.generator.state.Entity;
 
 public class AreaSingleCell extends Area {
 
@@ -14,7 +15,7 @@ public AreaSingleCell(Attack attack) {
 	}
 
 	@Override
-	public List<Cell> getArea(Map map, Cell launchCell, Cell targetCell) {
+	public List<Cell> getArea(Map map, Cell launchCell, Cell targetCell, Entity caster) {
 		ArrayList<Cell> area = new ArrayList<Cell>();
 		area.add(targetCell);
 		return area;

src/main/java/com/leekwars/generator/area/MaskArea.java

@@ -6,6 +6,7 @@
 import com.leekwars.generator.attack.Attack;
 import com.leekwars.generator.maps.Cell;
 import com.leekwars.generator.maps.Map;
+import com.leekwars.generator.state.Entity;
 
 public class MaskArea extends Area {
 
@@ -17,7 +18,7 @@ public MaskArea(Attack attack, int[][] area) {
 	}
 
 	@Override
-	public List<Cell> getArea(Map map, Cell launchCell, Cell targetCell) {
+	public List<Cell> getArea(Map map, Cell launchCell, Cell targetCell, Entity caster) {
 		int x = targetCell.getX(), y = targetCell.getY();
 		ArrayList<Cell> cells = new ArrayList<Cell>();
 		for (int i = 0; i < area.length; i++) {