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

Add mastery data to Cloth, Oil, and Metal

Browse source
This commit is contained in:
Seth Posner 2022-12-16 16:29:03 -08:00
parent 9e68dab914
commit e9d45cae02
4 changed files with 117 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/data/layers/cloth.tsx
View file

@ -573,6 +573,35 @@ const layer = createLayer(id, function (this: BaseLayer) {
}
});
const mastery = {
cloth: persistent<DecimalSource>(0),
totalCloth: persistent<DecimalSource>(0),
wool: persistent<DecimalSource>(0),
sheep: persistent<DecimalSource>(0),
buildPens: { amount: persistent<DecimalSource>(0) },
betterShears: { amount: persistent<DecimalSource>(0) },
fasterSpinning: { amount: persistent<DecimalSource>(0) },
treesUpgrades: {
treesUpgrade1: { bought: persistent<boolean>(false) },
treesUpgrade2: { bought: persistent<boolean>(false) },
treesUpgrade3: { bought: persistent<boolean>(false) },
treesUpgrade4: { bought: persistent<boolean>(false) }
},
metalUpgrades: {
metalUpgrade1: { bought: persistent<boolean>(false) },
metalUpgrade2: { bought: persistent<boolean>(false) },
metalUpgrade3: { bought: persistent<boolean>(false) },
metalUpgrade4: { bought: persistent<boolean>(false) }
},
paperUpgrades: {
paperUpgrade1: { bought: persistent<boolean>(false) },
paperUpgrade2: { bought: persistent<boolean>(false) },
paperUpgrade3: { bought: persistent<boolean>(false) },
paperUpgrade4: { bought: persistent<boolean>(false) }
}
};
const mastered = persistent<boolean>(false);
return {
name,
color,
@ -611,11 +640,9 @@ const layer = createLayer(id, function (this: BaseLayer) {
</Row>
</>
)),
minimizedDisplay: jsx(() => (
<div>
{name} - {format(cloth.value)} {cloth.displayName}
</div>
))
minimizedDisplay: jsx(() => (<div>{name} - {format(cloth.value)} {cloth.displayName}</div>)),
mastery,
mastered
};
});

27
src/data/layers/metal.tsx
View file

@ -624,6 +624,25 @@ const layer = createLayer(id, function (this: BaseLayer) {
}
});
const mastery = {
ore: persistent<DecimalSource>(0),
bestOre: persistent<DecimalSource>(0),
oreProgress: persistent<DecimalSource>(0),
metal: persistent<DecimalSource>(0),
bestMetal: persistent<DecimalSource>(0),
totalMetal: persistent<DecimalSource>(0),
simplePickaxe: { bought: persistent<boolean>(false) },
doublePickaxe: { bought: persistent<boolean>(false) },
crucible: { bought: persistent<boolean>(false) },
coalDrill: { bought: persistent<boolean>(false) },
industrialFurnace: { bought: persistent<boolean>(false) },
efficientDrill: { bought: persistent<boolean>(false) },
oreDrill: { amount: persistent<DecimalSource>(0) },
industrialCrucible: { amount: persistent<DecimalSource>(0) },
hotterForge: { amount: persistent<DecimalSource>(0) }
};
const mastered = persistent<boolean>(false);
return {
name,
day,
@ -719,11 +738,9 @@ const layer = createLayer(id, function (this: BaseLayer) {
{renderRow(oreDrill, industrialCrucible, hotterForge)}
</>
)),
minimizedDisplay: jsx(() => (
<div>
{name} - {format(metal.value)} {metal.displayName}
</div>
))
minimizedDisplay: jsx(() => (<div>{name} - {format(metal.value)} {metal.displayName}</div>)),
mastery,
mastered
};
});

65
src/data/layers/oil.tsx
View file

@ -1086,6 +1086,62 @@ const layer = createLayer(id, function (this: BaseLayer) {
}
});
const mastery = {
oil: persistent<DecimalSource>(0),
totalOil: persistent<DecimalSource>(0),
depth: persistent<DecimalSource>(0),
drillProgress: persistent<DecimalSource>(0),
activeHeavy: persistent<DecimalSource>(0),
buildHeavy: { amount: persistent<DecimalSource>(0) },
activeHeavy2: persistent<DecimalSource>(0),
buildHeavy2: { amount: persistent<DecimalSource>(0) },
activeExtractor: persistent<DecimalSource>(0),
buildExtractor: { amount: persistent<DecimalSource>(0) },
activePump: persistent<DecimalSource>(0),
buildPump: { amount: persistent<DecimalSource>(0) },
activeBurner: persistent<DecimalSource>(0),
buildBurner: { amount: persistent<DecimalSource>(0) },
activeSmelter: persistent<DecimalSource>(0),
buildSmelter: { amount: persistent<DecimalSource>(0) },
depthMilestones: [
{ earned: persistent<boolean>(false) },
{ earned: persistent<boolean>(false) },
{ earned: persistent<boolean>(false) },
{ earned: persistent<boolean>(false) },
{ earned: persistent<boolean>(false) },
{ earned: persistent<boolean>(false) },
{ earned: persistent<boolean>(false) },
{ earned: persistent<boolean>(false) }
],
oilMilestones: [
{ earned: persistent<boolean>(false) },
{ earned: persistent<boolean>(false) },
{ earned: persistent<boolean>(false) }
],
row1Upgrades: [
{ bought: persistent<boolean>(false) },
{ bought: persistent<boolean>(false) },
{ bought: persistent<boolean>(false) },
{ bought: persistent<boolean>(false) },
{ bought: persistent<boolean>(false) }
],
row2Upgrades: [
{ bought: persistent<boolean>(false) },
{ bought: persistent<boolean>(false) },
{ bought: persistent<boolean>(false) },
{ bought: persistent<boolean>(false) },
{ bought: persistent<boolean>(false) }
],
row3Upgrades: [
{ bought: persistent<boolean>(false) },
{ bought: persistent<boolean>(false) },
{ bought: persistent<boolean>(false) },
{ bought: persistent<boolean>(false) },
{ bought: persistent<boolean>(false) }
]
};
const mastered = persistent<boolean>(false);
return {
name,
day,
@ -1281,11 +1337,10 @@ const layer = createLayer(id, function (this: BaseLayer) {
</>
);
}),
minimizedDisplay: jsx(() => (
<div>
{name} - {format(oil.value)} {oil.displayName}
</div>
))
minimizedDisplay: jsx(() => (<div>{name} - {format(oil.value)} {oil.displayName}</div>)),
mastery,
mastered
};
});

6
src/data/projEntry.tsx
View file

@ -85,9 +85,9 @@ export const main = createLayer("main", function (this: BaseLayer) {
elves,
paper,
boxes,
// metal,
// cloth,
// oil,
metal,
cloth,
oil,
// plastic,
// dyes,
// management,