diff --git a/src/data/layers/metal.tsx b/src/data/layers/metal.tsx index bf80c30..e74aeb1 100644 --- a/src/data/layers/metal.tsx +++ b/src/data/layers/metal.tsx @@ -112,6 +112,11 @@ const layer = createLayer(id, function (this: BaseLayer) { exponent: 1.1, description: "Mary Level 2", enabled: management.elfTraining.heatedPlanterElfTraining.milestones[1].earned + })), + createExponentialModifier(() => ({ + exponent: 1.2, + description: "100% Sleigh Fixed", + enabled: sleigh.milestones.milestone8.earned })) ]); const computedOrePurity = computed(() => orePurity.apply(0.1)); @@ -183,6 +188,11 @@ const layer = createLayer(id, function (this: BaseLayer) { description: "Jazzy Wrapping Paper", enabled: computed(() => Decimal.gt(wrappingPaper.boosts.jazzy1.value, 1)) })), + createMultiplicativeModifier(() => ({ + multiplier: 2, + description: "30% Sleigh Fixed", + enabled: sleigh.milestones.milestone4.earned + })), createAdditiveModifier(() => ({ addend: () => Decimal.sub(lastOreGained.value, lastOreSmelted.value).max(0), description: "Metal Decoration", @@ -292,6 +302,11 @@ const layer = createLayer(id, function (this: BaseLayer) { description: "1000 Letters Processed", enabled: letters.milestones.miningMilestone.earned })), + createMultiplicativeModifier(() => ({ + multiplier: 2, + description: "30% Sleigh Fixed", + enabled: sleigh.milestones.milestone4.earned + })), createMultiplicativeModifier(() => ({ multiplier: () => Decimal.add(toys.clothes.value, 1), description: "Give elves clothes to wear", diff --git a/src/data/layers/plastic.tsx b/src/data/layers/plastic.tsx index 3915031..6023a10 100644 --- a/src/data/layers/plastic.tsx +++ b/src/data/layers/plastic.tsx @@ -321,6 +321,14 @@ const layer = createLayer(id, function (this: BaseLayer) { description: "Oil Refinery", enabled: () => Decimal.gt(activeRefinery.value, 0) })), + createAdditiveModifier(() => ({ + addend: () => + management.elfTraining.oilElfTraining.milestones[3].earned.value + ? Decimal.times(Decimal.div(sleigh.sleighProgress.value.value,2).floor(), 200) + : Decimal.times(activeRefinery.value, 40), + description: "75% Sleigh Fixed", + enabled: sleigh.milestones.milestone7.earned + })), createMultiplicativeModifier(() => ({ multiplier: 2, description: "Paper Elf Recruitment", @@ -386,6 +394,16 @@ const layer = createLayer(id, function (this: BaseLayer) { multiplier: () => dyes.boosts.white1.value, description: "White Dye Boost" })), + createMultiplicativeModifier(() => ({ + multiplier: () => Decimal.div(sleigh.sleighProgress.value.value, 5).floor().mul(0.05).add(1), + description: "20% Sleigh Fixed", + enabled: sleigh.milestones.milestone3.earned + })), + createMultiplicativeModifier(() => ({ + multiplier: 4, + description: "40% Sleigh Fixed", + enabled: sleigh.milestones.milestone5.earned + })), reindeer.reindeer.blitzen.modifier ]); const computedPlasticGain = computed(() => plasticGain.apply(0)); diff --git a/src/data/layers/sleigh.tsx b/src/data/layers/sleigh.tsx index 93247e9..35bfc71 100644 --- a/src/data/layers/sleigh.tsx +++ b/src/data/layers/sleigh.tsx @@ -43,9 +43,9 @@ const layer = createLayer(id, function (this: BaseLayer) { const sleighCost = computed(() => { let v = sleighProgress.value.value; return { - wood: Decimal.mul(1e60, Decimal.pow(1.2, v)), - metal: Decimal.mul(1e40, Decimal.pow(1.1, v)), - plastic: Decimal.mul(1e10, Decimal.pow(1.05, v)) + wood: Decimal.mul(1e97, Decimal.pow(1.2, v)), + metal: Decimal.mul(1e67, Decimal.pow(1.1, v)), + plastic: Decimal.mul(1e22, Decimal.pow(1.05, v)) }; }); const sleigh = createBuyable(() => ({ @@ -55,7 +55,7 @@ const layer = createLayer(id, function (this: BaseLayer) {

- Cost: {displayCost(trees.logs, sleighCost.value.wood, "logs")}, + Requires: {displayCost(trees.logs, sleighCost.value.wood, "logs")}, {displayCost(metal.metal, sleighCost.value.metal, "metal")}, {displayCost(plastic.plastic, sleighCost.value.plastic, "plastic")} @@ -111,7 +111,7 @@ const layer = createLayer(id, function (this: BaseLayer) { const milestone5 = createMilestone(() => ({ display: { requirement: "40% Sleigh Fixed", - effectDisplay: "Plastic gain is doubled" + effectDisplay: "Plastic gain is quadrupled" }, shouldEarn: () => Decimal.gte(sleighProgress.value.value, 40), showPopups: shouldShowPopups @@ -127,7 +127,7 @@ const layer = createLayer(id, function (this: BaseLayer) { const milestone7 = createMilestone(() => ({ display: { requirement: "75% Sleigh Fixed", - effectDisplay: "Gain 10 extra refineries for every 2% of sleigh fixed" + effectDisplay: "Gain 40 extra refineries for every 2% of sleigh fixed" }, shouldEarn: () => Decimal.gte(sleighProgress.value.value, 75), showPopups: shouldShowPopups diff --git a/src/data/layers/trees.tsx b/src/data/layers/trees.tsx index d121bcd..a0cdfed 100644 --- a/src/data/layers/trees.tsx +++ b/src/data/layers/trees.tsx @@ -559,6 +559,16 @@ const layer = createLayer(id, function (this: BaseLayer) { description: "Haul wood in trucks", enabled: factory.upgrades[0][2].bought })), + createMultiplicativeModifier(() => ({ + multiplier: () => Decimal.div(sleigh.sleighProgress.value.value, 5).floor().mul(0.05).add(1), + description: "10% Sleigh Fixed", + enabled: sleigh.milestones.milestone2.earned + })), + createMultiplicativeModifier(() => ({ + multiplier: 10, + description: "50% Sleigh Fixed", + enabled: sleigh.milestones.milestone6.earned + })), reindeer.reindeer.dasher.modifier, createExponentialModifier(() => ({ exponent: 1.2,