feat: multi-battle for stations

config/custom-environment-variables.json

@@ -1431,6 +1431,10 @@
         "__name": "DEFAULT_FILTERS_STATIONS_BATTLES",
         "__format": "boolean"
       },
+      "includeUpcoming": {
+        "__name": "DEFAULT_FILTERS_STATIONS_INCLUDE_UPCOMING",
+        "__format": "boolean"
+      },
       "gmaxStationed": {
         "__name": "DEFAULT_FILTERS_STATIONS_GMAX_STATIONED",
         "__format": "boolean"
@@ -2481,4 +2485,4 @@
       }
     }
   }
-}
+}

config/default.json

@@ -610,6 +610,7 @@
       "pokemon": false,
       "battleTier": "all",
       "battles": false,
+      "includeUpcoming": true,
       "gmaxStationed": false,
       "interactionRanges": false,
       "customRange": 0,

packages/locales/lib/human/en.json

@@ -835,6 +835,7 @@
   "stations_opacity": "Dynamic Power Spot Opacity",
   "inactive_stations": "Inactive Power Spots",
   "max_battles": "Max Battles",
+  "include_upcoming": "Include Upcoming",
   "dynamax": "Dynamax",
   "stations_subtitle": "Displays Power Spots on the map",
   "dynamax_subtitle": "Displays Dynamax Battles on the map",

packages/types/lib/scanner.d.ts

@@ -379,6 +379,24 @@ export interface StationPokemon extends PokemonDisplay {
   bread_mode: number
 }
 
+export interface StationBattle {
+  battle_level: number
+  battle_start?: number
+  battle_end?: number
+  updated?: number
+  battle_pokemon_id: number
+  battle_pokemon_form: number
+  battle_pokemon_costume: number
+  battle_pokemon_gender: Gender
+  battle_pokemon_alignment: number
+  battle_pokemon_bread_mode: number
+  battle_pokemon_move_1: number
+  battle_pokemon_move_2: number
+  battle_pokemon_stamina?: number
+  battle_pokemon_cp_multiplier?: number
+  battle_pokemon_estimated_cp?: number
+}
+
 export interface Station<Parsed extends boolean = false> {
   id: string
   lat: number
@@ -412,6 +430,7 @@ export interface Station<Parsed extends boolean = false> {
   stationed_pokemon: Parsed extends true
     ? StationPokemon[]
     : string | StationPokemon[]
+  battles?: StationBattle[]
   updated: number
 }
 

packages/types/lib/server.d.ts

@@ -46,6 +46,7 @@ export interface DbContext {
   hasShowcaseData: boolean
   hasShowcaseForm: boolean
   hasShowcaseType: boolean
+  hasMultiBattles: boolean
   hasStationedGmax: boolean
   hasBattlePokemonStats: boolean
   hasPokemonBackground: boolean

server/src/filters/builder/base.js

@@ -134,6 +134,9 @@ function buildDefaultFilters(perms) {
             maxBattles: perms.stations
               ? defaultFilters.stations.battles
               : undefined,
+            includeUpcoming: perms.dynamax
+              ? defaultFilters.stations.includeUpcoming
+              : undefined,
             filter: pokemon.stations,
             gmaxStationed: perms.dynamax
               ? defaultFilters.stations.gmaxStationed

server/src/graphql/typeDefs/map.graphql

@@ -80,6 +80,7 @@ type Search {
   # battle_pokemon_evolution: Int
   battle_pokemon_alignment: Int
   battle_pokemon_bread_mode: Int
+  battle_start: Int
   battle_end: Int
 }
 

server/src/graphql/typeDefs/scanner.graphql

@@ -319,6 +319,25 @@ type Station {
   battle_pokemon_stamina: Int
   battle_pokemon_cp_multiplier: Float
   battle_pokemon_estimated_cp: Int
+  battles: [StationBattle]
+}
+
+type StationBattle {
+  battle_level: Int
+  battle_start: Int
+  battle_end: Int
+  updated: Int
+  battle_pokemon_id: Int
+  battle_pokemon_form: Int
+  battle_pokemon_costume: Int
+  battle_pokemon_gender: Int
+  battle_pokemon_alignment: Int
+  battle_pokemon_bread_mode: Int
+  battle_pokemon_move_1: Int
+  battle_pokemon_move_2: Int
+  battle_pokemon_stamina: Int
+  battle_pokemon_cp_multiplier: Float
+  battle_pokemon_estimated_cp: Int
 }
 
 type StationPokemon {