Battlefield and matchmaking improvements

Author: doombubbles

spellsource-graphql/graphql/shared/fragments/serverGameMessage.graphql

@@ -38,6 +38,9 @@ fragment serverGameMessage on ServerGameMessage {
       }
       showLocal
     }
+    performedGameAction {
+      actionType
+    }
     entityTouched
     entityUntouched
   }

spellsource-graphql/schema.graphql

@@ -4317,6 +4317,7 @@ type GameEvent {
   targets: [Entity!]!
   value: Int
   cardEvent: CardEvent
+  performedGameAction: PerformedGameActionEvent
   entityTouched: Int
   entityUntouched: Int
 }
@@ -4522,6 +4523,10 @@ enum MessageType {
   TIMER
 }
 
+type PerformedGameActionEvent {
+  actionType: ActionType!
+}
+
 enum PlayerEntityAttribute {
   SIGNATURE
 }

spellsource-server/src/main/java/com/hiddenswitch/framework/graphql/GameEvent.java

@@ -16,13 +16,14 @@ public class GameEvent implements java.io.Serializable {
     private java.util.List<Entity> targets;
     private Integer value;
     private CardEvent cardEvent;
+    private PerformedGameActionEvent performedGameAction;
     private Integer entityTouched;
     private Integer entityUntouched;
 
     public GameEvent() {
     }
 
-    public GameEvent(GameEventType eventType, int id, String description, boolean isPowerHistory, boolean isSourcePlayerLocal, boolean isTargetPlayerLocal, Entity source, Entity target, java.util.List<Entity> targets, Integer value, CardEvent cardEvent, Integer entityTouched, Integer entityUntouched) {
+    public GameEvent(GameEventType eventType, int id, String description, boolean isPowerHistory, boolean isSourcePlayerLocal, boolean isTargetPlayerLocal, Entity source, Entity target, java.util.List<Entity> targets, Integer value, CardEvent cardEvent, PerformedGameActionEvent performedGameAction, Integer entityTouched, Integer entityUntouched) {
         this.eventType = eventType;
         this.id = id;
         this.description = description;
@@ -34,6 +35,7 @@ public GameEvent(GameEventType eventType, int id, String description, boolean is
         this.targets = targets;
         this.value = value;
         this.cardEvent = cardEvent;
+        this.performedGameAction = performedGameAction;
         this.entityTouched = entityTouched;
         this.entityUntouched = entityUntouched;
     }
@@ -115,6 +117,13 @@ public void setCardEvent(CardEvent cardEvent) {
         this.cardEvent = cardEvent;
     }
 
+    public PerformedGameActionEvent getPerformedGameAction() {
+        return performedGameAction;
+    }
+    public void setPerformedGameAction(PerformedGameActionEvent performedGameAction) {
+        this.performedGameAction = performedGameAction;
+    }
+
     public Integer getEntityTouched() {
         return entityTouched;
     }
@@ -148,6 +157,7 @@ public static class Builder {
         private java.util.List<Entity> targets;
         private Integer value;
         private CardEvent cardEvent;
+        private PerformedGameActionEvent performedGameAction;
         private Integer entityTouched;
         private Integer entityUntouched;
 
@@ -209,6 +219,11 @@ public Builder setCardEvent(CardEvent cardEvent) {
             return this;
         }
 
+        public Builder setPerformedGameAction(PerformedGameActionEvent performedGameAction) {
+            this.performedGameAction = performedGameAction;
+            return this;
+        }
+
         public Builder setEntityTouched(Integer entityTouched) {
             this.entityTouched = entityTouched;
             return this;
@@ -221,7 +236,7 @@ public Builder setEntityUntouched(Integer entityUntouched) {
 
 
         public GameEvent build() {
-            return new GameEvent(eventType, id, description, isPowerHistory, isSourcePlayerLocal, isTargetPlayerLocal, source, target, targets, value, cardEvent, entityTouched, entityUntouched);
+            return new GameEvent(eventType, id, description, isPowerHistory, isSourcePlayerLocal, isTargetPlayerLocal, source, target, targets, value, cardEvent, performedGameAction, entityTouched, entityUntouched);
         }
 
     }

spellsource-server/src/main/java/com/hiddenswitch/framework/graphql/PerformedGameActionEvent.java

@@ -0,0 +1,48 @@
+package com.hiddenswitch.framework.graphql;
+
+
+public class PerformedGameActionEvent implements java.io.Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private ActionType actionType;
+
+    public PerformedGameActionEvent() {
+    }
+
+    public PerformedGameActionEvent(ActionType actionType) {
+        this.actionType = actionType;
+    }
+
+    public ActionType getActionType() {
+        return actionType;
+    }
+    public void setActionType(ActionType actionType) {
+        this.actionType = actionType;
+    }
+
+
+
+    public static PerformedGameActionEvent.Builder builder() {
+        return new PerformedGameActionEvent.Builder();
+    }
+
+    public static class Builder {
+
+        private ActionType actionType;
+
+        public Builder() {
+        }
+
+        public Builder setActionType(ActionType actionType) {
+            this.actionType = actionType;
+            return this;
+        }
+
+
+        public PerformedGameActionEvent build() {
+            return new PerformedGameActionEvent(actionType);
+        }
+
+    }
+}

spellsource-server/src/main/java/com/hiddenswitch/framework/impl/GraphQLGameBridge.java

@@ -168,6 +168,9 @@ private static GameEvent toGraphQLEvent(Spellsource.GameEvent proto) {
 						.setCard(proto.getCardEvent().hasCard() ? toGraphQLEntity(proto.getCardEvent().getCard()) : null)
 						.setShowLocal(proto.getCardEvent().getShowLocal())
 						.build() : null)
+				.setPerformedGameAction(proto.hasPerformedGameAction() ? new PerformedGameActionEvent.Builder()
+						.setActionType(ActionType.valueOf(proto.getPerformedGameAction().getActionType().name()))
+						.build() : null)
 				.setEntityTouched(proto.getEntityTouched() != 0 ? proto.getEntityTouched() : null)
 				.setEntityUntouched(proto.getEntityUntouched() != 0 ? proto.getEntityUntouched() : null)
 				.build();

spellsource-server/src/main/resources/schema.graphqls

@@ -561,6 +561,10 @@ type CardEvent {
     showLocal: Boolean!
 }
 
+type PerformedGameActionEvent {
+    actionType: ActionType!
+}
+
 type GameEvent {
     eventType: GameEventType!
     id: Int!
@@ -573,6 +577,7 @@ type GameEvent {
     targets: [Entity!]!
     value: Int
     cardEvent: CardEvent
+    performedGameAction: PerformedGameActionEvent
     entityTouched: Int
     entityUntouched: Int
 }