fix: test fixtures and awakening type issues
- remove recruits property from Character test mock (doesn't exist in type) - add missing subaura property to Summon test mocks - consolidate Awakening imports to use entities source - make awakening type/level optional in GridWeapon/GridSummon - fix null handling in AwakeningDisplay (null -> undefined)
This commit is contained in:
parent
6dc10ce414
commit
c821873ac6
5 changed files with 7 additions and 8 deletions
|
|
@ -58,7 +58,6 @@ describe('EntityAdapter', () => {
|
||||||
ulb: true
|
ulb: true
|
||||||
},
|
},
|
||||||
special: false,
|
special: false,
|
||||||
recruits: null,
|
|
||||||
gender: 0,
|
gender: 0,
|
||||||
race: [1, 2],
|
race: [1, 2],
|
||||||
proficiency: [1, 2],
|
proficiency: [1, 2],
|
||||||
|
|
|
||||||
|
|
@ -57,6 +57,7 @@ describe('GridAdapter', () => {
|
||||||
element: 1,
|
element: 1,
|
||||||
maxLevel: 150,
|
maxLevel: 150,
|
||||||
uncap: { flb: true, ulb: true, transcendence: false },
|
uncap: { flb: true, ulb: true, transcendence: false },
|
||||||
|
subaura: false,
|
||||||
hp: { minHp: 100, maxHp: 500, maxHpFlb: 600, maxHpUlb: 700 },
|
hp: { minHp: 100, maxHp: 500, maxHpFlb: 600, maxHpUlb: 700 },
|
||||||
atk: { minAtk: 200, maxAtk: 1000, maxAtkFlb: 1200, maxAtkUlb: 1400 }
|
atk: { minAtk: 200, maxAtk: 1000, maxAtkFlb: 1200, maxAtkUlb: 1400 }
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
let awakeningData = $derived(getAwakeningData())
|
let awakeningData = $derived(getAwakeningData())
|
||||||
let imageUrl = $derived(getAwakeningImage(awakeningData))
|
let imageUrl = $derived(getAwakeningImage(awakeningData ?? undefined))
|
||||||
let displayName = $derived(awakeningData?.type?.name?.en || awakeningData?.type?.name?.ja || 'Awakening')
|
let displayName = $derived(awakeningData?.type?.name?.en || awakeningData?.type?.name?.ja || 'Awakening')
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -30,8 +30,8 @@ export interface GridWeapon {
|
||||||
weaponKeys?: WeaponKey[]
|
weaponKeys?: WeaponKey[]
|
||||||
ax?: SimpleAxSkill[]
|
ax?: SimpleAxSkill[]
|
||||||
awakening?: {
|
awakening?: {
|
||||||
type: Awakening
|
type?: Awakening
|
||||||
level: number
|
level?: number
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -44,8 +44,8 @@ export interface GridCharacter {
|
||||||
transcendenceStep?: number
|
transcendenceStep?: number
|
||||||
character: Character // Named properly, not "object"
|
character: Character // Named properly, not "object"
|
||||||
awakening?: {
|
awakening?: {
|
||||||
type: Awakening
|
type?: Awakening
|
||||||
level: number
|
level?: number
|
||||||
}
|
}
|
||||||
aetherialMastery?: { modifier: number; strength: number }
|
aetherialMastery?: { modifier: number; strength: number }
|
||||||
overMastery?: Array<{ modifier: number; strength: number }>
|
overMastery?: Array<{ modifier: number; strength: number }>
|
||||||
|
|
|
||||||
|
|
@ -2,8 +2,7 @@
|
||||||
* Utility functions for weapon and character modifiers (awakenings, weapon keys, AX skills)
|
* Utility functions for weapon and character modifiers (awakenings, weapon keys, AX skills)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import type { Awakening } from '$lib/types/Awakening'
|
import type { Awakening, WeaponKey } from '$lib/types/api/entities'
|
||||||
import type { WeaponKey } from '$lib/types/api/entities'
|
|
||||||
import type { SimpleAxSkill } from '$lib/types/SimpleAxSkill'
|
import type { SimpleAxSkill } from '$lib/types/SimpleAxSkill'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue