From b8940cfd4cf135de8b3a300cf459b988c67e535a Mon Sep 17 00:00:00 2001 From: Fribbels Date: Sat, 9 Nov 2024 15:57:31 -0800 Subject: [PATCH] refactor: utils, i18n folders --- misc/i18n/generateTranslations.ts | 2 +- src/index.tsx | 4 ++-- src/lib/characterPreview/CharacterPreview.jsx | 10 +++++----- src/lib/characterPreview/CharacterScoringSummary.tsx | 10 +++++----- src/lib/characterPreview/CharacterStatSummary.tsx | 2 +- src/lib/characterPreview/StatRow.tsx | 6 +++--- src/lib/characters/characterScorer.ts | 8 ++++---- src/lib/characters/characterStats.ts | 2 +- src/lib/conditionals/character/Acheron.ts | 2 +- src/lib/conditionals/character/Argenti.ts | 2 +- src/lib/conditionals/character/Arlan.ts | 2 +- src/lib/conditionals/character/Asta.ts | 2 +- src/lib/conditionals/character/Aventurine.ts | 4 ++-- src/lib/conditionals/character/Bailu.ts | 2 +- src/lib/conditionals/character/BlackSwan.ts | 2 +- src/lib/conditionals/character/Blade.ts | 2 +- src/lib/conditionals/character/Boothill.ts | 4 ++-- src/lib/conditionals/character/Bronya.ts | 4 ++-- src/lib/conditionals/character/Clara.ts | 2 +- src/lib/conditionals/character/DanHeng.ts | 2 +- src/lib/conditionals/character/DrRatio.ts | 2 +- src/lib/conditionals/character/Feixiao.ts | 2 +- src/lib/conditionals/character/Firefly.ts | 2 +- src/lib/conditionals/character/FuXuan.ts | 4 ++-- src/lib/conditionals/character/Fugue.ts | 2 +- src/lib/conditionals/character/Gallagher.ts | 2 +- src/lib/conditionals/character/Gepard.ts | 4 ++-- src/lib/conditionals/character/Guinaifen.ts | 2 +- src/lib/conditionals/character/Hanya.ts | 4 ++-- src/lib/conditionals/character/Herta.ts | 2 +- src/lib/conditionals/character/Himeko.ts | 2 +- src/lib/conditionals/character/Hook.ts | 2 +- src/lib/conditionals/character/Huohuo.ts | 2 +- src/lib/conditionals/character/ImbibitorLunae.ts | 2 +- src/lib/conditionals/character/Jade.ts | 2 +- src/lib/conditionals/character/Jiaoqiu.ts | 2 +- src/lib/conditionals/character/JingYuan.ts | 2 +- src/lib/conditionals/character/Jingliu.ts | 2 +- src/lib/conditionals/character/Kafka.ts | 2 +- src/lib/conditionals/character/Lingsha.ts | 4 ++-- src/lib/conditionals/character/Luka.ts | 2 +- src/lib/conditionals/character/Luocha.ts | 2 +- src/lib/conditionals/character/Lynx.ts | 4 ++-- src/lib/conditionals/character/March7thImaginary.ts | 2 +- src/lib/conditionals/character/Misha.ts | 2 +- src/lib/conditionals/character/Moze.ts | 2 +- src/lib/conditionals/character/Natasha.ts | 2 +- src/lib/conditionals/character/Pela.ts | 2 +- src/lib/conditionals/character/Qingque.ts | 2 +- src/lib/conditionals/character/Rappa.ts | 2 +- src/lib/conditionals/character/Robin.ts | 2 +- src/lib/conditionals/character/RuanMei.ts | 2 +- src/lib/conditionals/character/Sampo.ts | 2 +- src/lib/conditionals/character/Seele.ts | 2 +- src/lib/conditionals/character/Serval.ts | 2 +- src/lib/conditionals/character/SilverWolf.ts | 2 +- src/lib/conditionals/character/Sparkle.ts | 4 ++-- src/lib/conditionals/character/Sunday.ts | 2 +- src/lib/conditionals/character/Sushang.ts | 2 +- src/lib/conditionals/character/Tingyun.ts | 4 ++-- src/lib/conditionals/character/Topaz.ts | 2 +- .../conditionals/character/TrailblazerDestruction.ts | 2 +- src/lib/conditionals/character/TrailblazerHarmony.ts | 2 +- .../character/TrailblazerPreservation.ts | 2 +- src/lib/conditionals/character/Welt.ts | 2 +- src/lib/conditionals/character/Xueyi.ts | 4 ++-- src/lib/conditionals/character/Yanqing.ts | 2 +- src/lib/conditionals/character/Yukong.ts | 2 +- src/lib/conditionals/character/Yunli.ts | 2 +- src/lib/conditionals/conditionalConstants.ts | 2 +- src/lib/conditionals/lightcone/3star/Adversarial.ts | 2 +- src/lib/conditionals/lightcone/3star/Amber.ts | 2 +- src/lib/conditionals/lightcone/3star/Arrows.ts | 2 +- src/lib/conditionals/lightcone/3star/Chorus.ts | 2 +- .../conditionals/lightcone/3star/CollapsingSky.ts | 2 +- src/lib/conditionals/lightcone/3star/Cornucopia.ts | 2 +- src/lib/conditionals/lightcone/3star/DartingArrow.ts | 2 +- src/lib/conditionals/lightcone/3star/DataBank.ts | 2 +- src/lib/conditionals/lightcone/3star/HiddenShadow.ts | 2 +- src/lib/conditionals/lightcone/3star/Loop.ts | 2 +- src/lib/conditionals/lightcone/3star/Mediation.ts | 2 +- src/lib/conditionals/lightcone/3star/MutualDemise.ts | 2 +- src/lib/conditionals/lightcone/3star/Sagacity.ts | 2 +- .../conditionals/lightcone/3star/ShatteredHome.ts | 2 +- src/lib/conditionals/lightcone/3star/Void.ts | 2 +- src/lib/conditionals/lightcone/4star/ASecretVow.ts | 2 +- .../lightcone/4star/AfterTheCharmonyFall.ts | 2 +- .../conditionals/lightcone/4star/BoundlessChoreo.ts | 2 +- .../lightcone/4star/CarveTheMoonWeaveTheClouds.ts | 2 +- .../conditionals/lightcone/4star/ConcertForTwo.ts | 2 +- .../lightcone/4star/DayOneOfMyNewLife.ts | 2 +- .../lightcone/4star/DreamvilleAdventure.ts | 2 +- src/lib/conditionals/lightcone/4star/Fermata.ts | 2 +- src/lib/conditionals/lightcone/4star/FinalVictor.ts | 2 +- src/lib/conditionals/lightcone/4star/FlamesAfar.ts | 2 +- .../lightcone/4star/ForTomorrowsJourney.ts | 2 +- .../conditionals/lightcone/4star/GeniusesRepose.ts | 2 +- .../lightcone/4star/GoodNightAndSleepWell.ts | 2 +- src/lib/conditionals/lightcone/4star/HeyOverHere.ts | 2 +- .../conditionals/lightcone/4star/IndeliblePromise.ts | 2 +- src/lib/conditionals/lightcone/4star/ItsShowtime.ts | 4 ++-- .../lightcone/4star/MakeTheWorldClamor.ts | 2 +- .../lightcone/4star/NinjaRecordSoundHunt.ts | 2 +- .../lightcone/4star/OnlySilenceRemains.ts | 2 +- .../conditionals/lightcone/4star/PastAndFuture.ts | 2 +- .../conditionals/lightcone/4star/PerfectTiming.ts | 4 ++-- .../lightcone/4star/PlanetaryRendezvous.ts | 2 +- .../conditionals/lightcone/4star/PoisedToBloom.ts | 2 +- .../lightcone/4star/PostOpConversation.ts | 2 +- .../4star/ResolutionShinesAsPearlsOfSweat.ts | 2 +- .../lightcone/4star/RiverFlowsInSpring.ts | 2 +- .../conditionals/lightcone/4star/ShadowedByNight.ts | 2 +- .../conditionals/lightcone/4star/SubscribeForMore.ts | 2 +- src/lib/conditionals/lightcone/4star/Swordplay.ts | 2 +- .../lightcone/4star/TheBirthOfTheSelf.ts | 2 +- .../lightcone/4star/TheDayTheCosmosFell.ts | 2 +- .../lightcone/4star/TheMolesWelcomeYou.ts | 2 +- .../lightcone/4star/TheSeriousnessOfBreakfast.ts | 2 +- src/lib/conditionals/lightcone/4star/ThisIsMe.ts | 2 +- .../lightcone/4star/TodayIsAnotherPeacefulDay.ts | 2 +- .../conditionals/lightcone/4star/UnderTheBlueSky.ts | 2 +- .../conditionals/lightcone/4star/WeAreWildfire.ts | 2 +- .../conditionals/lightcone/4star/WeWillMeetAgain.ts | 2 +- src/lib/conditionals/lightcone/4star/WoofWalkTime.ts | 2 +- .../conditionals/lightcone/5star/AGroundedAscent.ts | 2 +- .../lightcone/5star/AlongThePassingShore.ts | 2 +- .../lightcone/5star/AnInstantBeforeAGaze.ts | 2 +- .../lightcone/5star/BaptismOfPureThought.ts | 2 +- src/lib/conditionals/lightcone/5star/BeforeDawn.ts | 2 +- .../lightcone/5star/BrighterThanTheSun.ts | 2 +- .../lightcone/5star/ButTheBattleIsntOver.ts | 2 +- .../lightcone/5star/CruisingInTheStellarSea.ts | 2 +- .../conditionals/lightcone/5star/DanceAtSunset.ts | 2 +- .../conditionals/lightcone/5star/EarthlyEscapade.ts | 2 +- .../lightcone/5star/EchoesOfTheCoffin.ts | 2 +- .../conditionals/lightcone/5star/EternalCalculus.ts | 2 +- .../conditionals/lightcone/5star/FlowingNightglow.ts | 2 +- .../lightcone/5star/IShallBeMyOwnSword.ts | 2 +- .../lightcone/5star/IVentureForthToHunt.ts | 2 +- .../lightcone/5star/InTheNameOfTheWorld.ts | 2 +- src/lib/conditionals/lightcone/5star/InTheNight.ts | 2 +- .../conditionals/lightcone/5star/IncessantRain.ts | 2 +- .../lightcone/5star/InherentlyUnjustDestiny.ts | 2 +- .../lightcone/5star/LongRoadLeadsHome.ts | 2 +- .../conditionals/lightcone/5star/MomentOfVictory.ts | 2 +- .../conditionals/lightcone/5star/NightOfFright.ts | 2 +- .../lightcone/5star/NightOnTheMilkyWay.ts | 2 +- .../lightcone/5star/OnTheFallOfAnAeon.ts | 2 +- .../lightcone/5star/PastSelfInTheMirror.ts | 2 +- .../lightcone/5star/PatienceIsAllYouNeed.ts | 2 +- .../lightcone/5star/ReforgedRemembrance.ts | 2 +- .../lightcone/5star/SailingTowardsASecondLife.ts | 4 ++-- .../lightcone/5star/ScentAloneStaysTrue.ts | 2 +- .../lightcone/5star/SheAlreadyShutHerEyes.ts | 2 +- .../conditionals/lightcone/5star/SleepLikeTheDead.ts | 2 +- .../conditionals/lightcone/5star/SolitaryHealing.ts | 2 +- .../lightcone/5star/SomethingIrreplaceable.ts | 2 +- .../lightcone/5star/TextureOfMemories.ts | 2 +- .../lightcone/5star/TheUnreachableSide.ts | 2 +- .../conditionals/lightcone/5star/ThoseManySprings.ts | 2 +- .../lightcone/5star/TimeWaitsForNoOne.ts | 2 +- .../lightcone/5star/WhereaboutsShouldDreamsRest.ts | 2 +- .../lightcone/5star/WorrisomeBlissful.ts | 2 +- .../lightcone/5star/YetHopeIsPriceless.ts | 2 +- src/lib/{ => constants}/constants.ts | 0 src/lib/{ => constants}/constantsSession.ts | 0 src/lib/{ => constants}/constantsUi.ts | 0 src/lib/gpu/conditionals/dynamicConditionals.ts | 2 +- src/lib/gpu/conditionals/setConditionals.ts | 2 +- src/lib/gpu/injection/generateWgsl.ts | 2 +- src/lib/gpu/injection/injectConditionals.ts | 2 +- src/lib/gpu/injection/injectSettings.ts | 2 +- src/lib/gpu/tests/webgpuTestGenerator.ts | 4 ++-- src/lib/gpu/tests/webgpuTestUtils.ts | 2 +- src/lib/gpu/webgpuDataTransform.ts | 2 +- src/lib/gpu/webgpuDebugger.ts | 2 +- src/lib/gpu/webgpuDevice.ts | 4 ++-- src/lib/gpu/webgpuInternals.ts | 2 +- src/lib/gpu/webgpuOptimizer.ts | 4 ++-- src/lib/{interactions => i18n}/LanguageSelector.tsx | 2 +- src/lib/{ => i18n}/i18n.ts | 0 src/lib/importer/characterConverter.ts | 4 ++-- src/lib/importer/hoyoLabFormatParser.tsx | 4 ++-- src/lib/importer/kelzFormatParser.tsx | 4 ++-- src/lib/interactions/message.ts | 2 +- src/lib/interactions/notifications.tsx | 2 +- src/lib/layout/LayoutHeader.tsx | 2 +- src/lib/optimizer/bufferPacker.ts | 2 +- src/lib/optimizer/calculateBuild.ts | 4 ++-- src/lib/optimizer/calculateConditionals.ts | 2 +- src/lib/optimizer/calculateStats.ts | 2 +- src/lib/optimizer/computedStatsArray.ts | 2 +- src/lib/optimizer/context/calculateContext.ts | 2 +- src/lib/optimizer/defaultForm.ts | 4 ++-- src/lib/optimizer/optimizer.ts | 8 ++++---- src/lib/optimizer/optimizerUtils.ts | 2 +- src/lib/optimizer/relicSetSolver.ts | 4 ++-- src/lib/optimizer/rotation/comboDrawerController.tsx | 4 ++-- src/lib/optimizer/rotation/comboStateTransform.ts | 2 +- src/lib/optimizer/rotation/rotationPreprocessor.ts | 4 ++-- src/lib/optimizer/rotation/setConditionalContent.ts | 4 ++-- src/lib/overlays/drawers/MenuDrawer.tsx | 2 +- src/lib/overlays/drawers/SettingsDrawer.tsx | 4 ++-- src/lib/overlays/modals/RelicModal.tsx | 6 +++--- src/lib/overlays/modals/ScoringModal.tsx | 4 ++-- src/lib/overlays/modals/SwitchRelicsModal.tsx | 4 ++-- src/lib/relics/relicAugmenter.ts | 4 ++-- src/lib/relics/relicFilters.ts | 6 +++--- src/lib/relics/relicModalController.ts | 6 +++--- src/lib/relics/relicRollFixer.ts | 6 +++--- src/lib/relics/relicRollGrader.test.ts | 2 +- src/lib/relics/relicRollGrader.ts | 2 +- src/lib/relics/relicScorer.test.ts | 2 +- src/lib/relics/relicScorerPotential.ts | 6 +++--- src/lib/relics/statCalculator.ts | 4 ++-- src/lib/relics/substatRollTable.ts | 2 +- src/lib/rendering/assets.ts | 2 +- src/lib/rendering/gradient.ts | 2 +- src/lib/rendering/renderer.tsx | 4 ++-- .../statSimulationController.tsx | 6 +++--- src/lib/state/dataParser.ts | 2 +- src/lib/state/db.ts | 10 +++++----- src/lib/state/saveState.ts | 2 +- src/lib/tabs/Tabs.tsx | 2 +- src/lib/tabs/tabChangelog/ChangelogTab.tsx | 2 +- src/lib/tabs/tabCharacters/CharacterTab.jsx | 4 ++-- src/lib/tabs/tabHome/HomeTab.tsx | 2 +- src/lib/tabs/tabImport/ClearDataSubmenu.tsx | 2 +- src/lib/tabs/tabImport/ImportTab.tsx | 4 ++-- src/lib/tabs/tabImport/LoadDataSubmenu.tsx | 2 +- src/lib/tabs/tabImport/ScannerImportSubmenu.tsx | 6 +++--- src/lib/tabs/tabMetadata/MetadataTab.tsx | 2 +- src/lib/tabs/tabOptimizer/OptimizerBuildPreview.tsx | 2 +- src/lib/tabs/tabOptimizer/OptimizerForm.tsx | 6 +++--- src/lib/tabs/tabOptimizer/OptimizerGrid.jsx | 2 +- .../tabs/tabOptimizer/OptimizerSuggestionsModal.tsx | 6 +++--- src/lib/tabs/tabOptimizer/Sidebar.tsx | 8 ++++---- .../conditionals/LightConeConditionalDisplay.tsx | 12 ++++++------ .../optimizerForm/CardSelectModalComponents.tsx | 4 ++-- .../tabOptimizer/optimizerForm/CharacterSelect.tsx | 2 +- .../optimizerForm/CharacterSelectorDisplay.tsx | 4 ++-- .../tabOptimizer/optimizerForm/CombatBuffsDrawer.tsx | 4 ++-- .../optimizerForm/EnemyConfigurationsDrawer.tsx | 2 +- .../optimizerForm/FormSetConditionals.jsx | 2 +- .../optimizerForm/FormStatRollSlider.tsx | 4 ++-- .../tabOptimizer/optimizerForm/LightConeSelect.tsx | 2 +- .../optimizerForm/OptimizerOptionsDisplay.tsx | 2 +- .../optimizerForm/OrnamentSetTagRenderer.tsx | 2 +- .../tabOptimizer/optimizerForm/OrnamentsOptions.tsx | 2 +- .../optimizerForm/RecommendedPresetsButton.tsx | 8 ++++---- .../optimizerForm/RelicMainSetFilters.tsx | 2 +- .../optimizerForm/RelicSetTagRenderer.tsx | 2 +- .../tabs/tabOptimizer/optimizerForm/SetsOptions.tsx | 2 +- .../optimizerForm/SimulatedBuildsGrid.tsx | 4 ++-- .../optimizerForm/StatSimulationDisplay.tsx | 6 +++--- .../tabs/tabOptimizer/optimizerForm/TeammateCard.tsx | 4 ++-- src/lib/tabs/tabOptimizer/optimizerTabConstants.ts | 4 ++-- .../tabOptimizer}/optimizerTabController.ts | 8 ++++---- src/lib/tabs/tabOptimizer/rotation/ComboDrawer.tsx | 4 ++-- src/lib/tabs/tabRelics/RelicFilterBar.tsx | 6 +++--- src/lib/tabs/tabRelics/RelicPreview.tsx | 2 +- src/lib/tabs/tabRelics/RelicsTab.jsx | 2 +- src/lib/tabs/tabRelics/relicPreview/GenerateStat.tsx | 4 ++-- src/lib/tabs/tabShowcase/RelicScorerTab.jsx | 8 ++++---- src/lib/ui/LoadingBlurredImage.tsx | 2 +- src/lib/{ => utils}/TsUtils.ts | 2 +- src/lib/{ => utils}/utils.js | 2 +- src/lib/worker/optimizerWorker.ts | 2 +- src/lib/worker/workerPool.ts | 2 +- src/types/Character.d.ts | 2 +- src/types/Conditionals.d.ts | 10 +++++----- src/types/Form.d.ts | 4 ++-- src/types/LightCone.d.ts | 2 +- src/types/Relic.d.ts | 2 +- src/types/store.ts | 2 +- src/window.d.ts | 6 +++--- 276 files changed, 382 insertions(+), 382 deletions(-) rename src/lib/{ => constants}/constants.ts (100%) rename src/lib/{ => constants}/constantsSession.ts (100%) rename src/lib/{ => constants}/constantsUi.ts (100%) rename src/lib/{interactions => i18n}/LanguageSelector.tsx (98%) rename src/lib/{ => i18n}/i18n.ts (100%) rename src/lib/{controllers => simulations}/statSimulationController.tsx (98%) rename src/lib/{controllers => tabs/tabOptimizer}/optimizerTabController.ts (99%) rename src/lib/{ => utils}/TsUtils.ts (97%) rename src/lib/{ => utils}/utils.js (99%) diff --git a/misc/i18n/generateTranslations.ts b/misc/i18n/generateTranslations.ts index b272e07ff..7f8333254 100644 --- a/misc/i18n/generateTranslations.ts +++ b/misc/i18n/generateTranslations.ts @@ -4,7 +4,7 @@ import { writeFile } from "fs" import { readFile } from "fs/promises" //@ts-ignore import yaml from "js-yaml" -import { TsUtils } from '../../src/lib/TsUtils' +import { TsUtils } from 'src/lib/utils/TsUtils' import { betaInformation } from "./betaInformation" import pathConfig from './AvatarBaseType.json' import AvatarConfig from './AvatarConfig.json' diff --git a/src/index.tsx b/src/index.tsx index 515626daa..c2b7fa711 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,8 +1,8 @@ import { Typography } from 'antd' import WrappedApp from 'App' -import 'lib/i18n' +import 'lib/i18n/i18n' import { CharacterStats } from 'lib/characters/characterStats' -import { Constants } from 'lib/constants' +import { Constants } from 'lib/constants/constants' import { verifyWebgpuSupport } from 'lib/gpu/webgpuDevice' import 'overlayscrollbars/overlayscrollbars.css' import { CharacterConverter } from 'lib/importer/characterConverter' diff --git a/src/lib/characterPreview/CharacterPreview.jsx b/src/lib/characterPreview/CharacterPreview.jsx index eb94cef6a..c6f1a3e31 100644 --- a/src/lib/characterPreview/CharacterPreview.jsx +++ b/src/lib/characterPreview/CharacterPreview.jsx @@ -21,8 +21,8 @@ import { ElementToDamage, SETTINGS_TEAM, SIMULATION_SCORE, -} from 'lib/constants' -import { SavedSessionKeys } from 'lib/constantsSession' +} from 'lib/constants/constants' +import { SavedSessionKeys } from 'lib/constants/constantsSession' import { defaultGap, innerW, @@ -33,8 +33,8 @@ import { middleColumnWidth, parentH, parentW, -} from 'lib/constantsUi' -import { OptimizerTabController } from 'lib/controllers/optimizerTabController' +} from 'lib/constants/constantsUi' +import { OptimizerTabController } from 'lib/tabs/tabOptimizer/optimizerTabController' import { Message } from 'lib/interactions/message' import { calculateBuild } from 'lib/optimizer/calculateBuild' import CharacterModal from 'lib/overlays/modals/CharacterModal' @@ -50,7 +50,7 @@ import { SaveState } from 'lib/state/saveState' import { RelicPreview } from 'lib/tabs/tabRelics/RelicPreview' import { HeaderText } from 'lib/ui/HeaderText' import { LoadingBlurredImage } from 'lib/ui/LoadingBlurredImage' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' import PropTypes from 'prop-types' import React, { useEffect, useRef, useState } from 'react' import { useTranslation } from 'react-i18next' diff --git a/src/lib/characterPreview/CharacterScoringSummary.tsx b/src/lib/characterPreview/CharacterScoringSummary.tsx index 4698a57b6..4279b41d2 100644 --- a/src/lib/characterPreview/CharacterScoringSummary.tsx +++ b/src/lib/characterPreview/CharacterScoringSummary.tsx @@ -4,18 +4,18 @@ import { CharacterStatSummary } from 'lib/characterPreview/CharacterStatSummary' import { damageStats } from 'lib/characterPreview/StatRow' import { StatTextSm } from 'lib/characterPreview/StatText' import { diminishingReturnsFormula, SimulationScore, SimulationStatUpgrade } from 'lib/characters/characterScorer' -import { ElementToDamage, MainStats, Parts, Stats, StatsValues, SubStats } from 'lib/constants' -import { defaultGap, iconSize } from 'lib/constantsUi' -import { Simulation } from 'lib/controllers/statSimulationController' +import { ElementToDamage, MainStats, Parts, Stats, StatsValues, SubStats } from 'lib/constants/constants' +import { defaultGap, iconSize } from 'lib/constants/constantsUi' +import { Simulation } from 'lib/simulations/statSimulationController' import { SortOption } from 'lib/optimizer/sortOptions' import { StatCalculator } from 'lib/relics/statCalculator' import { Assets } from 'lib/rendering/assets' import DB from 'lib/state/db' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { ColorizedLinkWithIcon } from 'lib/ui/ColorizedLink' import { VerticalDivider } from 'lib/ui/Dividers' import { HeaderText } from 'lib/ui/HeaderText' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' import React, { ReactElement } from 'react' import { Trans, useTranslation } from 'react-i18next' diff --git a/src/lib/characterPreview/CharacterStatSummary.tsx b/src/lib/characterPreview/CharacterStatSummary.tsx index 5637b67e0..a9c5464f9 100644 --- a/src/lib/characterPreview/CharacterStatSummary.tsx +++ b/src/lib/characterPreview/CharacterStatSummary.tsx @@ -1,6 +1,6 @@ import { Flex } from 'antd' import StatRow from 'lib/characterPreview/StatRow' -import { Constants, Stats } from 'lib/constants' +import { Constants, Stats } from 'lib/constants/constants' const epsilon = 0.001 diff --git a/src/lib/characterPreview/StatRow.tsx b/src/lib/characterPreview/StatRow.tsx index ba2de806c..215bbb285 100644 --- a/src/lib/characterPreview/StatRow.tsx +++ b/src/lib/characterPreview/StatRow.tsx @@ -1,11 +1,11 @@ import { Divider, Flex } from 'antd' import StatText from 'lib/characterPreview/StatText' -import { Constants, StatsValues } from 'lib/constants' -import { iconSize } from 'lib/constantsUi' +import { Constants, StatsValues } from 'lib/constants/constants' +import { iconSize } from 'lib/constants/constantsUi' import { Assets } from 'lib/rendering/assets' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' import { useTranslation } from 'react-i18next' const checkSpeedInBreakpoint = (speedValue: number): boolean => { diff --git a/src/lib/characters/characterScorer.ts b/src/lib/characters/characterScorer.ts index d6fd21aa8..8dda8d523 100644 --- a/src/lib/characters/characterScorer.ts +++ b/src/lib/characters/characterScorer.ts @@ -1,7 +1,7 @@ import { CharacterConditionals } from 'lib/conditionals/characterConditionals' import { ComputedStatsObject } from 'lib/conditionals/conditionalConstants' import { LightConeConditionals } from 'lib/conditionals/lightConeConditionals' -import { CUSTOM_TEAM, Parts, Sets, Stats, SubStats } from 'lib/constants' +import { CUSTOM_TEAM, Parts, Sets, Stats, SubStats } from 'lib/constants/constants' import { calculateOrnamentSets, calculateRelicSets, @@ -10,7 +10,7 @@ import { Simulation, SimulationRequest, SimulationStats, -} from 'lib/controllers/statSimulationController' +} from 'lib/simulations/statSimulationController' import { generateContext } from 'lib/optimizer/context/calculateContext' import { getDefaultForm } from 'lib/optimizer/defaultForm' import { emptyRelic } from 'lib/optimizer/optimizerUtils' @@ -18,8 +18,8 @@ import { SortOptionProperties } from 'lib/optimizer/sortOptions' import { StatCalculator } from 'lib/relics/statCalculator' import DB from 'lib/state/db' import { StatSimTypes } from 'lib/tabs/tabOptimizer/optimizerForm/StatSimulationDisplay' -import { TsUtils } from 'lib/TsUtils' -import { Utils } from 'lib/utils' +import { TsUtils } from 'lib/utils/TsUtils' +import { Utils } from 'lib/utils/utils' import { Character } from 'types/Character' import { Conditional } from 'types/Conditionals' import { Form } from 'types/Form' diff --git a/src/lib/characters/characterStats.ts b/src/lib/characters/characterStats.ts index de8f96094..ea89abfa1 100644 --- a/src/lib/characters/characterStats.ts +++ b/src/lib/characters/characterStats.ts @@ -1,4 +1,4 @@ -import { Stats } from 'lib/constants' +import { Stats } from 'lib/constants/constants' export const CharacterStats = { getZeroes: function () { diff --git a/src/lib/conditionals/character/Acheron.ts b/src/lib/conditionals/character/Acheron.ts index 05058b3eb..257e4a0a2 100644 --- a/src/lib/conditionals/character/Acheron.ts +++ b/src/lib/conditionals/character/Acheron.ts @@ -2,7 +2,7 @@ import { BASIC_TYPE, SKILL_TYPE, ULT_TYPE } from 'lib/conditionals/conditionalCo import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { buffAbilityResPen, buffAbilityVulnerability } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' import { NumberToNumberMap } from 'types/Common' diff --git a/src/lib/conditionals/character/Argenti.ts b/src/lib/conditionals/character/Argenti.ts index 2ae3fb2a7..668cf50d0 100644 --- a/src/lib/conditionals/character/Argenti.ts +++ b/src/lib/conditionals/character/Argenti.ts @@ -2,7 +2,7 @@ import { ULT_TYPE } from 'lib/conditionals/conditionalConstants' import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { buffAbilityDefPen } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Arlan.ts b/src/lib/conditionals/character/Arlan.ts index 384bb0918..1f7efe53b 100644 --- a/src/lib/conditionals/character/Arlan.ts +++ b/src/lib/conditionals/character/Arlan.ts @@ -2,7 +2,7 @@ import { SKILL_TYPE, ULT_TYPE } from 'lib/conditionals/conditionalConstants' import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Asta.ts b/src/lib/conditionals/character/Asta.ts index 8e6ea109a..37b76ecf2 100644 --- a/src/lib/conditionals/character/Asta.ts +++ b/src/lib/conditionals/character/Asta.ts @@ -1,6 +1,6 @@ import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Aventurine.ts b/src/lib/conditionals/character/Aventurine.ts index 07f7c0498..235c1ce35 100644 --- a/src/lib/conditionals/character/Aventurine.ts +++ b/src/lib/conditionals/character/Aventurine.ts @@ -8,11 +8,11 @@ import { standardDefFinalizer, standardDefShieldFinalizer, } from 'lib/conditionals/conditionalUtils' -import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants' +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 { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/character/Bailu.ts b/src/lib/conditionals/character/Bailu.ts index d638f32b5..bd6bc41e5 100644 --- a/src/lib/conditionals/character/Bailu.ts +++ b/src/lib/conditionals/character/Bailu.ts @@ -9,7 +9,7 @@ import { standardHpHealFinalizer, } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/BlackSwan.ts b/src/lib/conditionals/character/BlackSwan.ts index 8e85302e0..40b8eb1bc 100644 --- a/src/lib/conditionals/character/BlackSwan.ts +++ b/src/lib/conditionals/character/BlackSwan.ts @@ -3,7 +3,7 @@ import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalize import { BlackSwanConversionConditional } from 'lib/gpu/conditionals/dynamicConditionals' import { buffAbilityDefPen, buffAbilityVulnerability } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Blade.ts b/src/lib/conditionals/character/Blade.ts index 3cedff18f..2ac396f6f 100644 --- a/src/lib/conditionals/character/Blade.ts +++ b/src/lib/conditionals/character/Blade.ts @@ -3,7 +3,7 @@ import { AbilityEidolon, calculateAshblazingSet, Conditionals, ContentDefinition import { wgslTrue } from 'lib/gpu/injection/wgslUtils' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Boothill.ts b/src/lib/conditionals/character/Boothill.ts index 85d6da801..295248e27 100644 --- a/src/lib/conditionals/character/Boothill.ts +++ b/src/lib/conditionals/character/Boothill.ts @@ -1,9 +1,9 @@ import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils' -import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants' +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 { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Bronya.ts b/src/lib/conditionals/character/Bronya.ts index fb757d5d8..a206a96a4 100644 --- a/src/lib/conditionals/character/Bronya.ts +++ b/src/lib/conditionals/character/Bronya.ts @@ -1,11 +1,11 @@ import { ASHBLAZING_ATK_STACK, BASIC_TYPE } from 'lib/conditionals/conditionalConstants' import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardFuaAtkFinalizer, standardFuaAtkFinalizer } from 'lib/conditionals/conditionalUtils' -import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants' +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 { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Clara.ts b/src/lib/conditionals/character/Clara.ts index 5f1343b3a..cc2f9036d 100644 --- a/src/lib/conditionals/character/Clara.ts +++ b/src/lib/conditionals/character/Clara.ts @@ -2,7 +2,7 @@ import { ASHBLAZING_ATK_STACK, FUA_TYPE } from 'lib/conditionals/conditionalCons import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardFuaAtkFinalizer, standardFuaAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/DanHeng.ts b/src/lib/conditionals/character/DanHeng.ts index aece4e46e..93b5dad5a 100644 --- a/src/lib/conditionals/character/DanHeng.ts +++ b/src/lib/conditionals/character/DanHeng.ts @@ -2,7 +2,7 @@ import { BASIC_TYPE } from 'lib/conditionals/conditionalConstants' import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/DrRatio.ts b/src/lib/conditionals/character/DrRatio.ts index 6d9a6ea91..7dc710eed 100644 --- a/src/lib/conditionals/character/DrRatio.ts +++ b/src/lib/conditionals/character/DrRatio.ts @@ -2,7 +2,7 @@ import { ASHBLAZING_ATK_STACK, FUA_TYPE } from 'lib/conditionals/conditionalCons import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardFuaAtkFinalizer, standardFuaAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Feixiao.ts b/src/lib/conditionals/character/Feixiao.ts index 8b954f2f8..f8333587f 100644 --- a/src/lib/conditionals/character/Feixiao.ts +++ b/src/lib/conditionals/character/Feixiao.ts @@ -2,7 +2,7 @@ import { ASHBLAZING_ATK_STACK, FUA_TYPE, ULT_TYPE } from 'lib/conditionals/condi import { AbilityEidolon, calculateAshblazingSet, Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { buffAbilityCd } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Firefly.ts b/src/lib/conditionals/character/Firefly.ts index ec9529da1..bc990417e 100644 --- a/src/lib/conditionals/character/Firefly.ts +++ b/src/lib/conditionals/character/Firefly.ts @@ -4,7 +4,7 @@ import { FireflyConversionConditional } from 'lib/gpu/conditionals/dynamicCondit import { wgslTrue } from 'lib/gpu/injection/wgslUtils' import { buffAbilityVulnerability } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/FuXuan.ts b/src/lib/conditionals/character/FuXuan.ts index 4e56f60f4..d44ca158b 100644 --- a/src/lib/conditionals/character/FuXuan.ts +++ b/src/lib/conditionals/character/FuXuan.ts @@ -8,11 +8,11 @@ import { standardHpFinalizer, standardHpHealFinalizer, } from 'lib/conditionals/conditionalUtils' -import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants' +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 { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Fugue.ts b/src/lib/conditionals/character/Fugue.ts index 4feb6256d..38492ff6f 100644 --- a/src/lib/conditionals/character/Fugue.ts +++ b/src/lib/conditionals/character/Fugue.ts @@ -1,7 +1,7 @@ import i18next from 'i18next' import { BREAK_TYPE } from 'lib/conditionals/conditionalConstants' import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils' -import { CURRENT_DATA_VERSION } from 'lib/constants' +import { CURRENT_DATA_VERSION } from 'lib/constants/constants' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' diff --git a/src/lib/conditionals/character/Gallagher.ts b/src/lib/conditionals/character/Gallagher.ts index 784fc877f..8a99f4180 100644 --- a/src/lib/conditionals/character/Gallagher.ts +++ b/src/lib/conditionals/character/Gallagher.ts @@ -11,7 +11,7 @@ import { import { GallagherConversionConditional } from 'lib/gpu/conditionals/dynamicConditionals' import { buffAbilityVulnerability } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/character/Gepard.ts b/src/lib/conditionals/character/Gepard.ts index 43a0d87e4..636a8496a 100644 --- a/src/lib/conditionals/character/Gepard.ts +++ b/src/lib/conditionals/character/Gepard.ts @@ -7,10 +7,10 @@ import { standardAtkFinalizer, standardDefShieldFinalizer, } from 'lib/conditionals/conditionalUtils' -import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants' +import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants/constants' import { conditionalWgslWrapper } from 'lib/gpu/conditionals/dynamicConditionals' import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/character/Guinaifen.ts b/src/lib/conditionals/character/Guinaifen.ts index a0e251590..4993aa2d2 100644 --- a/src/lib/conditionals/character/Guinaifen.ts +++ b/src/lib/conditionals/character/Guinaifen.ts @@ -1,6 +1,6 @@ import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Hanya.ts b/src/lib/conditionals/character/Hanya.ts index bd9c9574d..d8d881267 100644 --- a/src/lib/conditionals/character/Hanya.ts +++ b/src/lib/conditionals/character/Hanya.ts @@ -1,9 +1,9 @@ import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils' -import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants' +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 { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Herta.ts b/src/lib/conditionals/character/Herta.ts index e0a9dfcaa..7fcf80e10 100644 --- a/src/lib/conditionals/character/Herta.ts +++ b/src/lib/conditionals/character/Herta.ts @@ -2,7 +2,7 @@ import { ASHBLAZING_ATK_STACK, FUA_TYPE, SKILL_TYPE, ULT_TYPE } from 'lib/condit import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardFuaAtkFinalizer, standardFuaAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Himeko.ts b/src/lib/conditionals/character/Himeko.ts index 0a919effb..34a7d6ea7 100644 --- a/src/lib/conditionals/character/Himeko.ts +++ b/src/lib/conditionals/character/Himeko.ts @@ -2,7 +2,7 @@ import { ASHBLAZING_ATK_STACK, SKILL_TYPE } from 'lib/conditionals/conditionalCo import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardFuaAtkFinalizer, standardFuaAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' import { NumberToNumberMap } from 'types/Common' diff --git a/src/lib/conditionals/character/Hook.ts b/src/lib/conditionals/character/Hook.ts index c0e897393..e9dcb3c24 100644 --- a/src/lib/conditionals/character/Hook.ts +++ b/src/lib/conditionals/character/Hook.ts @@ -2,7 +2,7 @@ import { SKILL_TYPE } from 'lib/conditionals/conditionalConstants' import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Huohuo.ts b/src/lib/conditionals/character/Huohuo.ts index d31573ae5..f73334b36 100644 --- a/src/lib/conditionals/character/Huohuo.ts +++ b/src/lib/conditionals/character/Huohuo.ts @@ -9,7 +9,7 @@ import { standardHpHealFinalizer, } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/ImbibitorLunae.ts b/src/lib/conditionals/character/ImbibitorLunae.ts index 564cf7db3..4d3955e05 100644 --- a/src/lib/conditionals/character/ImbibitorLunae.ts +++ b/src/lib/conditionals/character/ImbibitorLunae.ts @@ -2,7 +2,7 @@ import { BASIC_TYPE } from 'lib/conditionals/conditionalConstants' import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { buffAbilityResPen } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Jade.ts b/src/lib/conditionals/character/Jade.ts index 32473adac..0a81520d5 100644 --- a/src/lib/conditionals/character/Jade.ts +++ b/src/lib/conditionals/character/Jade.ts @@ -2,7 +2,7 @@ import { ASHBLAZING_ATK_STACK, FUA_TYPE } from 'lib/conditionals/conditionalCons import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardFuaAtkFinalizer, standardFuaAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Jiaoqiu.ts b/src/lib/conditionals/character/Jiaoqiu.ts index 2880bd622..b9e379ba3 100644 --- a/src/lib/conditionals/character/Jiaoqiu.ts +++ b/src/lib/conditionals/character/Jiaoqiu.ts @@ -3,7 +3,7 @@ import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalize import { JiaoqiuConversionConditional } from 'lib/gpu/conditionals/dynamicConditionals' import { buffAbilityVulnerability } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/JingYuan.ts b/src/lib/conditionals/character/JingYuan.ts index ca773e17f..fc6124197 100644 --- a/src/lib/conditionals/character/JingYuan.ts +++ b/src/lib/conditionals/character/JingYuan.ts @@ -2,7 +2,7 @@ import { ASHBLAZING_ATK_STACK, BASIC_TYPE, FUA_TYPE, SKILL_TYPE, ULT_TYPE } from import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardFuaAtkFinalizer, standardFuaAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { buffAbilityCd, buffAbilityDmg, buffAbilityVulnerability } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Jingliu.ts b/src/lib/conditionals/character/Jingliu.ts index 57c1639d4..b7d51f27c 100644 --- a/src/lib/conditionals/character/Jingliu.ts +++ b/src/lib/conditionals/character/Jingliu.ts @@ -2,7 +2,7 @@ import { SKILL_TYPE, ULT_TYPE } from 'lib/conditionals/conditionalConstants' import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/character/Kafka.ts b/src/lib/conditionals/character/Kafka.ts index 312a92185..cc4cfa269 100644 --- a/src/lib/conditionals/character/Kafka.ts +++ b/src/lib/conditionals/character/Kafka.ts @@ -2,7 +2,7 @@ import { ASHBLAZING_ATK_STACK, DOT_TYPE } from 'lib/conditionals/conditionalCons import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardFuaAtkFinalizer, standardFuaAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { buffAbilityDmg, buffAbilityVulnerability } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Lingsha.ts b/src/lib/conditionals/character/Lingsha.ts index 686645bee..10788f0e3 100644 --- a/src/lib/conditionals/character/Lingsha.ts +++ b/src/lib/conditionals/character/Lingsha.ts @@ -8,12 +8,12 @@ import { standardAtkHealFinalizer, standardFuaAtkFinalizer, } from 'lib/conditionals/conditionalUtils' -import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants' +import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants/constants' import { conditionalWgslWrapper } from 'lib/gpu/conditionals/dynamicConditionals' import { wgslFalse } from 'lib/gpu/injection/wgslUtils' import { buffAbilityVulnerability } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Luka.ts b/src/lib/conditionals/character/Luka.ts index 20a63fcdf..a5a720ccd 100644 --- a/src/lib/conditionals/character/Luka.ts +++ b/src/lib/conditionals/character/Luka.ts @@ -1,6 +1,6 @@ import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Luocha.ts b/src/lib/conditionals/character/Luocha.ts index edd0a92a3..1d04065f6 100644 --- a/src/lib/conditionals/character/Luocha.ts +++ b/src/lib/conditionals/character/Luocha.ts @@ -9,7 +9,7 @@ import { standardAtkHealFinalizer, } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/character/Lynx.ts b/src/lib/conditionals/character/Lynx.ts index 085580eef..189dbafa5 100644 --- a/src/lib/conditionals/character/Lynx.ts +++ b/src/lib/conditionals/character/Lynx.ts @@ -8,11 +8,11 @@ import { standardHpFinalizer, standardHpHealFinalizer, } from 'lib/conditionals/conditionalUtils' -import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants' +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 { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/character/March7thImaginary.ts b/src/lib/conditionals/character/March7thImaginary.ts index 5e21c56d7..fc2b17b39 100644 --- a/src/lib/conditionals/character/March7thImaginary.ts +++ b/src/lib/conditionals/character/March7thImaginary.ts @@ -2,7 +2,7 @@ import { ASHBLAZING_ATK_STACK, BASIC_TYPE } from 'lib/conditionals/conditionalCo import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardFuaAtkFinalizer, standardFuaAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { buffAbilityCd, buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Misha.ts b/src/lib/conditionals/character/Misha.ts index 22bc771fd..1e6d86dab 100644 --- a/src/lib/conditionals/character/Misha.ts +++ b/src/lib/conditionals/character/Misha.ts @@ -1,6 +1,6 @@ import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Moze.ts b/src/lib/conditionals/character/Moze.ts index 77c249037..a9c328b6d 100644 --- a/src/lib/conditionals/character/Moze.ts +++ b/src/lib/conditionals/character/Moze.ts @@ -2,7 +2,7 @@ import { ASHBLAZING_ATK_STACK, FUA_TYPE, ULT_TYPE } from 'lib/conditionals/condi import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardFuaAtkFinalizer, standardFuaAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { buffAbilityVulnerability } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Natasha.ts b/src/lib/conditionals/character/Natasha.ts index 994d2d3ee..20ec9bd27 100644 --- a/src/lib/conditionals/character/Natasha.ts +++ b/src/lib/conditionals/character/Natasha.ts @@ -2,7 +2,7 @@ import { SKILL_TYPE, ULT_TYPE } from 'lib/conditionals/conditionalConstants' import { AbilityEidolon, Conditionals, ContentDefinition, standardHpHealFinalizer } from 'lib/conditionals/conditionalUtils' import { wgslTrue } from 'lib/gpu/injection/wgslUtils' import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/character/Pela.ts b/src/lib/conditionals/character/Pela.ts index 25759533c..ac82cbb17 100644 --- a/src/lib/conditionals/character/Pela.ts +++ b/src/lib/conditionals/character/Pela.ts @@ -3,7 +3,7 @@ import { AbilityEidolon, Conditionals, ContentDefinition } from 'lib/conditional import { wgslTrue } from 'lib/gpu/injection/wgslUtils' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Qingque.ts b/src/lib/conditionals/character/Qingque.ts index 2a8a0a5e0..6906d2946 100644 --- a/src/lib/conditionals/character/Qingque.ts +++ b/src/lib/conditionals/character/Qingque.ts @@ -2,7 +2,7 @@ import { ASHBLAZING_ATK_STACK, ULT_TYPE } from 'lib/conditionals/conditionalCons import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardFuaAtkFinalizer, standardFuaAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Rappa.ts b/src/lib/conditionals/character/Rappa.ts index 8c8bf1230..b6994c740 100644 --- a/src/lib/conditionals/character/Rappa.ts +++ b/src/lib/conditionals/character/Rappa.ts @@ -1,7 +1,7 @@ import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { RappaConversionConditional } from 'lib/gpu/conditionals/dynamicConditionals' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Robin.ts b/src/lib/conditionals/character/Robin.ts index e0755ade5..d30bc586b 100644 --- a/src/lib/conditionals/character/Robin.ts +++ b/src/lib/conditionals/character/Robin.ts @@ -3,7 +3,7 @@ import { AbilityEidolon, Conditionals, ContentDefinition } from 'lib/conditional import { wgslTrue } from 'lib/gpu/injection/wgslUtils' import { buffAbilityCd } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/RuanMei.ts b/src/lib/conditionals/character/RuanMei.ts index bdbc64bc7..fb0985499 100644 --- a/src/lib/conditionals/character/RuanMei.ts +++ b/src/lib/conditionals/character/RuanMei.ts @@ -1,7 +1,7 @@ import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { RuanMeiConversionConditional } from 'lib/gpu/conditionals/dynamicConditionals' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/character/Sampo.ts b/src/lib/conditionals/character/Sampo.ts index ea191561d..362574139 100644 --- a/src/lib/conditionals/character/Sampo.ts +++ b/src/lib/conditionals/character/Sampo.ts @@ -2,7 +2,7 @@ import { DOT_TYPE } from 'lib/conditionals/conditionalConstants' import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { buffAbilityVulnerability } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Seele.ts b/src/lib/conditionals/character/Seele.ts index 80ec723f6..38307176c 100644 --- a/src/lib/conditionals/character/Seele.ts +++ b/src/lib/conditionals/character/Seele.ts @@ -1,7 +1,7 @@ import { AbilityEidolon, Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { wgslTrue } from 'lib/gpu/injection/wgslUtils' import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Serval.ts b/src/lib/conditionals/character/Serval.ts index a4b903e7d..57a1a22a1 100644 --- a/src/lib/conditionals/character/Serval.ts +++ b/src/lib/conditionals/character/Serval.ts @@ -1,6 +1,6 @@ import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/SilverWolf.ts b/src/lib/conditionals/character/SilverWolf.ts index e3c1c0f78..697c700be 100644 --- a/src/lib/conditionals/character/SilverWolf.ts +++ b/src/lib/conditionals/character/SilverWolf.ts @@ -1,6 +1,6 @@ import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Sparkle.ts b/src/lib/conditionals/character/Sparkle.ts index bbc674545..0d2ee8d85 100644 --- a/src/lib/conditionals/character/Sparkle.ts +++ b/src/lib/conditionals/character/Sparkle.ts @@ -1,9 +1,9 @@ import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils' -import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants' +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 { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Sunday.ts b/src/lib/conditionals/character/Sunday.ts index 3406b80d2..ed1a6fb9b 100644 --- a/src/lib/conditionals/character/Sunday.ts +++ b/src/lib/conditionals/character/Sunday.ts @@ -1,6 +1,6 @@ import i18next from 'i18next' import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils' -import { ConditionalActivation, ConditionalType, CURRENT_DATA_VERSION, Stats } from 'lib/constants' +import { ConditionalActivation, ConditionalType, CURRENT_DATA_VERSION, 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' diff --git a/src/lib/conditionals/character/Sushang.ts b/src/lib/conditionals/character/Sushang.ts index 622cf4ee3..89cee7a1a 100644 --- a/src/lib/conditionals/character/Sushang.ts +++ b/src/lib/conditionals/character/Sushang.ts @@ -2,7 +2,7 @@ import { SKILL_TYPE } from 'lib/conditionals/conditionalConstants' import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Tingyun.ts b/src/lib/conditionals/character/Tingyun.ts index b3dba5505..e1a378925 100644 --- a/src/lib/conditionals/character/Tingyun.ts +++ b/src/lib/conditionals/character/Tingyun.ts @@ -1,11 +1,11 @@ import { BASIC_TYPE } from 'lib/conditionals/conditionalConstants' import { AbilityEidolon, Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' -import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants' +import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants/constants' import { conditionalWgslWrapper } from 'lib/gpu/conditionals/dynamicConditionals' import { wgslFalse, wgslTrue } from 'lib/gpu/injection/wgslUtils' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/character/Topaz.ts b/src/lib/conditionals/character/Topaz.ts index 1924041eb..ceebe7ffa 100644 --- a/src/lib/conditionals/character/Topaz.ts +++ b/src/lib/conditionals/character/Topaz.ts @@ -2,7 +2,7 @@ import { ASHBLAZING_ATK_STACK, BASIC_TYPE, FUA_TYPE, SKILL_TYPE } from 'lib/cond 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 { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/TrailblazerDestruction.ts b/src/lib/conditionals/character/TrailblazerDestruction.ts index cfb8349b1..4164d3def 100644 --- a/src/lib/conditionals/character/TrailblazerDestruction.ts +++ b/src/lib/conditionals/character/TrailblazerDestruction.ts @@ -2,7 +2,7 @@ import { SKILL_TYPE, ULT_TYPE } from 'lib/conditionals/conditionalConstants' import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/character/TrailblazerHarmony.ts b/src/lib/conditionals/character/TrailblazerHarmony.ts index 54d641f96..d9dc0e843 100644 --- a/src/lib/conditionals/character/TrailblazerHarmony.ts +++ b/src/lib/conditionals/character/TrailblazerHarmony.ts @@ -1,6 +1,6 @@ import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/TrailblazerPreservation.ts b/src/lib/conditionals/character/TrailblazerPreservation.ts index 30fbbed18..9b8ff9d4e 100644 --- a/src/lib/conditionals/character/TrailblazerPreservation.ts +++ b/src/lib/conditionals/character/TrailblazerPreservation.ts @@ -1,7 +1,7 @@ import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardDefShieldFinalizer, standardDefShieldFinalizer } from 'lib/conditionals/conditionalUtils' import { wgslTrue } from 'lib/gpu/injection/wgslUtils' import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/character/Welt.ts b/src/lib/conditionals/character/Welt.ts index 8626fe78d..c82645d08 100644 --- a/src/lib/conditionals/character/Welt.ts +++ b/src/lib/conditionals/character/Welt.ts @@ -1,6 +1,6 @@ import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Xueyi.ts b/src/lib/conditionals/character/Xueyi.ts index 2b8a3c3ab..5a3f14c7c 100644 --- a/src/lib/conditionals/character/Xueyi.ts +++ b/src/lib/conditionals/character/Xueyi.ts @@ -1,11 +1,11 @@ import { ASHBLAZING_ATK_STACK, FUA_TYPE, ULT_TYPE } from 'lib/conditionals/conditionalConstants' import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardFuaAtkFinalizer, standardFuaAtkFinalizer } from 'lib/conditionals/conditionalUtils' -import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants' +import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants/constants' import { conditionalWgslWrapper } from 'lib/gpu/conditionals/dynamicConditionals' import { wgslFalse } from 'lib/gpu/injection/wgslUtils' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/character/Yanqing.ts b/src/lib/conditionals/character/Yanqing.ts index dda6bc89c..1a13967ed 100644 --- a/src/lib/conditionals/character/Yanqing.ts +++ b/src/lib/conditionals/character/Yanqing.ts @@ -1,7 +1,7 @@ import { ASHBLAZING_ATK_STACK } from 'lib/conditionals/conditionalConstants' import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardFuaAtkFinalizer, standardFuaAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/character/Yukong.ts b/src/lib/conditionals/character/Yukong.ts index dfd55667c..df571c3ce 100644 --- a/src/lib/conditionals/character/Yukong.ts +++ b/src/lib/conditionals/character/Yukong.ts @@ -1,6 +1,6 @@ import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardAtkFinalizer, standardAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/character/Yunli.ts b/src/lib/conditionals/character/Yunli.ts index 7b2ee5a92..d01f16c27 100644 --- a/src/lib/conditionals/character/Yunli.ts +++ b/src/lib/conditionals/character/Yunli.ts @@ -2,7 +2,7 @@ import { ASHBLAZING_ATK_STACK, FUA_TYPE, ULT_TYPE } from 'lib/conditionals/condi import { AbilityEidolon, Conditionals, ContentDefinition, gpuStandardFuaAtkFinalizer, standardFuaAtkFinalizer } from 'lib/conditionals/conditionalUtils' import { buffAbilityCd, buffAbilityCr, buffAbilityDefPen, buffAbilityDmg, buffAbilityResPen } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Eidolon } from 'types/Character' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/conditionals/conditionalConstants.ts b/src/lib/conditionals/conditionalConstants.ts index 3632721eb..061b858ca 100644 --- a/src/lib/conditionals/conditionalConstants.ts +++ b/src/lib/conditionals/conditionalConstants.ts @@ -1,4 +1,4 @@ -import { Sets } from 'lib/constants' +import { Sets } from 'lib/constants/constants' import { ComputedStatsObjectExternal } from 'lib/optimizer/computedStatsArray' export const ASHBLAZING_ATK_STACK = 0.06 diff --git a/src/lib/conditionals/lightcone/3star/Adversarial.ts b/src/lib/conditionals/lightcone/3star/Adversarial.ts index c616a05e6..7fc031108 100644 --- a/src/lib/conditionals/lightcone/3star/Adversarial.ts +++ b/src/lib/conditionals/lightcone/3star/Adversarial.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/3star/Amber.ts b/src/lib/conditionals/lightcone/3star/Amber.ts index 96a0f51ed..05cd06539 100644 --- a/src/lib/conditionals/lightcone/3star/Amber.ts +++ b/src/lib/conditionals/lightcone/3star/Amber.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/3star/Arrows.ts b/src/lib/conditionals/lightcone/3star/Arrows.ts index 5367b1754..027f96297 100644 --- a/src/lib/conditionals/lightcone/3star/Arrows.ts +++ b/src/lib/conditionals/lightcone/3star/Arrows.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/3star/Chorus.ts b/src/lib/conditionals/lightcone/3star/Chorus.ts index 81df09e8e..7e261fc45 100644 --- a/src/lib/conditionals/lightcone/3star/Chorus.ts +++ b/src/lib/conditionals/lightcone/3star/Chorus.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/3star/CollapsingSky.ts b/src/lib/conditionals/lightcone/3star/CollapsingSky.ts index adfa4b6f6..185727904 100644 --- a/src/lib/conditionals/lightcone/3star/CollapsingSky.ts +++ b/src/lib/conditionals/lightcone/3star/CollapsingSky.ts @@ -2,7 +2,7 @@ import { BASIC_TYPE, SKILL_TYPE } from 'lib/conditionals/conditionalConstants' import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/3star/Cornucopia.ts b/src/lib/conditionals/lightcone/3star/Cornucopia.ts index 9a68c364e..6d0d9926a 100644 --- a/src/lib/conditionals/lightcone/3star/Cornucopia.ts +++ b/src/lib/conditionals/lightcone/3star/Cornucopia.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/3star/DartingArrow.ts b/src/lib/conditionals/lightcone/3star/DartingArrow.ts index 28e199e1a..7140e24f8 100644 --- a/src/lib/conditionals/lightcone/3star/DartingArrow.ts +++ b/src/lib/conditionals/lightcone/3star/DartingArrow.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/3star/DataBank.ts b/src/lib/conditionals/lightcone/3star/DataBank.ts index 6eb532ed0..6e351a9b3 100644 --- a/src/lib/conditionals/lightcone/3star/DataBank.ts +++ b/src/lib/conditionals/lightcone/3star/DataBank.ts @@ -2,7 +2,7 @@ import { ULT_TYPE } from 'lib/conditionals/conditionalConstants' import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/3star/HiddenShadow.ts b/src/lib/conditionals/lightcone/3star/HiddenShadow.ts index 123942a03..e9a372f14 100644 --- a/src/lib/conditionals/lightcone/3star/HiddenShadow.ts +++ b/src/lib/conditionals/lightcone/3star/HiddenShadow.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/3star/Loop.ts b/src/lib/conditionals/lightcone/3star/Loop.ts index 572651df6..1149a9794 100644 --- a/src/lib/conditionals/lightcone/3star/Loop.ts +++ b/src/lib/conditionals/lightcone/3star/Loop.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/3star/Mediation.ts b/src/lib/conditionals/lightcone/3star/Mediation.ts index 34ce3edb9..e78754f69 100644 --- a/src/lib/conditionals/lightcone/3star/Mediation.ts +++ b/src/lib/conditionals/lightcone/3star/Mediation.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/3star/MutualDemise.ts b/src/lib/conditionals/lightcone/3star/MutualDemise.ts index 040d484ec..05611445e 100644 --- a/src/lib/conditionals/lightcone/3star/MutualDemise.ts +++ b/src/lib/conditionals/lightcone/3star/MutualDemise.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/3star/Sagacity.ts b/src/lib/conditionals/lightcone/3star/Sagacity.ts index 51811499d..99ad45bd2 100644 --- a/src/lib/conditionals/lightcone/3star/Sagacity.ts +++ b/src/lib/conditionals/lightcone/3star/Sagacity.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/3star/ShatteredHome.ts b/src/lib/conditionals/lightcone/3star/ShatteredHome.ts index 84b8d0a2d..1baf435a5 100644 --- a/src/lib/conditionals/lightcone/3star/ShatteredHome.ts +++ b/src/lib/conditionals/lightcone/3star/ShatteredHome.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/3star/Void.ts b/src/lib/conditionals/lightcone/3star/Void.ts index f1594c788..c3f9b8dd8 100644 --- a/src/lib/conditionals/lightcone/3star/Void.ts +++ b/src/lib/conditionals/lightcone/3star/Void.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/ASecretVow.ts b/src/lib/conditionals/lightcone/4star/ASecretVow.ts index 186b2fcd2..82cc63eda 100644 --- a/src/lib/conditionals/lightcone/4star/ASecretVow.ts +++ b/src/lib/conditionals/lightcone/4star/ASecretVow.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/AfterTheCharmonyFall.ts b/src/lib/conditionals/lightcone/4star/AfterTheCharmonyFall.ts index 99cab9aac..f8bec3611 100644 --- a/src/lib/conditionals/lightcone/4star/AfterTheCharmonyFall.ts +++ b/src/lib/conditionals/lightcone/4star/AfterTheCharmonyFall.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/BoundlessChoreo.ts b/src/lib/conditionals/lightcone/4star/BoundlessChoreo.ts index 44a802275..45b3a0245 100644 --- a/src/lib/conditionals/lightcone/4star/BoundlessChoreo.ts +++ b/src/lib/conditionals/lightcone/4star/BoundlessChoreo.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/CarveTheMoonWeaveTheClouds.ts b/src/lib/conditionals/lightcone/4star/CarveTheMoonWeaveTheClouds.ts index 11661a86e..a56385769 100644 --- a/src/lib/conditionals/lightcone/4star/CarveTheMoonWeaveTheClouds.ts +++ b/src/lib/conditionals/lightcone/4star/CarveTheMoonWeaveTheClouds.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' diff --git a/src/lib/conditionals/lightcone/4star/ConcertForTwo.ts b/src/lib/conditionals/lightcone/4star/ConcertForTwo.ts index 22521f7e6..7a0b52343 100644 --- a/src/lib/conditionals/lightcone/4star/ConcertForTwo.ts +++ b/src/lib/conditionals/lightcone/4star/ConcertForTwo.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/DayOneOfMyNewLife.ts b/src/lib/conditionals/lightcone/4star/DayOneOfMyNewLife.ts index adce65214..12bc9b68f 100644 --- a/src/lib/conditionals/lightcone/4star/DayOneOfMyNewLife.ts +++ b/src/lib/conditionals/lightcone/4star/DayOneOfMyNewLife.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/DreamvilleAdventure.ts b/src/lib/conditionals/lightcone/4star/DreamvilleAdventure.ts index 260e4a759..d176110cf 100644 --- a/src/lib/conditionals/lightcone/4star/DreamvilleAdventure.ts +++ b/src/lib/conditionals/lightcone/4star/DreamvilleAdventure.ts @@ -2,7 +2,7 @@ import { BASIC_TYPE, SKILL_TYPE, ULT_TYPE } from 'lib/conditionals/conditionalCo import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/Fermata.ts b/src/lib/conditionals/lightcone/4star/Fermata.ts index 58b9f35f3..6bbf4103b 100644 --- a/src/lib/conditionals/lightcone/4star/Fermata.ts +++ b/src/lib/conditionals/lightcone/4star/Fermata.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/FinalVictor.ts b/src/lib/conditionals/lightcone/4star/FinalVictor.ts index 1a7ad3949..3c9ad1add 100644 --- a/src/lib/conditionals/lightcone/4star/FinalVictor.ts +++ b/src/lib/conditionals/lightcone/4star/FinalVictor.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/FlamesAfar.ts b/src/lib/conditionals/lightcone/4star/FlamesAfar.ts index dc568916f..b2da8fb64 100644 --- a/src/lib/conditionals/lightcone/4star/FlamesAfar.ts +++ b/src/lib/conditionals/lightcone/4star/FlamesAfar.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/ForTomorrowsJourney.ts b/src/lib/conditionals/lightcone/4star/ForTomorrowsJourney.ts index dc708eac7..b470654ac 100644 --- a/src/lib/conditionals/lightcone/4star/ForTomorrowsJourney.ts +++ b/src/lib/conditionals/lightcone/4star/ForTomorrowsJourney.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/GeniusesRepose.ts b/src/lib/conditionals/lightcone/4star/GeniusesRepose.ts index fd8b981ce..308ab8870 100644 --- a/src/lib/conditionals/lightcone/4star/GeniusesRepose.ts +++ b/src/lib/conditionals/lightcone/4star/GeniusesRepose.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/GoodNightAndSleepWell.ts b/src/lib/conditionals/lightcone/4star/GoodNightAndSleepWell.ts index 58ff45764..b5e3902dc 100644 --- a/src/lib/conditionals/lightcone/4star/GoodNightAndSleepWell.ts +++ b/src/lib/conditionals/lightcone/4star/GoodNightAndSleepWell.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/HeyOverHere.ts b/src/lib/conditionals/lightcone/4star/HeyOverHere.ts index c0bd31698..d287351a4 100644 --- a/src/lib/conditionals/lightcone/4star/HeyOverHere.ts +++ b/src/lib/conditionals/lightcone/4star/HeyOverHere.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/IndeliblePromise.ts b/src/lib/conditionals/lightcone/4star/IndeliblePromise.ts index 6575530b9..95ee37f5d 100644 --- a/src/lib/conditionals/lightcone/4star/IndeliblePromise.ts +++ b/src/lib/conditionals/lightcone/4star/IndeliblePromise.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/ItsShowtime.ts b/src/lib/conditionals/lightcone/4star/ItsShowtime.ts index 9c6948f8b..7370094c2 100644 --- a/src/lib/conditionals/lightcone/4star/ItsShowtime.ts +++ b/src/lib/conditionals/lightcone/4star/ItsShowtime.ts @@ -1,8 +1,8 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' -import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants' +import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants/constants' import { conditionalWgslWrapper } from 'lib/gpu/conditionals/dynamicConditionals' import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/MakeTheWorldClamor.ts b/src/lib/conditionals/lightcone/4star/MakeTheWorldClamor.ts index afd7e5563..5d2414161 100644 --- a/src/lib/conditionals/lightcone/4star/MakeTheWorldClamor.ts +++ b/src/lib/conditionals/lightcone/4star/MakeTheWorldClamor.ts @@ -2,7 +2,7 @@ import { ULT_TYPE } from 'lib/conditionals/conditionalConstants' import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/NinjaRecordSoundHunt.ts b/src/lib/conditionals/lightcone/4star/NinjaRecordSoundHunt.ts index d4f9b98ff..672874177 100644 --- a/src/lib/conditionals/lightcone/4star/NinjaRecordSoundHunt.ts +++ b/src/lib/conditionals/lightcone/4star/NinjaRecordSoundHunt.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/OnlySilenceRemains.ts b/src/lib/conditionals/lightcone/4star/OnlySilenceRemains.ts index 69ef0a911..c8cdc450a 100644 --- a/src/lib/conditionals/lightcone/4star/OnlySilenceRemains.ts +++ b/src/lib/conditionals/lightcone/4star/OnlySilenceRemains.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/PastAndFuture.ts b/src/lib/conditionals/lightcone/4star/PastAndFuture.ts index 6911af411..42d76a20e 100644 --- a/src/lib/conditionals/lightcone/4star/PastAndFuture.ts +++ b/src/lib/conditionals/lightcone/4star/PastAndFuture.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/PerfectTiming.ts b/src/lib/conditionals/lightcone/4star/PerfectTiming.ts index a3a5032fb..46678e66c 100644 --- a/src/lib/conditionals/lightcone/4star/PerfectTiming.ts +++ b/src/lib/conditionals/lightcone/4star/PerfectTiming.ts @@ -1,8 +1,8 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' -import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants' +import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants/constants' import { conditionalWgslWrapper } from 'lib/gpu/conditionals/dynamicConditionals' import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/PlanetaryRendezvous.ts b/src/lib/conditionals/lightcone/4star/PlanetaryRendezvous.ts index 567610dd1..eab5883b5 100644 --- a/src/lib/conditionals/lightcone/4star/PlanetaryRendezvous.ts +++ b/src/lib/conditionals/lightcone/4star/PlanetaryRendezvous.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/PoisedToBloom.ts b/src/lib/conditionals/lightcone/4star/PoisedToBloom.ts index 3d09015b3..5bb4b78da 100644 --- a/src/lib/conditionals/lightcone/4star/PoisedToBloom.ts +++ b/src/lib/conditionals/lightcone/4star/PoisedToBloom.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/PostOpConversation.ts b/src/lib/conditionals/lightcone/4star/PostOpConversation.ts index 85ec5bd0d..178c5bc0a 100644 --- a/src/lib/conditionals/lightcone/4star/PostOpConversation.ts +++ b/src/lib/conditionals/lightcone/4star/PostOpConversation.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/ResolutionShinesAsPearlsOfSweat.ts b/src/lib/conditionals/lightcone/4star/ResolutionShinesAsPearlsOfSweat.ts index a2d961d63..8eebe611b 100644 --- a/src/lib/conditionals/lightcone/4star/ResolutionShinesAsPearlsOfSweat.ts +++ b/src/lib/conditionals/lightcone/4star/ResolutionShinesAsPearlsOfSweat.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/RiverFlowsInSpring.ts b/src/lib/conditionals/lightcone/4star/RiverFlowsInSpring.ts index 44efe4ffb..ebe46817e 100644 --- a/src/lib/conditionals/lightcone/4star/RiverFlowsInSpring.ts +++ b/src/lib/conditionals/lightcone/4star/RiverFlowsInSpring.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/ShadowedByNight.ts b/src/lib/conditionals/lightcone/4star/ShadowedByNight.ts index 263781e36..385f5c3df 100644 --- a/src/lib/conditionals/lightcone/4star/ShadowedByNight.ts +++ b/src/lib/conditionals/lightcone/4star/ShadowedByNight.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/SubscribeForMore.ts b/src/lib/conditionals/lightcone/4star/SubscribeForMore.ts index 13d211d33..17c4ddab6 100644 --- a/src/lib/conditionals/lightcone/4star/SubscribeForMore.ts +++ b/src/lib/conditionals/lightcone/4star/SubscribeForMore.ts @@ -2,7 +2,7 @@ import { BASIC_TYPE, SKILL_TYPE } from 'lib/conditionals/conditionalConstants' import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/Swordplay.ts b/src/lib/conditionals/lightcone/4star/Swordplay.ts index 57cda9f58..11a43faee 100644 --- a/src/lib/conditionals/lightcone/4star/Swordplay.ts +++ b/src/lib/conditionals/lightcone/4star/Swordplay.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/TheBirthOfTheSelf.ts b/src/lib/conditionals/lightcone/4star/TheBirthOfTheSelf.ts index c7d3cede4..392e30dac 100644 --- a/src/lib/conditionals/lightcone/4star/TheBirthOfTheSelf.ts +++ b/src/lib/conditionals/lightcone/4star/TheBirthOfTheSelf.ts @@ -2,7 +2,7 @@ import { FUA_TYPE } from 'lib/conditionals/conditionalConstants' import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/TheDayTheCosmosFell.ts b/src/lib/conditionals/lightcone/4star/TheDayTheCosmosFell.ts index cb3b6b7ea..57f6fa981 100644 --- a/src/lib/conditionals/lightcone/4star/TheDayTheCosmosFell.ts +++ b/src/lib/conditionals/lightcone/4star/TheDayTheCosmosFell.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/TheMolesWelcomeYou.ts b/src/lib/conditionals/lightcone/4star/TheMolesWelcomeYou.ts index b797e59d3..92eb6a192 100644 --- a/src/lib/conditionals/lightcone/4star/TheMolesWelcomeYou.ts +++ b/src/lib/conditionals/lightcone/4star/TheMolesWelcomeYou.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/TheSeriousnessOfBreakfast.ts b/src/lib/conditionals/lightcone/4star/TheSeriousnessOfBreakfast.ts index 2a65929eb..02226e9fb 100644 --- a/src/lib/conditionals/lightcone/4star/TheSeriousnessOfBreakfast.ts +++ b/src/lib/conditionals/lightcone/4star/TheSeriousnessOfBreakfast.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/ThisIsMe.ts b/src/lib/conditionals/lightcone/4star/ThisIsMe.ts index f5bb261dd..0db150f51 100644 --- a/src/lib/conditionals/lightcone/4star/ThisIsMe.ts +++ b/src/lib/conditionals/lightcone/4star/ThisIsMe.ts @@ -1,5 +1,5 @@ import { ContentDefinition } from 'lib/conditionals/conditionalUtils' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' diff --git a/src/lib/conditionals/lightcone/4star/TodayIsAnotherPeacefulDay.ts b/src/lib/conditionals/lightcone/4star/TodayIsAnotherPeacefulDay.ts index 98e994498..606934b0f 100644 --- a/src/lib/conditionals/lightcone/4star/TodayIsAnotherPeacefulDay.ts +++ b/src/lib/conditionals/lightcone/4star/TodayIsAnotherPeacefulDay.ts @@ -1,7 +1,7 @@ import { ComputedStatsObject } from 'lib/conditionals/conditionalConstants' import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { ContentItem } from 'types/Conditionals' import { SuperImpositionLevel } from 'types/LightCone' diff --git a/src/lib/conditionals/lightcone/4star/UnderTheBlueSky.ts b/src/lib/conditionals/lightcone/4star/UnderTheBlueSky.ts index d8e06b740..2ffa3e03e 100644 --- a/src/lib/conditionals/lightcone/4star/UnderTheBlueSky.ts +++ b/src/lib/conditionals/lightcone/4star/UnderTheBlueSky.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/WeAreWildfire.ts b/src/lib/conditionals/lightcone/4star/WeAreWildfire.ts index b3b9347dd..b0a7f445b 100644 --- a/src/lib/conditionals/lightcone/4star/WeAreWildfire.ts +++ b/src/lib/conditionals/lightcone/4star/WeAreWildfire.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/4star/WeWillMeetAgain.ts b/src/lib/conditionals/lightcone/4star/WeWillMeetAgain.ts index e93638f31..d3c329f60 100644 --- a/src/lib/conditionals/lightcone/4star/WeWillMeetAgain.ts +++ b/src/lib/conditionals/lightcone/4star/WeWillMeetAgain.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' diff --git a/src/lib/conditionals/lightcone/4star/WoofWalkTime.ts b/src/lib/conditionals/lightcone/4star/WoofWalkTime.ts index 10fbb0c4e..a64d3f3f5 100644 --- a/src/lib/conditionals/lightcone/4star/WoofWalkTime.ts +++ b/src/lib/conditionals/lightcone/4star/WoofWalkTime.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/AGroundedAscent.ts b/src/lib/conditionals/lightcone/5star/AGroundedAscent.ts index e3c4f8495..b6edefa9e 100644 --- a/src/lib/conditionals/lightcone/5star/AGroundedAscent.ts +++ b/src/lib/conditionals/lightcone/5star/AGroundedAscent.ts @@ -1,6 +1,6 @@ import i18next from 'i18next' import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' -import { CURRENT_DATA_VERSION } from 'lib/constants' +import { CURRENT_DATA_VERSION } from 'lib/constants/constants' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' diff --git a/src/lib/conditionals/lightcone/5star/AlongThePassingShore.ts b/src/lib/conditionals/lightcone/5star/AlongThePassingShore.ts index 6da40fa11..0c6d2f710 100644 --- a/src/lib/conditionals/lightcone/5star/AlongThePassingShore.ts +++ b/src/lib/conditionals/lightcone/5star/AlongThePassingShore.ts @@ -2,7 +2,7 @@ import { ULT_TYPE } from 'lib/conditionals/conditionalConstants' import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/AnInstantBeforeAGaze.ts b/src/lib/conditionals/lightcone/5star/AnInstantBeforeAGaze.ts index d14dfb661..5e0f248e3 100644 --- a/src/lib/conditionals/lightcone/5star/AnInstantBeforeAGaze.ts +++ b/src/lib/conditionals/lightcone/5star/AnInstantBeforeAGaze.ts @@ -2,7 +2,7 @@ import { ULT_TYPE } from 'lib/conditionals/conditionalConstants' import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/BaptismOfPureThought.ts b/src/lib/conditionals/lightcone/5star/BaptismOfPureThought.ts index 6982164b2..3e4654f38 100644 --- a/src/lib/conditionals/lightcone/5star/BaptismOfPureThought.ts +++ b/src/lib/conditionals/lightcone/5star/BaptismOfPureThought.ts @@ -2,7 +2,7 @@ import { FUA_TYPE } from 'lib/conditionals/conditionalConstants' import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { buffAbilityDefPen } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/BeforeDawn.ts b/src/lib/conditionals/lightcone/5star/BeforeDawn.ts index 48ec7cbe1..20e5aee9e 100644 --- a/src/lib/conditionals/lightcone/5star/BeforeDawn.ts +++ b/src/lib/conditionals/lightcone/5star/BeforeDawn.ts @@ -2,7 +2,7 @@ import { FUA_TYPE, SKILL_TYPE, ULT_TYPE } from 'lib/conditionals/conditionalCons import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/BrighterThanTheSun.ts b/src/lib/conditionals/lightcone/5star/BrighterThanTheSun.ts index adbf79604..dd3ae6c13 100644 --- a/src/lib/conditionals/lightcone/5star/BrighterThanTheSun.ts +++ b/src/lib/conditionals/lightcone/5star/BrighterThanTheSun.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/ButTheBattleIsntOver.ts b/src/lib/conditionals/lightcone/5star/ButTheBattleIsntOver.ts index 2ab089d10..f3d75736f 100644 --- a/src/lib/conditionals/lightcone/5star/ButTheBattleIsntOver.ts +++ b/src/lib/conditionals/lightcone/5star/ButTheBattleIsntOver.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/CruisingInTheStellarSea.ts b/src/lib/conditionals/lightcone/5star/CruisingInTheStellarSea.ts index 8eda4f78e..724054e7a 100644 --- a/src/lib/conditionals/lightcone/5star/CruisingInTheStellarSea.ts +++ b/src/lib/conditionals/lightcone/5star/CruisingInTheStellarSea.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/DanceAtSunset.ts b/src/lib/conditionals/lightcone/5star/DanceAtSunset.ts index 4c427c181..384ade5e0 100644 --- a/src/lib/conditionals/lightcone/5star/DanceAtSunset.ts +++ b/src/lib/conditionals/lightcone/5star/DanceAtSunset.ts @@ -2,7 +2,7 @@ import { FUA_TYPE } from 'lib/conditionals/conditionalConstants' import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/EarthlyEscapade.ts b/src/lib/conditionals/lightcone/5star/EarthlyEscapade.ts index 2044eb5a2..6ef004263 100644 --- a/src/lib/conditionals/lightcone/5star/EarthlyEscapade.ts +++ b/src/lib/conditionals/lightcone/5star/EarthlyEscapade.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/EchoesOfTheCoffin.ts b/src/lib/conditionals/lightcone/5star/EchoesOfTheCoffin.ts index a3caa9373..22067281b 100644 --- a/src/lib/conditionals/lightcone/5star/EchoesOfTheCoffin.ts +++ b/src/lib/conditionals/lightcone/5star/EchoesOfTheCoffin.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/EternalCalculus.ts b/src/lib/conditionals/lightcone/5star/EternalCalculus.ts index 75bf93d4d..ba29c03f3 100644 --- a/src/lib/conditionals/lightcone/5star/EternalCalculus.ts +++ b/src/lib/conditionals/lightcone/5star/EternalCalculus.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/FlowingNightglow.ts b/src/lib/conditionals/lightcone/5star/FlowingNightglow.ts index 0ea6fc7e3..c79edc99d 100644 --- a/src/lib/conditionals/lightcone/5star/FlowingNightglow.ts +++ b/src/lib/conditionals/lightcone/5star/FlowingNightglow.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/IShallBeMyOwnSword.ts b/src/lib/conditionals/lightcone/5star/IShallBeMyOwnSword.ts index 1d811dac1..f46d641b4 100644 --- a/src/lib/conditionals/lightcone/5star/IShallBeMyOwnSword.ts +++ b/src/lib/conditionals/lightcone/5star/IShallBeMyOwnSword.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/IVentureForthToHunt.ts b/src/lib/conditionals/lightcone/5star/IVentureForthToHunt.ts index 33b3b597c..cecb186d1 100644 --- a/src/lib/conditionals/lightcone/5star/IVentureForthToHunt.ts +++ b/src/lib/conditionals/lightcone/5star/IVentureForthToHunt.ts @@ -2,7 +2,7 @@ import { ULT_TYPE } from 'lib/conditionals/conditionalConstants' import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { buffAbilityDefPen } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/InTheNameOfTheWorld.ts b/src/lib/conditionals/lightcone/5star/InTheNameOfTheWorld.ts index 4e0d3f49b..13729d440 100644 --- a/src/lib/conditionals/lightcone/5star/InTheNameOfTheWorld.ts +++ b/src/lib/conditionals/lightcone/5star/InTheNameOfTheWorld.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/InTheNight.ts b/src/lib/conditionals/lightcone/5star/InTheNight.ts index 9ca265fdb..55ca0a7c3 100644 --- a/src/lib/conditionals/lightcone/5star/InTheNight.ts +++ b/src/lib/conditionals/lightcone/5star/InTheNight.ts @@ -3,7 +3,7 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUti import { wgslTrue } from 'lib/gpu/injection/wgslUtils' import { buffAbilityCd, buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/IncessantRain.ts b/src/lib/conditionals/lightcone/5star/IncessantRain.ts index 704820a59..aeb55e9e3 100644 --- a/src/lib/conditionals/lightcone/5star/IncessantRain.ts +++ b/src/lib/conditionals/lightcone/5star/IncessantRain.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/InherentlyUnjustDestiny.ts b/src/lib/conditionals/lightcone/5star/InherentlyUnjustDestiny.ts index 20095c79f..679f2cf8a 100644 --- a/src/lib/conditionals/lightcone/5star/InherentlyUnjustDestiny.ts +++ b/src/lib/conditionals/lightcone/5star/InherentlyUnjustDestiny.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/LongRoadLeadsHome.ts b/src/lib/conditionals/lightcone/5star/LongRoadLeadsHome.ts index 7496a7c6b..5abd3fcae 100644 --- a/src/lib/conditionals/lightcone/5star/LongRoadLeadsHome.ts +++ b/src/lib/conditionals/lightcone/5star/LongRoadLeadsHome.ts @@ -1,6 +1,6 @@ import i18next from 'i18next' import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' -import { CURRENT_DATA_VERSION } from 'lib/constants' +import { CURRENT_DATA_VERSION } from 'lib/constants/constants' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' diff --git a/src/lib/conditionals/lightcone/5star/MomentOfVictory.ts b/src/lib/conditionals/lightcone/5star/MomentOfVictory.ts index 30b18997d..278a67f78 100644 --- a/src/lib/conditionals/lightcone/5star/MomentOfVictory.ts +++ b/src/lib/conditionals/lightcone/5star/MomentOfVictory.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/NightOfFright.ts b/src/lib/conditionals/lightcone/5star/NightOfFright.ts index 09415bdd4..d943eed0a 100644 --- a/src/lib/conditionals/lightcone/5star/NightOfFright.ts +++ b/src/lib/conditionals/lightcone/5star/NightOfFright.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/NightOnTheMilkyWay.ts b/src/lib/conditionals/lightcone/5star/NightOnTheMilkyWay.ts index cb6d995f0..cc2d575b4 100644 --- a/src/lib/conditionals/lightcone/5star/NightOnTheMilkyWay.ts +++ b/src/lib/conditionals/lightcone/5star/NightOnTheMilkyWay.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/OnTheFallOfAnAeon.ts b/src/lib/conditionals/lightcone/5star/OnTheFallOfAnAeon.ts index 3663d50d3..82bb79baf 100644 --- a/src/lib/conditionals/lightcone/5star/OnTheFallOfAnAeon.ts +++ b/src/lib/conditionals/lightcone/5star/OnTheFallOfAnAeon.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/PastSelfInTheMirror.ts b/src/lib/conditionals/lightcone/5star/PastSelfInTheMirror.ts index 7a6ef1c73..ba9f13261 100644 --- a/src/lib/conditionals/lightcone/5star/PastSelfInTheMirror.ts +++ b/src/lib/conditionals/lightcone/5star/PastSelfInTheMirror.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/PatienceIsAllYouNeed.ts b/src/lib/conditionals/lightcone/5star/PatienceIsAllYouNeed.ts index 2b24eacc1..5f5fba780 100644 --- a/src/lib/conditionals/lightcone/5star/PatienceIsAllYouNeed.ts +++ b/src/lib/conditionals/lightcone/5star/PatienceIsAllYouNeed.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/ReforgedRemembrance.ts b/src/lib/conditionals/lightcone/5star/ReforgedRemembrance.ts index 3e6e02152..309e5beaf 100644 --- a/src/lib/conditionals/lightcone/5star/ReforgedRemembrance.ts +++ b/src/lib/conditionals/lightcone/5star/ReforgedRemembrance.ts @@ -2,7 +2,7 @@ import { DOT_TYPE } from 'lib/conditionals/conditionalConstants' import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { buffAbilityDefPen } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/SailingTowardsASecondLife.ts b/src/lib/conditionals/lightcone/5star/SailingTowardsASecondLife.ts index 00e1769ac..3808ef10b 100644 --- a/src/lib/conditionals/lightcone/5star/SailingTowardsASecondLife.ts +++ b/src/lib/conditionals/lightcone/5star/SailingTowardsASecondLife.ts @@ -1,10 +1,10 @@ import { BREAK_TYPE } from 'lib/conditionals/conditionalConstants' import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' -import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants' +import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants/constants' import { conditionalWgslWrapper } from 'lib/gpu/conditionals/dynamicConditionals' import { buffAbilityDefPen } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/ScentAloneStaysTrue.ts b/src/lib/conditionals/lightcone/5star/ScentAloneStaysTrue.ts index a596ebdca..e90102248 100644 --- a/src/lib/conditionals/lightcone/5star/ScentAloneStaysTrue.ts +++ b/src/lib/conditionals/lightcone/5star/ScentAloneStaysTrue.ts @@ -1,7 +1,7 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { wgslTrue } from 'lib/gpu/injection/wgslUtils' import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/SheAlreadyShutHerEyes.ts b/src/lib/conditionals/lightcone/5star/SheAlreadyShutHerEyes.ts index 8b7893b95..936b09322 100644 --- a/src/lib/conditionals/lightcone/5star/SheAlreadyShutHerEyes.ts +++ b/src/lib/conditionals/lightcone/5star/SheAlreadyShutHerEyes.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/SleepLikeTheDead.ts b/src/lib/conditionals/lightcone/5star/SleepLikeTheDead.ts index 10f7eccf7..7349230b7 100644 --- a/src/lib/conditionals/lightcone/5star/SleepLikeTheDead.ts +++ b/src/lib/conditionals/lightcone/5star/SleepLikeTheDead.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/SolitaryHealing.ts b/src/lib/conditionals/lightcone/5star/SolitaryHealing.ts index d07c522d1..d2f6cc652 100644 --- a/src/lib/conditionals/lightcone/5star/SolitaryHealing.ts +++ b/src/lib/conditionals/lightcone/5star/SolitaryHealing.ts @@ -2,7 +2,7 @@ import { DOT_TYPE } from 'lib/conditionals/conditionalConstants' import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/SomethingIrreplaceable.ts b/src/lib/conditionals/lightcone/5star/SomethingIrreplaceable.ts index 49031ce63..6afd60fb5 100644 --- a/src/lib/conditionals/lightcone/5star/SomethingIrreplaceable.ts +++ b/src/lib/conditionals/lightcone/5star/SomethingIrreplaceable.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/TextureOfMemories.ts b/src/lib/conditionals/lightcone/5star/TextureOfMemories.ts index ff18c3d1b..5fad864c8 100644 --- a/src/lib/conditionals/lightcone/5star/TextureOfMemories.ts +++ b/src/lib/conditionals/lightcone/5star/TextureOfMemories.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/TheUnreachableSide.ts b/src/lib/conditionals/lightcone/5star/TheUnreachableSide.ts index 33b30c93c..58f545b94 100644 --- a/src/lib/conditionals/lightcone/5star/TheUnreachableSide.ts +++ b/src/lib/conditionals/lightcone/5star/TheUnreachableSide.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/ThoseManySprings.ts b/src/lib/conditionals/lightcone/5star/ThoseManySprings.ts index b70098d6d..02261bd35 100644 --- a/src/lib/conditionals/lightcone/5star/ThoseManySprings.ts +++ b/src/lib/conditionals/lightcone/5star/ThoseManySprings.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/TimeWaitsForNoOne.ts b/src/lib/conditionals/lightcone/5star/TimeWaitsForNoOne.ts index 4225940df..e9ded5903 100644 --- a/src/lib/conditionals/lightcone/5star/TimeWaitsForNoOne.ts +++ b/src/lib/conditionals/lightcone/5star/TimeWaitsForNoOne.ts @@ -1,5 +1,5 @@ import { ContentDefinition } from 'lib/conditionals/conditionalUtils' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' diff --git a/src/lib/conditionals/lightcone/5star/WhereaboutsShouldDreamsRest.ts b/src/lib/conditionals/lightcone/5star/WhereaboutsShouldDreamsRest.ts index bbbbbc0d4..0c209d74b 100644 --- a/src/lib/conditionals/lightcone/5star/WhereaboutsShouldDreamsRest.ts +++ b/src/lib/conditionals/lightcone/5star/WhereaboutsShouldDreamsRest.ts @@ -1,6 +1,6 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/WorrisomeBlissful.ts b/src/lib/conditionals/lightcone/5star/WorrisomeBlissful.ts index 4dde15ae5..f53642691 100644 --- a/src/lib/conditionals/lightcone/5star/WorrisomeBlissful.ts +++ b/src/lib/conditionals/lightcone/5star/WorrisomeBlissful.ts @@ -2,7 +2,7 @@ import { FUA_TYPE } from 'lib/conditionals/conditionalConstants' import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUtils' import { buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/conditionals/lightcone/5star/YetHopeIsPriceless.ts b/src/lib/conditionals/lightcone/5star/YetHopeIsPriceless.ts index ccb7f7bb4..749c29618 100644 --- a/src/lib/conditionals/lightcone/5star/YetHopeIsPriceless.ts +++ b/src/lib/conditionals/lightcone/5star/YetHopeIsPriceless.ts @@ -3,7 +3,7 @@ import { Conditionals, ContentDefinition } from 'lib/conditionals/conditionalUti import { wgslTrue } from 'lib/gpu/injection/wgslUtils' import { buffAbilityDefPen, buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { SuperImpositionLevel } from 'types/LightCone' import { LightConeConditional } from 'types/LightConeConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/constants.ts b/src/lib/constants/constants.ts similarity index 100% rename from src/lib/constants.ts rename to src/lib/constants/constants.ts diff --git a/src/lib/constantsSession.ts b/src/lib/constants/constantsSession.ts similarity index 100% rename from src/lib/constantsSession.ts rename to src/lib/constants/constantsSession.ts diff --git a/src/lib/constantsUi.ts b/src/lib/constants/constantsUi.ts similarity index 100% rename from src/lib/constantsUi.ts rename to src/lib/constants/constantsUi.ts diff --git a/src/lib/gpu/conditionals/dynamicConditionals.ts b/src/lib/gpu/conditionals/dynamicConditionals.ts index 6debef9d0..cd84224a8 100644 --- a/src/lib/gpu/conditionals/dynamicConditionals.ts +++ b/src/lib/gpu/conditionals/dynamicConditionals.ts @@ -1,5 +1,5 @@ import { precisionRound } from 'lib/conditionals/conditionalUtils' -import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants' +import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants/constants' import { indent, wgslFalse } from 'lib/gpu/injection/wgslUtils' import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray' import { OptimizerAction, OptimizerContext, TeammateAction } from 'types/Optimizer' diff --git a/src/lib/gpu/conditionals/setConditionals.ts b/src/lib/gpu/conditionals/setConditionals.ts index cfc198577..c50c67643 100644 --- a/src/lib/gpu/conditionals/setConditionals.ts +++ b/src/lib/gpu/conditionals/setConditionals.ts @@ -1,5 +1,5 @@ import { BASIC_TYPE, BREAK_TYPE, FUA_TYPE, SKILL_TYPE, SUPER_BREAK_TYPE, ULT_TYPE } from 'lib/conditionals/conditionalConstants' -import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants' +import { ConditionalActivation, ConditionalType, Stats } from 'lib/constants/constants' import { conditionalWgslWrapper, DynamicConditional } from 'lib/gpu/conditionals/dynamicConditionals' import { buffAbilityDefPen, buffAbilityDmg } from 'lib/optimizer/calculateBuffs' import { ComputedStatsArray, Key, Source } from 'lib/optimizer/computedStatsArray' diff --git a/src/lib/gpu/injection/generateWgsl.ts b/src/lib/gpu/injection/generateWgsl.ts index 26b813ed6..68f17e177 100644 --- a/src/lib/gpu/injection/generateWgsl.ts +++ b/src/lib/gpu/injection/generateWgsl.ts @@ -1,4 +1,4 @@ -import { Constants } from 'lib/constants' +import { Constants } from 'lib/constants/constants' import { injectConditionals } from 'lib/gpu/injection/injectConditionals' import { injectSettings } from 'lib/gpu/injection/injectSettings' import { injectUtils } from 'lib/gpu/injection/injectUtils' diff --git a/src/lib/gpu/injection/injectConditionals.ts b/src/lib/gpu/injection/injectConditionals.ts index 5cf5f40a2..e8f80b412 100644 --- a/src/lib/gpu/injection/injectConditionals.ts +++ b/src/lib/gpu/injection/injectConditionals.ts @@ -1,7 +1,7 @@ import { CharacterConditionals } from 'lib/conditionals/characterConditionals' import { BASIC_TYPE, FUA_TYPE, SKILL_TYPE, ULT_TYPE } from 'lib/conditionals/conditionalConstants' import { LightConeConditionals } from 'lib/conditionals/lightConeConditionals' -import { Stats } from 'lib/constants' +import { Stats } from 'lib/constants/constants' import { DynamicConditional } from 'lib/gpu/conditionals/dynamicConditionals' import { injectPrecomputedStatsContext } from 'lib/gpu/injection/injectPrecomputedStats' import { indent } from 'lib/gpu/injection/wgslUtils' diff --git a/src/lib/gpu/injection/injectSettings.ts b/src/lib/gpu/injection/injectSettings.ts index 94a7b9936..bd5eefc85 100644 --- a/src/lib/gpu/injection/injectSettings.ts +++ b/src/lib/gpu/injection/injectSettings.ts @@ -1,4 +1,4 @@ -import { Stats } from 'lib/constants' +import { Stats } from 'lib/constants/constants' import { Form } from 'types/Form' import { OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/gpu/tests/webgpuTestGenerator.ts b/src/lib/gpu/tests/webgpuTestGenerator.ts index c0c320e2d..19904f716 100644 --- a/src/lib/gpu/tests/webgpuTestGenerator.ts +++ b/src/lib/gpu/tests/webgpuTestGenerator.ts @@ -1,6 +1,6 @@ import { generateFullDefaultForm } from 'lib/characters/characterScorer' -import { SetsOrnamentsNames, SetsRelicsNames } from 'lib/constants' -import { OptimizerTabController } from 'lib/controllers/optimizerTabController' +import { SetsOrnamentsNames, SetsRelicsNames } from 'lib/constants/constants' +import { OptimizerTabController } from 'lib/tabs/tabOptimizer/optimizerTabController' import { generateTestRelics, StatDeltaAnalysis, testWrapper } from 'lib/gpu/tests/webgpuTestUtils' import { getWebgpuDevice } from 'lib/gpu/webgpuDevice' import { RelicsByPart } from 'lib/gpu/webgpuTypes' diff --git a/src/lib/gpu/tests/webgpuTestUtils.ts b/src/lib/gpu/tests/webgpuTestUtils.ts index 76fc82888..ecc36bf45 100644 --- a/src/lib/gpu/tests/webgpuTestUtils.ts +++ b/src/lib/gpu/tests/webgpuTestUtils.ts @@ -1,4 +1,4 @@ -import { COMPUTE_ENGINE_GPU_EXPERIMENTAL, SetsOrnaments, SetsRelics } from 'lib/constants' +import { COMPUTE_ENGINE_GPU_EXPERIMENTAL, SetsOrnaments, SetsRelics } from 'lib/constants/constants' import { WebgpuTest } from 'lib/gpu/tests/webgpuTestGenerator' import { debugWebgpuComputedStats } from 'lib/gpu/webgpuDebugger' import { destroyPipeline, generateExecutionPass, initializeGpuPipeline } from 'lib/gpu/webgpuInternals' diff --git a/src/lib/gpu/webgpuDataTransform.ts b/src/lib/gpu/webgpuDataTransform.ts index 2ca2e029d..c03aa533f 100644 --- a/src/lib/gpu/webgpuDataTransform.ts +++ b/src/lib/gpu/webgpuDataTransform.ts @@ -1,4 +1,4 @@ -import { Constants, OrnamentSetToIndex, RelicSetToIndex, SetsRelicsNames, Stats } from 'lib/constants' +import { Constants, OrnamentSetToIndex, RelicSetToIndex, SetsRelicsNames, Stats } from 'lib/constants/constants' import { createGpuBuffer } from 'lib/gpu/webgpuInternals' import { GpuExecutionContext, RelicsByPart } from 'lib/gpu/webgpuTypes' import { StringToNumberMap } from 'types/Common' diff --git a/src/lib/gpu/webgpuDebugger.ts b/src/lib/gpu/webgpuDebugger.ts index 1f886f143..2550026a0 100644 --- a/src/lib/gpu/webgpuDebugger.ts +++ b/src/lib/gpu/webgpuDebugger.ts @@ -1,6 +1,6 @@ import { GpuExecutionContext } from 'lib/gpu/webgpuTypes' import { ComputedStatsObjectExternal, InternalKeyToExternal, Key, KeysType } from 'lib/optimizer/computedStatsArray' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' export function logIterationTimer(i: number, gpuContext: GpuExecutionContext) { const endTime = new Date().getTime() diff --git a/src/lib/gpu/webgpuDevice.ts b/src/lib/gpu/webgpuDevice.ts index 6118b2df3..99e3cd6a7 100644 --- a/src/lib/gpu/webgpuDevice.ts +++ b/src/lib/gpu/webgpuDevice.ts @@ -1,5 +1,5 @@ -import { COMPUTE_ENGINE_CPU } from 'lib/constants' -import { SavedSessionKeys } from 'lib/constantsSession' +import { COMPUTE_ENGINE_CPU } from 'lib/constants/constants' +import { SavedSessionKeys } from 'lib/constants/constantsSession' import { webgpuNotSupportedNotification } from 'lib/interactions/notifications' export async function getWebgpuDevice(warn?: boolean) { diff --git a/src/lib/gpu/webgpuInternals.ts b/src/lib/gpu/webgpuInternals.ts index 77d8e53e5..6cadd5543 100644 --- a/src/lib/gpu/webgpuInternals.ts +++ b/src/lib/gpu/webgpuInternals.ts @@ -1,4 +1,4 @@ -import { COMPUTE_ENGINE_GPU_EXPERIMENTAL } from 'lib/constants' +import { COMPUTE_ENGINE_GPU_EXPERIMENTAL } from 'lib/constants/constants' import { generateWgsl } from 'lib/gpu/injection/generateWgsl' import { generateBaseParamsArray, generateParamsMatrix, mergeRelicsIntoArray } from 'lib/gpu/webgpuDataTransform' import { GpuExecutionContext, GpuResult, RelicsByPart } from 'lib/gpu/webgpuTypes' diff --git a/src/lib/gpu/webgpuOptimizer.ts b/src/lib/gpu/webgpuOptimizer.ts index 9d8443461..886f47071 100644 --- a/src/lib/gpu/webgpuOptimizer.ts +++ b/src/lib/gpu/webgpuOptimizer.ts @@ -1,5 +1,5 @@ -import { COMPUTE_ENGINE_GPU_EXPERIMENTAL, ComputeEngine } from 'lib/constants' -import { OptimizerTabController } from 'lib/controllers/optimizerTabController' +import { COMPUTE_ENGINE_GPU_EXPERIMENTAL, ComputeEngine } from 'lib/constants/constants' +import { OptimizerTabController } from 'lib/tabs/tabOptimizer/optimizerTabController' import { debugWebgpuOutput } from 'lib/gpu/webgpuDebugger' import { getWebgpuDevice } from 'lib/gpu/webgpuDevice' import { destroyPipeline, generateExecutionPass, initializeGpuPipeline } from 'lib/gpu/webgpuInternals' diff --git a/src/lib/interactions/LanguageSelector.tsx b/src/lib/i18n/LanguageSelector.tsx similarity index 98% rename from src/lib/interactions/LanguageSelector.tsx rename to src/lib/i18n/LanguageSelector.tsx index e717782f2..2bfe95349 100644 --- a/src/lib/interactions/LanguageSelector.tsx +++ b/src/lib/i18n/LanguageSelector.tsx @@ -1,5 +1,5 @@ import { Button, Flex, Select } from 'antd' -import { languages } from 'lib/i18n' +import { languages } from 'lib/i18n/i18n' import { Assets } from 'lib/rendering/assets' import React, { ReactElement } from 'react' import { useTranslation } from 'react-i18next' diff --git a/src/lib/i18n.ts b/src/lib/i18n/i18n.ts similarity index 100% rename from src/lib/i18n.ts rename to src/lib/i18n/i18n.ts diff --git a/src/lib/importer/characterConverter.ts b/src/lib/importer/characterConverter.ts index 96ac801ac..c1a40e005 100644 --- a/src/lib/importer/characterConverter.ts +++ b/src/lib/importer/characterConverter.ts @@ -1,7 +1,7 @@ -import { Constants } from 'lib/constants' +import { Constants } from 'lib/constants/constants' import { RelicAugmenter } from 'lib/relics/relicAugmenter' import DB from 'lib/state/db' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' const partConversion = { 1: Constants.Parts.Head, diff --git a/src/lib/importer/hoyoLabFormatParser.tsx b/src/lib/importer/hoyoLabFormatParser.tsx index 0b2250269..e834ff0a9 100644 --- a/src/lib/importer/hoyoLabFormatParser.tsx +++ b/src/lib/importer/hoyoLabFormatParser.tsx @@ -1,7 +1,7 @@ -import { Constants, Parts, SubStats } from 'lib/constants' +import { Constants, Parts, SubStats } from 'lib/constants/constants' import { RelicAugmenter } from 'lib/relics/relicAugmenter' import DB from 'lib/state/db' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' /* diff --git a/src/lib/importer/kelzFormatParser.tsx b/src/lib/importer/kelzFormatParser.tsx index 550f85c67..81dfe8dfe 100644 --- a/src/lib/importer/kelzFormatParser.tsx +++ b/src/lib/importer/kelzFormatParser.tsx @@ -9,8 +9,8 @@ import semver from 'semver' import stringSimilarity from 'string-similarity' import { Character } from 'types/Character' import { Relic } from 'types/Relic' -import { Constants, Parts, Sets } from '../constants' -import { Utils } from '../utils' +import { Constants, Parts, Sets } from 'lib/constants/constants' +import { Utils } from 'lib/utils/utils' const { Text } = Typography diff --git a/src/lib/interactions/message.ts b/src/lib/interactions/message.ts index 2c817dcc8..042a3de50 100644 --- a/src/lib/interactions/message.ts +++ b/src/lib/interactions/message.ts @@ -1,4 +1,4 @@ -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' export const Message = { success: (content: string, duration: number = 3) => { diff --git a/src/lib/interactions/notifications.tsx b/src/lib/interactions/notifications.tsx index 45bfe753e..4a50d72c2 100644 --- a/src/lib/interactions/notifications.tsx +++ b/src/lib/interactions/notifications.tsx @@ -1,7 +1,7 @@ import { DiscordOutlined, UnorderedListOutlined } from '@ant-design/icons' import { Button, Flex, Space } from 'antd' import i18next from 'i18next' -import { CURRENT_OPTIMIZER_VERSION } from 'lib/constants' +import { CURRENT_OPTIMIZER_VERSION } from 'lib/constants/constants' import { AppPages } from 'lib/state/db' import { ColorizedLinkWithIcon } from 'lib/ui/ColorizedLink' import { Trans } from 'react-i18next' diff --git a/src/lib/layout/LayoutHeader.tsx b/src/lib/layout/LayoutHeader.tsx index 0711f3e96..e101bcf8e 100644 --- a/src/lib/layout/LayoutHeader.tsx +++ b/src/lib/layout/LayoutHeader.tsx @@ -1,6 +1,6 @@ import { CloseOutlined, MenuOutlined } from '@ant-design/icons' import { Button, Flex, Layout, theme, Typography } from 'antd' -import { LanguageSelector } from 'lib/interactions/LanguageSelector' +import { LanguageSelector } from 'lib/i18n/LanguageSelector' import { Assets } from 'lib/rendering/assets' import { BASE_PATH } from 'lib/state/db' diff --git a/src/lib/optimizer/bufferPacker.ts b/src/lib/optimizer/bufferPacker.ts index b2863b91f..aa2c5f13f 100644 --- a/src/lib/optimizer/bufferPacker.ts +++ b/src/lib/optimizer/bufferPacker.ts @@ -1,4 +1,4 @@ -import { Stats } from 'lib/constants' +import { Stats } from 'lib/constants/constants' import { ComputedStatsArray, Key } from 'lib/optimizer/computedStatsArray' import { FixedSizePriorityQueue } from 'lib/optimizer/fixedSizePriorityQueue' diff --git a/src/lib/optimizer/calculateBuild.ts b/src/lib/optimizer/calculateBuild.ts index 4958813d2..4c082712c 100644 --- a/src/lib/optimizer/calculateBuild.ts +++ b/src/lib/optimizer/calculateBuild.ts @@ -1,5 +1,5 @@ import { BasicStatsObject } from 'lib/conditionals/conditionalConstants' -import { Constants, OrnamentSetCount, OrnamentSetToIndex, Parts, RelicSetCount, RelicSetToIndex } from 'lib/constants' +import { Constants, OrnamentSetCount, OrnamentSetToIndex, Parts, RelicSetCount, RelicSetToIndex } from 'lib/constants/constants' import { SingleRelicByPart } from 'lib/gpu/webgpuTypes' import { calculateBaseMultis, calculateDamage } from 'lib/optimizer/calculateDamage' import { baseCharacterStats, calculateBaseStats, calculateComputedStats, calculateElementalStats, calculateRelicStats, calculateSetCounts } from 'lib/optimizer/calculateStats' @@ -8,7 +8,7 @@ import { generateContext } from 'lib/optimizer/context/calculateContext' import { emptyRelic } from 'lib/optimizer/optimizerUtils' import { transformComboState } from 'lib/optimizer/rotation/comboStateTransform' import { RelicFilters } from 'lib/relics/relicFilters' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' import { Form } from 'types/Form' import { OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/optimizer/calculateConditionals.ts b/src/lib/optimizer/calculateConditionals.ts index 1714b5699..5aa8b629f 100644 --- a/src/lib/optimizer/calculateConditionals.ts +++ b/src/lib/optimizer/calculateConditionals.ts @@ -1,6 +1,6 @@ import { CharacterConditionals } from 'lib/conditionals/characterConditionals' import { LightConeConditionals } from 'lib/conditionals/lightConeConditionals' -import { Stats } from 'lib/constants' +import { Stats } from 'lib/constants/constants' import { DynamicConditional } from 'lib/gpu/conditionals/dynamicConditionals' import { ConditionalSets } from 'lib/gpu/conditionals/setConditionals' import { CharacterConditional } from 'types/CharacterConditional' diff --git a/src/lib/optimizer/calculateStats.ts b/src/lib/optimizer/calculateStats.ts index 4a03957a2..192bb9d17 100644 --- a/src/lib/optimizer/calculateStats.ts +++ b/src/lib/optimizer/calculateStats.ts @@ -1,5 +1,5 @@ import { BASIC_TYPE, BasicStatsObject, FUA_TYPE, SKILL_TYPE, ULT_TYPE } from 'lib/conditionals/conditionalConstants' -import { Stats, StatsValues } from 'lib/constants' +import { Stats, StatsValues } from 'lib/constants/constants' import { evaluateConditional } from 'lib/gpu/conditionals/dynamicConditionals' import { BelobogOfTheArchitectsConditional, diff --git a/src/lib/optimizer/computedStatsArray.ts b/src/lib/optimizer/computedStatsArray.ts index 5297ed690..9886a80a6 100644 --- a/src/lib/optimizer/computedStatsArray.ts +++ b/src/lib/optimizer/computedStatsArray.ts @@ -1,5 +1,5 @@ import { baseComputedStatsObject, BasicStatsObject, ComputedStatsObject } from 'lib/conditionals/conditionalConstants' -import { ElementToResPenType, Sets, Stats } from 'lib/constants' +import { ElementToResPenType, Sets, Stats } from 'lib/constants/constants' import { evaluateConditional } from 'lib/gpu/conditionals/dynamicConditionals' import { OptimizerAction, OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/optimizer/context/calculateContext.ts b/src/lib/optimizer/context/calculateContext.ts index 3d8438839..2706790ea 100644 --- a/src/lib/optimizer/context/calculateContext.ts +++ b/src/lib/optimizer/context/calculateContext.ts @@ -1,7 +1,7 @@ import { CharacterStats } from 'lib/characters/characterStats' import { CharacterConditionals } from 'lib/conditionals/characterConditionals' import { LightConeConditionals } from 'lib/conditionals/lightConeConditionals' -import { ElementToDamage, ElementToResPenType, Stats } from 'lib/constants' +import { ElementToDamage, ElementToResPenType, Stats } from 'lib/constants/constants' import { emptyLightCone } from 'lib/optimizer/optimizerUtils' import { transformComboState } from 'lib/optimizer/rotation/comboStateTransform' import DB from 'lib/state/db' diff --git a/src/lib/optimizer/defaultForm.ts b/src/lib/optimizer/defaultForm.ts index 17cbac144..ea263704a 100644 --- a/src/lib/optimizer/defaultForm.ts +++ b/src/lib/optimizer/defaultForm.ts @@ -1,6 +1,6 @@ -import { CombatBuffs, Constants, DEFAULT_STAT_DISPLAY, Sets } from 'lib/constants' +import { CombatBuffs, Constants, DEFAULT_STAT_DISPLAY, Sets } from 'lib/constants/constants' import DB from 'lib/state/db' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { Form, Teammate } from 'types/Form' export function getDefaultWeights(characterId?: string) { diff --git a/src/lib/optimizer/optimizer.ts b/src/lib/optimizer/optimizer.ts index e6a504918..0c46935ab 100644 --- a/src/lib/optimizer/optimizer.ts +++ b/src/lib/optimizer/optimizer.ts @@ -1,7 +1,7 @@ import { BasicStatsObject } from 'lib/conditionals/conditionalConstants' -import { COMPUTE_ENGINE_CPU, Constants, ElementToDamage, Stats } from 'lib/constants' -import { SavedSessionKeys } from 'lib/constantsSession' -import { OptimizerTabController } from 'lib/controllers/optimizerTabController' +import { COMPUTE_ENGINE_CPU, Constants, ElementToDamage, Stats } from 'lib/constants/constants' +import { SavedSessionKeys } from 'lib/constants/constantsSession' +import { OptimizerTabController } from 'lib/tabs/tabOptimizer/optimizerTabController' import { getWebgpuDevice } from 'lib/gpu/webgpuDevice' import { gpuOptimize } from 'lib/gpu/webgpuOptimizer' import { Message } from 'lib/interactions/message' @@ -16,7 +16,7 @@ import { RelicFilters } from 'lib/relics/relicFilters' import DB from 'lib/state/db' import { setSortColumn } from 'lib/tabs/tabOptimizer/optimizerForm/RecommendedPresetsButton' import { activateZeroPermutationsSuggestionsModal, activateZeroResultSuggestionsModal } from 'lib/tabs/tabOptimizer/OptimizerSuggestionsModal' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' import { WorkerPool } from 'lib/worker/workerPool' import { Form } from 'types/Form' diff --git a/src/lib/optimizer/optimizerUtils.ts b/src/lib/optimizer/optimizerUtils.ts index 8edcffaa6..594f16397 100644 --- a/src/lib/optimizer/optimizerUtils.ts +++ b/src/lib/optimizer/optimizerUtils.ts @@ -1,4 +1,4 @@ -import { Constants, Stats } from 'lib/constants' +import { Constants, Stats } from 'lib/constants/constants' import { AugmentedStats } from 'lib/relics/relicAugmenter' export function p4(set: number) { diff --git a/src/lib/optimizer/relicSetSolver.ts b/src/lib/optimizer/relicSetSolver.ts index c51a7fb9c..74221fe93 100644 --- a/src/lib/optimizer/relicSetSolver.ts +++ b/src/lib/optimizer/relicSetSolver.ts @@ -1,5 +1,5 @@ -import { Constants, RelicSetFilterOptions } from 'lib/constants' -import { Utils } from 'lib/utils' +import { Constants, RelicSetFilterOptions } from 'lib/constants/constants' +import { Utils } from 'lib/utils/utils' import { Form } from 'types/Form' // Here be dragons diff --git a/src/lib/optimizer/rotation/comboDrawerController.tsx b/src/lib/optimizer/rotation/comboDrawerController.tsx index 82ce9a99b..446b3fd11 100644 --- a/src/lib/optimizer/rotation/comboDrawerController.tsx +++ b/src/lib/optimizer/rotation/comboDrawerController.tsx @@ -1,7 +1,7 @@ import { CharacterConditionals } from 'lib/conditionals/characterConditionals' import { LightConeConditionals } from 'lib/conditionals/lightConeConditionals' -import { ConditionalDataType, SetsOrnaments, SetsOrnamentsNames, SetsRelics, SetsRelicsNames } from 'lib/constants' -import { OptimizerTabController } from 'lib/controllers/optimizerTabController' +import { ConditionalDataType, SetsOrnaments, SetsOrnamentsNames, SetsRelics, SetsRelicsNames } from 'lib/constants/constants' +import { OptimizerTabController } from 'lib/tabs/tabOptimizer/optimizerTabController' import { defaultSetConditionals, getDefaultForm } from 'lib/optimizer/defaultForm' import { precomputeConditionalActivations } from 'lib/optimizer/rotation/rotationPreprocessor' import { ConditionalSetMetadata } from 'lib/optimizer/rotation/setConditionalContent' diff --git a/src/lib/optimizer/rotation/comboStateTransform.ts b/src/lib/optimizer/rotation/comboStateTransform.ts index 5f2c778c4..e4b70a0d4 100644 --- a/src/lib/optimizer/rotation/comboStateTransform.ts +++ b/src/lib/optimizer/rotation/comboStateTransform.ts @@ -1,6 +1,6 @@ import { CharacterConditionals } from 'lib/conditionals/characterConditionals' import { LightConeConditionals } from 'lib/conditionals/lightConeConditionals' -import { SACERDOS_RELIVED_ORDEAL_1_STACK, SACERDOS_RELIVED_ORDEAL_2_STACK, Sets } from 'lib/constants' +import { SACERDOS_RELIVED_ORDEAL_1_STACK, SACERDOS_RELIVED_ORDEAL_2_STACK, Sets } from 'lib/constants/constants' import { DynamicConditional } from 'lib/gpu/conditionals/dynamicConditionals' import { calculateContextConditionalRegistry } from 'lib/optimizer/calculateConditionals' import { baseComputedStatsArray, ComputedStatsArray, ComputedStatsArrayCore, Key, Source } from 'lib/optimizer/computedStatsArray' diff --git a/src/lib/optimizer/rotation/rotationPreprocessor.ts b/src/lib/optimizer/rotation/rotationPreprocessor.ts index 47ffa8f99..4d77b8187 100644 --- a/src/lib/optimizer/rotation/rotationPreprocessor.ts +++ b/src/lib/optimizer/rotation/rotationPreprocessor.ts @@ -1,6 +1,6 @@ import { Form } from 'types/Form' import { ComboBooleanConditional, ComboState } from 'lib/optimizer/rotation/comboDrawerController' -import { Sets } from 'lib/constants' +import { Sets } from 'lib/constants/constants' /** * Some passives such as Scholar Lost In Erudition set only activate after abilities trigger them. @@ -51,4 +51,4 @@ function scholarLostInEruditionPreprocessor(comboState: ComboState, request: For function setComboBooleanCategoryActivation(comboState: ComboState, index: number, value: boolean) { const category = comboState.comboCharacter.setConditionals[Sets.ScholarLostInErudition] as ComboBooleanConditional category.activations[index] = value -} \ No newline at end of file +} diff --git a/src/lib/optimizer/rotation/setConditionalContent.ts b/src/lib/optimizer/rotation/setConditionalContent.ts index 87712bccc..d9ab26923 100644 --- a/src/lib/optimizer/rotation/setConditionalContent.ts +++ b/src/lib/optimizer/rotation/setConditionalContent.ts @@ -1,4 +1,4 @@ -import { ConditionalDataType, Constants, Sets } from 'lib/constants' +import { ConditionalDataType, Constants, Sets } from 'lib/constants/constants' export type SelectOptionContent = { display: string @@ -326,4 +326,4 @@ function SetContentDuranDynastyOfRunningWolves() { options[5].label = `${5} stacks (+${5 * 5}% FUA DMG + 25% CD)` return options -} \ No newline at end of file +} diff --git a/src/lib/overlays/drawers/MenuDrawer.tsx b/src/lib/overlays/drawers/MenuDrawer.tsx index ed61ce9dd..e3271e03d 100644 --- a/src/lib/overlays/drawers/MenuDrawer.tsx +++ b/src/lib/overlays/drawers/MenuDrawer.tsx @@ -17,7 +17,7 @@ import { Flex, Menu, Typography } from 'antd' import { CoffeeIcon } from 'icons/CoffeeIcon' import { DiscordIcon } from 'icons/DiscordIcon' import { GithubIcon } from 'icons/GithubIcon' -import { officialOnly } from 'lib/constants' +import { officialOnly } from 'lib/constants/constants' import { AppPages } from 'lib/state/db' import React, { useMemo } from 'react' import { useTranslation } from 'react-i18next' diff --git a/src/lib/overlays/drawers/SettingsDrawer.tsx b/src/lib/overlays/drawers/SettingsDrawer.tsx index 57705e999..e2ef849b7 100644 --- a/src/lib/overlays/drawers/SettingsDrawer.tsx +++ b/src/lib/overlays/drawers/SettingsDrawer.tsx @@ -1,7 +1,7 @@ import { Drawer, Flex, Form, Select, Typography } from 'antd' import { SaveState } from 'lib/state/saveState' -import { TsUtils } from 'lib/TsUtils' -import { Utils } from 'lib/utils' +import { TsUtils } from 'lib/utils/TsUtils' +import { Utils } from 'lib/utils/utils' import React, { useEffect } from 'react' import { useTranslation } from 'react-i18next' import styled from 'styled-components' diff --git a/src/lib/overlays/modals/RelicModal.tsx b/src/lib/overlays/modals/RelicModal.tsx index 99c30e780..7ac70c4dc 100644 --- a/src/lib/overlays/modals/RelicModal.tsx +++ b/src/lib/overlays/modals/RelicModal.tsx @@ -2,14 +2,14 @@ import { CaretRightOutlined } from '@ant-design/icons' import { Button, Flex, Form, Image, Input, InputNumber, Modal, Radio, Select, theme } from 'antd' import { FormInstance } from 'antd/es/form/hooks/useForm' import i18next from 'i18next' -import { Constants, setToId, Stats, UnreleasedSets } from 'lib/constants' +import { Constants, setToId, Stats, UnreleasedSets } from 'lib/constants/constants' import { Message } from 'lib/interactions/message' import { calculateUpgradeValues, RelicForm, RelicUpgradeValues, validateRelic } from 'lib/relics/relicModalController' import { Assets } from 'lib/rendering/assets' import { generateCharacterList } from 'lib/rendering/displayUtils' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { HeaderText } from 'lib/ui/HeaderText' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' import PropTypes from 'prop-types' import React, { ReactElement, useEffect, useMemo, useRef, useState } from 'react' import { useTranslation } from 'react-i18next' diff --git a/src/lib/overlays/modals/ScoringModal.tsx b/src/lib/overlays/modals/ScoringModal.tsx index de1eae7ae..24932d856 100644 --- a/src/lib/overlays/modals/ScoringModal.tsx +++ b/src/lib/overlays/modals/ScoringModal.tsx @@ -1,11 +1,11 @@ import { Button, Divider, Flex, Form, InputNumber, Modal, Popconfirm, Select, Typography } from 'antd' import { usePublish } from 'hooks/usePublish' import { ScoringMetadata } from 'lib/characters/characterScorer' -import { Parts, Stats } from 'lib/constants' +import { Parts, Stats } from 'lib/constants/constants' import { Assets } from 'lib/rendering/assets' import DB from 'lib/state/db' import CharacterSelect from 'lib/tabs/tabOptimizer/optimizerForm/CharacterSelect' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { ColorizedLinkWithIcon } from 'lib/ui/ColorizedLink' import React, { useEffect } from 'react' import { useTranslation } from 'react-i18next' diff --git a/src/lib/overlays/modals/SwitchRelicsModal.tsx b/src/lib/overlays/modals/SwitchRelicsModal.tsx index 53a085eff..917517b46 100644 --- a/src/lib/overlays/modals/SwitchRelicsModal.tsx +++ b/src/lib/overlays/modals/SwitchRelicsModal.tsx @@ -1,8 +1,8 @@ import { Button, Flex, Form as AntDForm, Modal, Select } from 'antd' -import { defaultGap } from 'lib/constantsUi' +import { defaultGap } from 'lib/constants/constantsUi' import { generateCharacterList } from 'lib/rendering/displayUtils' import { HeaderText } from 'lib/ui/HeaderText' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' import React, { useEffect, useMemo } from 'react' import { useTranslation } from 'react-i18next' import { Character } from 'types/Character' diff --git a/src/lib/relics/relicAugmenter.ts b/src/lib/relics/relicAugmenter.ts index 386ded9dc..dca236d64 100644 --- a/src/lib/relics/relicAugmenter.ts +++ b/src/lib/relics/relicAugmenter.ts @@ -1,7 +1,7 @@ -import { Constants, Stats } from 'lib/constants' +import { Constants, Stats } from 'lib/constants/constants' import { RelicRollFixer } from 'lib/relics/relicRollFixer' import { RelicRollGrader } from 'lib/relics/relicRollGrader' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' import { Relic } from 'types/Relic' export type AugmentedStats = { diff --git a/src/lib/relics/relicFilters.ts b/src/lib/relics/relicFilters.ts index 23a285092..29161005c 100644 --- a/src/lib/relics/relicFilters.ts +++ b/src/lib/relics/relicFilters.ts @@ -1,8 +1,8 @@ -import { Constants, Parts, RelicSetFilterOptions } from 'lib/constants' +import { Constants, Parts, RelicSetFilterOptions } from 'lib/constants/constants' import { RelicsByPart } from 'lib/gpu/webgpuTypes' import DB from 'lib/state/db' -import { TsUtils } from 'lib/TsUtils' -import { Utils } from 'lib/utils' +import { TsUtils } from 'lib/utils/TsUtils' +import { Utils } from 'lib/utils/utils' import { Form } from 'types/Form' import { Relic } from 'types/Relic' diff --git a/src/lib/relics/relicModalController.ts b/src/lib/relics/relicModalController.ts index 0c6460211..8b873d36e 100644 --- a/src/lib/relics/relicModalController.ts +++ b/src/lib/relics/relicModalController.ts @@ -1,12 +1,12 @@ import i18next from 'i18next' -import { Constants, Stats, SubStats, SubStatValues } from 'lib/constants' -import { OptimizerTabController } from 'lib/controllers/optimizerTabController' +import { Constants, Stats, SubStats, SubStatValues } from 'lib/constants/constants' +import { OptimizerTabController } from 'lib/tabs/tabOptimizer/optimizerTabController' import { Message } from 'lib/interactions/message' import { RelicAugmenter } from 'lib/relics/relicAugmenter' import { RelicRollFixer } from 'lib/relics/relicRollFixer' import DB from 'lib/state/db' import { SaveState } from 'lib/state/saveState' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' import { Relic, RelicEnhance, RelicGrade, Stat } from 'types/Relic' export const RelicModalController = { diff --git a/src/lib/relics/relicRollFixer.ts b/src/lib/relics/relicRollFixer.ts index 8c087f5cb..ec9db978c 100644 --- a/src/lib/relics/relicRollFixer.ts +++ b/src/lib/relics/relicRollFixer.ts @@ -1,8 +1,8 @@ -import { Constants } from 'lib/constants' +import { Constants } from 'lib/constants/constants' import { CharacterConverter } from 'lib/importer/characterConverter' import DB from 'lib/state/db' -import { TsUtils } from 'lib/TsUtils' -import { Utils } from 'lib/utils' +import { TsUtils } from 'lib/utils/TsUtils' +import { Utils } from 'lib/utils/utils' import { Relic } from 'types/Relic' let optimizerStatToJsonSubStat: Record diff --git a/src/lib/relics/relicRollGrader.test.ts b/src/lib/relics/relicRollGrader.test.ts index be5555572..0fde7b4db 100644 --- a/src/lib/relics/relicRollGrader.test.ts +++ b/src/lib/relics/relicRollGrader.test.ts @@ -1,4 +1,4 @@ -import { Constants } from 'lib/constants' +import { Constants } from 'lib/constants/constants' import { RelicRollGrader } from 'lib/relics/relicRollGrader' import { DataParser } from 'lib/state/dataParser' import DB from 'lib/state/db' diff --git a/src/lib/relics/relicRollGrader.ts b/src/lib/relics/relicRollGrader.ts index 1a784dab9..4ff8dcf7e 100644 --- a/src/lib/relics/relicRollGrader.ts +++ b/src/lib/relics/relicRollGrader.ts @@ -1,4 +1,4 @@ -import { SubStatValues } from 'lib/constants' +import { SubStatValues } from 'lib/constants/constants' import { Relic, StatRolls } from 'types/Relic' // non exported interface, the number are float diff --git a/src/lib/relics/relicScorer.test.ts b/src/lib/relics/relicScorer.test.ts index 22cf13211..fc512e410 100644 --- a/src/lib/relics/relicScorer.test.ts +++ b/src/lib/relics/relicScorer.test.ts @@ -1,4 +1,4 @@ -import { Constants, PartsMainStats } from 'lib/constants' +import { Constants, PartsMainStats } from 'lib/constants/constants' import { RelicScorer } from 'lib/relics/relicScorerPotential' import { DataParser } from 'lib/state/dataParser' diff --git a/src/lib/relics/relicScorerPotential.ts b/src/lib/relics/relicScorerPotential.ts index 7dd747eab..ade69a903 100644 --- a/src/lib/relics/relicScorerPotential.ts +++ b/src/lib/relics/relicScorerPotential.ts @@ -1,8 +1,8 @@ import i18next from 'i18next' -import { Constants, MainStats, MainStatsValues, Parts, PartsMainStats, Stats, StatsValues, SubStats, SubStatValues } from 'lib/constants' +import { Constants, MainStats, MainStatsValues, Parts, PartsMainStats, Stats, StatsValues, SubStats, SubStatValues } from 'lib/constants/constants' import DB from 'lib/state/db' -import { TsUtils } from 'lib/TsUtils' -import { Utils } from 'lib/utils' +import { TsUtils } from 'lib/utils/TsUtils' +import { Utils } from 'lib/utils/utils' import { Character, CharacterId } from 'types/Character' import { GUID } from 'types/Common' import { Relic, RelicEnhance, RelicGrade, Stat } from 'types/Relic' diff --git a/src/lib/relics/statCalculator.ts b/src/lib/relics/statCalculator.ts index 907b2b458..e584d5394 100644 --- a/src/lib/relics/statCalculator.ts +++ b/src/lib/relics/statCalculator.ts @@ -1,5 +1,5 @@ -import { Constants, SubStatValues } from 'lib/constants' -import { Utils } from 'lib/utils' +import { Constants, SubStatValues } from 'lib/constants/constants' +import { Utils } from 'lib/utils/utils' import { Relic } from 'types/Relic' const maxedMainStats = { diff --git a/src/lib/relics/substatRollTable.ts b/src/lib/relics/substatRollTable.ts index e739ceddb..b7983c5bb 100644 --- a/src/lib/relics/substatRollTable.ts +++ b/src/lib/relics/substatRollTable.ts @@ -1,4 +1,4 @@ -import { Stats } from 'lib/constants' +import { Stats } from 'lib/constants/constants' export const SubstatTextToRollValue = { [Stats.HP]: { diff --git a/src/lib/rendering/assets.ts b/src/lib/rendering/assets.ts index 28ed578a6..74e3c1831 100644 --- a/src/lib/rendering/assets.ts +++ b/src/lib/rendering/assets.ts @@ -1,4 +1,4 @@ -import { Constants, Parts, SACERDOS_RELIVED_ORDEAL_1_STACK, SACERDOS_RELIVED_ORDEAL_2_STACK, Sets, setToId, Stats } from 'lib/constants' +import { Constants, Parts, SACERDOS_RELIVED_ORDEAL_1_STACK, SACERDOS_RELIVED_ORDEAL_2_STACK, Sets, setToId, Stats } from 'lib/constants/constants' import { BASE_PATH } from 'lib/state/db' // let baseUrl = process.env.PUBLIC_URL // Local testing; diff --git a/src/lib/rendering/gradient.ts b/src/lib/rendering/gradient.ts index 0f66f78ba..44c4c89ef 100644 --- a/src/lib/rendering/gradient.ts +++ b/src/lib/rendering/gradient.ts @@ -1,5 +1,5 @@ import type { GlobalToken } from 'antd/es/theme/interface' -import { OptimizerTabController } from 'lib/controllers/optimizerTabController' +import { OptimizerTabController } from 'lib/tabs/tabOptimizer/optimizerTabController' import { ColorThemeOverrides } from 'lib/rendering/theme' import tinygradient from 'tinygradient' diff --git a/src/lib/rendering/renderer.tsx b/src/lib/rendering/renderer.tsx index 01dad0a3b..8b2830dc8 100644 --- a/src/lib/rendering/renderer.tsx +++ b/src/lib/rendering/renderer.tsx @@ -1,9 +1,9 @@ import { CheckCircleFilled, CloseCircleFilled } from '@ant-design/icons' import { Flex, Image, Tooltip } from 'antd' import i18next from 'i18next' -import { Constants } from 'lib/constants' +import { Constants } from 'lib/constants/constants' import { Assets } from 'lib/rendering/assets' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' import { Relic, Stat } from 'types/Relic' export const Renderer = { diff --git a/src/lib/controllers/statSimulationController.tsx b/src/lib/simulations/statSimulationController.tsx similarity index 98% rename from src/lib/controllers/statSimulationController.tsx rename to src/lib/simulations/statSimulationController.tsx index 646742f88..0ce78b1f4 100644 --- a/src/lib/controllers/statSimulationController.tsx +++ b/src/lib/simulations/statSimulationController.tsx @@ -1,8 +1,8 @@ import { Flex, Tag } from 'antd' import i18next from 'i18next' import { SimulationResult } from 'lib/characters/characterScorer' -import { Constants, Parts, SetsOrnamentsNames, SetsRelicsNames, Stats, SubStats } from 'lib/constants' -import { OptimizerTabController } from 'lib/controllers/optimizerTabController' +import { Constants, Parts, SetsOrnamentsNames, SetsRelicsNames, Stats, SubStats } from 'lib/constants/constants' +import { OptimizerTabController } from 'lib/tabs/tabOptimizer/optimizerTabController' import { Message } from 'lib/interactions/message' import { calculateBuild } from 'lib/optimizer/calculateBuild' import { calculateCurrentlyEquippedRow, renameFields } from 'lib/optimizer/optimizer' @@ -15,7 +15,7 @@ import DB from 'lib/state/db' import { SaveState } from 'lib/state/saveState' import { setSortColumn } from 'lib/tabs/tabOptimizer/optimizerForm/RecommendedPresetsButton' import { StatSimTypes } from 'lib/tabs/tabOptimizer/optimizerForm/StatSimulationDisplay' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' import { useTranslation } from 'react-i18next' import { Form } from 'types/Form' import { OptimizerContext } from 'types/Optimizer' diff --git a/src/lib/state/dataParser.ts b/src/lib/state/dataParser.ts index 370ea0666..744e2dfe2 100644 --- a/src/lib/state/dataParser.ts +++ b/src/lib/state/dataParser.ts @@ -2,7 +2,7 @@ import gameData from 'data/game_data.json' with { type: 'json' } import relicMainAffixes from 'data/relic_main_affixes.json' with { type: 'json' } import relicSubAffixes from 'data/relic_sub_affixes.json' with { type: 'json' } import { ScoringMetadata } from 'lib/characters/characterScorer' -import { Constants, Parts, PartsMainStats, Sets, SetsRelics, Stats } from 'lib/constants' +import { Constants, Parts, PartsMainStats, Sets, SetsRelics, Stats } from 'lib/constants/constants' import { SortOption } from 'lib/optimizer/sortOptions' import DB, { DBMetadata } from 'lib/state/db' import { PresetEffects } from 'lib/tabs/tabOptimizer/optimizerForm/RecommendedPresetsButton.tsx' diff --git a/src/lib/state/db.ts b/src/lib/state/db.ts index 2b3a371e4..b14530569 100644 --- a/src/lib/state/db.ts +++ b/src/lib/state/db.ts @@ -1,9 +1,9 @@ import i18next from 'i18next' import { ScoringMetadata, SimulationMetadata } from 'lib/characters/characterScorer' import { oldCharacterScoringMetadata } from 'lib/characters/oldCharacterScoringMetadata' -import { COMPUTE_ENGINE_GPU_STABLE, ComputeEngine, Constants, CURRENT_OPTIMIZER_VERSION, DAMAGE_UPGRADES, DEFAULT_STAT_DISPLAY, Parts, Sets, SIMULATION_SCORE } from 'lib/constants' -import { SavedSessionKeys } from 'lib/constantsSession' -import { OptimizerTabController } from 'lib/controllers/optimizerTabController' +import { COMPUTE_ENGINE_GPU_STABLE, ComputeEngine, Constants, CURRENT_OPTIMIZER_VERSION, DAMAGE_UPGRADES, DEFAULT_STAT_DISPLAY, Parts, Sets, SIMULATION_SCORE } from 'lib/constants/constants' +import { SavedSessionKeys } from 'lib/constants/constantsSession' +import { OptimizerTabController } from 'lib/tabs/tabOptimizer/optimizerTabController' import { Message } from 'lib/interactions/message' import { getDefaultForm } from 'lib/optimizer/defaultForm' import { ComboState } from 'lib/optimizer/rotation/comboDrawerController' @@ -13,8 +13,8 @@ import { Themes } from 'lib/rendering/theme' import { SaveState } from 'lib/state/saveState' import { OptimizerMenuIds } from 'lib/tabs/tabOptimizer/FormRow' import { StatSimTypes } from 'lib/tabs/tabOptimizer/optimizerForm/StatSimulationDisplay' -import { TsUtils } from 'lib/TsUtils' -import { Utils } from 'lib/utils' +import { TsUtils } from 'lib/utils/TsUtils' +import { Utils } from 'lib/utils/utils' import { Character } from 'types/Character' import { Form } from 'types/Form' import { Relic, Stat } from 'types/Relic' diff --git a/src/lib/state/saveState.ts b/src/lib/state/saveState.ts index 55749dd96..7f2ac1dbe 100644 --- a/src/lib/state/saveState.ts +++ b/src/lib/state/saveState.ts @@ -1,4 +1,4 @@ -import { CURRENT_OPTIMIZER_VERSION } from 'lib/constants' +import { CURRENT_OPTIMIZER_VERSION } from 'lib/constants/constants' import DB from 'lib/state/db' import { HsrOptimizerSaveFormat } from 'types/store' diff --git a/src/lib/tabs/Tabs.tsx b/src/lib/tabs/Tabs.tsx index 627b24ff7..05ab5afea 100644 --- a/src/lib/tabs/Tabs.tsx +++ b/src/lib/tabs/Tabs.tsx @@ -1,5 +1,5 @@ import { Flex, Typography } from 'antd' -import { OptimizerTabController } from 'lib/controllers/optimizerTabController' +import { OptimizerTabController } from 'lib/tabs/tabOptimizer/optimizerTabController' import ScoringModal from 'lib/overlays/modals/ScoringModal' import { AppPages, PageToRoute } from 'lib/state/db' import ChangelogTab from 'lib/tabs/tabChangelog/ChangelogTab' diff --git a/src/lib/tabs/tabChangelog/ChangelogTab.tsx b/src/lib/tabs/tabChangelog/ChangelogTab.tsx index e48c2dac0..9868d19bf 100644 --- a/src/lib/tabs/tabChangelog/ChangelogTab.tsx +++ b/src/lib/tabs/tabChangelog/ChangelogTab.tsx @@ -1,5 +1,5 @@ import { Flex, List, theme, Typography } from 'antd' -import { officialOnly } from 'lib/constants' +import { officialOnly } from 'lib/constants/constants' import { Assets } from 'lib/rendering/assets' import { AppPages } from 'lib/state/db' import { ColorizedLinkWithIcon } from 'lib/ui/ColorizedLink' diff --git a/src/lib/tabs/tabCharacters/CharacterTab.jsx b/src/lib/tabs/tabCharacters/CharacterTab.jsx index fd2bdba39..b9c874330 100644 --- a/src/lib/tabs/tabCharacters/CharacterTab.jsx +++ b/src/lib/tabs/tabCharacters/CharacterTab.jsx @@ -13,7 +13,7 @@ import { Button, Dropdown, Flex, Image, Input, Modal, theme, Typography } from ' import { useSubscribe } from 'hooks/useSubscribe' import i18next from 'i18next' import { CharacterPreview } from 'lib/characterPreview/CharacterPreview' -import { OptimizerTabController } from 'lib/controllers/optimizerTabController' +import { OptimizerTabController } from 'lib/tabs/tabOptimizer/optimizerTabController' import { arrowKeyGridNavigation } from 'lib/interactions/arrowKeyGridNavigation' import { Message } from 'lib/interactions/message' import BuildsModal from 'lib/overlays/modals/BuildsModal' @@ -30,7 +30,7 @@ import { generatePathTags, SegmentedFilterRow, } from 'lib/tabs/tabOptimizer/optimizerForm/CardSelectModalComponents.tsx' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' import PropTypes from 'prop-types' import React, { useCallback, useMemo, useRef, useState } from 'react' import { Trans, useTranslation } from 'react-i18next' diff --git a/src/lib/tabs/tabHome/HomeTab.tsx b/src/lib/tabs/tabHome/HomeTab.tsx index fae8fe3ab..fffa9cba8 100644 --- a/src/lib/tabs/tabHome/HomeTab.tsx +++ b/src/lib/tabs/tabHome/HomeTab.tsx @@ -4,7 +4,7 @@ import { Button, Card, Collapse, Divider, Flex, Input } from 'antd' import { Message } from 'lib/interactions/message' import { Assets } from 'lib/rendering/assets' import { AppPages } from 'lib/state/db.js' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { ColorizedLinkWithIcon } from 'lib/ui/ColorizedLink' import React from 'react' diff --git a/src/lib/tabs/tabImport/ClearDataSubmenu.tsx b/src/lib/tabs/tabImport/ClearDataSubmenu.tsx index 23e1c7361..768d65d23 100644 --- a/src/lib/tabs/tabImport/ClearDataSubmenu.tsx +++ b/src/lib/tabs/tabImport/ClearDataSubmenu.tsx @@ -2,9 +2,9 @@ import { DeleteOutlined } from '@ant-design/icons' import { Button, Flex, Popconfirm, Typography } from 'antd' import { Message } from 'lib/interactions/message' import DB from 'lib/state/db' +import { importerTabButtonWidth, importerTabSpinnerMs } from 'lib/tabs/tabImport/importerTabUiConstants' import { useState } from 'react' import { useTranslation } from 'react-i18next' -import { importerTabButtonWidth, importerTabSpinnerMs } from './importerTabUiConstants' const { Text } = Typography diff --git a/src/lib/tabs/tabImport/ImportTab.tsx b/src/lib/tabs/tabImport/ImportTab.tsx index 1cc5a978b..a004ba246 100644 --- a/src/lib/tabs/tabImport/ImportTab.tsx +++ b/src/lib/tabs/tabImport/ImportTab.tsx @@ -2,12 +2,12 @@ import { DownloadOutlined } from '@ant-design/icons' import { Button, Flex, Tabs, Typography } from 'antd' import { Message } from 'lib/interactions/message' import { SaveState } from 'lib/state/saveState' +import { ClearDataSubmenu } from 'lib/tabs/tabImport/ClearDataSubmenu' import { LoadDataSubmenu } from 'lib/tabs/tabImport/LoadDataSubmenu' import { ScannerImportSubmenu } from 'lib/tabs/tabImport/ScannerImportSubmenu' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import React from 'react' import { useTranslation } from 'react-i18next' -import { ClearDataSubmenu } from './ClearDataSubmenu' const { Text } = Typography diff --git a/src/lib/tabs/tabImport/LoadDataSubmenu.tsx b/src/lib/tabs/tabImport/LoadDataSubmenu.tsx index 2f1cc5d7d..172f21638 100644 --- a/src/lib/tabs/tabImport/LoadDataSubmenu.tsx +++ b/src/lib/tabs/tabImport/LoadDataSubmenu.tsx @@ -2,9 +2,9 @@ import { ImportOutlined, UploadOutlined } from '@ant-design/icons' import { Button, Flex, Steps, Typography, Upload } from 'antd' import DB from 'lib/state/db' import { SaveState } from 'lib/state/saveState' +import { importerTabButtonWidth, importerTabSpinnerMs } from 'lib/tabs/tabImport/importerTabUiConstants' import { useState } from 'react' import { useTranslation } from 'react-i18next' -import { importerTabButtonWidth, importerTabSpinnerMs } from './importerTabUiConstants' const { Text } = Typography diff --git a/src/lib/tabs/tabImport/ScannerImportSubmenu.tsx b/src/lib/tabs/tabImport/ScannerImportSubmenu.tsx index 507ef2ddc..86a9c933d 100644 --- a/src/lib/tabs/tabImport/ScannerImportSubmenu.tsx +++ b/src/lib/tabs/tabImport/ScannerImportSubmenu.tsx @@ -183,9 +183,9 @@ export function ScannerImportSubmenu() { linkIcon={true} />) +
  • {t('Import.Stage1.HoyolabDesc.l1')}
    • +
  • {t('Import.Stage1.HoyolabDesc.l2')}
    • + diff --git a/src/lib/tabs/tabMetadata/MetadataTab.tsx b/src/lib/tabs/tabMetadata/MetadataTab.tsx index 67f11d129..23d06aa8f 100644 --- a/src/lib/tabs/tabMetadata/MetadataTab.tsx +++ b/src/lib/tabs/tabMetadata/MetadataTab.tsx @@ -1,6 +1,6 @@ import { Collapse, Flex } from 'antd' import gameData from 'data/game_data.json' -import { Sets, Stats } from 'lib/constants' +import { Sets, Stats } from 'lib/constants/constants' import { Assets } from 'lib/rendering/assets' import { AppPages, DB } from 'lib/state/db' import React, { useState } from 'react' diff --git a/src/lib/tabs/tabOptimizer/OptimizerBuildPreview.tsx b/src/lib/tabs/tabOptimizer/OptimizerBuildPreview.tsx index b570a50d8..80b2e624b 100644 --- a/src/lib/tabs/tabOptimizer/OptimizerBuildPreview.tsx +++ b/src/lib/tabs/tabOptimizer/OptimizerBuildPreview.tsx @@ -1,5 +1,5 @@ import { Flex } from 'antd' -import { OptimizerTabController } from 'lib/controllers/optimizerTabController' +import { OptimizerTabController } from 'lib/tabs/tabOptimizer/optimizerTabController' import RelicModal from 'lib/overlays/modals/RelicModal' import { RelicModalController } from 'lib/relics/relicModalController' diff --git a/src/lib/tabs/tabOptimizer/OptimizerForm.tsx b/src/lib/tabs/tabOptimizer/OptimizerForm.tsx index f9cdeb47f..fce6ff3d4 100644 --- a/src/lib/tabs/tabOptimizer/OptimizerForm.tsx +++ b/src/lib/tabs/tabOptimizer/OptimizerForm.tsx @@ -1,7 +1,7 @@ import { Flex, Form as AntDForm } from 'antd' import { LightConeConditionals } from 'lib/conditionals/lightConeConditionals' -import { SavedSessionKeys } from 'lib/constantsSession' -import { OptimizerTabController } from 'lib/controllers/optimizerTabController' +import { SavedSessionKeys } from 'lib/constants/constantsSession' +import { OptimizerTabController } from 'lib/tabs/tabOptimizer/optimizerTabController' import { Optimizer } from 'lib/optimizer/optimizer' import { updateConditionalChange } from 'lib/optimizer/rotation/comboDrawerController' import DB from 'lib/state/db' @@ -24,7 +24,7 @@ import { MinMaxRatingFilters, MinMaxStatFilters } from 'lib/tabs/tabOptimizer/op import { StatSimulationDisplay } from 'lib/tabs/tabOptimizer/optimizerForm/StatSimulationDisplay' import { SubstatWeightFilters } from 'lib/tabs/tabOptimizer/optimizerForm/SubstatWeightFilters' import TeammateCard from 'lib/tabs/tabOptimizer/optimizerForm/TeammateCard' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' import React, { useEffect } from 'react' import { Form } from 'types/Form' diff --git a/src/lib/tabs/tabOptimizer/OptimizerGrid.jsx b/src/lib/tabs/tabOptimizer/OptimizerGrid.jsx index a9efe9293..a6c1be750 100644 --- a/src/lib/tabs/tabOptimizer/OptimizerGrid.jsx +++ b/src/lib/tabs/tabOptimizer/OptimizerGrid.jsx @@ -1,6 +1,6 @@ import { AgGridReact } from 'ag-grid-react' import { Flex, theme } from 'antd' -import { OptimizerTabController } from 'lib/controllers/optimizerTabController' +import { OptimizerTabController } from 'lib/tabs/tabOptimizer/optimizerTabController' import { arrowKeyGridNavigation } from 'lib/interactions/arrowKeyGridNavigation' import { getGridTheme } from 'lib/rendering/theme' import DB from 'lib/state/db' diff --git a/src/lib/tabs/tabOptimizer/OptimizerSuggestionsModal.tsx b/src/lib/tabs/tabOptimizer/OptimizerSuggestionsModal.tsx index 2986ddb67..b692be303 100644 --- a/src/lib/tabs/tabOptimizer/OptimizerSuggestionsModal.tsx +++ b/src/lib/tabs/tabOptimizer/OptimizerSuggestionsModal.tsx @@ -1,12 +1,12 @@ import { Button, Flex, Modal, Typography } from 'antd' import { TFunction } from 'i18next' -import { Parts } from 'lib/constants' -import { OptimizerTabController } from 'lib/controllers/optimizerTabController' +import { Parts } from 'lib/constants/constants' +import { OptimizerTabController } from 'lib/tabs/tabOptimizer/optimizerTabController' import { Message } from 'lib/interactions/message' import { Optimizer } from 'lib/optimizer/optimizer' import DB, { AppPages } from 'lib/state/db' import { HorizontalDivider } from 'lib/ui/Dividers' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' import { ReactElement } from 'react' import { useTranslation } from 'react-i18next' import { Form } from 'types/Form' diff --git a/src/lib/tabs/tabOptimizer/Sidebar.tsx b/src/lib/tabs/tabOptimizer/Sidebar.tsx index e11de00ed..3143754d7 100644 --- a/src/lib/tabs/tabOptimizer/Sidebar.tsx +++ b/src/lib/tabs/tabOptimizer/Sidebar.tsx @@ -1,9 +1,9 @@ import { DownOutlined, ThunderboltFilled } from '@ant-design/icons' import { Button, Divider, Dropdown, Flex, Grid, Modal, Popconfirm, Progress, Radio, theme, Typography } from 'antd' import i18next from 'i18next' -import { COMPUTE_ENGINE_CPU, COMPUTE_ENGINE_GPU_EXPERIMENTAL, COMPUTE_ENGINE_GPU_STABLE, ComputeEngine } from 'lib/constants' -import { SavedSessionKeys } from 'lib/constantsSession' -import { OptimizerTabController } from 'lib/controllers/optimizerTabController' +import { COMPUTE_ENGINE_CPU, COMPUTE_ENGINE_GPU_EXPERIMENTAL, COMPUTE_ENGINE_GPU_STABLE, ComputeEngine } from 'lib/constants/constants' +import { SavedSessionKeys } from 'lib/constants/constantsSession' +import { OptimizerTabController } from 'lib/tabs/tabOptimizer/optimizerTabController' import { verifyWebgpuSupport } from 'lib/gpu/webgpuDevice' import { Hint } from 'lib/interactions/hint' import { Message } from 'lib/interactions/message' @@ -13,7 +13,7 @@ import DB from 'lib/state/db' import { defaultPadding } from 'lib/tabs/tabOptimizer/optimizerTabConstants' import { HeaderText } from 'lib/ui/HeaderText' import { TooltipImage } from 'lib/ui/TooltipImage' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' import React, { useState } from 'react' import { useTranslation } from 'react-i18next' diff --git a/src/lib/tabs/tabOptimizer/conditionals/LightConeConditionalDisplay.tsx b/src/lib/tabs/tabOptimizer/conditionals/LightConeConditionalDisplay.tsx index 5444a2db8..5ce37706c 100644 --- a/src/lib/tabs/tabOptimizer/conditionals/LightConeConditionalDisplay.tsx +++ b/src/lib/tabs/tabOptimizer/conditionals/LightConeConditionalDisplay.tsx @@ -44,12 +44,12 @@ export const LightConeConditionalDisplay = memo((props: LightConeConditionalDisp return ( {(teammateIndex == null) - && ( - - {t('LightconePassives')/* Light cone passives */} - - - )} + && ( + + {t('LightconePassives')/* Light cone passives */} + + + )} ) diff --git a/src/lib/tabs/tabOptimizer/optimizerForm/CardSelectModalComponents.tsx b/src/lib/tabs/tabOptimizer/optimizerForm/CardSelectModalComponents.tsx index ef528fc5f..bbf72609c 100644 --- a/src/lib/tabs/tabOptimizer/optimizerForm/CardSelectModalComponents.tsx +++ b/src/lib/tabs/tabOptimizer/optimizerForm/CardSelectModalComponents.tsx @@ -1,8 +1,8 @@ import { Flex, theme, Typography } from 'antd' import CheckableTag from 'antd/lib/tag/CheckableTag' -import { ElementToDamage, PathNames } from 'lib/constants' +import { ElementToDamage, PathNames } from 'lib/constants/constants' import { Assets } from 'lib/rendering/assets' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' import { ReactElement } from 'react' const { useToken } = theme diff --git a/src/lib/tabs/tabOptimizer/optimizerForm/CharacterSelect.tsx b/src/lib/tabs/tabOptimizer/optimizerForm/CharacterSelect.tsx index 116ebbcb6..9bcda9df2 100644 --- a/src/lib/tabs/tabOptimizer/optimizerForm/CharacterSelect.tsx +++ b/src/lib/tabs/tabOptimizer/optimizerForm/CharacterSelect.tsx @@ -1,7 +1,7 @@ import { Button, Card, Flex, Input, InputRef, Modal, Select } from 'antd' import { Assets } from 'lib/rendering/assets' import { CardGridItemContent, generateElementTags, generatePathTags, SegmentedFilterRow } from 'lib/tabs/tabOptimizer/optimizerForm/CardSelectModalComponents' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' import * as React from 'react' import { useEffect, useMemo, useRef, useState } from 'react' import { useTranslation } from 'react-i18next' diff --git a/src/lib/tabs/tabOptimizer/optimizerForm/CharacterSelectorDisplay.tsx b/src/lib/tabs/tabOptimizer/optimizerForm/CharacterSelectorDisplay.tsx index 3e98009a5..aad3edbcf 100644 --- a/src/lib/tabs/tabOptimizer/optimizerForm/CharacterSelectorDisplay.tsx +++ b/src/lib/tabs/tabOptimizer/optimizerForm/CharacterSelectorDisplay.tsx @@ -1,5 +1,5 @@ import { Flex, Form, Select } from 'antd' -import { OptimizerTabController } from 'lib/controllers/optimizerTabController' +import { OptimizerTabController } from 'lib/tabs/tabOptimizer/optimizerTabController' import { Hint } from 'lib/interactions/hint' import { SortOption } from 'lib/optimizer/sortOptions' import CharacterSelect from 'lib/tabs/tabOptimizer/optimizerForm/CharacterSelect' @@ -8,7 +8,7 @@ import RecommendedPresetsButton from 'lib/tabs/tabOptimizer/optimizerForm/Recomm import { optimizerTabDefaultGap, panelWidth } from 'lib/tabs/tabOptimizer/optimizerTabConstants' import { HeaderText } from 'lib/ui/HeaderText' import { TooltipImage } from 'lib/ui/TooltipImage' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' import { useEffect, useMemo } from 'react' import { useTranslation } from 'react-i18next' diff --git a/src/lib/tabs/tabOptimizer/optimizerForm/CombatBuffsDrawer.tsx b/src/lib/tabs/tabOptimizer/optimizerForm/CombatBuffsDrawer.tsx index 889d122be..9af0b6dd2 100644 --- a/src/lib/tabs/tabOptimizer/optimizerForm/CombatBuffsDrawer.tsx +++ b/src/lib/tabs/tabOptimizer/optimizerForm/CombatBuffsDrawer.tsx @@ -1,6 +1,6 @@ import { Drawer, Flex, Form, Typography } from 'antd' -import { CombatBuffs } from 'lib/constants' -import { defaultGap } from 'lib/constantsUi' +import { CombatBuffs } from 'lib/constants/constants' +import { defaultGap } from 'lib/constants/constantsUi' import InputNumberStyled from 'lib/tabs/tabOptimizer/optimizerForm/InputNumberStyled' import { optimizerTabDefaultGap } from 'lib/tabs/tabOptimizer/optimizerTabConstants' import { useMemo } from 'react' diff --git a/src/lib/tabs/tabOptimizer/optimizerForm/EnemyConfigurationsDrawer.tsx b/src/lib/tabs/tabOptimizer/optimizerForm/EnemyConfigurationsDrawer.tsx index 72b203fa2..23e1b5b70 100644 --- a/src/lib/tabs/tabOptimizer/optimizerForm/EnemyConfigurationsDrawer.tsx +++ b/src/lib/tabs/tabOptimizer/optimizerForm/EnemyConfigurationsDrawer.tsx @@ -3,7 +3,7 @@ import { Drawer, Flex, Form, Select, Switch, Typography } from 'antd' import { Hint } from 'lib/interactions/hint' import { HeaderText } from 'lib/ui/HeaderText' import { TooltipImage } from 'lib/ui/TooltipImage' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' import { useMemo } from 'react' import { useTranslation } from 'react-i18next' diff --git a/src/lib/tabs/tabOptimizer/optimizerForm/FormSetConditionals.jsx b/src/lib/tabs/tabOptimizer/optimizerForm/FormSetConditionals.jsx index 641d13aec..744e7e937 100644 --- a/src/lib/tabs/tabOptimizer/optimizerForm/FormSetConditionals.jsx +++ b/src/lib/tabs/tabOptimizer/optimizerForm/FormSetConditionals.jsx @@ -1,5 +1,5 @@ import { Drawer, Flex, Form, Popover, Select, Switch, Typography } from 'antd' -import { Constants, setToId } from 'lib/constants' +import { Constants, setToId } from 'lib/constants/constants' import { Assets } from 'lib/rendering/assets' import ColorizeNumbers from 'lib/ui/ColorizeNumbers' import { VerticalDivider } from 'lib/ui/Dividers' diff --git a/src/lib/tabs/tabOptimizer/optimizerForm/FormStatRollSlider.tsx b/src/lib/tabs/tabOptimizer/optimizerForm/FormStatRollSlider.tsx index 0a342c63f..610d43825 100644 --- a/src/lib/tabs/tabOptimizer/optimizerForm/FormStatRollSlider.tsx +++ b/src/lib/tabs/tabOptimizer/optimizerForm/FormStatRollSlider.tsx @@ -1,7 +1,7 @@ import { Flex, Form, InputNumber, Slider, Typography } from 'antd' -import { Constants, Parts } from 'lib/constants' +import { Constants, Parts } from 'lib/constants/constants' import { Assets } from 'lib/rendering/assets' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' import React, { ReactElement, useState } from 'react' import { useTranslation } from 'react-i18next' import styled from 'styled-components' diff --git a/src/lib/tabs/tabOptimizer/optimizerForm/LightConeSelect.tsx b/src/lib/tabs/tabOptimizer/optimizerForm/LightConeSelect.tsx index 4e2007470..0eff419b2 100644 --- a/src/lib/tabs/tabOptimizer/optimizerForm/LightConeSelect.tsx +++ b/src/lib/tabs/tabOptimizer/optimizerForm/LightConeSelect.tsx @@ -2,7 +2,7 @@ import { Card, Flex, Input, InputRef, Modal, Select } from 'antd' import { Assets } from 'lib/rendering/assets' import DB from 'lib/state/db' import { CardGridItemContent, generatePathTags, generateRarityTags, SegmentedFilterRow } from 'lib/tabs/tabOptimizer/optimizerForm/CardSelectModalComponents' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' import * as React from 'react' import { useEffect, useMemo, useRef, useState } from 'react' import { useTranslation } from 'react-i18next' diff --git a/src/lib/tabs/tabOptimizer/optimizerForm/OptimizerOptionsDisplay.tsx b/src/lib/tabs/tabOptimizer/optimizerForm/OptimizerOptionsDisplay.tsx index 72010a8c5..134b4feb9 100644 --- a/src/lib/tabs/tabOptimizer/optimizerForm/OptimizerOptionsDisplay.tsx +++ b/src/lib/tabs/tabOptimizer/optimizerForm/OptimizerOptionsDisplay.tsx @@ -9,7 +9,7 @@ import DB from 'lib/state/db' import { optimizerTabDefaultGap, panelWidth } from 'lib/tabs/tabOptimizer/optimizerTabConstants' import { HeaderText } from 'lib/ui/HeaderText' import { TooltipImage } from 'lib/ui/TooltipImage' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' import { useMemo } from 'react' import { useTranslation } from 'react-i18next' diff --git a/src/lib/tabs/tabOptimizer/optimizerForm/OrnamentSetTagRenderer.tsx b/src/lib/tabs/tabOptimizer/optimizerForm/OrnamentSetTagRenderer.tsx index cdee1b667..d28674554 100644 --- a/src/lib/tabs/tabOptimizer/optimizerForm/OrnamentSetTagRenderer.tsx +++ b/src/lib/tabs/tabOptimizer/optimizerForm/OrnamentSetTagRenderer.tsx @@ -1,5 +1,5 @@ import { Flex, Tag } from 'antd' -import { Constants } from 'lib/constants' +import { Constants } from 'lib/constants/constants' import { Assets } from 'lib/rendering/assets' import React from 'react' diff --git a/src/lib/tabs/tabOptimizer/optimizerForm/OrnamentsOptions.tsx b/src/lib/tabs/tabOptimizer/optimizerForm/OrnamentsOptions.tsx index a684e45a6..ac6af950e 100644 --- a/src/lib/tabs/tabOptimizer/optimizerForm/OrnamentsOptions.tsx +++ b/src/lib/tabs/tabOptimizer/optimizerForm/OrnamentsOptions.tsx @@ -1,6 +1,6 @@ import { Flex } from 'antd' import i18next from 'i18next' -import { Constants, setToId, UnreleasedSets } from 'lib/constants' +import { Constants, setToId, UnreleasedSets } from 'lib/constants/constants' import { Assets } from 'lib/rendering/assets' diff --git a/src/lib/tabs/tabOptimizer/optimizerForm/RecommendedPresetsButton.tsx b/src/lib/tabs/tabOptimizer/optimizerForm/RecommendedPresetsButton.tsx index 273c49b17..6c70b6e79 100644 --- a/src/lib/tabs/tabOptimizer/optimizerForm/RecommendedPresetsButton.tsx +++ b/src/lib/tabs/tabOptimizer/optimizerForm/RecommendedPresetsButton.tsx @@ -2,13 +2,13 @@ import { DownOutlined } from '@ant-design/icons' import { ApplyColumnStateParams } from 'ag-grid-community' import { Button, Dropdown } from 'antd' import { ScoringMetadata } from 'lib/characters/characterScorer' -import { Constants, Sets } from 'lib/constants' -import { OptimizerTabController } from 'lib/controllers/optimizerTabController' +import { Constants, Sets } from 'lib/constants/constants' +import { OptimizerTabController } from 'lib/tabs/tabOptimizer/optimizerTabController' import { Message } from 'lib/interactions/message' import { defaultSetConditionals, getDefaultForm } from 'lib/optimizer/defaultForm' import DB from 'lib/state/db' -import { TsUtils } from 'lib/TsUtils' -import { Utils } from 'lib/utils' +import { TsUtils } from 'lib/utils/TsUtils' +import { Utils } from 'lib/utils/utils' import React, { useMemo } from 'react' import { useTranslation } from 'react-i18next' import { ReactElement } from 'types/Components' diff --git a/src/lib/tabs/tabOptimizer/optimizerForm/RelicMainSetFilters.tsx b/src/lib/tabs/tabOptimizer/optimizerForm/RelicMainSetFilters.tsx index 7e1c137ca..bf4d2409c 100644 --- a/src/lib/tabs/tabOptimizer/optimizerForm/RelicMainSetFilters.tsx +++ b/src/lib/tabs/tabOptimizer/optimizerForm/RelicMainSetFilters.tsx @@ -1,6 +1,6 @@ import { SettingOutlined } from '@ant-design/icons' import { Button, Cascader, Flex, Form, Select } from 'antd' -import { Constants, Parts } from 'lib/constants' +import { Constants, Parts } from 'lib/constants/constants' import { Hint } from 'lib/interactions/hint' import { Assets } from 'lib/rendering/assets' import { OrnamentSetTagRenderer } from 'lib/tabs/tabOptimizer/optimizerForm/OrnamentSetTagRenderer' diff --git a/src/lib/tabs/tabOptimizer/optimizerForm/RelicSetTagRenderer.tsx b/src/lib/tabs/tabOptimizer/optimizerForm/RelicSetTagRenderer.tsx index fb59c27ef..de5b5ce13 100644 --- a/src/lib/tabs/tabOptimizer/optimizerForm/RelicSetTagRenderer.tsx +++ b/src/lib/tabs/tabOptimizer/optimizerForm/RelicSetTagRenderer.tsx @@ -1,5 +1,5 @@ import { Flex, Tag } from 'antd' -import { Constants, RelicSetFilterOptions } from 'lib/constants' +import { Constants, RelicSetFilterOptions } from 'lib/constants/constants' import { Assets } from 'lib/rendering/assets' import React from 'react' diff --git a/src/lib/tabs/tabOptimizer/optimizerForm/SetsOptions.tsx b/src/lib/tabs/tabOptimizer/optimizerForm/SetsOptions.tsx index 80d3055b3..d61fbfd1f 100644 --- a/src/lib/tabs/tabOptimizer/optimizerForm/SetsOptions.tsx +++ b/src/lib/tabs/tabOptimizer/optimizerForm/SetsOptions.tsx @@ -1,6 +1,6 @@ import { Flex } from 'antd' import i18next from 'i18next' -import { Constants, RelicSetFilterOptions, setToId, UnreleasedSets } from 'lib/constants' +import { Constants, RelicSetFilterOptions, setToId, UnreleasedSets } from 'lib/constants/constants' import { Assets } from 'lib/rendering/assets' // This should be memoised with either the t function or resolved language as a dependency diff --git a/src/lib/tabs/tabOptimizer/optimizerForm/SimulatedBuildsGrid.tsx b/src/lib/tabs/tabOptimizer/optimizerForm/SimulatedBuildsGrid.tsx index bcbc1bc98..c8ea30a59 100644 --- a/src/lib/tabs/tabOptimizer/optimizerForm/SimulatedBuildsGrid.tsx +++ b/src/lib/tabs/tabOptimizer/optimizerForm/SimulatedBuildsGrid.tsx @@ -1,9 +1,9 @@ import { CloseOutlined } from '@ant-design/icons' import { IRowNode } from 'ag-grid-community' import { Empty, Flex, Table, TableColumnsType } from 'antd' -import { deleteStatSimulationBuild, renderDefaultSimulationName } from 'lib/controllers/statSimulationController' +import { deleteStatSimulationBuild, renderDefaultSimulationName } from 'lib/simulations/statSimulationController' import { STAT_SIMULATION_GRID_WIDTH } from 'lib/tabs/tabOptimizer/optimizerForm/StatSimulationDisplay' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' import { useEffect } from 'react' import { useTranslation } from 'react-i18next' diff --git a/src/lib/tabs/tabOptimizer/optimizerForm/StatSimulationDisplay.tsx b/src/lib/tabs/tabOptimizer/optimizerForm/StatSimulationDisplay.tsx index 4ec77695e..c25625e22 100644 --- a/src/lib/tabs/tabOptimizer/optimizerForm/StatSimulationDisplay.tsx +++ b/src/lib/tabs/tabOptimizer/optimizerForm/StatSimulationDisplay.tsx @@ -1,7 +1,7 @@ import { DeleteOutlined, DoubleLeftOutlined, DownOutlined, SettingOutlined, UpOutlined } from '@ant-design/icons' import { Button, Flex, Form, Input, InputNumber, Popconfirm, Radio, Select, Typography } from 'antd' -import { Parts, Stats, SubStats } from 'lib/constants' -import { deleteAllStatSimulationBuilds, importOptimizerBuild, saveStatSimulationBuildFromForm, startOptimizerStatSimulation } from 'lib/controllers/statSimulationController' +import { Parts, Stats, SubStats } from 'lib/constants/constants' +import { deleteAllStatSimulationBuilds, importOptimizerBuild, saveStatSimulationBuildFromForm, startOptimizerStatSimulation } from 'lib/simulations/statSimulationController' import { Assets } from 'lib/rendering/assets' import FormCard from 'lib/tabs/tabOptimizer/FormCard' import { OrnamentSetTagRenderer } from 'lib/tabs/tabOptimizer/optimizerForm/OrnamentSetTagRenderer' @@ -10,7 +10,7 @@ import { GenerateBasicSetsOptions } from 'lib/tabs/tabOptimizer/optimizerForm/Se import { SimulatedBuildsGrid } from 'lib/tabs/tabOptimizer/optimizerForm/SimulatedBuildsGrid' import { VerticalDivider } from 'lib/ui/Dividers' import { HeaderText } from 'lib/ui/HeaderText' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' import { useMemo } from 'react' import { useTranslation } from 'react-i18next' diff --git a/src/lib/tabs/tabOptimizer/optimizerForm/TeammateCard.tsx b/src/lib/tabs/tabOptimizer/optimizerForm/TeammateCard.tsx index a7b8097ef..128d1c1ea 100644 --- a/src/lib/tabs/tabOptimizer/optimizerForm/TeammateCard.tsx +++ b/src/lib/tabs/tabOptimizer/optimizerForm/TeammateCard.tsx @@ -2,8 +2,8 @@ import { SyncOutlined } from '@ant-design/icons' import { Button, Flex, Form as AntDForm, Select, Typography } from 'antd' import { CharacterConditionals } from 'lib/conditionals/characterConditionals' import { LightConeConditionals } from 'lib/conditionals/lightConeConditionals' -import { Constants, SACERDOS_RELIVED_ORDEAL_1_STACK, SACERDOS_RELIVED_ORDEAL_2_STACK, Sets } from 'lib/constants' -import { OptimizerTabController } from 'lib/controllers/optimizerTabController' +import { Constants, SACERDOS_RELIVED_ORDEAL_1_STACK, SACERDOS_RELIVED_ORDEAL_2_STACK, Sets } from 'lib/constants/constants' +import { OptimizerTabController } from 'lib/tabs/tabOptimizer/optimizerTabController' import { Message } from 'lib/interactions/message' import { Assets } from 'lib/rendering/assets' import DB from 'lib/state/db' diff --git a/src/lib/tabs/tabOptimizer/optimizerTabConstants.ts b/src/lib/tabs/tabOptimizer/optimizerTabConstants.ts index eae7684a5..c92fe56e4 100644 --- a/src/lib/tabs/tabOptimizer/optimizerTabConstants.ts +++ b/src/lib/tabs/tabOptimizer/optimizerTabConstants.ts @@ -1,9 +1,9 @@ import { GetRowIdParams } from 'ag-grid-community' import { TFunction } from 'i18next' -import { Constants } from 'lib/constants' +import { Constants } from 'lib/constants/constants' import { Gradient } from 'lib/rendering/gradient' import { Renderer } from 'lib/rendering/renderer' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' export const DIGITS_3 = 46 export const DIGITS_4 = 50 diff --git a/src/lib/controllers/optimizerTabController.ts b/src/lib/tabs/tabOptimizer/optimizerTabController.ts similarity index 99% rename from src/lib/controllers/optimizerTabController.ts rename to src/lib/tabs/tabOptimizer/optimizerTabController.ts index 3a7ff7868..dfd55aca3 100644 --- a/src/lib/controllers/optimizerTabController.ts +++ b/src/lib/tabs/tabOptimizer/optimizerTabController.ts @@ -3,8 +3,8 @@ import { inPlaceSort } from 'fast-sort' import { CharacterStats } from 'lib/characters/characterStats' import { CharacterConditionals } from 'lib/conditionals/characterConditionals' import { LightConeConditionals } from 'lib/conditionals/lightConeConditionals' -import { CombatBuffs, ConditionalDataType, Constants, DamageKeys, DEFAULT_STAT_DISPLAY, Stats } from 'lib/constants' -import { SavedSessionKeys } from 'lib/constantsSession' +import { CombatBuffs, ConditionalDataType, Constants, DamageKeys, DEFAULT_STAT_DISPLAY, Stats } from 'lib/constants/constants' +import { SavedSessionKeys } from 'lib/constants/constantsSession' import { RelicsByPart } from 'lib/gpu/webgpuTypes' import { Message } from 'lib/interactions/message' import { OptimizerDisplayData, OptimizerDisplayDataStatSim } from 'lib/optimizer/bufferPacker' @@ -15,8 +15,8 @@ import { GridAggregations } from 'lib/rendering/gradient' import DB from 'lib/state/db' import { SaveState } from 'lib/state/saveState' import { applyMetadataPresetToForm } from 'lib/tabs/tabOptimizer/optimizerForm/RecommendedPresetsButton' -import { TsUtils } from 'lib/TsUtils' -import { Utils } from 'lib/utils' +import { TsUtils } from 'lib/utils/TsUtils' +import { Utils } from 'lib/utils/utils' import { CharacterConditionalMap } from 'types/CharacterConditional' import { Form, Teammate } from 'types/Form' import { LightConeConditionalMap } from 'types/LightConeConditionals' diff --git a/src/lib/tabs/tabOptimizer/rotation/ComboDrawer.tsx b/src/lib/tabs/tabOptimizer/rotation/ComboDrawer.tsx index 932153aa0..6942d3363 100644 --- a/src/lib/tabs/tabOptimizer/rotation/ComboDrawer.tsx +++ b/src/lib/tabs/tabOptimizer/rotation/ComboDrawer.tsx @@ -2,8 +2,8 @@ import { MinusCircleOutlined, PlusCircleOutlined } from '@ant-design/icons' import { Button, Divider, Drawer, Flex, Select } from 'antd' import { CharacterConditionals } from 'lib/conditionals/characterConditionals' import { LightConeConditionals } from 'lib/conditionals/lightConeConditionals' -import { ConditionalDataType, setToId } from 'lib/constants' -import { OptimizerTabController } from 'lib/controllers/optimizerTabController' +import { ConditionalDataType, setToId } from 'lib/constants/constants' +import { OptimizerTabController } from 'lib/tabs/tabOptimizer/optimizerTabController' import { ComboBooleanConditional, ComboCharacter, diff --git a/src/lib/tabs/tabRelics/RelicFilterBar.tsx b/src/lib/tabs/tabRelics/RelicFilterBar.tsx index 9981bf375..010b82f37 100644 --- a/src/lib/tabs/tabRelics/RelicFilterBar.tsx +++ b/src/lib/tabs/tabRelics/RelicFilterBar.tsx @@ -2,7 +2,7 @@ import { ClearOutlined } from '@ant-design/icons' import { Button, Flex, Select, theme, Tooltip, Typography } from 'antd' import CheckableTag from 'antd/lib/tag/CheckableTag' import { useSubscribe } from 'hooks/useSubscribe' -import { Constants, Sets, SetsRelics, setToId, Stats, UnreleasedSets } from 'lib/constants' +import { Constants, Sets, SetsRelics, setToId, Stats, UnreleasedSets } from 'lib/constants/constants' import { Hint } from 'lib/interactions/hint' import { SettingOptions } from 'lib/overlays/drawers/SettingsDrawer' import { RelicScorer } from 'lib/relics/relicScorerPotential' @@ -11,10 +11,10 @@ import { Renderer } from 'lib/rendering/renderer' import DB, { DBMetadataCharacter } from 'lib/state/db' import { SaveState } from 'lib/state/saveState' import CharacterSelect from 'lib/tabs/tabOptimizer/optimizerForm/CharacterSelect' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' import { HeaderText } from 'lib/ui/HeaderText' import { TooltipImage } from 'lib/ui/TooltipImage' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' import React, { useEffect, useMemo, useState } from 'react' import { useTranslation } from 'react-i18next' import { ReactElement } from 'types/Components' diff --git a/src/lib/tabs/tabRelics/RelicPreview.tsx b/src/lib/tabs/tabRelics/RelicPreview.tsx index 4c7e9478c..9dda30440 100644 --- a/src/lib/tabs/tabRelics/RelicPreview.tsx +++ b/src/lib/tabs/tabRelics/RelicPreview.tsx @@ -1,5 +1,5 @@ import { Card, Divider, Flex } from 'antd' -import { iconSize } from 'lib/constantsUi' +import { iconSize } from 'lib/constants/constantsUi' import { RelicScoringResult } from 'lib/relics/relicScorerPotential' import { Assets } from 'lib/rendering/assets' diff --git a/src/lib/tabs/tabRelics/RelicsTab.jsx b/src/lib/tabs/tabRelics/RelicsTab.jsx index debdf1628..4f40173a5 100644 --- a/src/lib/tabs/tabRelics/RelicsTab.jsx +++ b/src/lib/tabs/tabRelics/RelicsTab.jsx @@ -1,7 +1,7 @@ import { SettingOutlined } from '@ant-design/icons' import { AgGridReact } from 'ag-grid-react' import { Button, Flex, InputNumber, Popconfirm, Popover, Select, theme, Typography } from 'antd' -import { Constants, Stats } from 'lib/constants' +import { Constants, Stats } from 'lib/constants/constants' import { arrowKeyGridNavigation } from 'lib/interactions/arrowKeyGridNavigation' import { Hint } from 'lib/interactions/hint' import { Message } from 'lib/interactions/message' diff --git a/src/lib/tabs/tabRelics/relicPreview/GenerateStat.tsx b/src/lib/tabs/tabRelics/relicPreview/GenerateStat.tsx index 5ae85966c..faa1609b2 100644 --- a/src/lib/tabs/tabRelics/relicPreview/GenerateStat.tsx +++ b/src/lib/tabs/tabRelics/relicPreview/GenerateStat.tsx @@ -1,10 +1,10 @@ import { Flex } from 'antd' import { RightIcon } from 'icons/RightIcon' -import { iconSize } from 'lib/constantsUi' +import { iconSize } from 'lib/constants/constantsUi' import { Assets } from 'lib/rendering/assets' import { Renderer } from 'lib/rendering/renderer' import RelicStatText from 'lib/tabs/tabRelics/relicPreview/RelicStatText' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' import { ReactElement } from 'react' import { useTranslation } from 'react-i18next' import { Relic, StatRolls } from 'types/Relic' diff --git a/src/lib/tabs/tabShowcase/RelicScorerTab.jsx b/src/lib/tabs/tabShowcase/RelicScorerTab.jsx index 1a44e1b32..570b6f5a8 100644 --- a/src/lib/tabs/tabShowcase/RelicScorerTab.jsx +++ b/src/lib/tabs/tabShowcase/RelicScorerTab.jsx @@ -8,9 +8,9 @@ import Icon, { } from '@ant-design/icons' import { Button, Dropdown, Flex, Form, Input, Segmented, theme, Typography } from 'antd' import { CharacterPreview } from 'lib/characterPreview/CharacterPreview' -import { Constants, CURRENT_DATA_VERSION, officialOnly } from 'lib/constants' -import { SavedSessionKeys } from 'lib/constantsSession' -import { OptimizerTabController } from 'lib/controllers/optimizerTabController' +import { Constants, CURRENT_DATA_VERSION, officialOnly } from 'lib/constants/constants' +import { SavedSessionKeys } from 'lib/constants/constantsSession' +import { OptimizerTabController } from 'lib/tabs/tabOptimizer/optimizerTabController' import { CharacterConverter } from 'lib/importer/characterConverter' import { Message } from 'lib/interactions/message' import { calculateBuild } from 'lib/optimizer/calculateBuild' @@ -19,7 +19,7 @@ import { Assets } from 'lib/rendering/assets' import DB, { AppPages, PageToRoute } from 'lib/state/db' import { SaveState } from 'lib/state/saveState' import { applySpdPreset } from 'lib/tabs/tabOptimizer/optimizerForm/RecommendedPresetsButton' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' import PropTypes from 'prop-types' import React, { useEffect, useMemo, useRef, useState } from 'react' import { useTranslation } from 'react-i18next' diff --git a/src/lib/ui/LoadingBlurredImage.tsx b/src/lib/ui/LoadingBlurredImage.tsx index 2784107fc..5000568e7 100644 --- a/src/lib/ui/LoadingBlurredImage.tsx +++ b/src/lib/ui/LoadingBlurredImage.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useState } from 'react' -import { TsUtils } from 'lib/TsUtils' +import { TsUtils } from 'lib/utils/TsUtils' interface LoadingBlurredImageProps extends React.ImgHTMLAttributes { src: string diff --git a/src/lib/TsUtils.ts b/src/lib/utils/TsUtils.ts similarity index 97% rename from src/lib/TsUtils.ts rename to src/lib/utils/TsUtils.ts index 490c82b33..5cd60eff9 100644 --- a/src/lib/TsUtils.ts +++ b/src/lib/utils/TsUtils.ts @@ -1,7 +1,7 @@ import i18next, { DefaultNamespace, KeyPrefix, Namespace, TFunction } from 'i18next' import stringify from 'json-stable-stringify' import { v4 as uuidv4 } from 'uuid' -import { Constants } from './constants' +import { Constants } from 'lib/constants/constants' export const TsUtils = { // Returns the same object diff --git a/src/lib/utils.js b/src/lib/utils/utils.js similarity index 99% rename from src/lib/utils.js rename to src/lib/utils/utils.js index cbe9d6f3e..39074c73d 100644 --- a/src/lib/utils.js +++ b/src/lib/utils/utils.js @@ -1,7 +1,7 @@ import * as htmlToImage from 'html-to-image' import i18next from 'i18next' import stringify from 'json-stable-stringify' -import { Constants } from 'lib/constants' +import { Constants } from 'lib/constants/constants' import DB from 'lib/state/db' import { v4 as uuidv4 } from 'uuid' diff --git a/src/lib/worker/optimizerWorker.ts b/src/lib/worker/optimizerWorker.ts index eb1a0f657..6a88932ef 100644 --- a/src/lib/worker/optimizerWorker.ts +++ b/src/lib/worker/optimizerWorker.ts @@ -1,7 +1,7 @@ import { CharacterConditionals } from 'lib/conditionals/characterConditionals' import { BasicStatsObject } from 'lib/conditionals/conditionalConstants' import { LightConeConditionals } from 'lib/conditionals/lightConeConditionals' -import { Constants, OrnamentSetToIndex, RelicSetToIndex, SetsOrnaments, SetsRelics, Stats, StatsValues } from 'lib/constants' +import { Constants, OrnamentSetToIndex, RelicSetToIndex, SetsOrnaments, SetsRelics, Stats, StatsValues } from 'lib/constants/constants' import { DynamicConditional } from 'lib/gpu/conditionals/dynamicConditionals' import { RelicsByPart } from 'lib/gpu/webgpuTypes' import { BufferPacker } from 'lib/optimizer/bufferPacker' diff --git a/src/lib/worker/workerPool.ts b/src/lib/worker/workerPool.ts index 020fbe26b..6cb8f829b 100644 --- a/src/lib/worker/workerPool.ts +++ b/src/lib/worker/workerPool.ts @@ -1,4 +1,4 @@ -import { Constants } from 'lib/constants' +import { Constants } from 'lib/constants/constants' import { RelicsByPart } from 'lib/gpu/webgpuTypes' import { BufferPacker } from 'lib/optimizer/bufferPacker' import OptimizerWorker from 'lib/worker/optimizerWorker.ts?worker&inline' diff --git a/src/types/Character.d.ts b/src/types/Character.d.ts index da2eada59..f74cd6331 100644 --- a/src/types/Character.d.ts +++ b/src/types/Character.d.ts @@ -1,5 +1,5 @@ import { CustomPortrait } from 'types/store' -import { Parts, SetsOrnaments, SetsRelics, StatsValues } from '../lib/constants' +import { Parts, SetsOrnaments, SetsRelics, StatsValues } from 'lib/constants/constants' import { GUID } from './Common' import { Form } from './Form' diff --git a/src/types/Conditionals.d.ts b/src/types/Conditionals.d.ts index 61f458804..2d2a19b76 100644 --- a/src/types/Conditionals.d.ts +++ b/src/types/Conditionals.d.ts @@ -60,11 +60,11 @@ export type ContentComponentMap = { // extracted content to apply to export type ContentItem = { [K in keyof ContentComponentMap]: { - formItem: K - id: string - content: string - teammateIndex?: number -} & Omit, 'content' | 'title'> + formItem: K + id: string + content: string + teammateIndex?: number + } & Omit, 'content' | 'title'> }[keyof ContentComponentMap] export type ConditionalBuff = diff --git a/src/types/Form.d.ts b/src/types/Form.d.ts index 67a1423b4..86b6f504c 100644 --- a/src/types/Form.d.ts +++ b/src/types/Form.d.ts @@ -1,6 +1,6 @@ // import { } from "./Common"; -import { SetsOrnaments } from 'lib/constants' -import { Simulation } from 'lib/controllers/statSimulationController' +import { SetsOrnaments } from 'lib/constants/constants' +import { Simulation } from 'lib/simulations/statSimulationController' import { CharacterId, Eidolon } from 'types/Character' import { CharacterConditionalMap } from 'types/CharacterConditional' import { SuperImpositionLevel } from 'types/LightCone' diff --git a/src/types/LightCone.d.ts b/src/types/LightCone.d.ts index 9e3d345d9..ea82e00b4 100644 --- a/src/types/LightCone.d.ts +++ b/src/types/LightCone.d.ts @@ -1,4 +1,4 @@ -import { StatsValues } from 'lib/constants' +import { StatsValues } from 'lib/constants/constants' import { PreconvertStatKey } from 'lib/importer/characterConverter' import { DataMineId } from './Common' import { LightConeRanksDescriptions } from './LightConeConditionals' diff --git a/src/types/Relic.d.ts b/src/types/Relic.d.ts index d623f1b85..a6ed53da5 100644 --- a/src/types/Relic.d.ts +++ b/src/types/Relic.d.ts @@ -1,4 +1,4 @@ -import { MainStats, Parts, Sets, StatsValues } from 'lib/constants' +import { MainStats, Parts, Sets, StatsValues } from 'lib/constants/constants' import { AugmentedStats } from 'lib/relics/relicAugmenter' import { RelicScoringWeights } from 'lib/tabs/tabRelics/RelicFilterBar' import { GUID } from './Common' diff --git a/src/types/store.ts b/src/types/store.ts index 6c419f4f6..1ec92caee 100644 --- a/src/types/store.ts +++ b/src/types/store.ts @@ -3,7 +3,7 @@ import { ComboState } from 'lib/optimizer/rotation/comboDrawerController' import { ColorThemeOverrides } from 'lib/rendering/theme' import { StatSimTypes } from 'lib/tabs/tabOptimizer/optimizerForm/StatSimulationDisplay' import { Form } from 'types/Form' -import { ComputeEngine } from '../lib/constants' +import { ComputeEngine } from 'lib/constants/constants' import { Build, Character, CharacterId } from './Character' import { Relic } from './Relic' diff --git a/src/window.d.ts b/src/window.d.ts index 08f9f467b..8e793debf 100644 --- a/src/window.d.ts +++ b/src/window.d.ts @@ -6,8 +6,8 @@ import { HookAPI } from 'antd/lib/modal/useModal' import { CharacterStats } from 'lib/characters/characterStats' import { CharacterConditionals } from 'lib/conditionals/characterConditionals' import { LightConeConditionals } from 'lib/conditionals/lightConeConditionals' -import { Constants } from 'lib/constants' -import { OptimizerTabController } from 'lib/controllers/optimizerTabController' +import { Constants } from 'lib/constants/constants' +import { OptimizerTabController } from 'lib/tabs/tabOptimizer/optimizerTabController' import { CharacterConverter } from 'lib/importer/characterConverter' import { Hint } from 'lib/interactions/hint' import { Message } from 'lib/interactions/message' @@ -24,7 +24,7 @@ import { ColorThemeOverrides } from 'lib/rendering/theme' import { DataParser } from 'lib/state/dataParser' import { DB } from 'lib/state/db' import { SaveState } from 'lib/state/saveState' -import { Utils } from 'lib/utils' +import { Utils } from 'lib/utils/utils' import { WorkerPool } from 'lib/worker/workerPool' import { DispatchWithoutAction, RefObject } from 'react' import { Build, Character } from 'types/Character'