feat: max battle stats display

Requires UnownHash/Golbat#307.

Author: Mygod

packages/locales/lib/human/en.json

@@ -825,6 +825,8 @@
   "placed_pokemon": "Placed Pokémon",
   "attack_bonus": "Attack Bonus",
   "battle_bonus": "Battle Bonus",
+  "station_battle_hp": "{{value}} HP",
+  "station_battle_cp_multiplier": "CP Multiplier: {{value}}",
   "copy_coordinates": "Copy Coordinates",
   "enable_station_popup_coords": "Show Power Spot Coords",
   "station_icons": "Power Spot Icons",

packages/types/lib/scanner.d.ts

@@ -385,6 +385,8 @@ export interface Station<Parsed extends boolean = false> {
   battle_pokemon_bread_mode: number
   battle_pokemon_move_1: number
   battle_pokemon_move_2: number
+  battle_pokemon_stamina?: number
+  battle_pokemon_cp_multiplier?: number
 
   total_stationed_pokemon: number
   total_stationed_gmax: number

packages/types/lib/server.d.ts

@@ -46,6 +46,7 @@ export interface DbContext {
   hasShowcaseForm: boolean
   hasShowcaseType: boolean
   hasStationedGmax: boolean
+  hasBattlePokemonStats: boolean
   hasPokemonShinyStats?: boolean
   connection?: number
 }

server/src/graphql/typeDefs/scanner.graphql

@@ -297,6 +297,8 @@ type Station {
   battle_pokemon_bread_mode: Int
   battle_pokemon_move_1: Int
   battle_pokemon_move_2: Int
+  battle_pokemon_stamina: Int
+  battle_pokemon_cp_multiplier: Float
 }
 
 type StationPokemon {

server/src/models/Station.js

@@ -20,7 +20,11 @@ class Station extends Model {
    * @param {import("@rm/types").DbContext} ctx
    * @returns {Promise<import("@rm/types").FullStation[]>}
    */
-  static async getAll(perms, args, { isMad, hasStationedGmax }) {
+  static async getAll(
+    perms,
+    args,
+    { isMad, hasStationedGmax, hasBattlePokemonStats },
+  ) {
     const { areaRestrictions } = perms
     const { stationUpdateLimit, stationInactiveLimitDays } =
       config.getSafe('api')
@@ -98,6 +102,9 @@ class Station extends Model {
       select.push(
         hasStationedGmax ? 'total_stationed_gmax' : 'stationed_pokemon',
       )
+      if (hasBattlePokemonStats) {
+        select.push('battle_pokemon_stamina', 'battle_pokemon_cp_multiplier')
+      }
 
       if (!onlyAllStations) {
         query.whereNotNull('battle_pokemon_id').andWhere('battle_end', '>', ts)

server/src/services/DbManager.js

@@ -155,8 +155,11 @@ class DbManager extends Logger {
         'showcase_pokemon_form_id' in columns,
         'showcase_pokemon_type_id' in columns,
       ])
-    const hasStationedGmax =
-      'total_stationed_gmax' in (await schema('station').columnInfo())
+    const stationColumns = await schema('station').columnInfo()
+    const hasStationedGmax = 'total_stationed_gmax' in stationColumns
+    const hasBattlePokemonStats =
+      'battle_pokemon_stamina' in stationColumns &&
+      'battle_pokemon_cp_multiplier' in stationColumns
     const [hasLayerColumn] = isMad
       ? await schema('trs_quest')
           .columnInfo()
@@ -213,6 +216,7 @@ class DbManager extends Logger {
       hasShowcaseForm,
       hasShowcaseType,
       hasStationedGmax,
+      hasBattlePokemonStats,
       hasShortcode,
       hasPokemonShinyStats,
     }
@@ -235,7 +239,6 @@ class DbManager extends Logger {
                 // Add support for HTTP authentication
                 httpAuth: this.endpoints[i].httpAuth,
                 pvpV2: true,
-                hasPokemonShinyStats: false,
               }
 
           Object.entries(this.models).forEach(([category, sources]) => {

src/features/station/StationPopup.jsx

@@ -269,6 +269,8 @@ function StationMedia({
   battle_pokemon_bread_mode,
   battle_level,
   battle_end,
+  battle_pokemon_stamina,
+  battle_pokemon_cp_multiplier,
 }) {
   const { t: tById } = useTranslateById()
   const { t } = useTranslation()
@@ -282,6 +284,14 @@ function StationMedia({
     }
     return poke?.types || []
   })
+  const battleStaminaDisplay =
+    typeof battle_pokemon_stamina === 'number'
+      ? battle_pokemon_stamina.toLocaleString()
+      : null
+  const battleCpMultiplierDisplay =
+    typeof battle_pokemon_cp_multiplier === 'number'
+      ? battle_pokemon_cp_multiplier.toLocaleString()
+      : null
 
   return isBattleActive ? (
     <CardMedia>
@@ -329,6 +339,18 @@ function StationMedia({
               {t(`max_battle_${battle_level}`)}
             </Typography>
           )}
+          {battleStaminaDisplay && (
+            <Typography variant="caption" align="center">
+              {t('station_battle_hp', { value: battleStaminaDisplay })}
+            </Typography>
+          )}
+          {battleCpMultiplierDisplay && (
+            <Typography variant="caption" align="center">
+              {t('station_battle_cp_multiplier', {
+                value: battleCpMultiplierDisplay,
+              })}
+            </Typography>
+          )}
         </Stack>
       </Box>
     </CardMedia>

src/features/station/StationTile.jsx

@@ -103,6 +103,8 @@ const trackedBattleKeys = [
   'battle_start',
   'battle_end',
   'is_battle_available',
+  'battle_pokemon_stamina',
+  'battle_pokemon_cp_multiplier',
   'total_stationed_pokemon',
   'total_stationed_gmax',
   'updated',

src/services/queries/station.js

@@ -29,6 +29,8 @@ const battle = gql`
     battle_pokemon_bread_mode
     battle_pokemon_move_1
     battle_pokemon_move_2
+    battle_pokemon_stamina
+    battle_pokemon_cp_multiplier
     total_stationed_pokemon
     total_stationed_gmax
   }