profectus/Profectus
Template
1
0
Fork 4
Code Issues 38 Pull requests 6 Projects 2 Releases Packages Wiki Activity Actions

Fixed issue with demo layer working incorrectly

Browse source
This commit is contained in:
thepaperpilot 2021-09-04 20:42:59 -05:00
parent d7b6df5b4f
commit 9a01a2931b
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/data/layers/demo.ts
View file

@ -1932,7 +1932,7 @@ export default {
return getBuyableAmount("p", 11)!.gte(1); return getBuyableAmount("p", 11)!.gte(1);
}, },
unlocked() { unlocked() {
return layers.p.activeSubtab?.id == "Pointy points"; return layers.p.activeSubtab?.id != "Pointy points";
} }
}, },
1: { 1: {
@ -1945,7 +1945,7 @@ export default {
unlocked() { unlocked() {
return ( return (
hasMilestone(this.layer, Number(this.id) - 1) && hasMilestone(this.layer, Number(this.id) - 1) &&
layers.p.activeSubtab?.id == "Pointy points" layers.p.activeSubtab?.id != "Pointy points"
); );
} }
}, },
@ -1959,7 +1959,7 @@ export default {
unlocked() { unlocked() {
return ( return (
hasMilestone(this.layer, Number(this.id) - 1) && hasMilestone(this.layer, Number(this.id) - 1) &&
layers.p.activeSubtab?.id == "Pointy points" layers.p.activeSubtab?.id != "Pointy points"
); );
} }
}, },
@ -1973,7 +1973,7 @@ export default {
unlocked() { unlocked() {
return ( return (
hasMilestone(this.layer, Number(this.id) - 1) && hasMilestone(this.layer, Number(this.id) - 1) &&
layers.p.activeSubtab?.id == "Pointy points" layers.p.activeSubtab?.id != "Pointy points"
); );
} }
}, },
@ -1986,7 +1986,7 @@ export default {
unlocked() { unlocked() {
return ( return (
hasMilestone(this.layer, Number(this.id) - 1) && hasMilestone(this.layer, Number(this.id) - 1) &&
layers.p.activeSubtab?.id == "Pointy points" layers.p.activeSubtab?.id != "Pointy points"
); );
} }
}, },
@ -1999,7 +1999,7 @@ export default {
unlocked() { unlocked() {
return ( return (
hasMilestone(this.layer, Number(this.id) - 1) && hasMilestone(this.layer, Number(this.id) - 1) &&
layers.p.activeSubtab?.id == "Pointy points" layers.p.activeSubtab?.id != "Pointy points"
); );
} }
}, },
@ -2013,7 +2013,7 @@ export default {
return ( return (
hasMilestone(this.layer, Number(this.id) - 1) && hasMilestone(this.layer, Number(this.id) - 1) &&
(hasUpgrade(this.layer, 104) || player.layers.i.unlocked) && (hasUpgrade(this.layer, 104) || player.layers.i.unlocked) &&
layers.p.activeSubtab?.id == "Pointy points" layers.p.activeSubtab?.id != "Pointy points"
); );
} }
}, },
@ -2028,7 +2028,7 @@ export default {
return ( return (
hasMilestone(this.layer, Number(this.id) - 1) && hasMilestone(this.layer, Number(this.id) - 1) &&
(hasUpgrade(this.layer, 111) || player.layers.i.unlocked) && (hasUpgrade(this.layer, 111) || player.layers.i.unlocked) &&
layers.p.activeSubtab?.id == "Pointy points" layers.p.activeSubtab?.id != "Pointy points"
); );
} }
}, },
@ -2045,7 +2045,7 @@ export default {
hasUpgrade(this.layer, 143) || hasUpgrade(this.layer, 143) ||
hasUpgrade(this.layer, 142) || hasUpgrade(this.layer, 142) ||
player.layers.i.unlocked) && player.layers.i.unlocked) &&
layers.p.activeSubtab?.id == "Pointy points" layers.p.activeSubtab?.id != "Pointy points"
); );
} }
}, },
@ -2268,19 +2268,19 @@ export default {
return hasUpgrade("p", 104) || player.layers.i.points.gte(1); return hasUpgrade("p", 104) || player.layers.i.points.gte(1);
}, },
display: ` display: `
<div style="color: red; font-size: 32px; font-family: Comic Sans MS">{{ format(player.layers.p.buyables![21]) }} pointy points</div> <div style="color: red; font-size: 32px; font-family: Comic Sans MS">{{ format(player.layers.p.buyables[21]) }} pointy points</div>
<div style="color: red; font-size: 32px; font-family: Comic Sans MS">My pointy points are multiplying generator efficiency by {{ format(new Decimal(player.layers.p.buyables![21]).plus(1)) }}</div> <div style="color: red; font-size: 32px; font-family: Comic Sans MS">My pointy points are multiplying generator efficiency by {{ format(new Decimal(player.layers.p.buyables[21]).plus(1)) }}</div>
<spacer /> <spacer />
<spacer /> <spacer />
<row><buyable id="21" /></row> <row><buyable id="21" /></row>
<div v-if="hasMilestone('i', 5)" style="color: red; font-size: 32px; font-family: Comic Sans MS">I have {{ format(player.layers.p.buyables![22]) }} pointy prestige points</div> <div v-if="hasMilestone('i', 5)" style="color: red; font-size: 32px; font-family: Comic Sans MS">I have {{ format(player.layers.p.buyables[22]) }} pointy prestige points</div>
<row><buyable id="22" /></row> <row><buyable id="22" /></row>
<spacer /> <spacer />
<upgrades :upgrades="[211, 212, 213, 214, 215]" /> <upgrades :upgrades="[211, 212, 213, 214, 215]" />
<upgrades :upgrades="[221, 222, 223, 224, 225]" /> <upgrades :upgrades="[221, 222, 223, 224, 225]" />
<div v-if="hasMilestone('p', 225)" style="color: red; font-size: 32px; font-family: Comic Sans MS">I have {{ format(player.layers.p.buyables![23]) }} pointy boosters!</div> <div v-if="hasUpgrade('p', 225)" style="color: red; font-size: 32px; font-family: Comic Sans MS">I have {{ format(player.layers.p.buyables[23]) }} pointy boosters!</div>
<row><buyable id="23" /></row> <row><buyable id="23" /></row>
<div v-if="hasMilestone('p', 225) || getBuyableAmount('p', 23).gt(0)" style="color: red; font-size: 32px; font-family: Comic Sans MS">My pointy boosters are raising generator efficiency to the ^{{ format(new Decimal(player.layers.p.buyables![23]).div(10).mul(new Decimal(0.1).plus(layers.p.buyables[41].effect).times(10)).plus(1)) }}</div> <div v-if="hasUpgrade('p', 225) || getBuyableAmount('p', 23).gt(0)" style="color: red; font-size: 32px; font-family: Comic Sans MS">My pointy boosters are raising generator efficiency to the ^{{ format(new Decimal(player.layers.p.buyables[23]).div(10).mul(new Decimal(0.1).plus(layers.p.buyables[41].effect).times(10)).plus(1)) }}</div>
<spacer /> <spacer />
<spacer /> <spacer />
<div v-if="hasMilestone('p', 11)" style="font-size: 24px">Booster upgrades</div> <div v-if="hasMilestone('p', 11)" style="font-size: 24px">Booster upgrades</div>

2
src/game/layers.ts
View file

@ -617,7 +617,7 @@ function setRowCol<T extends GridFeatures<S>, S extends Feature>(features: RawGr
} }
let maxRow = 0; let maxRow = 0;
let maxCol = 0; let maxCol = 0;
for (const id in features) { for (const id in features.data) {
const index = Number(id); const index = Number(id);
if (!isNaN(index)) { if (!isNaN(index)) {
if (Math.floor(index / 10) > maxRow) { if (Math.floor(index / 10) > maxRow) {