Fix skipped not updating; fix old constraints lingering (#2659)

frzyc · Jan 31, 2025 · 6274af8 · 6274af8
1 parent db0443d
commit 6274af8
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/libs/zzz/db/src/Database/DataManagers/CharacterDataManager.ts b/libs/zzz/db/src/Database/DataManagers/CharacterDataManager.ts
@@ -1,5 +1,10 @@
 import type { TriggerString } from '@genshin-optimizer/common/database'
-import { clamp, objFilter, validateArr } from '@genshin-optimizer/common/util'
+import {
+  clamp,
+  objFilter,
+  objFilterKeys,
+  validateArr,
+} from '@genshin-optimizer/common/util'
 import type {
   CharacterKey,
   DiscMainStatKey,
@@ -8,6 +13,7 @@ import type {
   WengineKey,
 } from '@genshin-optimizer/zzz/consts'
 import {
+  allAttributeDamageKeys,
   allCharacterKeys,
   allDiscSetKeys,
   allFormulaKeys,
@@ -119,6 +125,20 @@ export class CharacterDataManager extends DataManager<
       ({ value, isMax }) =>
         typeof value === 'number' && typeof isMax === 'boolean'
     )
+    constraints = objFilterKeys(
+      constraints,
+      // Taken from StatFilterCard
+      [
+        'hp',
+        'def',
+        'atk',
+        'crit_',
+        'crit_dmg_',
+        'anomProf',
+        'pen',
+        ...allAttributeDamageKeys,
+      ]
+    )
     useEquipped = !!useEquipped
 
     slot4 = validateArr(slot4, discSlotToMainStatKeys['4'])

diff --git a/libs/zzz/solver/src/childWorker.ts b/libs/zzz/solver/src/childWorker.ts
@@ -186,12 +186,12 @@ async function start() {
     } else {
       skipped++
     }
-    if (builds.length > MAX_BUILDS_TO_SEND) {
+    if (builds.length + skipped > MAX_BUILDS_TO_SEND) {
       sliceSortSendBuilds()
     }
   }
 
-  if (builds.length > 0) {
+  if (builds.length + skipped > 0) {
     sliceSortSendBuilds()
   }