regenerate sheets

frzyc · Nov 9, 2024 · 781d722 · 781d722
1 parent 99e64e2
commit 781d722
Show file tree

Hide file tree

Showing 104 changed files with 1,352 additions and 624 deletions.
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
diff --git a/libs/sr/formula/src/data/lightCone/sheets/BaptismOfPureThought.ts b/libs/sr/formula/src/data/lightCone/sheets/BaptismOfPureThought.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 = 'BaptismOfPureThought'
 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