[Feature] Clickers (Bubba, Poppy and Orion)

app/account/obols/content.tsx

@@ -12,7 +12,7 @@ import ShadowBox from "../../../components/base/ShadowBox";
 import { Player } from "../../../data/domain/player";
 import LeftNavButton from "../../../components/base/LeftNavButton";
 import ObolsInfo from "../../../components/account/task-board/obolsInfo";
-import { ObolsData, ObolType } from "../../../data/domain/obols";
+import { ObolsData, ObolType } from "../../../data/domain/world-2/obols";
 import TextAndLabel from "../../../components/base/TextAndLabel";
 import TipDisplay, { TipDirection } from "../../../components/base/TipDisplay";
 import { ItemStat } from "../../../data/domain/items";

app/account/slab/content.tsx

@@ -11,7 +11,7 @@
 import TipDisplay, { TipDirection } from '../../../components/base/TipDisplay';
 import IconImage from '../../../components/base/IconImage';
 import { SourcesModel } from '../../../data/domain/model/sourcesModel';
-import { customHandCraftedListOfUnobtainableItems, Slab as SlabDomain } from '../../../data/domain/slab';
+import { customHandCraftedListOfUnobtainableItems, Slab as SlabDomain } from '../../../data/domain/world-5/slab';
 import TextAndLabel, { ComponentAndLabel } from '../../../components/base/TextAndLabel';
 import { NoteModel } from '../../../data/domain/model/noteModel';
 import ShadowBox from '../../../components/base/ShadowBox';
