Skip to content

Commit

Permalink
Merge pull request #9 from Forwaken/main
Browse files Browse the repository at this point in the history
Multiple bug fixes relating to evos and dice.
  • Loading branch information
Icecreamdudes authored Nov 1, 2024
2 parents 721748b + d18d181 commit 00d908c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
2 changes: 2 additions & 0 deletions js/dice.js
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,8 @@
{
player.in.infinityPause = new Decimal(5)
}

if (player.ev.evolutionsUnlocked[5]) player.d.challengeDicePoints = player.d.challengeDicePoints.add(player.d.challengeDicePointsToGet)
},
style: { width: '200px', "min-height": '100px' },
},
Expand Down
6 changes: 3 additions & 3 deletions js/evolution.js
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@
},
23: {
title() { return "EVOLVE" },
canClick() { return player.cb.evolutionShards.gte(25) && player.cb.paragonShards.gte(1) && player.d.dicePoints.gte(1e45) && player.cb.evolvedLevels[0].gte(6) && player.cb.evolvedLevels[1].gte(6) && player.cb.evolvedLevels[2].gte(5) && player.cb.XPBoost.gte(7) && player.cb.rarePetLevels[1].gte(5) },
canClick() { return player.cb.evolutionShards.gte(25) && player.cb.paragonShards.gte(1) && player.ta.highestDicePoints.gte(1e45) && player.cb.evolvedLevels[0].gte(6) && player.cb.evolvedLevels[1].gte(6) && player.cb.evolvedLevels[2].gte(5) && player.cb.XPBoost.gte(7) && player.cb.rarePetLevels[1].gte(5) },
unlocked() { return player.ev.evolutionDisplayIndex == 5 },
onClick() {
player.ev.evolutionDisplayIndex = new Decimal(-1)
Expand Down Expand Up @@ -1477,14 +1477,14 @@ addLayer("ev4", {
let growth = 1.2
if (player.buyMax == false)
{
let buyonecost = new Decimal(growth).pow(getBuyableAmount(this.layer, this.id)).mul(base)
let buyonecost = new Decimal(growth).pow(getBuyableAmount(this.layer, this.id)).mul(base).floor()
player.cb.evolutionShards = player.cb.evolutionShards.sub(buyonecost)
setBuyableAmount(this.layer, this.id, getBuyableAmount(this.layer, this.id).add(1))
} else
{

let max = Decimal.affordGeometricSeries(player.cb.evolutionShards, base, growth, getBuyableAmount(this.layer, this.id))
let cost = Decimal.sumGeometricSeries(max, base, growth, getBuyableAmount(this.layer, this.id))
let cost = Decimal.sumGeometricSeries(max, base, growth, getBuyableAmount(this.layer, this.id)).floor()
player.cb.evolutionShards = player.cb.evolutionShards.sub(cost)

setBuyableAmount(this.layer, this.id, getBuyableAmount(this.layer, this.id).add(max))
Expand Down
4 changes: 2 additions & 2 deletions js/hex.js
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@
player.d.buyables[14] = new Decimal(0)
player.d.buyables[15] = new Decimal(0)

for (let i = 0; i < player.d.diceEffects.length; i++)
for (let i = 0; i < 11; i++)
{
player.d.diceEffects[i] = new Decimal(1)
}
Expand Down Expand Up @@ -565,7 +565,7 @@
player.d.buyables[14] = new Decimal(0)
player.d.buyables[15] = new Decimal(0)

for (let i = 0; i < player.d.diceEffects.length; i++)
for (let i = 0; i < 11; i++)
{
player.d.diceEffects[i] = new Decimal(1)
}
Expand Down
2 changes: 1 addition & 1 deletion js/realmMods.js
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@
player.d.buyables[14] = new Decimal(0)
player.d.buyables[15] = new Decimal(0)

for (let i = 0; i < player.d.diceEffects.length; i++)
for (let i = 0; i < 11; i++)
{
player.d.diceEffects[i] = new Decimal(1)
}
Expand Down

0 comments on commit 00d908c

Please sign in to comment.