diff --git a/src/data/layers/factory.tsx b/src/data/layers/factory.tsx index 4512aea..1804df1 100644 --- a/src/data/layers/factory.tsx +++ b/src/data/layers/factory.tsx @@ -83,6 +83,7 @@ import "./styles/factory.css"; import Toy from "./Toy.vue"; import toys from "./toys"; import trees from "./trees"; +import workshop from "./workshop"; const id = "factory"; @@ -149,6 +150,11 @@ const factory = createLayer(id, () => { addend: () => Decimal.add(1, coal.coal.value).log10(), description: "Coal Energy Production" })), + createMultiplicativeModifier(() => ({ + multiplier: Decimal.add(1, coal.coal.value).log10().div(100), + description: "1400% workshop", + enabled: workshop.milestones.extraExpansionMilestone7.earned + })), createAdditiveModifier(() => ({ addend: () => Decimal.times(oilFuel.amount.value, 10), description: "Oil Fuel", diff --git a/src/data/layers/trees.tsx b/src/data/layers/trees.tsx index d4a061d..51a799a 100644 --- a/src/data/layers/trees.tsx +++ b/src/data/layers/trees.tsx @@ -547,7 +547,7 @@ const layer = createLayer(id, function (this: BaseLayer) { enabled: toys.row1Upgrades[0].bought })), createMultiplicativeModifier(() => ({ - multiplier: () => Decimal.add(toys.clothes.value, 1), + multiplier: () => Decimal.add(toys.clothes.value, 1).pow(0.75), description: "3000 Toys", enabled: toys.milestones.milestone7.earned })), diff --git a/src/data/layers/workshop.tsx b/src/data/layers/workshop.tsx index 5216055..584bd43 100644 --- a/src/data/layers/workshop.tsx +++ b/src/data/layers/workshop.tsx @@ -299,6 +299,16 @@ const layer = createLayer(id, function (this: BaseLayer) { showIf(extraExpansionMilestone5.earned.value && toys.row1Upgrades[2].bought.value), showPopups: shouldShowPopups })); + const extraExpansionMilestone7 = createMilestone(() => ({ + display: { + requirement: "1400% Foundation Completed", + effectDisplay: "Coal has a greater effect on energy gain" + }, + shouldEarn: () => Decimal.gte(foundationProgress.value, 1400), + visibility: () => + showIf(extraExpansionMilestone6.earned.value && toys.row1Upgrades[2].bought.value), + showPopups: shouldShowPopups + })); const milestones = { logGainMilestone1, autoCutMilestone1, @@ -313,7 +323,8 @@ const layer = createLayer(id, function (this: BaseLayer) { extraExpansionMilestone3, extraExpansionMilestone4, extraExpansionMilestone5, - extraExpansionMilestone6 + extraExpansionMilestone6, + extraExpansionMilestone7 }; const { collapseMilestones, display: milestonesDisplay } = createCollapsibleMilestones(milestones);