diff --git a/src/main/java/com/epita/creeps/AsyncExec.java b/src/main/java/com/epita/creeps/AsyncExec.java index fd36f47..46b04f3 100644 --- a/src/main/java/com/epita/creeps/AsyncExec.java +++ b/src/main/java/com/epita/creeps/AsyncExec.java @@ -16,11 +16,15 @@ import java.util.function.Supplier; @NoArgsConstructor public class AsyncExec { - @Getter - @Setter + private static float ticksPerSecond = 1; // private CompletableFuture task; + + public static void setTicksPerSecond(float ticksPerSecond) { + AsyncExec.ticksPerSecond = ticksPerSecond; + } + public static long ticksToTime(long ticks) { return Math.ceilDiv(ticks, (long)Math.ceil(ticksPerSecond)); } diff --git a/src/main/java/com/epita/creeps/Program.java b/src/main/java/com/epita/creeps/Program.java index 02fb30c..1a881ef 100644 --- a/src/main/java/com/epita/creeps/Program.java +++ b/src/main/java/com/epita/creeps/Program.java @@ -1,21 +1,29 @@ package com.epita.creeps; import com.epita.creeps.commands.Basics; +import com.epita.creeps.given.extra.Cartographer; import com.epita.creeps.given.vo.geometry.Direction; +import com.epita.creeps.given.vo.geometry.Point; import com.epita.creeps.given.vo.response.CommandResponse; import com.epita.creeps.given.vo.response.InitResponse; -import com.epita.creeps.units.Citizen; +import com.epita.creeps.given.vo.response.StatisticsResponse; +import com.epita.creeps.units.*; import kong.unirest.core.HttpResponse; import kong.unirest.core.JsonNode; import kong.unirest.core.Unirest; import kong.unirest.core.UnirestException; +import lombok.Getter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.ArrayList; +import java.util.List; + public class Program { private static String srvUrl; private static Logger logger; + @Getter private static String login; public static void main(String[] args) { @@ -53,70 +61,23 @@ public class Program { logger.error("Cannot connect to the server. Aborting..."); throw e; } -// AsyncExec.justWait(0); // Create account and get init infos logger.info("Creating account"); InitResponse initResponse = Basics.connectAccount(login); login = initResponse.login; // Just in case - AsyncExec.setTicksPerSecond((long)initResponse.setup.ticksPerSeconds); - Citizen citizen1 = new Citizen(login, initResponse.citizen1Id); - Citizen citizen2 = new Citizen(login, initResponse.citizen2Id); + AsyncExec.setTicksPerSecond((float) initResponse.setup.ticksPerSeconds); + Citizen citizen1 = new Citizen(login, initResponse.citizen1Id, initResponse.householdCoordinates); + Citizen citizen2 = new Citizen(login, initResponse.citizen2Id, initResponse.householdCoordinates); + Unit.getUnits().add(citizen1); + Unit.getUnits().add(citizen2); - for(int i = 0; i < 3; i++) { - citizen1.move(Direction.RIGHT); - citizen2.move(Direction.UP); - - citizen1.waitFinished(); - citizen2.waitFinished(); - -// logger.debug("Received actions responses"); -// logger.debug("citizen1.error: " + citizen1_resp.error); -// logger.debug("citizen2.error: " + citizen2_resp.error); - } - - for(int i = 0; i < 3; i++) { - citizen1.move(Direction.LEFT); - citizen2.move(Direction.DOWN); - - citizen1.waitFinished(); - citizen2.waitFinished(); - -// logger.debug("Received actions responses"); -// logger.debug("citizen1.error: " + citizen1_resp.error); -// logger.debug("citizen2.error: " + citizen2_resp.error); - } + // Et voilà, machtou pichtou - -// logger.info("Done"); + logger.info("Done"); } -// ### Get statistics -//GET http://localhost:1664/statistics -// -//### Get status -//GET http://localhost:1664/status -// -//### Get report -//GET http://localhost:1664/report/148997e9b -// -//### Login with user login_l -//POST http://localhost:1664/init/login_l -// -//> {% -//client.global.set("baseId", response.body.baseId); -//client.global.set("probeId", response.body.probeId); -//client.global.set("login", response.body.login); -//%} -// -//### Post noop commande -//POST http://localhost:1664/command/{{login}}/{{probeId}}/noop -// -//### -//POST http://localhost:1664/command/dumeig_a/8d87eea10/inspect -// -//### } diff --git a/src/main/java/com/epita/creeps/commands/Basics.java b/src/main/java/com/epita/creeps/commands/Basics.java index bae31e7..070fab9 100644 --- a/src/main/java/com/epita/creeps/commands/Basics.java +++ b/src/main/java/com/epita/creeps/commands/Basics.java @@ -1,10 +1,16 @@ package com.epita.creeps.commands; import com.epita.creeps.AsyncExec; +import com.epita.creeps.Program; import com.epita.creeps.given.exception.NoReportException; +import com.epita.creeps.given.extra.Cartographer; import com.epita.creeps.given.json.Json; -import com.epita.creeps.given.vo.report.Report; +import com.epita.creeps.given.vo.report.*; import com.epita.creeps.given.vo.response.InitResponse; +import com.epita.creeps.given.vo.response.StatisticsResponse; +import com.epita.creeps.units.BomberBot; +import com.epita.creeps.units.Turret; +import com.epita.creeps.units.Unit; import kong.unirest.core.HttpResponse; import kong.unirest.core.JsonNode; import kong.unirest.core.Unirest; @@ -23,9 +29,12 @@ import java.util.concurrent.CompletableFuture; public class Basics { private static final Logger logger = LoggerFactory.getLogger(Basics.class); - @Getter @Setter private static String srvUrl; + public static void setSrvUrl(String srvUrl) { + Basics.srvUrl = srvUrl; + } + public static InitResponse connectAccount(String login) { try { CompletableFuture> resp = AsyncExec.asyncExec(() -> Unirest.post(srvUrl + "/init/" + login).asJson(), 0); @@ -43,20 +52,78 @@ public class Basics { } } + + public static StatisticsResponse getStatistics() { + try { + CompletableFuture> resp = AsyncExec.asyncExec(() -> Unirest.get(srvUrl + "/statistics").asJson(), 0); + HttpResponse response = resp.join(); + return Json.parse(response.getBody().toString(), StatisticsResponse.class); + } catch (UnirestException e) { + logger.error("Cannot retrieve statistics."); + throw e; + } + } + // Asks the server for a certain report public static Report getReport (String reportId) { - HttpResponse response; + HttpResponse response = null; try { response = Unirest.get(srvUrl + "/report/" + reportId).asJson(); - logger.debug("Got report: " + response.getBody().toPrettyString()); - return Json.parseReport(response.getBody().toString()); +// logger.debug("Got report: " + response.getBody().toPrettyString()); + Report report = Json.parseReport(response.getBody().toString()); + handleReport(report); + return report; } catch (UnirestException e) { logger.error("Could not retrieve report"); throw new RuntimeException(e); } catch (NoReportException e) { logger.error("Could not parse report: not a report"); + logger.debug(response.getBody().toPrettyString()); throw new RuntimeException(e); } } + public static void handleReport(Report report) { + Cartographer c = Cartographer.INSTANCE; + if (report.opcode.startsWith("farm")) { + c.register((FarmReport) report); + } + else if (report.opcode.startsWith("gather")) { + c.register((GatherReport) report); + } + else if (report.opcode.startsWith("move")) { + c.register((MoveReport) report); + } + else if (report.opcode.startsWith("build")) { + c.register((BuildReport) report); + } + else if (report.opcode.startsWith("observe")) { + c.register((ObserveReport) report); + } + else if (report.opcode.startsWith("spawn")) + { + SpawnReport spawnReport = (SpawnReport) report; + if (spawnReport.errorCode != null) { + logger.warn("Could not spawn unit: got report with an error: " + report.errorCode); + } + if (spawnReport.spawnedUnit.opcode.endsWith("turret")) { + Turret turret = new Turret(Program.getLogin(), spawnReport.spawnedUnitId, spawnReport.spawnedUnit.position); + Unit.getUnits().add(turret); + } + else if (spawnReport.spawnedUnit.opcode.endsWith("bomber-bot")) { + BomberBot bombhero = new BomberBot(Program.getLogin(), spawnReport.spawnedUnitId, spawnReport.spawnedUnit.position); + Unit.getUnits().add(bombhero); + } + else { + logger.warn("Spawned unit is an unknown type. Ignored..."); + } + } + else if (report.opcode.startsWith("fire")) { + logger.debug("FIRREEE!!"); + } + else { + logger.warn("Unknown opcode '" + report.opcode + "' in the server report. Ignored..."); + } + } + } diff --git a/src/main/java/com/epita/creeps/commands/ObeserveReport.java b/src/main/java/com/epita/creeps/commands/ObeserveReport.java new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/com/epita/creeps/units/BomberBot.java b/src/main/java/com/epita/creeps/units/BomberBot.java new file mode 100644 index 0000000..c499dea --- /dev/null +++ b/src/main/java/com/epita/creeps/units/BomberBot.java @@ -0,0 +1,26 @@ +package com.epita.creeps.units; + +import com.epita.creeps.given.extra.Cartographer; +import com.epita.creeps.given.json.Json; +import com.epita.creeps.given.vo.geometry.Point; +import com.epita.creeps.given.vo.parameter.FireParameter; + +import java.util.List; + +public class BomberBot extends Unit { + + public BomberBot(String login, String id, Point position) { + super(login, id, position); + } + + // Retrieves all units that are turrets + public static List getBomberBotUnits() { + return getUnits().stream().filter(unit -> unit.getClass() == BomberBot.class).toList(); + } + + public BomberBot fire() { + FireParameter fp = new FireParameter(this.position); + sendActionWithBody("fire:bomber-bot", Json.serialize(fp), 2); + return this; + } +} diff --git a/src/main/java/com/epita/creeps/units/Citizen.java b/src/main/java/com/epita/creeps/units/Citizen.java index 67d62f8..6d2b4a5 100644 --- a/src/main/java/com/epita/creeps/units/Citizen.java +++ b/src/main/java/com/epita/creeps/units/Citizen.java @@ -6,6 +6,7 @@ import com.epita.creeps.commands.Basics; import com.epita.creeps.given.exception.NoReportException; import com.epita.creeps.given.json.Json; import com.epita.creeps.given.vo.geometry.Direction; +import com.epita.creeps.given.vo.geometry.Point; import com.epita.creeps.given.vo.parameter.MessageParameter; import com.epita.creeps.given.vo.report.MoveReport; import com.epita.creeps.given.vo.report.Report; @@ -19,40 +20,50 @@ import java.util.concurrent.CompletableFuture; public class Citizen extends Unit { - public Citizen(String login, String citizen_id ) { - super(login, citizen_id); + public Citizen(String login, String citizen_id, Point position) { + super(login, citizen_id, position); } - public void move(Direction direction) { + public Citizen move(Direction direction) { sendAction("move:"+direction.direction, 2); + return this; } - public void observe() { + public Citizen observe() { sendAction("observe", 1); + return this; } - public void gather() { + public Citizen gather() { sendAction("gather", 4); + return this; } - public void unload() { + public Citizen unload() { sendAction("unload", 3); + return this; } - public void farm() { + public Citizen farm() { sendAction("farm", 10); + return this; } - public void build(Building building) { + public Citizen build(Building building) { sendAction("build:" + building.name, 20); + return this; } - public void spawn(String unit) { + public Citizen spawn(String unit) { sendAction("spawn:" + unit, 6); + return this; } - public void refine(String resource) { + public Citizen refine(String resource) { sendAction("refine:" + resource, 8); + return this; } - public void sendMessage(String receiver, String message) { + public Citizen sendMessage(String receiver, String message) { MessageParameter mp = new MessageParameter(receiver, message); sendActionWithBody("message:send", Json.serialize(mp), 1); + return this; } - public void fetchMessages() { + public Citizen fetchMessages() { sendAction("message:fetch", 1); + return this; } diff --git a/src/main/java/com/epita/creeps/units/Turret.java b/src/main/java/com/epita/creeps/units/Turret.java new file mode 100644 index 0000000..f2ba638 --- /dev/null +++ b/src/main/java/com/epita/creeps/units/Turret.java @@ -0,0 +1,27 @@ +package com.epita.creeps.units; + +import com.epita.creeps.given.extra.Cartographer; +import com.epita.creeps.given.json.Json; +import com.epita.creeps.given.vo.geometry.Point; +import com.epita.creeps.given.vo.parameter.FireParameter; + +import java.util.List; + +public class Turret extends Unit { + + public Turret(String login, String id, Point position) { + super(login, id, position); + } + + // Retrieves all units that are turrets + public static List getTurretUnits() { + return getUnits().stream().filter(unit -> unit.getClass() == Turret.class).toList(); + } + + public Turret fire(Point target) { + FireParameter fp = new FireParameter(target); + Cartographer cartographer = Cartographer.INSTANCE; + sendActionWithBody("fire:turret", Json.serialize(fp), 2); + return this; + } +} diff --git a/src/main/java/com/epita/creeps/units/Unit.java b/src/main/java/com/epita/creeps/units/Unit.java index 674f0e6..d508fa4 100644 --- a/src/main/java/com/epita/creeps/units/Unit.java +++ b/src/main/java/com/epita/creeps/units/Unit.java @@ -4,37 +4,55 @@ import com.epita.creeps.AsyncExec; import com.epita.creeps.ServerReponseException; import com.epita.creeps.commands.Basics; import com.epita.creeps.given.json.Json; +import com.epita.creeps.given.vo.geometry.Point; import com.epita.creeps.given.vo.report.Report; import com.epita.creeps.given.vo.response.CommandResponse; import kong.unirest.core.HttpResponse; import kong.unirest.core.JsonNode; import kong.unirest.core.Unirest; +import lombok.Getter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.ArrayList; +import java.util.List; import java.util.concurrent.CompletableFuture; public abstract class Unit { - protected final String id; - protected final String command_uri; - protected CompletableFuture> pendingAction; - protected CompletableFuture pendingReport; + + @Getter + private static final List units = new ArrayList<>(); public static String srvUrl; public static final Logger logger = LoggerFactory.getLogger(Unit.class); - public Unit(String login, String id) { + protected final String id; + @Getter + protected final Point position; + protected final String command_uri; + protected CompletableFuture> pendingAction; + protected CompletableFuture pendingReport; + protected Report lastReport; + protected boolean idle = true; + + public Unit(String login, String id, Point position) { if (srvUrl == null) { throw new RuntimeException("Tried to create a citizen without properly initializing static fields"); } this.id = id; + this.position = position; command_uri = srvUrl + "/command/" + login + "/" + id + "/"; } // Sends a specific action to the server using it's HTTPS string representation // Sets pending action accordingly and asks for a report after `delay` ticks public void sendActionWithBody(String actionCode, String body, long delay) { - // Move - pendingAction = AsyncExec.asyncExec(() -> Unirest.post(command_uri + actionCode).asJson(), delay) + if (!idle) { +// logger.warn("Unit is already busy, queuing action"); + this.waitFinished(); + } + // Do + idle = false; + pendingAction = AsyncExec.asyncExec(() -> Unirest.post(command_uri + actionCode).body(body).asJson(), delay) .thenApplyAsync( x -> x ); // Get report pendingReport = getCommandReport(); @@ -56,18 +74,23 @@ public abstract class Unit { * @return true if action succeeded, false otherwise */ public boolean waitFinished() { + if (idle) { + logger.warn("Tried to wait for an idle citizen"); + return false; + } if (pendingAction == null || pendingReport == null) { logger.warn("Tried to wait a citizen with no pending action or report"); return false; } - Report r = pendingReport.join(); - if (r == null) { + lastReport = pendingReport.join(); + if (lastReport == null) { logger.warn("Invalid report received: null value"); return false; } - logger.debug("Got report: " + r); +// logger.debug("Got report: " + lastReport); + idle = true; - return r.errorCode != null; + return lastReport.errorCode != null; } @@ -79,8 +102,10 @@ public abstract class Unit { } return AsyncExec.thenAsyncExec(pendingAction, x -> { CommandResponse cr = Json.parse(x.getBody().toString(), CommandResponse.class); - if (cr.error != null) + if (cr.error != null) { + logger.debug("Server reponse: " + cr.toString()); throw new ServerReponseException("Error retrieving the report id"); + } String reportId = cr.reportId; return Basics.getReport(reportId); }, 0);