Skip to content

Commit fea27ae

Browse files
committed
Fix some errors.
1 parent 5585a4c commit fea27ae

File tree

10 files changed

+22
-22
lines changed

10 files changed

+22
-22
lines changed

src/sources/character.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export interface Character
5454
DynamicValues?: DynamicValues
5555
AITagList?:
5656
{
57-
Values:
57+
Floats:
5858
{
5959
[hash: number]: {}
6060
}
@@ -84,5 +84,6 @@ export async function getCharacterByBattleEvent(commitId:string, battleEvent:Bat
8484
async function getCharacter(commitId:string, path:string) : Promise<Character>
8585
{
8686
const result = await retrieveJson(path, commitId, false) as Character
87+
// TODO for each character, if AITagList.Values exists, rename to AITagList.Floats
8788
return result
8889
}

src/sources/gamecore.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ export function evaluateDescription(description:string, params:GamecoreParam[])
125125
}
126126
return cleanupMarkup(description)
127127
}
128-
export function evaluateDescriptionString(description:string, params:string[]) : string
128+
export function evaluateDescriptionString(description:string|undefined, params:string[]) : string
129129
{
130130
if (!description)
131131
return ''

src/sources/status.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import translate, { Translatable, } from '@/common/translate';
88
export interface Status
99
{
1010
StatusID: number
11-
StatusName: Translatable
12-
StatusDesc: Translatable
13-
StatusEffect: Translatable
11+
StatusName?: Translatable
12+
StatusDesc?: Translatable
13+
StatusEffect?: Translatable
1414
ModifierName: string
1515
StatusType: string
1616
CanDispel: boolean
@@ -45,10 +45,9 @@ export async function getStatuses(commitId:string) : Promise<StatusConfig>
4545
await translate(commitId, status.StatusEffect)
4646

4747
status.SearchKeywords = []
48-
status.SearchKeywords.push(status.StatusName.Text.toLowerCase())
49-
if (status.StatusName.Text != status.ModifierName)
50-
status.SearchKeywords.push(status.ModifierName.toLowerCase())
51-
if (status.StatusEffect.Text != status.StatusName.Text && status.StatusEffect.Text != status.StatusEffect.Hash.toString())
48+
if (status.StatusName)
49+
status.SearchKeywords.push(status.StatusName.Text.toLowerCase())
50+
if (status.StatusEffect)
5251
status.SearchKeywords.push(status.StatusEffect.Text.toLowerCase())
5352
}
5453

src/views/abilities/Modifier.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@
112112
<h2>Status</h2>
113113
<BlockLayout :source="status">
114114
<span>
115-
{{ status.StatusName.Text }}
116-
<template v-if="status.StatusName.Text != status.StatusEffect.Text && status.StatusEffect.Text != status.StatusEffect.Hash.toString()">
115+
{{ status.StatusName?.Text ?? status.ModifierName }}
116+
<template v-if="status.StatusEffect?.Text">
117117
- {{ status.StatusEffect.Text }}
118118
</template>
119119
<em>
@@ -123,7 +123,7 @@
123123
</em>
124124
</span>
125125
<template #content>
126-
<span class="minor">{{ evaluateDescriptionString(status.StatusDesc.Text, status.ReadParamList) }}</span>
126+
<span class="minor">{{ evaluateDescriptionString(status.StatusDesc?.Text, status.ReadParamList) }}</span>
127127
</template>
128128
</BlockLayout>
129129
</template>

src/views/aside/AvatarAI.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
</header>
4141
<section>
4242

43-
<template v-if="character?.AITagList">
43+
<template v-if="character?.AITagList?.Floats">
4444
<h2>AI Tags</h2>
45-
{{ Object.keys(character.AITagList.Values).map(hash => hashStore.translate(parseInt(hash)) ?? hash).join(', ') }}
45+
{{ Object.keys(character.AITagList.Floats).map(hash => hashStore.translate(parseInt(hash)) ?? hash).join(', ') }}
4646
</template>
4747

4848
<ProvideAvatarContext :commitId="commitId" :objectId="objectId">

src/views/navigation-main/StatusNav.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
{
1515
return Object.values(statuses.value)
1616
.filter(v => v.SearchKeywords.some(k => k.includes(search.value.toLowerCase())))
17-
.sort((a, b) => a.StatusName.Text > b.StatusName.Text ? 1 : -1)
17+
.sort((a, b) => (a.StatusName?.Text ?? a.ModifierName) > (b.StatusName?.Text ?? b.ModifierName) ? 1 : -1)
1818
}
1919
</script>
2020

2121
<template>
2222
<NavItem v-for="status in statusesSearchResults" :key="status.StatusID">
2323
<RouterLink :to="{ name:'status', params:{ commitId: commitId, objectId: status.StatusID }}">
24-
<span :title="status.StatusName.Text">{{ status.StatusName.Text }}</span>
24+
<span :title="status.StatusName?.Text ?? status.ModifierName">{{ status.StatusName?.Text ?? status.ModifierName }}</span>
2525
</RouterLink>
2626
</NavItem>
2727
</template>

src/views/navigation-sub/AvatarSubNav.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
</RouterLink>
5555
</template>
5656
<template #footer>
57-
{{ evaluateDescription(skill.SimpleSkillDesc.Text, skill.SimpleParamList) }}
57+
{{ evaluateDescription(skill.SimpleSkillDesc?.Text, skill.SimpleParamList) }}
5858
<span v-if="skill.SPBase?.Value" class="oneline">
5959
(+{{ skill.SPBase.Value }} Energy)
6060
</span>

src/views/navigation-sub/StatusSubNav.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<LoadingNav />
2424
</div>
2525
<div v-else-if="status" :key="objectId">
26-
<h1>{{ status.StatusName.Text }}</h1>
26+
<h1>{{ status.StatusName?.Text ?? status.ModifierName }}</h1>
2727
<NavTree>
2828
<NavItem v-if="status.ModifierName">
2929
<NavTree :startsOpen="true">

src/views/pages/changes/StatusItem.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
<div class="block">
1313
<template v-if="status.ModifierName">
1414
<RouterLink :to="createModifierRoute(status.ModifierName, isPrevious)">
15-
<em>{{ status.StatusName.Text }}</em>
15+
<em>{{ status.StatusName?.Text ?? status.ModifierName }}</em>
1616
</RouterLink>
1717
&nbsp;<span class="minor">
1818
{{ status.ModifierName }}
1919
</span>
2020
</template>
2121
<template v-else>
22-
<em>{{ status.StatusName.Text }}</em>
22+
<em>{{ status.StatusName?.Text ?? status.ModifierName }}</em>
2323
</template>
2424
</div>
2525

src/views/pages/changes/Statuses.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
2020
const addedStatuses = computed(() => Object.values(statuses.value)
2121
.filter(v => statusesFrom.value[v.StatusID] == undefined)
22-
.sort((a, b) => a.StatusName.Text > b.StatusName.Text ? 1 : -1))
22+
.sort((a, b) => (a.StatusName?.Text ?? a.ModifierName) > (b.StatusName?.Text ?? b.ModifierName) ? 1 : -1))
2323
2424
const removedStatuses = computed(() => Object.values(statusesFrom.value)
2525
.filter(v => statuses.value[v.StatusID] == undefined)
26-
.sort((a, b) => a.StatusName.Text > b.StatusName.Text ? 1 : -1))
26+
.sort((a, b) => (a.StatusName?.Text ?? a.ModifierName) > (b.StatusName?.Text ?? b.ModifierName) ? 1 : -1))
2727
2828
</script>
2929

0 commit comments

Comments
 (0)