@@ -67,7 +67,7 @@
         }
 
         return slabInfo.obtainableItems.filter(item => !item.obtained).filter(item => !customHandCraftedListOfUnobtainableItems.includes(item.internalName));
     }, [slabInfo, lastUpdated]);
 
     const obtainedItems = useMemo(() => {
         if (!slabInfo) {
@@ -75,7 +75,7 @@
         }
 
         return slabInfo.obtainableItems.filter(item => item.obtained);
     }, [slabInfo, lastUpdated]);
 
     if (!slabInfo) {
         return <Box>Loading</Box>

app/account/tome/content.tsx

@@ -9,7 +9,7 @@ import {
 import ShadowBox from '../../../components/base/ShadowBox';
 import { useAppDataStore } from '../../../lib/providers/appDataStoreProvider';
 import { useShallow } from 'zustand/react/shallow';
-import { TomeLine, Tome as TomeDomain, TomeScoreColors } from '../../../data/domain/tome';
+import { TomeLine, Tome as TomeDomain, TomeScoreColors } from '../../../data/domain/world-4/tome';
 import { CircleInformation } from 'grommet-icons';
 import TipDisplay from '../../../components/base/TipDisplay';
 import { Player } from '../../../data/domain/player';

app/players/content.tsx

@@ -21,10 +21,10 @@
 import { SkillsIndex } from "../../data/domain/SkillsIndex";
 import { ClassIndex, ClassTalentMap, GetTalentArray } from '../../data/domain/talents';
 import { Capacity, playerInventoryBagMapping } from '../../data/domain/capacity';
-import { Alchemy, Bubble, CauldronIndex } from "../../data/domain/alchemy";
+import { Alchemy, Bubble, CauldronIndex } from "../../data/domain/world-2/alchemy/alchemy";
 import { Stamp } from '../../data/domain/world-1/stamps';
-import { Shrine } from '../../data/domain/shrines';
-import { PlayerStatues } from '../../data/domain/statues';
+import { Shrine } from '../../data/domain/world-3/construction/shrines';
+import { PlayerStatues } from '../../data/domain/world-1/statues';
 
 import { getCoinsArray, nFormatter } from '../../data/utility';
 import CoinsDisplay from '../../components/coinsDisplay';
@@ -34,37 +34,37 @@
 import { Alert, CircleInformation, Next } from 'grommet-icons';
 import { Item, ItemStat, Food, DropSource } from '../../data/domain/items';
 import { Storage } from '../../data/domain/storage';
-import { Prayer } from '../../data/domain/prayers';
+import { Prayer } from '../../data/domain/world-3/prayers';
 import { TimeDown, TimeUp } from '../../components/base/TimeDisplay';
-import { Worship } from '../../data/domain/worship';
+import { Worship } from '../../data/domain/world-3/worship';
 import ObolsInfo from '../../components/account/task-board/obolsInfo';
 import TextAndLabel, { ComponentAndLabel } from '../../components/base/TextAndLabel';
 import { Skilling } from '../../data/domain/skilling';
 import { Family } from '../../data/domain/family';
-import { Achievement, AchievementConst } from '../../data/domain/achievements';
+import { Achievement } from '../../data/domain/achievements';
 import { MapInfo } from '../../data/domain/maps';
 import { EnemyInfo } from '../../data/domain/enemies';
 import Stat from '../../components/base/Stat';
 import IconImage from '../../components/base/IconImage';
 import { SourcesModel } from '../../data/domain/model/sourcesModel';
-import { Sigils } from '../../data/domain/sigils';
-import { Chip } from '../../data/domain/lab';
-import { AnvilWrapper } from '../../data/domain/anvil';
+import { Sigils } from '../../data/domain/world-2/alchemy/sigils';
+import { Chip } from '../../data/domain/world-4/lab';
+import { AnvilWrapper } from '../../data/domain/world-1/anvil';
 import { Alerts, CardSetAlert } from '../../data/domain/alerts';
-import { POExtra } from '../../data/domain/postoffice';
-import { Cooking } from '../../data/domain/cooking';
-import { BeanstalkingBonusType, Sneaking } from '../../data/domain/world-6/sneaking';
+import { POExtra } from '../../data/domain/world-2/postoffice';
+import { Cooking } from '../../data/domain/world-4/cooking';
+import { Sneaking } from '../../data/domain/world-6/sneaking';
 
 import { useShallow } from 'zustand/react/shallow'
 import { useAppDataStore } from '../../lib/providers/appDataStoreProvider';
-import { Bribe } from '../../data/domain/bribes';
+import { Bribe } from '../../data/domain/world-1/bribes';
 import { Card } from '../../data/domain/cards';
 import { EquipmentSets } from '../../data/domain/misc/equipmentSets';
 import { LegendTalents } from '../../data/domain/world-7/legendTalents';
 import { Companion } from '../../data/domain/companions';
 import { Votes } from '../../data/domain/world-2/votes';
 
 function ItemSourcesDisplay({ sources, dropInfo }: { sources: SourcesModel, dropInfo: DropSource[] }) {
 
     const possibleSources = useMemo(() => {
         if (!sources) {
@@ -246,7 +246,7 @@
             return (new Date().getTime() - lastUpdated.getTime()) / 1000;
         }
         return 0;
     }, [theData, lastUpdated]);
 
     return (
         <Box pad="medium">
@@ -316,6 +316,7 @@
                     <Stat stat={player.crystalChance} />
                     <Stat stat={player.doubleClaimChance} />
                     <Stat stat={player.monsterCash} />
+                    <Stat stat={player.buildSpeed} />
                     {playerWorshipInfo.maxCharge > 0 &&
                         <Box>
                             <Text size="small">Charge Rate = {Math.round(playerWorshipInfo.chargeRate * 24)}% / day</Text>

app/world-1/anvil/content.tsx

@@ -8,7 +8,7 @@ import {
     Text,
 } from 'grommet'
 import { useMemo, useState } from 'react';
-import { Anvil as AnvilModel, AnvilProduct, AnvilWrapper } from '../../../data/domain/anvil';
+import { Anvil as AnvilModel, AnvilProduct, AnvilWrapper } from '../../../data/domain/world-1/anvil';
 import { Player } from '../../../data/domain/player';
 import IconImage from '../../../components/base/IconImage';
 import ShadowBox from '../../../components/base/ShadowBox';

app/world-1/forge/content.tsx

@@ -9,7 +9,7 @@ import {
 import { useEffect, useState, useMemo } from 'react';
 
 import ShadowBox from '../../../components/base/ShadowBox';
-import { Forge as ForgeDomain } from '../../../data/domain/forge';
+import { Forge as ForgeDomain } from '../../../data/domain/world-1/forge';
 import TextAndLabel, { ComponentAndLabel } from '../../../components/base/TextAndLabel';
 import CoinsDisplay from '../../../components/coinsDisplay';
 import { getCoinsArray, nFormatter } from '../../../data/utility';

app/world-1/stamps/content.tsx

@@ -24,7 +24,7 @@ import ItemSourcesDisplay from "../../../components/base/ItemSourceDisplay";
 import TipDisplay, { TipDirection } from "../../../components/base/TipDisplay";
 import IconImage from "../../../components/base/IconImage";
 import TextAndLabel, { ComponentAndLabel } from "../../../components/base/TextAndLabel";
-import { AtomCollider } from "../../../data/domain/atomCollider";
+import { AtomCollider } from "../../../data/domain/world-3/construction/atomCollider";
 import { Storage } from "../../../data/domain/storage";
 import { CircleInformation, List, Grid as GridIcon } from "grommet-icons";
 import { normalizeColor } from "grommet/utils";

app/world-2/alchemy/content.tsx

@@ -13,7 +13,7 @@ import {
 } from "grommet"
 import styled from 'styled-components'
 
-import { Alchemy as AlchemyData, Cauldron, Bubble, CauldronBoostIndex, Vial } from '../../../data/domain/alchemy';
+import { Alchemy as AlchemyData, Cauldron, Bubble, CauldronBoostIndex, Vial } from '../../../data/domain/world-2/alchemy/alchemy';
 import { Achievement, AchievementConst } from '../../../data/domain/achievements'
 import { useEffect, useState, useContext } from 'react';
 import { nFormatter, round } from '../../../data/utility'
@@ -22,10 +22,10 @@ import { Item } from "../../../data/domain/items";
 import TipDisplay, { TipDirection } from "../../../components/base/TipDisplay";
 import { Ascending } from "grommet-icons";
 import IconImage from "../../../components/base/IconImage";
-import { Sigils } from "../../../data/domain/sigils";
+import { Sigils } from "../../../data/domain/world-2/alchemy/sigils";
 import TextAndLabel, { ComponentAndLabel } from "../../../components/base/TextAndLabel";
 import { TimeDown } from "../../../components/base/TimeDisplay";
-import { AtomCollider } from "../../../data/domain/atomCollider";
+import { AtomCollider } from "../../../data/domain/world-3/construction/atomCollider";
 import P2WDisplay from "../../../components/world-2/alchemy/p2w";
 import { useAppDataStore } from "../../../lib/providers/appDataStoreProvider";
 import { useShallow } from "zustand/react/shallow";

app/world-2/arcade/content.tsx

@@ -8,7 +8,7 @@ import {
 import { useEffect, useState, useMemo } from 'react';
 import ShadowBox from '../../../components/base/ShadowBox';
 import TextAndLabel, { ComponentAndLabel } from '../../../components/base/TextAndLabel';
-import { Arcade as ArcadeData } from '../../../data/domain/arcade';
+import { Arcade as ArcadeData } from '../../../data/domain/world-2/arcade';
 import { Stamp } from '../../../data/domain/world-1/stamps';
 import { StaticTime, TimeDisplaySize } from '../../../components/base/TimeDisplay';
 import IconImage from '../../../components/base/IconImage';

app/world-3/construction/content.tsx

@@ -18,27 +18,27 @@ import React, { useEffect, useContext, useState, useMemo } from 'react';
 
 import ShadowBox from '../../../components/base/ShadowBox';
 import TabButton from '../../../components/base/TabButton';
-import { Refinery } from '../../../data/domain/refinery';
+import { Refinery } from '../../../data/domain/world-3/construction/refinery';
 import { Item } from '../../../data/domain/items';
 import { Storage } from '../../../data/domain/storage';
 import { lavaLog, nFormatter, range, toTime } from '../../../data/utility';
 import { StaticTime, TimeDisplaySize, TimeDown } from '../../../components/base/TimeDisplay';
-import { INDEX_DAYS_SINCE_SAMPLE_ARTIFACT, Printer, Sample } from '../../../data/domain/printer';
+import { INDEX_DAYS_SINCE_SAMPLE_ARTIFACT, Printer, Sample } from '../../../data/domain/world-3/construction/printer';
 import { Player } from '../../../data/domain/player';
 import { CircleInformation, Star, StatusWarning } from 'grommet-icons';
 import TipDisplay, { TipDirection } from '../../../components/base/TipDisplay';
-import { Deathnote } from '../../../data/domain/deathnote';
+import { Deathnote } from '../../../data/domain/world-3/construction/deathnote';
 import TextAndLabel, { ComponentAndLabel } from '../../../components/base/TextAndLabel';
 import { ClassIndex, Talent } from '../../../data/domain/talents';
 import { TaskBoard } from '../../../data/domain/tasks';
-import { Shrine } from '../../../data/domain/shrines';
+import { Shrine } from '../../../data/domain/world-3/construction/shrines';
 import { MapInfo } from '../../../data/domain/maps';
 import IconImage from '../../../components/base/IconImage';
 import { BuildingsDisplay } from '../../../components/world-3/construction/buildings';
 import { SaltLickDisplay } from '../../../components/world-3/construction/saltLick';
-import { ArtifactStatus } from '../../../data/domain/sailing/artifacts';
+import { ArtifactStatus } from '../../../data/domain/world-5/sailing/artifacts';
 import { AtomColliderDisplay } from '../../../components/world-3/construction/atomCollider';
-import { Sailing } from '../../../data/domain/sailing';
+import { Sailing } from '../../../data/domain/world-5/sailing/sailing';
 import { useShallow } from 'zustand/react/shallow';
 import { useAppDataStore } from '../../../lib/providers/appDataStoreProvider';
 

app/world-3/equinox/content.tsx

@@ -10,7 +10,7 @@ import {
 } from 'grommet'
 import ShadowBox from '../../../components/base/ShadowBox';
 
-import { Equinox as EquinoxDomain, isFoodLust } from '../../../data/domain/equinox';
+import { Equinox as EquinoxDomain, isFoodLust } from '../../../data/domain/world-3/equinox';
 
 import { TimeDown } from "../../../components/base/TimeDisplay";
 import TextAndLabel, { ComponentAndLabel } from '../../../components/base/TextAndLabel';

app/world-3/trapping/content.tsx

@@ -14,7 +14,7 @@ import {
 } from 'grommet'
 import { useContext } from 'react';
 
-import { Trap, TrapSet } from '../../../data/domain/traps';
+import { Trap, TrapSet } from '../../../data/domain/world-3/traps';
 import ShadowBox from '../../../components/base/ShadowBox';
 import { Player } from '../../../data/domain/player';
 import { SkillsIndex } from "../../../data/domain/SkillsIndex";

app/world-4/breeding/content.tsx

@@ -15,7 +15,7 @@ import { ArenaBonusDisplay } from '../../../components/world-4/breeding/arena';
 import { PetsDisplay } from '../../../components/world-4/breeding/pets';
 import TextAndLabel, { ComponentAndLabel } from '../../../components/base/TextAndLabel';
 import { StaticTime, TimeDown } from '../../../components/base/TimeDisplay';
-import { Breeding as BreedingDomain } from '../../../data/domain/breeding';
+import { Breeding as BreedingDomain } from '../../../data/domain/world-4/breeding';
 import { nFormatter } from '../../../data/utility';
 import { useAppDataStore } from '../../../lib/providers/appDataStoreProvider';
 import { useShallow } from 'zustand/react/shallow';

app/world-4/cooking/content.tsx

@@ -15,11 +15,11 @@ import ShadowBox from '../../../components/base/ShadowBox';
 import { TimeDown } from '../../../components/base/TimeDisplay';
 import TipDisplay, { TipDirection } from '../../../components/base/TipDisplay';
 import CoinsDisplay from '../../../components/coinsDisplay';
-import { territoryNiceNames } from '../../../data/domain/breeding';
-import { Cooking as CookingDomain, Kitchen, KitchenStatus, Meal, UpgradeType } from '../../../data/domain/cooking';
+import { territoryNiceNames } from '../../../data/domain/world-4/breeding';
+import { Cooking as CookingDomain, Kitchen, KitchenStatus, Meal, UpgradeType } from '../../../data/domain/world-4/cooking';
 import { getCoinsArray, nFormatter, notateNumber, toTime } from '../../../data/utility';
 import TextAndLabel, { ComponentAndLabel } from '../../../components/base/TextAndLabel';
-import { AtomCollider } from '../../../data/domain/atomCollider';
+import { AtomCollider } from '../../../data/domain/world-3/construction/atomCollider';
 import { Ascending, CircleInformation } from 'grommet-icons';
 import { useAppDataStore } from '../../../lib/providers/appDataStoreProvider';
 import { useShallow } from 'zustand/react/shallow';

app/world-4/lab/content.tsx

@@ -11,12 +11,12 @@ import IconImage from '../../../components/base/IconImage';
 import ShadowBox from '../../../components/base/ShadowBox';
 import TabButton from '../../../components/base/TabButton';
 import TipDisplay, { TipDirection } from '../../../components/base/TipDisplay';
-import { Chip, Lab as LabDomain } from '../../../data/domain/lab';
+import { Chip, Lab as LabDomain } from '../../../data/domain/world-4/lab';
 import { Player } from '../../../data/domain/player';
 import { SkillsIndex } from "../../../data/domain/SkillsIndex";
 import { CharacterBox } from '../../../components/base/CharacterBox';
 import { ComponentAndLabel } from '../../../components/base/TextAndLabel';
-import { Rift, SkillMastery } from '../../../data/domain/rift';
+import { Rift, SkillMastery } from '../../../data/domain/world-4/rift';
 import { useAppDataStore } from '../../../lib/providers/appDataStoreProvider';
 import { useShallow } from 'zustand/react/shallow';
 

app/world-4/rift/content.tsx

@@ -10,13 +10,13 @@ import IconImage from '../../../components/base/IconImage';
 import ShadowBox from '../../../components/base/ShadowBox';
 import TabButton from '../../../components/base/TabButton';
 import TextAndLabel, { ComponentAndLabel } from '../../../components/base/TextAndLabel';
-import { ConstructionMastery, KillroyPrime, Rift, RiftBonus, SkillMastery } from '../../../data/domain/rift';
+import { ConstructionMastery, KillroyPrime, Rift, RiftBonus, SkillMastery } from '../../../data/domain/world-4/rift';
 import { SkillsIndex } from '../../../data/domain/SkillsIndex';
 import { Skilling } from '../../../data/domain/skilling';
 import { ImageData } from '../../../data/domain/imageData';
 import { Player } from '../../../data/domain/player';
 import TipDisplay, { TipDirection } from '../../../components/base/TipDisplay';
-import { Construction } from '../../../data/domain/construction';
+import { Construction } from '../../../data/domain/world-3/construction/construction';
 import { nFormatter } from '../../../data/utility';
 import { useAppDataStore } from '../../../lib/providers/appDataStoreProvider';
 import { useShallow } from 'zustand/react/shallow';

app/world-5/divinity/content.tsx

@@ -11,7 +11,7 @@ import IconImage from '../../../components/base/IconImage';
 import ShadowBox from '../../../components/base/ShadowBox';
 import TabButton from '../../../components/base/TabButton';
 import TextAndLabel, { ComponentAndLabel } from '../../../components/base/TextAndLabel';
-import { Divinity as DivinityDomain } from '../../../data/domain/divinity';
+import { Divinity as DivinityDomain } from '../../../data/domain/world-5/divinity';
 import { Player } from '../../../data/domain/player';
 import { Skilling } from '../../../data/domain/skilling';
 import { SkillsIndex } from '../../../data/domain/SkillsIndex';

app/world-5/gaming/content.tsx

@@ -9,7 +9,7 @@ import { useEffect, useMemo, useState } from 'react';
 import ShadowBox from '../../../components/base/ShadowBox';
 import { ComponentAndLabel } from '../../../components/base/TextAndLabel';
 import { TimeDown } from '../../../components/base/TimeDisplay';
-import { Gaming as GamingDomain } from '../../../data/domain/gaming';
+import { Gaming as GamingDomain } from '../../../data/domain/world-5/gaming';
 import { nFormatter } from '../../../data/utility';
 import { useAppDataStore } from '../../../lib/providers/appDataStoreProvider';
 import { useShallow } from 'zustand/react/shallow';

app/world-5/sailing/content.tsx

@@ -17,8 +17,8 @@ import TabButton from '../../../components/base/TabButton';
 import TextAndLabel, { ComponentAndLabel } from '../../../components/base/TextAndLabel';
 import { TimeDisplaySize, TimeDown } from '../../../components/base/TimeDisplay';
 import TipDisplay, { TipDirection } from '../../../components/base/TipDisplay';
-import { BoatUpgradeType, CaptainTrait, IslandStatus, Sailing as SailingDomain } from '../../../data/domain/sailing';
-import { ArtifactStatus } from '../../../data/domain/sailing/artifacts';
+import { BoatUpgradeType, CaptainTrait, IslandStatus, Sailing as SailingDomain } from '../../../data/domain/world-5/sailing/sailing';
+import { ArtifactStatus } from '../../../data/domain/world-5/sailing/artifacts';
 import { nFormatter, range } from '../../../data/utility';
 import styled from 'styled-components';
 import { useAppDataStore } from '../../../lib/providers/appDataStoreProvider';

components/account/task-board/obolsInfo.tsx

@@ -1,7 +1,7 @@
 import { Box, Text } from "grommet";
 import { useEffect, useMemo, useState } from "react";
 import { ItemStat } from "../../../data/domain/items";
-import { ObolsData, ObolType } from "../../../data/domain/obols";
+import { ObolsData, ObolType } from "../../../data/domain/world-2/obols";
 import IconImage from "../../base/IconImage";
 import TextAndLabel, { ComponentAndLabel } from "../../base/TextAndLabel";
 import TipDisplay, { TipDirection } from "../../base/TipDisplay";

components/dashboard/dashboard.tsx

@@ -15,7 +15,7 @@ import TipDisplay from "../base/TipDisplay";
 import { Player } from "../../data/domain/player";
 import CoinsDisplay from "../coinsDisplay";
 import { TimeDown } from "../base/TimeDisplay";
-import { Arcade } from "../../data/domain/arcade";
+import { Arcade } from "../../data/domain/world-2/arcade";
 import { AFKTypeEnum } from "../../data/domain/enum/aFKTypeEnum";
 import { useAppDataStore } from "../../lib/providers/appDataStoreProvider";
 import { DataStatus } from "../../lib/stores/appDataStore";

components/world-1/stampTableView.tsx

@@ -26,7 +26,7 @@ import ShadowBox from "../base/ShadowBox";
 import CoinsDisplay from "../coinsDisplay";
 import { Item } from "../../data/domain/items";
 import { Storage } from "../../data/domain/storage";
-import { AtomCollider } from "../../data/domain/atomCollider";
+import { AtomCollider } from "../../data/domain/world-3/construction/atomCollider";
 
 enum StampStatus {
     NoCalculator = 'Unknown',