Merge branch 'master' into zo_setfilter

frzyc · Jan 30, 2025 · 6e6ab6c · 6e6ab6c
2 parents 39ad4b8 + 1a673dd
commit 6e6ab6c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/libs/zzz/consts/src/disc.ts b/libs/zzz/consts/src/disc.ts
@@ -160,13 +160,13 @@ export const disc2pEffect: Record<
   DiscSetKey,
   Partial<Record<StatKey, number>>
 > = {
-  AstralVoice: { atk: 0.1 },
+  AstralVoice: { atk_: 0.1 },
   BranchBladeSong: { crit_dmg_: 0.16 },
   ChaosJazz: { anomProf: 30 },
-  ChaoticMetal: { ether_dmg_: 10 },
+  ChaoticMetal: { ether_dmg_: 0.1 },
   FangedMetal: { physical_dmg_: 0.1 },
   FreedomBlues: { anomProf: 30 },
-  HormonePunk: { atk: 0.1 },
+  HormonePunk: { atk_: 0.1 },
   InfernoMetal: { fire_dmg_: 0.1 },
   PolarMetal: { ice_dmg_: 0.1 },
   ProtoPunk: { shield_: 0.15 },

diff --git a/libs/zzz/page-optimize/src/Optimize.tsx b/libs/zzz/page-optimize/src/Optimize.tsx
@@ -250,7 +250,7 @@ export default function OptimizeWrapper({
               onClick={optimizing ? onCancel : onOptimize}
               color={optimizing ? 'error' : 'success'}
               startIcon={optimizing ? <CloseIcon /> : <TrendingUpIcon />}
-              disabled={!totalPermutations || !location}
+              disabled={!totalPermutations || !character}
             >
               {optimizing ? t('cancel') : t('optimize')}
             </Button>

diff --git a/libs/zzz/page-optimize/src/index.tsx b/libs/zzz/page-optimize/src/index.tsx
@@ -42,10 +42,9 @@ export default function PageOptimize() {
   const [builds, setBuilds] = useState<BuildResult[]>([])
   const [locationKey, setLocationKey] = useState<LocationKey>('')
 
-  const character = useCharacter(locationKey)
-  if (!character && locationKey)
-    // if not created, create.
-    database.chars.getOrCreate(locationKey)
+  const character =
+    useCharacter(locationKey) ??
+    (locationKey ? database.chars.getOrCreate(locationKey) : undefined)
 
   const setStats = useCallback(
     (stats: Stats) => {