mirror of
https://github.com/thepaperpilot/Advent-Incremental.git
synced 2025-02-16 09:31:43 +00:00
Fix merge conflicts
This commit is contained in:
parent
deca7bffc1
commit
b00ee8518b
5 changed files with 29 additions and 111 deletions
|
|
@ -34,16 +34,7 @@ import { ElfBuyable } from "./elves";
|
|||
import management from "./management";
|
||||
import oil from "./oil";
|
||||
import paper from "./paper";
|
||||
<<<<<<< HEAD
|
||||
import trees from "./trees";
|
||||
=======
|
||||
import boxes from "./boxes";
|
||||
import { ElfBuyable } from "./elves";
|
||||
import toys from "./toys"
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> finish balancing toys layer
|
||||
=======
|
||||
>>>>>>> 19d58d575e4f3e5ecb3adad514f7089e50360057
|
||||
|
||||
interface Dye {
|
||||
name: string;
|
||||
|
|
@ -64,15 +55,7 @@ type DyeUpg =
|
|||
| "blueDyeUpg2"
|
||||
| "coalUpg";
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
export type enumColor = "blue" | "red" | "green" | "yellow" | "purple" | "orange";
|
||||
=======
|
||||
export type enumColor = "red" | "green" | "blue" | "yellow" | "purple" | "orange" | "black";
|
||||
>>>>>>> finish balancing toys layer
|
||||
=======
|
||||
export type enumColor = "red" | "green" | "blue" | "yellow" | "purple" | "orange" | "black";
|
||||
>>>>>>> 19d58d575e4f3e5ecb3adad514f7089e50360057
|
||||
|
||||
const id = "dyes";
|
||||
const day = 11;
|
||||
|
|
@ -229,6 +212,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
|
|||
case "red":
|
||||
case "yellow":
|
||||
case "blue":
|
||||
case "black":
|
||||
dyeBook = paper.books.primaryDyeBook;
|
||||
break;
|
||||
case "orange":
|
||||
|
|
@ -507,6 +491,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
|
|||
black: createDye({
|
||||
name: "Black Dye",
|
||||
color: "black",
|
||||
key: "a",
|
||||
costs: () => [
|
||||
{
|
||||
base: "1e42",
|
||||
|
|
@ -522,40 +507,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
|
|||
listedBoosts: [
|
||||
{
|
||||
visible: true,
|
||||
desc: computed(
|
||||
() =>
|
||||
`*${format(
|
||||
boosts.black1.value
|
||||
)} letters processed.`
|
||||
)
|
||||
}
|
||||
],
|
||||
dyesToReset: []
|
||||
}),
|
||||
black: createDye({
|
||||
name: "Black Dye",
|
||||
color: "black",
|
||||
costs: () => [
|
||||
{
|
||||
base: "1e42",
|
||||
root: 5,
|
||||
res: trees.logs
|
||||
},
|
||||
{
|
||||
base: computed(() => (upgrades.yellowDyeUpg2.bought.value ? "1e15" : "2e15")),
|
||||
root: 2,
|
||||
res: oil.oil
|
||||
}
|
||||
],
|
||||
listedBoosts: [
|
||||
{
|
||||
visible: true,
|
||||
desc: computed(
|
||||
() =>
|
||||
`*${format(
|
||||
boosts.black1.value
|
||||
)} letters processed.`
|
||||
)
|
||||
desc: computed(() => `*${format(boosts.black1.value)} letters processed.`)
|
||||
}
|
||||
],
|
||||
dyesToReset: []
|
||||
|
|
@ -739,7 +691,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
|
|||
),
|
||||
purple2: computed(() => Decimal.add(dyes.purple.amount.value, 1).log2().plus(1)),
|
||||
black1: computed(() =>
|
||||
Decimal.pow(2, Decimal.add(dyes.black.amount.value, 1).log2().sqrt())
|
||||
Decimal.pow(2, Decimal.add(dyes.black.amount.value, 1).log2().sqrt())
|
||||
.pow(upgrades.coalUpg.bought.value ? 1.2 : 1)
|
||||
.pow(management.elfTraining.clothElfTraining.milestones[3].earned.value ? 1.1 : 1)
|
||||
)
|
||||
|
|
|
|||
|
|
@ -35,15 +35,8 @@ import oil from "./oil";
|
|||
import paper from "./paper";
|
||||
import plastic from "./plastic";
|
||||
import workshop from "./workshop";
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
import wrappingPaper from "./wrapping-paper";
|
||||
=======
|
||||
import toys from "./toys";
|
||||
>>>>>>> finish balancing toys layer
|
||||
=======
|
||||
import toys from "./toys";
|
||||
>>>>>>> 19d58d575e4f3e5ecb3adad514f7089e50360057
|
||||
|
||||
const id = "metal";
|
||||
const day = 7;
|
||||
|
|
@ -300,7 +293,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
|
|||
multiplier: () => Decimal.add(toys.clothes.value, 1),
|
||||
description: "Give elves clothes to wear",
|
||||
enabled: toys.row1Upgrades[1].bought
|
||||
})),
|
||||
}))
|
||||
]);
|
||||
const computedOreAmount = computed(() => oreAmount.apply(1));
|
||||
const oreSpeed = createSequentialModifier(() => [
|
||||
|
|
|
|||
|
|
@ -537,21 +537,14 @@ const layer = createLayer(id, function (this: BaseLayer) {
|
|||
enabled: computed(() => Decimal.gt(wrappingPaper.boosts.christmas1.value, 1))
|
||||
})),
|
||||
createMultiplicativeModifier(() => ({
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
multiplier: () => Decimal.add(computedTotalTrees.value, 1).log10(),
|
||||
description: "Trees Decoration",
|
||||
enabled: masteryEffectActive
|
||||
=======
|
||||
})),
|
||||
createMultiplicativeModifier(() => ({
|
||||
multiplier: 2,
|
||||
description: "Load logs onto trucks",
|
||||
enabled: toys.row1Upgrades[0].bought
|
||||
>>>>>>> finish balancing toys layer
|
||||
=======
|
||||
multiplier: 2,
|
||||
description: "Load logs onto trucks",
|
||||
enabled: toys.row1Upgrades[0].bought
|
||||
>>>>>>> 19d58d575e4f3e5ecb3adad514f7089e50360057
|
||||
})),
|
||||
createExponentialModifier(() => ({
|
||||
exponent: 1.2,
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ import elves from "./elves";
|
|||
import management from "./management";
|
||||
import trees from "./trees";
|
||||
import wrappingPaper from "./wrapping-paper";
|
||||
import toys from "./toys"
|
||||
import toys from "./toys";
|
||||
|
||||
const id = "workshop";
|
||||
const day = 2;
|
||||
|
|
@ -49,7 +49,11 @@ const layer = createLayer(id, function (this: BaseLayer) {
|
|||
scaling: addHardcap(
|
||||
addSoftcap(addSoftcap(createPolynomialScaling(250, 1.5), 5423, 1 / 1e10), 1e20, 3e8),
|
||||
computed(() =>
|
||||
toys.row1Upgrades[2].bought ? 1200 : management.elfTraining.expandersElfTraining.milestones[2].earned.value ? 1000 : 100
|
||||
toys.row1Upgrades[2].bought
|
||||
? 1200
|
||||
: management.elfTraining.expandersElfTraining.milestones[2].earned.value
|
||||
? 1000
|
||||
: 100
|
||||
)
|
||||
),
|
||||
baseResource: trees.logs,
|
||||
|
|
@ -99,12 +103,13 @@ const layer = createLayer(id, function (this: BaseLayer) {
|
|||
showIf(
|
||||
Decimal.lt(
|
||||
foundationProgress.value,
|
||||
toys.row1Upgrades[2].bought.value ? 1200 : management.elfTraining.expandersElfTraining.milestones[2].earned.value
|
||||
toys.row1Upgrades[2].bought.value
|
||||
? 1200
|
||||
: management.elfTraining.expandersElfTraining.milestones[2].earned.value
|
||||
? 1000
|
||||
: 100
|
||||
)
|
||||
),
|
||||
<<<<<<< HEAD
|
||||
canClick: () => {
|
||||
if (Decimal.lt(trees.logs.value, foundationConversion.nextAt.value)) {
|
||||
return false;
|
||||
|
|
@ -112,26 +117,18 @@ const layer = createLayer(id, function (this: BaseLayer) {
|
|||
if (main.isMastery.value && main.currentlyMastering.value?.name === "Trees") {
|
||||
return false;
|
||||
}
|
||||
if (
|
||||
Decimal.gte(
|
||||
foundationProgress.value,
|
||||
management.elfTraining.expandersElfTraining.milestones[2].earned.value
|
||||
? 1000
|
||||
: 100
|
||||
)
|
||||
) {
|
||||
let cap = 100;
|
||||
if (management.elfTraining.expandersElfTraining.milestones[2].earned.value) {
|
||||
cap = 1000;
|
||||
}
|
||||
if (toys.row1Upgrades[2].bought.value) {
|
||||
cap = 1200;
|
||||
}
|
||||
if (Decimal.gte(foundationProgress.value, cap)) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
},
|
||||
=======
|
||||
canClick: () =>
|
||||
Decimal.gte(trees.logs.value, foundationConversion.nextAt.value) &&
|
||||
Decimal.lt(
|
||||
foundationProgress.value,
|
||||
toys.row1Upgrades[2].bought.value ? 1200 : management.elfTraining.expandersElfTraining.milestones[2].earned.value ? 1000 : 100
|
||||
),
|
||||
>>>>>>> finish balancing toys layer
|
||||
onClick() {
|
||||
if (!unref(this.canClick)) {
|
||||
return;
|
||||
|
|
@ -295,10 +292,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
|
|||
},
|
||||
shouldEarn: () => Decimal.gte(foundationProgress.value, 1200),
|
||||
visibility: () =>
|
||||
showIf(
|
||||
extraExpansionMilestone5.earned.value &&
|
||||
toys.row1Upgrades[2].bought.value
|
||||
),
|
||||
showIf(extraExpansionMilestone5.earned.value && toys.row1Upgrades[2].bought.value),
|
||||
showPopups: shouldShowPopups
|
||||
}));
|
||||
const milestones = {
|
||||
|
|
|
|||
|
|
@ -30,18 +30,11 @@ import metal from "./layers/metal";
|
|||
import oil from "./layers/oil";
|
||||
import paper from "./layers/paper";
|
||||
import plastic from "./layers/plastic";
|
||||
import ribbon from "./layers/ribbon";
|
||||
import toys from "./layers/toys";
|
||||
import trees from "./layers/trees";
|
||||
import workshop from "./layers/workshop";
|
||||
import wrappingPaper from "./layers/wrapping-paper";
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
import ribbon from "./layers/ribbon";
|
||||
=======
|
||||
import toys from "./layers/toys";
|
||||
>>>>>>> fix toy sum
|
||||
=======
|
||||
import toys from "./layers/toys";
|
||||
>>>>>>> 19d58d575e4f3e5ecb3adad514f7089e50360057
|
||||
import boxesSymbol from "./symbols/cardboardBox.png";
|
||||
import clothSymbol from "./symbols/cloth.png";
|
||||
import coalSymbol from "./symbols/coal.png";
|
||||
|
|
@ -583,16 +576,9 @@ export const getInitialLayers = (
|
|||
dyes,
|
||||
management,
|
||||
letters,
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
wrappingPaper,
|
||||
ribbon
|
||||
=======
|
||||
toys,
|
||||
>>>>>>> fix toy sum
|
||||
=======
|
||||
toys,
|
||||
>>>>>>> 19d58d575e4f3e5ecb3adad514f7089e50360057
|
||||
ribbon,
|
||||
toys
|
||||
];
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue