Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: typescript & optimizer components cleanup #703

Merged
merged 12 commits into from
Nov 10, 2024
8 changes: 4 additions & 4 deletions src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import 'overlayscrollbars/overlayscrollbars.css'
import { CharacterConverter } from 'lib/importer/characterConverter'
import { Hint } from 'lib/interactions/hint'
import { Message } from 'lib/interactions/message'
import { BufferPacker } from 'lib/optimizer/bufferPacker'
import { BufferPacker } from 'lib/optimization/bufferPacker'
import { RelicAugmenter } from 'lib/relics/relicAugmenter'
import { RelicFilters } from 'lib/relics/relicFilters'
import { RelicRollFixer } from 'lib/relics/relicRollFixer'
Expand All @@ -18,8 +18,8 @@ import { Gradient } from 'lib/rendering/gradient'
import { Renderer } from 'lib/rendering/renderer'
import { Themes } from 'lib/rendering/theme'
import { CharacterStats } from 'lib/scoring/characterStats'
import { DataParser } from 'lib/state/dataParser'
import { DB } from 'lib/state/db'
import { Metadata } from 'lib/state/metadata'
import { SaveState } from 'lib/state/saveState'

import { WorkerPool } from 'lib/worker/workerPool'
Expand All @@ -31,7 +31,7 @@ import 'style/hsro.css'

window.WorkerPool = WorkerPool
window.Constants = Constants
window.DataParser = DataParser
window.DataParser = Metadata
window.DB = DB
window.CharacterStats = CharacterStats
window.Assets = Assets
Expand All @@ -50,7 +50,7 @@ window.RelicRollFixer = RelicRollFixer

window.colorTheme = Themes.BLUE

DataParser.parse()
Metadata.initialize()
SaveState.load(false)
void verifyWebgpuSupport(false)

Expand Down
4 changes: 2 additions & 2 deletions src/lib/characterPreview/CharacterPreview.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import {
parentW,
} from 'lib/constants/constantsUi'
import { Message } from 'lib/interactions/message'
import { calculateBuild } from 'lib/optimizer/calculateBuild'
import { calculateBuild } from 'lib/optimization/calculateBuild'
import CharacterModal from 'lib/overlays/modals/CharacterModal'
import EditImageModal from 'lib/overlays/modals/EditImageModal'
import RelicModal from 'lib/overlays/modals/RelicModal.tsx'
Expand Down Expand Up @@ -251,7 +251,7 @@ export function CharacterPreview(props) {

const statCalculationRelics = Utils.clone(displayRelics)
RelicFilters.condenseRelicSubstatsForOptimizerSingle(Object.values(statCalculationRelics))
const { c: finalStats } = calculateBuild(OptimizerTabController.fixForm(OptimizerTabController.getDisplayFormValues(character.form)), statCalculationRelics)
const { c: finalStats } = calculateBuild(OptimizerTabController.displayToForm(OptimizerTabController.formToDisplay(character.form)), statCalculationRelics)
finalStats.CV = StatCalculator.calculateCv(Object.values(statCalculationRelics))
finalStats[elementalDmgValue] = finalStats.ELEMENTAL_DMG

Expand Down
2 changes: 1 addition & 1 deletion src/lib/characterPreview/CharacterScoringSummary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { damageStats } from 'lib/characterPreview/StatRow'
import { StatTextSm } from 'lib/characterPreview/StatText'
import { ElementToDamage, MainStats, Parts, Stats, StatsValues, SubStats } from 'lib/constants/constants'
import { defaultGap, iconSize } from 'lib/constants/constantsUi'
import { SortOption } from 'lib/optimizer/sortOptions'
import { SortOption } from 'lib/optimization/sortOptions'
import { StatCalculator } from 'lib/relics/statCalculator'
import { Assets } from 'lib/rendering/assets'
import { diminishingReturnsFormula, SimulationScore, SimulationStatUpgrade } from 'lib/scoring/characterScorer'
Expand Down
4 changes: 2 additions & 2 deletions src/lib/conditionals/character/1000/Arlan.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { SKILL_TYPE, ULT_TYPE } from 'lib/conditionals/conditionalConstants'
import { gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalFinalizers'
import { AbilityEidolon, Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils'
import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs'
import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
import { buffAbilityDmg } from 'lib/optimization/calculateBuffs'
import { ComputedStatsArray, Source } from 'lib/optimization/computedStatsArray'
import { TsUtils } from 'lib/utils/TsUtils'

import { Eidolon } from 'types/character'
Expand Down
2 changes: 1 addition & 1 deletion src/lib/conditionals/character/1000/Asta.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalFinalizers'
import { AbilityEidolon, Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils'
import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
import { ComputedStatsArray, Source } from 'lib/optimization/computedStatsArray'
import { TsUtils } from 'lib/utils/TsUtils'

import { Eidolon } from 'types/character'
Expand Down
4 changes: 2 additions & 2 deletions src/lib/conditionals/character/1000/DanHeng.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { BASIC_TYPE } from 'lib/conditionals/conditionalConstants'
import { gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalFinalizers'
import { AbilityEidolon, Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils'
import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs'
import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
import { buffAbilityDmg } from 'lib/optimization/calculateBuffs'
import { ComputedStatsArray, Source } from 'lib/optimization/computedStatsArray'
import { TsUtils } from 'lib/utils/TsUtils'

import { Eidolon } from 'types/character'
Expand Down
4 changes: 2 additions & 2 deletions src/lib/conditionals/character/1000/Herta.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { ASHBLAZING_ATK_STACK, FUA_TYPE, SKILL_TYPE, ULT_TYPE } from 'lib/conditionals/conditionalConstants'
import { gpuStandardFuaAtkFinalizer, standardFuaAtkFinalizer } from 'lib/conditionals/conditionalFinalizers'
import { AbilityEidolon, Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils'
import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs'
import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
import { buffAbilityDmg } from 'lib/optimization/calculateBuffs'
import { ComputedStatsArray, Source } from 'lib/optimization/computedStatsArray'
import { TsUtils } from 'lib/utils/TsUtils'

import { Eidolon } from 'types/character'
Expand Down
4 changes: 2 additions & 2 deletions src/lib/conditionals/character/1000/Himeko.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { ASHBLAZING_ATK_STACK, SKILL_TYPE } from 'lib/conditionals/conditionalConstants'
import { gpuStandardFuaAtkFinalizer, standardFuaAtkFinalizer } from 'lib/conditionals/conditionalFinalizers'
import { AbilityEidolon, Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils'
import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs'
import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
import { buffAbilityDmg } from 'lib/optimization/calculateBuffs'
import { ComputedStatsArray, Source } from 'lib/optimization/computedStatsArray'
import { TsUtils } from 'lib/utils/TsUtils'
import { Eidolon } from 'types/character'
import { NumberToNumberMap } from 'types/common'
Expand Down
4 changes: 2 additions & 2 deletions src/lib/conditionals/character/1000/Kafka.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { ASHBLAZING_ATK_STACK, DOT_TYPE } from 'lib/conditionals/conditionalConstants'
import { gpuStandardFuaAtkFinalizer, standardFuaAtkFinalizer } from 'lib/conditionals/conditionalFinalizers'
import { AbilityEidolon, Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils'
import { buffAbilityDmg, buffAbilityVulnerability } from 'lib/optimizer/calculateBuffs'
import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
import { buffAbilityDmg, buffAbilityVulnerability } from 'lib/optimization/calculateBuffs'
import { ComputedStatsArray, Source } from 'lib/optimization/computedStatsArray'
import { TsUtils } from 'lib/utils/TsUtils'

import { Eidolon } from 'types/character'
Expand Down
2 changes: 1 addition & 1 deletion src/lib/conditionals/character/1000/March7th.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ASHBLAZING_ATK_STACK } from 'lib/conditionals/conditionalConstants'
import { gpuStandardDefShieldFinalizer, standardDefShieldFinalizer } from 'lib/conditionals/conditionalFinalizers'
import { AbilityEidolon, calculateAshblazingSet } from 'lib/conditionals/conditionalUtils'
import { wgslTrue } from 'lib/gpu/injection/wgslUtils'
import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray'
import { ComputedStatsArray, Key, Source } from 'lib/optimization/computedStatsArray'
import { Eidolon } from 'types/character'

import { CharacterConditionalsController } from 'types/conditionals'
Expand Down
2 changes: 1 addition & 1 deletion src/lib/conditionals/character/1000/SilverWolf.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalFinalizers'
import { AbilityEidolon, Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils'
import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
import { ComputedStatsArray, Source } from 'lib/optimization/computedStatsArray'
import { TsUtils } from 'lib/utils/TsUtils'

import { Eidolon } from 'types/character'
Expand Down
2 changes: 1 addition & 1 deletion src/lib/conditionals/character/1000/Welt.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalFinalizers'
import { AbilityEidolon, Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils'
import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray'
import { ComputedStatsArray, Key, Source } from 'lib/optimization/computedStatsArray'
import { TsUtils } from 'lib/utils/TsUtils'

import { Eidolon } from 'types/character'
Expand Down
4 changes: 2 additions & 2 deletions src/lib/conditionals/character/1100/Bronya.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { AbilityEidolon, Conditionals, ContentDefinition } from 'lib/conditional
import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants/constants'
import { conditionalWgslWrapper } from 'lib/gpu/conditionals/dynamicConditionals'
import { wgslFalse } from 'lib/gpu/injection/wgslUtils'
import { buffAbilityCr } from 'lib/optimizer/calculateBuffs'
import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray'
import { buffAbilityCr } from 'lib/optimization/calculateBuffs'
import { ComputedStatsArray, Key, Source } from 'lib/optimization/computedStatsArray'
import { TsUtils } from 'lib/utils/TsUtils'

import { Eidolon } from 'types/character'
Expand Down
4 changes: 2 additions & 2 deletions src/lib/conditionals/character/1100/Clara.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { ASHBLAZING_ATK_STACK, FUA_TYPE } from 'lib/conditionals/conditionalConstants'
import { gpuStandardFuaAtkFinalizer, standardFuaAtkFinalizer } from 'lib/conditionals/conditionalFinalizers'
import { AbilityEidolon, Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils'
import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs'
import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
import { buffAbilityDmg } from 'lib/optimization/calculateBuffs'
import { ComputedStatsArray, Source } from 'lib/optimization/computedStatsArray'
import { TsUtils } from 'lib/utils/TsUtils'

import { Eidolon } from 'types/character'
Expand Down
2 changes: 1 addition & 1 deletion src/lib/conditionals/character/1100/Gepard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { gpuStandardAtkFinalizer, gpuStandardDefShieldFinalizer, standardAtkFina
import { AbilityEidolon, Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils'
import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants/constants'
import { conditionalWgslWrapper } from 'lib/gpu/conditionals/dynamicConditionals'
import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray'
import { ComputedStatsArray, Key, Source } from 'lib/optimization/computedStatsArray'
import { TsUtils } from 'lib/utils/TsUtils'
import { Eidolon } from 'types/character'

Expand Down
4 changes: 2 additions & 2 deletions src/lib/conditionals/character/1100/Hook.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { SKILL_TYPE } from 'lib/conditionals/conditionalConstants'
import { gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalFinalizers'
import { AbilityEidolon, Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils'
import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs'
import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
import { buffAbilityDmg } from 'lib/optimization/calculateBuffs'
import { ComputedStatsArray, Source } from 'lib/optimization/computedStatsArray'
import { TsUtils } from 'lib/utils/TsUtils'

import { Eidolon } from 'types/character'
Expand Down
2 changes: 1 addition & 1 deletion src/lib/conditionals/character/1100/Luka.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalFinalizers'
import { AbilityEidolon, Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils'
import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
import { ComputedStatsArray, Source } from 'lib/optimization/computedStatsArray'
import { TsUtils } from 'lib/utils/TsUtils'

import { Eidolon } from 'types/character'
Expand Down
2 changes: 1 addition & 1 deletion src/lib/conditionals/character/1100/Lynx.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { AbilityEidolon, Conditionals, ContentDefinition } from 'lib/conditional
import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants/constants'
import { conditionalWgslWrapper } from 'lib/gpu/conditionals/dynamicConditionals'
import { wgslFalse, wgslTrue } from 'lib/gpu/injection/wgslUtils'
import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray'
import { ComputedStatsArray, Key, Source } from 'lib/optimization/computedStatsArray'
import { TsUtils } from 'lib/utils/TsUtils'
import { Eidolon } from 'types/character'

Expand Down
2 changes: 1 addition & 1 deletion src/lib/conditionals/character/1100/Natasha.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { SKILL_TYPE, ULT_TYPE } from 'lib/conditionals/conditionalConstants'
import { standardHpHealFinalizer } from 'lib/conditionals/conditionalFinalizers'
import { AbilityEidolon, Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils'
import { wgslTrue } from 'lib/gpu/injection/wgslUtils'
import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray'
import { ComputedStatsArray, Key, Source } from 'lib/optimization/computedStatsArray'
import { TsUtils } from 'lib/utils/TsUtils'
import { Eidolon } from 'types/character'

Expand Down
4 changes: 2 additions & 2 deletions src/lib/conditionals/character/1100/Pela.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { BASIC_TYPE, SKILL_TYPE, ULT_TYPE } from 'lib/conditionals/conditionalConstants'
import { AbilityEidolon, Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils'
import { wgslTrue } from 'lib/gpu/injection/wgslUtils'
import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs'
import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray'
import { buffAbilityDmg } from 'lib/optimization/calculateBuffs'
import { ComputedStatsArray, Key, Source } from 'lib/optimization/computedStatsArray'
import { TsUtils } from 'lib/utils/TsUtils'

import { Eidolon } from 'types/character'
Expand Down
4 changes: 2 additions & 2 deletions src/lib/conditionals/character/1100/Sampo.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { DOT_TYPE } from 'lib/conditionals/conditionalConstants'
import { gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalFinalizers'
import { AbilityEidolon, Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils'
import { buffAbilityVulnerability } from 'lib/optimizer/calculateBuffs'
import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
import { buffAbilityVulnerability } from 'lib/optimization/calculateBuffs'
import { ComputedStatsArray, Source } from 'lib/optimization/computedStatsArray'
import { TsUtils } from 'lib/utils/TsUtils'

import { Eidolon } from 'types/character'
Expand Down
2 changes: 1 addition & 1 deletion src/lib/conditionals/character/1100/Seele.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { AbilityEidolon, Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils'
import { wgslTrue } from 'lib/gpu/injection/wgslUtils'
import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray'
import { ComputedStatsArray, Key, Source } from 'lib/optimization/computedStatsArray'
import { TsUtils } from 'lib/utils/TsUtils'

import { Eidolon } from 'types/character'
Expand Down
2 changes: 1 addition & 1 deletion src/lib/conditionals/character/1100/Serval.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalFinalizers'
import { AbilityEidolon, Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils'
import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
import { ComputedStatsArray, Source } from 'lib/optimization/computedStatsArray'
import { TsUtils } from 'lib/utils/TsUtils'

import { Eidolon } from 'types/character'
Expand Down
4 changes: 2 additions & 2 deletions src/lib/conditionals/character/1100/Topaz.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ASHBLAZING_ATK_STACK, BASIC_TYPE, FUA_TYPE, SKILL_TYPE } from 'lib/conditionals/conditionalConstants'
import { AbilityEidolon, calculateAshblazingSet, Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils'
import { buffAbilityCd, buffAbilityResPen, buffAbilityVulnerability } from 'lib/optimizer/calculateBuffs'
import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray'
import { buffAbilityCd, buffAbilityResPen, buffAbilityVulnerability } from 'lib/optimization/calculateBuffs'
import { ComputedStatsArray, Key, Source } from 'lib/optimization/computedStatsArray'
import { TsUtils } from 'lib/utils/TsUtils'

import { Eidolon } from 'types/character'
Expand Down
2 changes: 1 addition & 1 deletion src/lib/conditionals/character/1200/Bailu.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { NONE_TYPE, SKILL_TYPE, ULT_TYPE } from 'lib/conditionals/conditionalConstants'
import { gpuStandardAtkFinalizer, gpuStandardHpHealFinalizer, standardAtkFinalizer, standardHpHealFinalizer } from 'lib/conditionals/conditionalFinalizers'
import { AbilityEidolon, Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils'
import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
import { ComputedStatsArray, Source } from 'lib/optimization/computedStatsArray'
import { TsUtils } from 'lib/utils/TsUtils'

import { Eidolon } from 'types/character'
Expand Down
4 changes: 2 additions & 2 deletions src/lib/conditionals/character/1200/Blade.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { ASHBLAZING_ATK_STACK, FUA_TYPE } from 'lib/conditionals/conditionalConstants'
import { AbilityEidolon, calculateAshblazingSet, Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils'
import { wgslTrue } from 'lib/gpu/injection/wgslUtils'
import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs'
import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray'
import { buffAbilityDmg } from 'lib/optimization/calculateBuffs'
import { ComputedStatsArray, Key, Source } from 'lib/optimization/computedStatsArray'
import { TsUtils } from 'lib/utils/TsUtils'

import { Eidolon } from 'types/character'
Expand Down
4 changes: 2 additions & 2 deletions src/lib/conditionals/character/1200/Feixiao.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ASHBLAZING_ATK_STACK, FUA_TYPE, ULT_TYPE } from 'lib/conditionals/conditionalConstants'
import { AbilityEidolon, calculateAshblazingSet, Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils'
import { buffAbilityCd } from 'lib/optimizer/calculateBuffs'
import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray'
import { buffAbilityCd } from 'lib/optimization/calculateBuffs'
import { ComputedStatsArray, Key, Source } from 'lib/optimization/computedStatsArray'
import { TsUtils } from 'lib/utils/TsUtils'

import { Eidolon } from 'types/character'
Expand Down
2 changes: 1 addition & 1 deletion src/lib/conditionals/character/1200/FuXuan.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { AbilityEidolon, Conditionals, ContentDefinition } from 'lib/conditional
import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants/constants'
import { conditionalWgslWrapper } from 'lib/gpu/conditionals/dynamicConditionals'
import { wgslFalse } from 'lib/gpu/injection/wgslUtils'
import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray'
import { ComputedStatsArray, Key, Source } from 'lib/optimization/computedStatsArray'
import { TsUtils } from 'lib/utils/TsUtils'

import { Eidolon } from 'types/character'
Expand Down
4 changes: 2 additions & 2 deletions src/lib/conditionals/character/1200/Fugue.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { BREAK_TYPE } from 'lib/conditionals/conditionalConstants'
import { gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalFinalizers'
import { AbilityEidolon, Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils'
import { CURRENT_DATA_VERSION } from 'lib/constants/constants'
import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs'
import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
import { buffAbilityDmg } from 'lib/optimization/calculateBuffs'
import { ComputedStatsArray, Source } from 'lib/optimization/computedStatsArray'

import { Eidolon } from 'types/character'

Expand Down
2 changes: 1 addition & 1 deletion src/lib/conditionals/character/1200/Guinaifen.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalFinalizers'
import { AbilityEidolon, Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils'
import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray'
import { ComputedStatsArray, Source } from 'lib/optimization/computedStatsArray'
import { TsUtils } from 'lib/utils/TsUtils'

import { Eidolon } from 'types/character'
Expand Down
2 changes: 1 addition & 1 deletion src/lib/conditionals/character/1200/Hanya.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { AbilityEidolon, Conditionals, ContentDefinition } from 'lib/conditional
import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants/constants'
import { conditionalWgslWrapper } from 'lib/gpu/conditionals/dynamicConditionals'
import { wgslFalse } from 'lib/gpu/injection/wgslUtils'
import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray'
import { ComputedStatsArray, Key, Source } from 'lib/optimization/computedStatsArray'
import { TsUtils } from 'lib/utils/TsUtils'

import { Eidolon } from 'types/character'
Expand Down
Loading