From 4d8f5714bf7643f5a214339d6fbb45190f7910e7 Mon Sep 17 00:00:00 2001 From: skippi Date: Fri, 2 Sep 2022 01:17:07 -0500 Subject: [PATCH 1/2] fix dendro% not showing properly on viewer Caused by indices error between golang and webapp. --- app/src/util.ts | 4 ++-- pkg/core/attributes/stats.go | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/util.ts b/app/src/util.ts index b5c514d55..263565b9f 100644 --- a/app/src/util.ts +++ b/app/src/util.ts @@ -92,6 +92,6 @@ export const StatToIndexMap: { [key in string]: number } = { ElectroP: 15, AnemoP: 16, GeoP: 17, - PhyP: 18, - DendroP: 19, + DendroP: 18, + PhyP: 19, }; diff --git a/pkg/core/attributes/stats.go b/pkg/core/attributes/stats.go index 29e7657e5..ceee42d90 100644 --- a/pkg/core/attributes/stats.go +++ b/pkg/core/attributes/stats.go @@ -87,9 +87,8 @@ var StatTypeString = [...]string{ "electro%", "anemo%", "geo%", - "phys%", - // "ele%", "dendro%", + "phys%", "atkspd%", "dmg%", } From a069b80b397e42d7c1da6928be9b139b53bcb53a Mon Sep 17 00:00:00 2001 From: skippi Date: Fri, 2 Sep 2022 01:17:54 -0500 Subject: [PATCH 2/2] add dendro% to webapp stat list Now we show dendro on the viewer. Right now it's using hydro icon, so we'll have to change that once srl gets the actual icon. --- app/src/Components/Character/CharacterCard.tsx | 2 ++ app/src/Components/Character/Stats.ts | 8 ++++++++ app/src/Pages/Sim/helper.ts | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/src/Components/Character/CharacterCard.tsx b/app/src/Components/Character/CharacterCard.tsx index a769d6aef..b346d8696 100644 --- a/app/src/Components/Character/CharacterCard.tsx +++ b/app/src/Components/Character/CharacterCard.tsx @@ -66,6 +66,8 @@ function statKeyToIcon(key: string): JSX.Element { return ; case 'heal': return ; + case 'dendro': + return ; // TODO: fix dendro icon default: return ; } diff --git a/app/src/Components/Character/Stats.ts b/app/src/Components/Character/Stats.ts index c7982fd8e..4f04a734c 100644 --- a/app/src/Components/Character/Stats.ts +++ b/app/src/Components/Character/Stats.ts @@ -142,6 +142,14 @@ export function ConsolidateCharStats(chars: Character[]): { count: 0, t: '%', }, + dendro: { + name: 'dendro%', + flatIndex: -1, + percentIndex: StatToIndexMap['DendroP'], + val: {}, + count: 0, + t: '%', + }, heal: { name: 'heal', flatIndex: -1, diff --git a/app/src/Pages/Sim/helper.ts b/app/src/Pages/Sim/helper.ts index 4e629de81..f991a05c1 100644 --- a/app/src/Pages/Sim/helper.ts +++ b/app/src/Pages/Sim/helper.ts @@ -19,8 +19,8 @@ const statKeys = [ 'electro%', 'anemo%', 'geo%', - 'phys%', 'dendro%', + 'phys%', 'atkspd%', 'dmg%', ];