thepaperpilot/Advent-Incremental
1
0
Fork 0
mirror of https://github.com/thepaperpilot/Advent-Incremental.git synced 2024-11-24 17:31:54 +00:00
Code Issues Releases Activity Actions

Make joy and faith buy maxable

Browse source
This commit is contained in:
thepaperpilot 2022-12-14 22:20:15 -06:00
parent 9f05571a35
commit 1a1e5d167c
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/data/layers/elves.tsx
View file

@ -584,6 +584,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
onPurchase?: VoidFunction; // Will get overriden by the custom onpurchase, but that's fine
canBuy?: Computable<boolean>;
buyMax?: Computable<boolean>;
independent?: Computable<boolean>; // Whether or not the cost is independent of the current buyable amount
} & Partial<ClickableOptions>
) {
const buyProgress = persistent<DecimalSource>(0);
@ -594,6 +595,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
const isActive = convertComputable(options.canBuy ?? true);
const buyMax = convertComputable(options.buyMax ?? false);
const independent = convertComputable(options.independent ?? false);
function update(diff: number) {
if (upgrade.bought.value && unref(isActive)) {
@ -615,7 +617,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
const buyAmount = Decimal.min(
Decimal.sub(
buyable.inverseCost(buyable.resource?.value),
buyable.amount.value
unref(independent) ? 0 : buyable.amount.value
).add(1),
maxBuyAmount
);
@ -747,6 +749,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
"Joy will automatically purchase small fires you can afford, without actually spending any logs. You can toggle whether or not to enable the purchased small fires automatically. Small fires will start giving a boost to ash and coal gain.",
buyable: coal.buildFire,
cooldownModifier: smallFireCooldown,
buyMax: () => management.elfTraining.heatedCutterElfTraining.milestones[2].earned.value,
visibility: () => showIf(boxes.upgrades.logsUpgrade.bought.value),
hasToggle: true,
toggleDesc: "Activate auto-purchased small fires",
@ -765,6 +768,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
"Faith will automatically purchase bonfires you can afford. You can toggle whether or not to enable the purchased bonfires automatically. Bonfires will start giving a boost to ash and coal gain.",
buyable: coal.buildBonfire,
cooldownModifier: bonfireCooldown,
buyMax: () => management.elfTraining.heatedPlanterElfTraining.milestones[2].earned.value,
visibility: () => showIf(boxes.upgrades.ashUpgrade.bought.value),
hasToggle: true,
toggleDesc: "Activate auto-purchased bonfires",
@ -779,7 +783,8 @@ const layer = createLayer(id, function (this: BaseLayer) {
onPurchase() {
main.days[4].recentlyUpdated.value = true;
},
canBuy: coal.unlockBonfire.bought
canBuy: coal.unlockBonfire.bought,
independent: true
});
const kilnElf = createElf({
name: "Snowball",

7
src/data/layers/management.tsx
View file

@ -415,8 +415,7 @@ const layer = createLayer(id, () => {
createMilestone(() => ({
display: {
requirement: "Hope Level 3",
effectDisplay:
"The workshop can be expanded past 100%, but costs scale faster. It also buys max now."
effectDisplay: "The workshop can be expanded past 100%, but costs scale faster."
},
visibility: () => showIf(expanderElfMilestones[1].earned.value),
shouldEarn: () => expandersElfTraining.level.value >= 3
@ -457,7 +456,7 @@ const layer = createLayer(id, () => {
createMilestone(() => ({
display: {
requirement: "Jack Level 3",
effectDisplay: "Jack now buys max."
effectDisplay: "Jack and Joy now buy max."
},
visibility: () => showIf(heatedCutterElfMilestones[1].earned.value),
shouldEarn: () => heatedCutterElfTraining.level.value >= 3
@ -504,7 +503,7 @@ const layer = createLayer(id, () => {
createMilestone(() => ({
display: {
requirement: "Mary Level 3",
effectDisplay: "Mary now buys max."
effectDisplay: "Mary and Faith now buy max."
},
visibility: () => showIf(heatedPlanterElfMilestones[1].earned.value),
shouldEarn: () => heatedPlanterElfTraining.level.value >= 3