- Update another efficiency calculation

- Deprecate old calculation
frzyc · Dec 4, 2023 · b0c8975 · b0c8975
1 parent 4c12af7
commit b0c8975
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/apps/frontend/src/app/Data/Artifacts/Artifact.ts b/apps/frontend/src/app/Data/Artifacts/Artifact.ts
@@ -39,7 +39,9 @@ export default class Artifact {
       )
   )
 
-  //ARTIFACT IN GENERAL
+  /**
+   * @deprecate
+   */
   static getArtifactEfficiency(
     artifact: ICachedArtifact,
     filter: Set<SubstatKey>

diff --git a/libs/gi-util/src/artifact/artifact.ts b/libs/gi-util/src/artifact/artifact.ts
@@ -172,17 +172,14 @@ export function getArtifactEfficiency(
     filter.size -
     matchedSlotCount -
     (filter.has(artifact.mainStatKey as any) ? 1 : 0)
-  let maxEfficiency
-  if (emptySlotCount && unusedFilterCount)
-    maxEfficiency =
-      currentEfficiency + maxSubstatRollEfficiency[rarity] * rollsRemaining
-  // Rolls into good empty slot
-  else if (matchedSlotCount)
-    maxEfficiency =
-      currentEfficiency +
-      maxSubstatRollEfficiency[rarity] * (rollsRemaining - emptySlotCount)
-  // Rolls into existing matched slot
-  else maxEfficiency = currentEfficiency // No possible roll
+
+  let maxEfficiency = currentEfficiency
+  const maxRollEff = maxSubstatRollEfficiency[rarity]
+  // Rolls into good empty slots, assuming max-level artifacts have no empty slots
+  maxEfficiency += maxRollEff * Math.min(emptySlotCount, unusedFilterCount)
+  // Rolls into an existing good slot
+  if (matchedSlotCount || (emptySlotCount && unusedFilterCount))
+    maxEfficiency += maxRollEff * (rollsRemaining - emptySlotCount)
 
   return { currentEfficiency, maxEfficiency }
 }