More necessary GraphQL schema additions

Author: doombubbles

spellsource-graphql/build.gradle

@@ -57,6 +57,8 @@ tasks.named("yarnRunCodegen").configure {
   inputs.file("schema.graphql")
   inputs.dir("graphql/web")
   inputs.dir("graphql/shared")
+  
+  mustRunAfter ":spellsource-server:generateSchema"
   // TODO manually specify outputs as well?
 }
 
@@ -80,6 +82,8 @@ tasks.named("yarnRunStrawberryShake").configure {
       into "../spellsource-client/src/unity/Assets/Scripts/"
     }
   }
+  
+  mustRunAfter ":spellsource-server:generateSchema"
 }
 
 tasks.register("generateAll") {
@@ -103,6 +107,6 @@ tasks.register("generateSchema") {
 tasks.register("regenerate") {
   group('spellsource')
   description("Full cycle: generate stitched schema then run all codegen.")
-  dependsOn generateSchema, generateAll
-  generateAll.mustRunAfter(generateSchema)
+  dependsOn generateSchema
+  finalizedBy generateAll
 }

spellsource-graphql/graphql/shared/fragments/entity.graphql

@@ -11,6 +11,61 @@ fragment entity on Entity {
     zone
     player
   }
+  art {
+    body {
+      vertex {
+        r
+        g
+        b
+        a
+      }
+    }
+    highlight {
+      r
+      g
+      b
+      a
+    }
+    loop {
+      named
+    }
+    missile {
+      named
+    }
+    onCast {
+      named
+    }
+    onHit {
+      named
+    }
+    primary {
+      r
+      g
+      b
+      a
+    }
+    secondary {
+      r
+      g
+      b
+      a
+    }
+    shadow {
+      r
+      g
+      b
+      a
+    }
+    spell {
+      named
+    }
+    sprite {
+      named
+    }
+    spriteShadow {
+      named
+    }
+  }
   owner
   boardPosition
   attack

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

@@ -32,6 +32,14 @@ fragment serverGameMessage on ServerGameMessage {
       ...entitySummary
     }
     value
+    cardEvent {
+      card {
+        ...entitySummary
+      }
+      showLocal
+    }
+    entityTouched
+    entityUntouched
   }
   gameOver {
     localPlayerWon

spellsource-graphql/graphql/shared/fragments/spellAction.graphql

@@ -11,4 +11,18 @@ fragment spellAction on SpellAction {
     target
     friendlyBattlefieldIndex
   }
+  choices {
+    action
+    actionType
+    sourceId
+    description
+    entity {
+      ...entitySummary
+    }
+    targetKeyToActions {
+      action
+      target
+      friendlyBattlefieldIndex
+    }
+  }
 }

spellsource-graphql/graphql/shared/mutations/touchEntity.graphql

@@ -0,0 +1,3 @@
+mutation touchEntity($entityId: Int!) {
+  touchEntity(entityId: $entityId)
+}

spellsource-graphql/graphql/shared/mutations/untouchEntity.graphql

@@ -0,0 +1,3 @@
+mutation untouchEntity($entityId: Int!) {
+  untouchEntity(entityId: $entityId)
+}

spellsource-graphql/schema.graphql

@@ -721,6 +721,12 @@ type Mutation {
   """Concede the current game."""
   concedeGame: Boolean!
 
+  """Notify the opponent that a local entity is being hovered."""
+  touchEntity(entityId: Int!): Boolean!
+
+  """Notify the opponent that a local entity is no longer being hovered."""
+  untouchEntity(entityId: Int!): Boolean!
+
   """cards (editable)"""
   putCard(input: PutCardInput!): PutCardResult!
   deleteCard(editableCardId: String!): Boolean!
@@ -4007,6 +4013,41 @@ enum ActionType {
   TAP
 }
 
+type Art {
+  body: ArtFont
+  highlight: ArtColor
+  loop: ArtPrefab
+  missile: ArtPrefab
+  onCast: ArtPrefab
+  onHit: ArtPrefab
+  primary: ArtColor
+  secondary: ArtColor
+  shadow: ArtColor
+  spell: ArtPrefab
+  sprite: ArtSprite
+  spriteShadow: ArtSprite
+}
+
+"""─── Art types ────────────────────────────────────────────────"""
+type ArtColor {
+  r: Float!
+  g: Float!
+  b: Float!
+  a: Float!
+}
+
+type ArtFont {
+  vertex: ArtColor
+}
+
+type ArtPrefab {
+  named: String
+}
+
+type ArtSprite {
+  named: String
+}
+
 input AttributeValueInput {
   attribute: PlayerEntityAttribute!
   stringValue: String!
@@ -4018,6 +4059,11 @@ type AttributeValueTuple {
   stringValue: String!
 }
 
+type CardEvent {
+  card: Entity
+  showLocal: Boolean!
+}
+
 """─── Card catalogue ───────────────────────────────────────────"""
 type CardRecord {
   id: BigInt!
@@ -4154,6 +4200,7 @@ type Entity {
   entityType: EntityType!
   rarity: Rarity!
   location: EntityLocation
+  art: Art
   owner: Int!
   boardPosition: Int!
 
@@ -4268,6 +4315,9 @@ type GameEvent {
   target: Entity
   targets: [Entity!]!
   value: Int
+  cardEvent: CardEvent
+  entityTouched: Int
+  entityUntouched: Int
 }
 
 enum GameEventType {

spellsource-server/build.gradle

@@ -449,5 +449,6 @@ tasks.register("generateSchema", JavaExec) {
   mainClass.set('com.hiddenswitch.framework.tests.applications.SchemaGeneratorEntryPoint')
   environment("TESTCONTAINERS_REUSE_ENABLE", "true")
   jvmArgs.addAll(jvmArgs)
+  inputs.file("src/main/resources/schema.graphqls")
   outputs.file(rootProject.file("spellsource-graphql/schema.graphql"))
 }