thepaperpilot/Advent-Incremental
1
0
Fork 0
mirror of https://github.com/thepaperpilot/Advent-Incremental.git synced 2024-11-22 00:21:34 +00:00
Code Issues Releases Activity Actions

Presents polish

Browse source
This commit is contained in:
thepaperpilot 2022-12-23 21:56:36 -06:00
parent 2a2790e13e
commit 1d2c61409c
1 changed files with 33 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/data/layers/factory.tsx
View file

@ -77,7 +77,8 @@ import _truck from "./factory-components/truck.svg";
import _truckMaker from "./factory-components/truckmaker.svg"; import _truckMaker from "./factory-components/truckmaker.svg";
import _wheel from "./factory-components/wheel.svg"; import _wheel from "./factory-components/wheel.svg";
import _wheelMaker from "./factory-components/wheelmaker.svg"; import _wheelMaker from "./factory-components/wheelmaker.svg";
import _present from "./factory-components/presentmaker.svg"; import _present from "./factory-components/present.svg";
import _presentMaker from "./factory-components/presentmaker.svg";
import Factory from "./Factory.vue"; import Factory from "./Factory.vue";
import metal from "./metal"; import metal from "./metal";
import oil from "./oil"; import oil from "./oil";
@ -503,25 +504,6 @@ const factory = createLayer(id, () => {
}, },
visible: main.days[presentsDay - 1].opened visible: main.days[presentsDay - 1].opened
} as FactoryComponentDeclaration, } as FactoryComponentDeclaration,
boxMaker: {
imageSrc: _boxMaker,
key: "ctrl+8",
name: "Box Maker",
type: "processor",
description: computed(() => generateComponentDescription(FACTORY_COMPONENTS.boxMaker)),
energyCost: 3,
tick: 1,
inputs: {
plank: {
amount: 2
}
},
outputs: {
box: {
amount: 2
}
}
} as FactoryComponentDeclaration,
thread: { thread: {
imageSrc: _threadMaker, imageSrc: _threadMaker,
key: "shift+2", key: "shift+2",
@ -665,6 +647,25 @@ const factory = createLayer(id, () => {
}, },
visible: main.days[advancedDay - 1].opened visible: main.days[advancedDay - 1].opened
} as FactoryComponentDeclaration, } as FactoryComponentDeclaration,
boxMaker: {
imageSrc: _boxMaker,
key: "shift+9",
name: "Box Maker",
type: "processor",
description: computed(() => generateComponentDescription(FACTORY_COMPONENTS.boxMaker)),
energyCost: 3,
tick: 1,
inputs: {
plank: {
amount: 2
}
},
outputs: {
box: {
amount: 2
}
}
} as FactoryComponentDeclaration,
blocks: { blocks: {
imageSrc: _blockMaker, imageSrc: _blockMaker,
key: "ctrl+1", key: "ctrl+1",
@ -818,7 +819,7 @@ const factory = createLayer(id, () => {
visible: main.days[advancedDay - 1].opened visible: main.days[advancedDay - 1].opened
} as FactoryComponentDeclaration, } as FactoryComponentDeclaration,
present: { present: {
imageSrc: _present, imageSrc: _presentMaker,
type: "processor", type: "processor",
// idk about this // idk about this
key: "ctrl+7", key: "ctrl+7",
@ -832,7 +833,7 @@ const factory = createLayer(id, () => {
)} presents every tick.` )} presents every tick.`
), ),
tick: 1, tick: 1,
energyCost: 20, energyCost: 50,
inputs: { inputs: {
dye: { dye: {
amount: 4 amount: 4
@ -1276,7 +1277,7 @@ const factory = createLayer(id, () => {
display: { display: {
title: "Carrying more stuff in boxes", title: "Carrying more stuff in boxes",
description: description:
"Boxes seem really useful for carrying stuff. Why don't we use them to carry presents as well? Unlocks 2 new rebuyables (one of them is in the boxes layer)." "Boxes seem really useful for carrying stuff. Why don't we use them to carry presents as well? Unlocks 2 new buyables (one of them is in the boxes layer)."
}, },
visibility: () => showIf(excitmentUpgrade.bought.value) visibility: () => showIf(excitmentUpgrade.bought.value)
})); }));
@ -1288,13 +1289,14 @@ const factory = createLayer(id, () => {
.mul(Decimal.pow(2, carryBoxes.amount.value)) .mul(Decimal.pow(2, carryBoxes.amount.value))
.mul(1000); .mul(1000);
}, },
style: "width: 400px",
display: { display: {
title: "Carry boxes in... presents?", title: "Carry boxes in... presents?",
description: description:
"Presents are made out of boxes, so shouldn't they be able to hold boxes as well? Apparently it makes the boxes more durable. Each level multiplies boxes gain by 1.5.", "Presents are made out of boxes, so shouldn't they be able to hold boxes as well? Apparently it makes the boxes more durable. Each level multiplies boxes gain by 1.5.",
effectDisplay: jsx(() => <>x{format(Decimal.pow(1.5, carryBoxes.amount.value))}</>) effectDisplay: jsx(() => <>x{format(Decimal.pow(1.5, carryBoxes.amount.value))}</>)
}, },
visbility: () => showIf(carryPresents.bought.value) visibility: () => showIf(carryPresents.bought.value)
})) as GenericBuyable; })) as GenericBuyable;
const catalysts = createUpgrade(() => ({ const catalysts = createUpgrade(() => ({
resource: noPersist(presents), resource: noPersist(presents),
@ -1306,7 +1308,8 @@ const factory = createLayer(id, () => {
}, },
visibility: () => showIf(carryPresents.bought.value) visibility: () => showIf(carryPresents.bought.value)
})); }));
const factoryBuyables = { expandFactory, oilFuel, carryToys, carryBoxes }; const factoryBuyables = { expandFactory, oilFuel, carryToys };
const factoryBuyables2 = { carryBoxes };
const upgrades = [ const upgrades = [
[ [
createUpgrade(() => ({ createUpgrade(() => ({
@ -2291,7 +2294,10 @@ const factory = createLayer(id, () => {
/> />
{renderRow(...Object.values(elfBuyables))} {renderRow(...Object.values(elfBuyables))}
<Spacer /> <Spacer />
{renderRow(...Object.values(factoryBuyables))} {renderGrid(
Object.values(factoryBuyables),
Object.values(factoryBuyables2)
)}
<Spacer /> <Spacer />
<Spacer /> <Spacer />
{renderGrid(...(upgrades as VueFeature[][]))} {renderGrid(...(upgrades as VueFeature[][]))}
@ -2471,6 +2477,7 @@ const factory = createLayer(id, () => {
presents, presents,
tabs, tabs,
factoryBuyables, factoryBuyables,
factoryBuyables2,
carryBoxes, carryBoxes,
generalTabCollapsed, generalTabCollapsed,
hotkeys, hotkeys,