Merge 3a145ae into 12298ec

frzyc · Nov 9, 2024 · 55d92ed · 55d92ed
2 parents 12298ec + 3a145ae
commit 55d92ed
Show file tree

Hide file tree

Showing 113 changed files with 1,551 additions and 691 deletions.
diff --git a/libs/pando/engine/src/node/optimization.ts b/libs/pando/engine/src/node/optimization.ts
@@ -316,6 +316,18 @@ function dedupMapArray<I, O>(x: I[], map: (_: I) => O): O[] {
   return x.every((x, i) => (x as any) === newX[i]) ? (x as any) : newX
 }
 
+/**
+ * Generates a custom function, "cuz speed".
+ *
+ * @param n
+ * @param dynTagCategory
+ * @param slotCount
+ * @param initial
+ * @param header
+ * @returns a custom function that accepts an array `_` of data.
+ *
+ * NOTE: `slotCount` === `_.length` for optimization reasons.
+ */
 export function compile(
   n: NumTagFree[],
   dynTagCategory: string,

diff --git a/libs/sr/formula/src/data/common/index.ts b/libs/sr/formula/src/data/common/index.ts
@@ -1,4 +1,5 @@
 import { max, min, prod } from '@genshin-optimizer/pando/engine'
+import { allLightConeKeys } from '@genshin-optimizer/sr/consts'
 import type { TagMapNodeEntries } from '../util'
 import { own, ownBuff, percent, reader } from '../util'
 import dmg from './dmg'
@@ -14,6 +15,11 @@ const data: TagMapNodeEntries = [
   // convert sheet:<char/lightCone> to sheet:agg for accumulation
   // sheet:<relic> is reread in src/util.ts:relicsData()
   reader.sheet('agg').reread(reader.sheet('char')),
+
+  // add all light cones by default
+  ...allLightConeKeys.map((lc) =>
+    reader.sheet('lightCone').reread(reader.sheet(lc))
+  ),
   reader.sheet('agg').reread(reader.sheet('lightCone')),
 
   // Final <= Premod <= Base

diff --git a/libs/sr/formula/src/data/lightCone/sheets/ASecretVow.ts b/libs/sr/formula/src/data/lightCone/sheets/ASecretVow.ts
@@ -1,4 +1,4 @@
-import { subscript } from '@genshin-optimizer/pando/engine'
+import { cmpGE, subscript } from '@genshin-optimizer/pando/engine'
 import type { LightConeKey } from '@genshin-optimizer/sr/consts'
 import { allStats, mappedStats } from '@genshin-optimizer/sr/stats'
 import {
@@ -17,7 +17,7 @@ import { entriesForLightCone } from '../util'
 const key: LightConeKey = 'ASecretVow'
 const data_gen = allStats.lightCone[key]
 const dm = mappedStats.lightCone[key]
-
+const lcCount = own.common.count.sheet(key)
 const { superimpose } = own.lightCone
 
 // TODO: Add conditionals
@@ -28,20 +28,27 @@ const { numConditional } = allNumConditionals(key, true, 0, 2)
 const sheet = register(
   key,
   // Handles base stats and passive buffs
-  entriesForLightCone(data_gen),
+  entriesForLightCone(key, data_gen),
 
   // TODO: Add formulas/buffs
   // Conditional buffs
   registerBuff(
     'cond_dmg_',
     ownBuff.premod.dmg_.add(
-      boolConditional.ifOn(subscript(superimpose, dm.cond_dmg_))
+      boolConditional.ifOn(
+        cmpGE(lcCount, 1, subscript(superimpose, dm.cond_dmg_))
+      )
     )
   ),
   registerBuff(
     'team_dmg_',
-    teamBuff.premod.dmg_.add(listConditional.map({ val1: 1, val2: 2 }))
+    teamBuff.premod.dmg_.add(
+      cmpGE(lcCount, 1, listConditional.map({ val1: 1, val2: 2 }))
+    )
   ),
-  registerBuff('enemy_defIgn_', enemyDebuff.common.defIgn_.add(numConditional))
+  registerBuff(
+    'enemy_defIgn_',
+    enemyDebuff.common.defIgn_.add(cmpGE(lcCount, 1, numConditional))
+  )
 )
 export default sheet
diff --git a/libs/sr/formula/src/data/lightCone/sheets/Adversarial.ts b/libs/sr/formula/src/data/lightCone/sheets/Adversarial.ts
@@ -1,4 +1,4 @@
-import { subscript } from '@genshin-optimizer/pando/engine'
+import { cmpGE, subscript } from '@genshin-optimizer/pando/engine'
 import type { LightConeKey } from '@genshin-optimizer/sr/consts'
 import { allStats, mappedStats } from '@genshin-optimizer/sr/stats'
 import {
@@ -17,7 +17,7 @@ import { entriesForLightCone } from '../util'
 const key: LightConeKey = 'Adversarial'
 const data_gen = allStats.lightCone[key]
 const dm = mappedStats.lightCone[key]
-
+const lcCount = own.common.count.sheet(key)
 const { superimpose } = own.lightCone
 
 // TODO: Add conditionals
@@ -28,20 +28,27 @@ const { numConditional } = allNumConditionals(key, true, 0, 2)
 const sheet = register(
   key,
   // Handles base stats and passive buffs
-  entriesForLightCone(data_gen),
+  entriesForLightCone(key, data_gen),
 
   // TODO: Add formulas/buffs
   // Conditional buffs
   registerBuff(
     'cond_dmg_',
     ownBuff.premod.dmg_.add(
-      boolConditional.ifOn(subscript(superimpose, dm.cond_dmg_))
+      boolConditional.ifOn(
+        cmpGE(lcCount, 1, subscript(superimpose, dm.cond_dmg_))
+      )
     )
   ),
   registerBuff(
     'team_dmg_',
-    teamBuff.premod.dmg_.add(listConditional.map({ val1: 1, val2: 2 }))
+    teamBuff.premod.dmg_.add(
+      cmpGE(lcCount, 1, listConditional.map({ val1: 1, val2: 2 }))
+    )
   ),
-  registerBuff('enemy_defIgn_', enemyDebuff.common.defIgn_.add(numConditional))
+  registerBuff(
+    'enemy_defIgn_',
+    enemyDebuff.common.defIgn_.add(cmpGE(lcCount, 1, numConditional))
+  )
 )
 export default sheet
diff --git a/libs/sr/formula/src/data/lightCone/sheets/AfterTheCharmonyFall.ts b/libs/sr/formula/src/data/lightCone/sheets/AfterTheCharmonyFall.ts
@@ -1,4 +1,4 @@
-import { subscript } from '@genshin-optimizer/pando/engine'
+import { cmpGE, subscript } from '@genshin-optimizer/pando/engine'
 import type { LightConeKey } from '@genshin-optimizer/sr/consts'
 import { allStats, mappedStats } from '@genshin-optimizer/sr/stats'
 import {
@@ -17,7 +17,7 @@ import { entriesForLightCone } from '../util'
 const key: LightConeKey = 'AfterTheCharmonyFall'
 const data_gen = allStats.lightCone[key]
 const dm = mappedStats.lightCone[key]
-
+const lcCount = own.common.count.sheet(key)
 const { superimpose } = own.lightCone
 
 // TODO: Add conditionals
@@ -28,20 +28,27 @@ const { numConditional } = allNumConditionals(key, true, 0, 2)
 const sheet = register(
   key,
   // Handles base stats and passive buffs
-  entriesForLightCone(data_gen),
+  entriesForLightCone(key, data_gen),
 
   // TODO: Add formulas/buffs
   // Conditional buffs
   registerBuff(
     'cond_dmg_',
     ownBuff.premod.dmg_.add(
-      boolConditional.ifOn(subscript(superimpose, dm.cond_dmg_))
+      boolConditional.ifOn(
+        cmpGE(lcCount, 1, subscript(superimpose, dm.cond_dmg_))
+      )
     )
   ),
   registerBuff(
     'team_dmg_',
-    teamBuff.premod.dmg_.add(listConditional.map({ val1: 1, val2: 2 }))
+    teamBuff.premod.dmg_.add(
+      cmpGE(lcCount, 1, listConditional.map({ val1: 1, val2: 2 }))
+    )
   ),
-  registerBuff('enemy_defIgn_', enemyDebuff.common.defIgn_.add(numConditional))
+  registerBuff(
+    'enemy_defIgn_',
+    enemyDebuff.common.defIgn_.add(cmpGE(lcCount, 1, numConditional))
+  )
 )
 export default sheet
diff --git a/libs/sr/formula/src/data/lightCone/sheets/AlongThePassingShore.ts b/libs/sr/formula/src/data/lightCone/sheets/AlongThePassingShore.ts
@@ -1,4 +1,4 @@
-import { subscript } from '@genshin-optimizer/pando/engine'
+import { cmpGE, subscript } from '@genshin-optimizer/pando/engine'
 import type { LightConeKey } from '@genshin-optimizer/sr/consts'
 import { allStats, mappedStats } from '@genshin-optimizer/sr/stats'
 import {
@@ -17,7 +17,7 @@ import { entriesForLightCone } from '../util'
 const key: LightConeKey = 'AlongThePassingShore'
 const data_gen = allStats.lightCone[key]
 const dm = mappedStats.lightCone[key]
-
+const lcCount = own.common.count.sheet(key)
 const { superimpose } = own.lightCone
 
 // TODO: Add conditionals
@@ -28,20 +28,27 @@ const { numConditional } = allNumConditionals(key, true, 0, 2)
 const sheet = register(
   key,
   // Handles base stats and passive buffs
-  entriesForLightCone(data_gen),
+  entriesForLightCone(key, data_gen),
 
   // TODO: Add formulas/buffs
   // Conditional buffs
   registerBuff(
     'cond_dmg_',
     ownBuff.premod.dmg_.add(
-      boolConditional.ifOn(subscript(superimpose, dm.cond_dmg_))
+      boolConditional.ifOn(
+        cmpGE(lcCount, 1, subscript(superimpose, dm.cond_dmg_))
+      )
     )
   ),
   registerBuff(
     'team_dmg_',
-    teamBuff.premod.dmg_.add(listConditional.map({ val1: 1, val2: 2 }))
+    teamBuff.premod.dmg_.add(
+      cmpGE(lcCount, 1, listConditional.map({ val1: 1, val2: 2 }))
+    )
   ),
-  registerBuff('enemy_defIgn_', enemyDebuff.common.defIgn_.add(numConditional))
+  registerBuff(
+    'enemy_defIgn_',
+    enemyDebuff.common.defIgn_.add(cmpGE(lcCount, 1, numConditional))
+  )
 )
 export default sheet
diff --git a/libs/sr/formula/src/data/lightCone/sheets/Amber.ts b/libs/sr/formula/src/data/lightCone/sheets/Amber.ts
@@ -1,4 +1,4 @@
-import { subscript } from '@genshin-optimizer/pando/engine'
+import { cmpGE, subscript } from '@genshin-optimizer/pando/engine'
 import type { LightConeKey } from '@genshin-optimizer/sr/consts'
 import { allStats, mappedStats } from '@genshin-optimizer/sr/stats'
 import {
@@ -17,7 +17,7 @@ import { entriesForLightCone } from '../util'
 const key: LightConeKey = 'Amber'
 const data_gen = allStats.lightCone[key]
 const dm = mappedStats.lightCone[key]
-
+const lcCount = own.common.count.sheet(key)
 const { superimpose } = own.lightCone
 
 // TODO: Add conditionals
@@ -28,20 +28,27 @@ const { numConditional } = allNumConditionals(key, true, 0, 2)
 const sheet = register(
   key,
   // Handles base stats and passive buffs
-  entriesForLightCone(data_gen),
+  entriesForLightCone(key, data_gen),
 
   // TODO: Add formulas/buffs
   // Conditional buffs
   registerBuff(
     'cond_dmg_',
     ownBuff.premod.dmg_.add(
-      boolConditional.ifOn(subscript(superimpose, dm.cond_dmg_))
+      boolConditional.ifOn(
+        cmpGE(lcCount, 1, subscript(superimpose, dm.cond_dmg_))
+      )
     )
   ),
   registerBuff(
     'team_dmg_',
-    teamBuff.premod.dmg_.add(listConditional.map({ val1: 1, val2: 2 }))
+    teamBuff.premod.dmg_.add(
+      cmpGE(lcCount, 1, listConditional.map({ val1: 1, val2: 2 }))
+    )
   ),
-  registerBuff('enemy_defIgn_', enemyDebuff.common.defIgn_.add(numConditional))
+  registerBuff(
+    'enemy_defIgn_',
+    enemyDebuff.common.defIgn_.add(cmpGE(lcCount, 1, numConditional))
+  )
 )
 export default sheet
diff --git a/libs/sr/formula/src/data/lightCone/sheets/AnInstantBeforeAGaze.ts b/libs/sr/formula/src/data/lightCone/sheets/AnInstantBeforeAGaze.ts
@@ -1,4 +1,4 @@
-import { subscript } from '@genshin-optimizer/pando/engine'
+import { cmpGE, subscript } from '@genshin-optimizer/pando/engine'
 import type { LightConeKey } from '@genshin-optimizer/sr/consts'
 import { allStats, mappedStats } from '@genshin-optimizer/sr/stats'
 import {
@@ -17,7 +17,7 @@ import { entriesForLightCone } from '../util'
 const key: LightConeKey = 'AnInstantBeforeAGaze'
 const data_gen = allStats.lightCone[key]
 const dm = mappedStats.lightCone[key]
-
+const lcCount = own.common.count.sheet(key)
 const { superimpose } = own.lightCone
 
 // TODO: Add conditionals
@@ -28,20 +28,27 @@ const { numConditional } = allNumConditionals(key, true, 0, 2)
 const sheet = register(
   key,
   // Handles base stats and passive buffs
-  entriesForLightCone(data_gen),
+  entriesForLightCone(key, data_gen),
 
   // TODO: Add formulas/buffs
   // Conditional buffs
   registerBuff(
     'cond_dmg_',
     ownBuff.premod.dmg_.add(
-      boolConditional.ifOn(subscript(superimpose, dm.cond_dmg_))
+      boolConditional.ifOn(
+        cmpGE(lcCount, 1, subscript(superimpose, dm.cond_dmg_))
+      )
     )
   ),
   registerBuff(
     'team_dmg_',
-    teamBuff.premod.dmg_.add(listConditional.map({ val1: 1, val2: 2 }))
+    teamBuff.premod.dmg_.add(
+      cmpGE(lcCount, 1, listConditional.map({ val1: 1, val2: 2 }))
+    )
   ),
-  registerBuff('enemy_defIgn_', enemyDebuff.common.defIgn_.add(numConditional))
+  registerBuff(
+    'enemy_defIgn_',
+    enemyDebuff.common.defIgn_.add(cmpGE(lcCount, 1, numConditional))
+  )
 )
 export default sheet
diff --git a/libs/sr/formula/src/data/lightCone/sheets/Arrows.ts b/libs/sr/formula/src/data/lightCone/sheets/Arrows.ts
@@ -1,4 +1,4 @@
-import { subscript } from '@genshin-optimizer/pando/engine'
+import { cmpGE, subscript } from '@genshin-optimizer/pando/engine'
 import type { LightConeKey } from '@genshin-optimizer/sr/consts'
 import { allStats, mappedStats } from '@genshin-optimizer/sr/stats'
 import {
@@ -17,7 +17,7 @@ import { entriesForLightCone } from '../util'
 const key: LightConeKey = 'Arrows'
 const data_gen = allStats.lightCone[key]
 const dm = mappedStats.lightCone[key]
-
+const lcCount = own.common.count.sheet(key)
 const { superimpose } = own.lightCone
 
 // TODO: Add conditionals
@@ -28,20 +28,27 @@ const { numConditional } = allNumConditionals(key, true, 0, 2)
 const sheet = register(
   key,
   // Handles base stats and passive buffs
-  entriesForLightCone(data_gen),
+  entriesForLightCone(key, data_gen),
 
   // TODO: Add formulas/buffs
   // Conditional buffs
   registerBuff(
     'cond_dmg_',
     ownBuff.premod.dmg_.add(
-      boolConditional.ifOn(subscript(superimpose, dm.cond_dmg_))
+      boolConditional.ifOn(
+        cmpGE(lcCount, 1, subscript(superimpose, dm.cond_dmg_))
+      )
     )
   ),
   registerBuff(
     'team_dmg_',
-    teamBuff.premod.dmg_.add(listConditional.map({ val1: 1, val2: 2 }))
+    teamBuff.premod.dmg_.add(
+      cmpGE(lcCount, 1, listConditional.map({ val1: 1, val2: 2 }))
+    )
   ),
-  registerBuff('enemy_defIgn_', enemyDebuff.common.defIgn_.add(numConditional))
+  registerBuff(
+    'enemy_defIgn_',
+    enemyDebuff.common.defIgn_.add(cmpGE(lcCount, 1, numConditional))
+  )
 )
 export default sheet