diff --git a/src/data/layers/cloth.tsx b/src/data/layers/cloth.tsx index bff3bf6..458b8c9 100644 --- a/src/data/layers/cloth.tsx +++ b/src/data/layers/cloth.tsx @@ -33,11 +33,13 @@ import { computed, ref, unref } from "vue"; import boxes from "./boxes"; import dyes from "./dyes"; import { ElfBuyable } from "./elves"; +import factory from "./factory"; import management from "./management"; import metal from "./metal"; import paper from "./paper"; import plastic from "./plastic"; import reindeer from "./reindeer"; +import routing from "./routing"; import trees from "./trees"; import workshop from "./workshop"; import packing from "./packing" @@ -550,7 +552,16 @@ const layer = createLayer(id, function (this: BaseLayer) { description: "Yellow Dye", enabled: dyes.masteryEffectActive })), - reindeer.reindeer.cupid.modifier + reindeer.reindeer.cupid.modifier, + createMultiplicativeModifier(() => ({ + multiplier: () => + Object.values(factory.components).reduce( + (x, y) => y + (x.type == "cloth" ? 1 : 0), + 1 + ) as number, + description: "300,000 Cities Solved", + enabled: routing.metaMilestones[4].earned + })) ]) as WithRequired; const computedSpinningAmount = computed(() => spinningAmount.apply(1)); const spinningCooldown = createSequentialModifier(() => []); diff --git a/src/data/layers/dyes.tsx b/src/data/layers/dyes.tsx index ea9cb42..11a1d8f 100644 --- a/src/data/layers/dyes.tsx +++ b/src/data/layers/dyes.tsx @@ -38,7 +38,8 @@ import trees from "./trees"; import toys from "./toys"; import factory from "./factory"; import reindeer from "./reindeer"; -import packing from "./packing" +import routing from "./routing"; +import packing from "./packing"; interface Dye { name: string; @@ -59,7 +60,15 @@ type DyeUpg = | "blueDyeUpg2" | "coalUpg"; -export type enumColor = "red" | "green" | "blue" | "yellow" | "purple" | "orange" | "black" | "white"; +export type enumColor = + | "red" + | "green" + | "blue" + | "yellow" + | "purple" + | "orange" + | "black" + | "white"; const id = "dyes"; const day = 11; @@ -205,6 +214,17 @@ const layer = createLayer(id, function (this: BaseLayer) { })) ); modifiers.push(reindeer.reindeer.rudolph.modifier); + modifiers.push( + createMultiplicativeModifier(() => ({ + multiplier: () => + Object.values(factory.components).reduce( + (x, y) => y + (x.type == "dye" ? 1 : 0), + 1 + ) as number, + description: "300,000 Cities Solved", + enabled: routing.metaMilestones[4].earned + })) + ); return modifiers; }) as WithRequired; const computedToGenerate = computed(() => toGenerate.apply(0)); @@ -730,7 +750,12 @@ const layer = createLayer(id, function (this: BaseLayer) { .pow(upgrades.coalUpg.bought.value ? 1.2 : 1) .pow(management.elfTraining.clothElfTraining.milestones[3].earned.value ? 1.1 : 1) ), - purple2: computed(() => Decimal.add(dyes.purple.amount.value, 1).log2().plus(1).mul(packing.packingMilestones.secondaryDyeBoost.earned.value ? 2 : 1)), + purple2: computed(() => + Decimal.add(dyes.purple.amount.value, 1) + .log2() + .plus(1) + .mul(packing.packingMilestones.secondaryDyeBoost.earned.value ? 2 : 1) + ), black1: computed(() => Decimal.pow(2, Decimal.add(dyes.black.amount.value, 1).log2().sqrt()) .pow(upgrades.coalUpg.bought.value ? 1.2 : 1) diff --git a/src/data/layers/factory.tsx b/src/data/layers/factory.tsx index b6e8db7..f74428c 100644 --- a/src/data/layers/factory.tsx +++ b/src/data/layers/factory.tsx @@ -90,6 +90,7 @@ import toys from "./toys"; import trees from "./trees"; import workshop from "./workshop"; import ribbon from "./ribbon"; +import routing from "./routing"; const id = "factory"; @@ -235,6 +236,11 @@ const factory = createLayer(id, () => { multiplier: 1.5, description: "Carry ticks in boxes", enabled: () => upgrades[2][3].bought.value + })), + createMultiplicativeModifier(() => ({ + multiplier: () => Decimal.max(routing.citiesCompleted.value, 1).log10().sub(3).max(1), + description: "25,000 Cities Solved", + enabled: routing.metaMilestones[2].earned })) ]); const computedTickRate = computed(() => tickRate.apply(1)); @@ -301,6 +307,15 @@ const factory = createLayer(id, () => { )}
+ {routing.metaMilestones[5].earned.value ? ( + + + + ) : ( + "" + )}