summaryrefslogtreecommitdiff
path: root/api
diff options
context:
space:
mode:
authorMike Vink <mike1994vink@gmail.com>2021-08-02 23:16:19 +0200
committerMike Vink <mike1994vink@gmail.com>2021-08-02 23:16:19 +0200
commit7c3249f9c13551840fc4c48abaa06fbbf377d481 (patch)
tree5505851e8ea03f5cc71c7e75bc84da746baa6477 /api
parent158516dad7d2930de8846dff1022451533dce7ae (diff)
feat(battle): fight battle event start
Diffstat (limited to 'api')
-rw-r--r--api/src/main/java/akkamon/api/MessagingEngine.java7
-rw-r--r--api/src/main/java/akkamon/api/models/BattleRequestBody.java5
-rw-r--r--api/src/main/java/akkamon/api/models/Event.java1
3 files changed, 9 insertions, 4 deletions
diff --git a/api/src/main/java/akkamon/api/MessagingEngine.java b/api/src/main/java/akkamon/api/MessagingEngine.java
index cdb9a27..aa559d0 100644
--- a/api/src/main/java/akkamon/api/MessagingEngine.java
+++ b/api/src/main/java/akkamon/api/MessagingEngine.java
@@ -133,8 +133,8 @@ public class MessagingEngine implements AkkamonMessageEngine {
}
@Override
- public void removeTrainerSessionFromScene(AkkamonNexus.TrainerID sceneId, AkkamonSession session) {
- this.sceneIdToAkkamonSessions.get(sceneId).remove(session);
+ public void removeTrainerSessionFromScene(AkkamonNexus.TrainerID trainerID, AkkamonSession session) {
+ this.sceneIdToAkkamonSessions.get(trainerID.scene).remove(session);
}
@Override
@@ -199,7 +199,6 @@ public class MessagingEngine implements AkkamonMessageEngine {
}
void incoming(AkkamonSession session, String message) {
- System.out.println(message);
Event event = gson.fromJson(message, Event.class);
if (event == null) {
System.out.println("Received non-supported message DTO.");
@@ -212,6 +211,7 @@ public class MessagingEngine implements AkkamonMessageEngine {
switch (event.type) {
case INTERACTION_REPLY:
System.out.println("received interaction reply!");
+ System.out.println(message);
sendToHandshaker(event.requestName, event.trainerID, event.value);
break;
case INTERACTION_REQUEST:
@@ -226,7 +226,6 @@ public class MessagingEngine implements AkkamonMessageEngine {
));
break;
case START_MOVING:
- System.out.println(message);
nexus.tell(new AkkamonNexus.RequestStartMoving(
UUID.randomUUID().getMostSignificantBits() & Long.MAX_VALUE,
event.trainerID,
diff --git a/api/src/main/java/akkamon/api/models/BattleRequestBody.java b/api/src/main/java/akkamon/api/models/BattleRequestBody.java
new file mode 100644
index 0000000..2a1a423
--- /dev/null
+++ b/api/src/main/java/akkamon/api/models/BattleRequestBody.java
@@ -0,0 +1,5 @@
+package akkamon.api.models;
+
+public class BattleRequestBody {
+ public
+}
diff --git a/api/src/main/java/akkamon/api/models/Event.java b/api/src/main/java/akkamon/api/models/Event.java
index 06ca8d0..7ee3ee1 100644
--- a/api/src/main/java/akkamon/api/models/Event.java
+++ b/api/src/main/java/akkamon/api/models/Event.java
@@ -12,4 +12,5 @@ public class Event {
public Interaction interaction;
public String requestName;
public boolean value;
+ public BattleRequestBody battleRequestBody;
}