Compare commits
No commits in common. "master" and "creeps-live-ouvre" have entirely different histories.
master
...
creeps-liv
4 changed files with 59 additions and 29 deletions
|
|
@ -1,13 +1,15 @@
|
||||||
package com.epita.creeps;
|
package com.epita.creeps;
|
||||||
|
|
||||||
import com.epita.creeps.commands.Basics;
|
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.Direction;
|
||||||
import com.epita.creeps.given.vo.geometry.Point;
|
import com.epita.creeps.given.vo.geometry.Point;
|
||||||
import com.epita.creeps.given.vo.response.CommandResponse;
|
import com.epita.creeps.given.vo.response.CommandResponse;
|
||||||
import com.epita.creeps.given.vo.response.InitResponse;
|
import com.epita.creeps.given.vo.response.InitResponse;
|
||||||
import com.epita.creeps.given.vo.response.StatisticsResponse;
|
import com.epita.creeps.given.vo.response.StatisticsResponse;
|
||||||
import com.epita.creeps.units.*;
|
import com.epita.creeps.units.Building;
|
||||||
|
import com.epita.creeps.units.Citizen;
|
||||||
|
import com.epita.creeps.units.Turret;
|
||||||
|
import com.epita.creeps.units.Unit;
|
||||||
import kong.unirest.core.HttpResponse;
|
import kong.unirest.core.HttpResponse;
|
||||||
import kong.unirest.core.JsonNode;
|
import kong.unirest.core.JsonNode;
|
||||||
import kong.unirest.core.Unirest;
|
import kong.unirest.core.Unirest;
|
||||||
|
|
@ -61,6 +63,7 @@ public class Program {
|
||||||
logger.error("Cannot connect to the server. Aborting...");
|
logger.error("Cannot connect to the server. Aborting...");
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
|
// AsyncExec.justWait(0);
|
||||||
|
|
||||||
// Create account and get init infos
|
// Create account and get init infos
|
||||||
logger.info("Creating account");
|
logger.info("Creating account");
|
||||||
|
|
@ -73,11 +76,59 @@ public class Program {
|
||||||
Unit.getUnits().add(citizen1);
|
Unit.getUnits().add(citizen1);
|
||||||
Unit.getUnits().add(citizen2);
|
Unit.getUnits().add(citizen2);
|
||||||
|
|
||||||
// Et voilà, machtou pichtou
|
StatisticsResponse statistics = Basics.getStatistics();
|
||||||
|
logger.debug(statistics.toString());
|
||||||
|
|
||||||
|
while (true) {
|
||||||
|
for (var player : statistics.players) {
|
||||||
|
if (player.name == login)
|
||||||
|
continue;
|
||||||
|
citizen1.sendMessage(player.name, "Nicole");
|
||||||
|
citizen2.sendMessage(player.name,"Ouvre");
|
||||||
|
citizen1.waitFinished();
|
||||||
|
citizen2.waitFinished();
|
||||||
|
citizen1.sendMessage(player.name, "Nicole");
|
||||||
|
citizen2.sendMessage(player.name, "MAIS MOI JE VEUX FAIRE L'AMOUUUUR");
|
||||||
|
citizen1.waitFinished();
|
||||||
|
citizen2.waitFinished();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
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
|
||||||
|
//
|
||||||
|
//###
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@ import com.epita.creeps.given.json.Json;
|
||||||
import com.epita.creeps.given.vo.report.*;
|
import com.epita.creeps.given.vo.report.*;
|
||||||
import com.epita.creeps.given.vo.response.InitResponse;
|
import com.epita.creeps.given.vo.response.InitResponse;
|
||||||
import com.epita.creeps.given.vo.response.StatisticsResponse;
|
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.Turret;
|
||||||
import com.epita.creeps.units.Unit;
|
import com.epita.creeps.units.Unit;
|
||||||
import kong.unirest.core.HttpResponse;
|
import kong.unirest.core.HttpResponse;
|
||||||
|
|
@ -111,8 +110,8 @@ public class Basics {
|
||||||
Unit.getUnits().add(turret);
|
Unit.getUnits().add(turret);
|
||||||
}
|
}
|
||||||
else if (spawnReport.spawnedUnit.opcode.endsWith("bomber-bot")) {
|
else if (spawnReport.spawnedUnit.opcode.endsWith("bomber-bot")) {
|
||||||
BomberBot bombhero = new BomberBot(Program.getLogin(), spawnReport.spawnedUnitId, spawnReport.spawnedUnit.position);
|
Turret turret = new Turret(Program.getLogin(), spawnReport.spawnedUnitId, spawnReport.spawnedUnit.position);
|
||||||
Unit.getUnits().add(bombhero);
|
Unit.getUnits().add(turret);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
logger.warn("Spawned unit is an unknown type. Ignored...");
|
logger.warn("Spawned unit is an unknown type. Ignored...");
|
||||||
|
|
|
||||||
|
|
@ -1,26 +1,10 @@
|
||||||
package com.epita.creeps.units;
|
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.geometry.Point;
|
||||||
import com.epita.creeps.given.vo.parameter.FireParameter;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class BomberBot extends Unit {
|
public class BomberBot extends Unit {
|
||||||
|
|
||||||
public BomberBot(String login, String id, Point position) {
|
public BomberBot(String login, String id, Point position) {
|
||||||
super(login, id, position);
|
super(login, id, position);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Retrieves all units that are turrets
|
|
||||||
public static List<Unit> 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;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -46,11 +46,7 @@ public abstract class Unit {
|
||||||
// Sends a specific action to the server using it's HTTPS string representation
|
// 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
|
// Sets pending action accordingly and asks for a report after `delay` ticks
|
||||||
public void sendActionWithBody(String actionCode, String body, long delay) {
|
public void sendActionWithBody(String actionCode, String body, long delay) {
|
||||||
if (!idle) {
|
// Move
|
||||||
// logger.warn("Unit is already busy, queuing action");
|
|
||||||
this.waitFinished();
|
|
||||||
}
|
|
||||||
// Do
|
|
||||||
idle = false;
|
idle = false;
|
||||||
pendingAction = AsyncExec.asyncExec(() -> Unirest.post(command_uri + actionCode).body(body).asJson(), delay)
|
pendingAction = AsyncExec.asyncExec(() -> Unirest.post(command_uri + actionCode).body(body).asJson(), delay)
|
||||||
.thenApplyAsync( x -> x );
|
.thenApplyAsync( x -> x );
|
||||||
|
|
@ -87,7 +83,7 @@ public abstract class Unit {
|
||||||
logger.warn("Invalid report received: null value");
|
logger.warn("Invalid report received: null value");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
// logger.debug("Got report: " + lastReport);
|
logger.debug("Got report: " + lastReport);
|
||||||
idle = true;
|
idle = true;
|
||||||
|
|
||||||
return lastReport.errorCode != null;
|
return lastReport.errorCode != null;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue