Merge pull request #894 from skippi/dendro-web-fix

fix dendro not showing properly on web
genshinsim · Sep 2, 2022 · 07b6033 · 07b6033
2 parents c117096 + a069b80
commit 07b6033
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git 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 <IconPhysical />;
     case 'heal':
       return <IconHeal />;
+    case 'dendro':
+      return <IconHydro />; // TODO: fix dendro icon
     default:
       return <span />;
   }

diff --git 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
@@ -19,8 +19,8 @@ const statKeys = [
   'electro%',
   'anemo%',
   'geo%',
-  'phys%',
   'dendro%',
+  'phys%',
   'atkspd%',
   'dmg%',
 ];

diff --git 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
@@ -87,9 +87,8 @@ var StatTypeString = [...]string{
 	"electro%",
 	"anemo%",
 	"geo%",
-	"phys%",
-	// "ele%",
 	"dendro%",
+	"phys%",
 	"atkspd%",
 	"dmg%",
 }