From a8d97479ffccdef624034ada0c35fa1bb00c9da4 Mon Sep 17 00:00:00 2001 From: Justin Edmund Date: Wed, 3 Dec 2025 11:58:58 -0800 Subject: [PATCH] update Weapon.series to use WeaponSeriesRef, remove unused type files --- src/lib/types/Character.d.ts | 43 ----------------------------------- src/lib/types/Weapon.d.ts | 40 -------------------------------- src/lib/types/api/entities.ts | 5 +++- 3 files changed, 4 insertions(+), 84 deletions(-) delete mode 100644 src/lib/types/Character.d.ts delete mode 100644 src/lib/types/Weapon.d.ts diff --git a/src/lib/types/Character.d.ts b/src/lib/types/Character.d.ts deleted file mode 100644 index 7159c465..00000000 --- a/src/lib/types/Character.d.ts +++ /dev/null @@ -1,43 +0,0 @@ -interface Character { - type: 'character' - - id: string - granblue_id: string - character_id: readonly number[] - element: number - rarity: number - gender: number - max_level: number - season: number | null - season_name: string | null - series: number[] - series_names: string[] - gacha_available: boolean - name: { - [key: string]: string - en: string - ja: string - } - hp: { - min_hp: number - max_hp: number - max_hp_flb: number - } - atk: { - min_atk: number - max_atk: number - max_atk_flb: number - } - uncap: { - flb: boolean - ulb: boolean - } - race: { - race1: number - race2: number - } - proficiency: number[] - awakenings: Awakening[] - position?: number - special: boolean -} diff --git a/src/lib/types/Weapon.d.ts b/src/lib/types/Weapon.d.ts deleted file mode 100644 index 4ca644c1..00000000 --- a/src/lib/types/Weapon.d.ts +++ /dev/null @@ -1,40 +0,0 @@ -export interface Weapon { - type: 'weapon' - - id: string - granblue_id: number - element: number - proficiency: number - max_level: number - max_skill_level: number - max_awakening_level: number - series: number - ax: boolean - ax_type: number - awakenings: Awakening[] - promotions: number[] - promotion_names: string[] - name: { - [key: string]: string - en: string - ja: string - } - hp: { - min_hp: number - max_hp: number - max_hp_flb: number - max_hp_ulb: number - } - atk: { - min_atk: number - max_atk: number - max_atk_flb: number - max_atk_ulb: number - } - uncap: { - flb: boolean - ulb: boolean - transcendence: boolean - } - position?: number -} diff --git a/src/lib/types/api/entities.ts b/src/lib/types/api/entities.ts index b8956e48..3110834c 100644 --- a/src/lib/types/api/entities.ts +++ b/src/lib/types/api/entities.ts @@ -1,6 +1,8 @@ // Core entity types based on Rails blueprints // These are the base types for game objects +import type { WeaponSeriesRef } from './weaponSeries' + export interface LocalizedName { en: string ja: string @@ -17,7 +19,8 @@ export interface Weapon { maxLevel: number maxSkillLevel: number maxAwakeningLevel: number - series: number + /** Weapon series - object with slug/name/flags */ + series: WeaponSeriesRef | null ax: boolean axType: number hp: {