Skip to content

Commit

Permalink
Stylistic Changes, also a couple other changes too :)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Pseudonian
Pseudonian committed Aug 25, 2023
1 parent 58b0fa3 commit 2997458
Show file tree
Hide file tree
Showing 13 changed files with 421 additions and 135 deletions.
70 changes: 70 additions & 0 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2569,6 +2569,16 @@
<p id="c15Reward33" alt="c15Reward33" label="c15Reward33" class="challengePortion">33. Multiplier Hepteract: <span id="c15Reward33Num" alt="c15Reward33Num" label="c15Reward33Num" class="challengeNumber"></span></p>
<p id="c15Reward34" alt="c15Reward34" label="c15Reward34" class="challengePortion" style="color: pink;">34. Free Daily Overflux Orbs: +<span id="c15Reward34Num" alt="c15Reward34Num" label="c15Reward34Num" class="challengeNumber" style="color:pink"></span> at the start of the day</p>
<p id="c15Reward35" alt="c15Reward35" label="c15Reward35" class="challengePortion" style="color: orange;">35. Ascension Speed: +<span id="c15Reward35Num" alt="c15Reward35Num" label="c15Reward35Num" class="challengeNumber" style="color:orange"></span>%</p>
<p id="c15Reward36" alt="c15Reward36" label="c15Reward36" class="challengePortion" style="color: gold;">36. Golden Quarks: +<span id="c15Reward36Num" alt="c15Reward36Num" label="c15Reward36Num" class="challengeNumber" style="color:gold"></span>%</p>
<p id="c15Reward37" alt="c15Reward37" label="c15Reward37" class="challengePortion" style="color: pink;">37. Obtainium II: +<span id="c15Reward37Num" alt="c15Reward37Num" label="c15Reward37Num" class="challengeNumber" style="color:pink"></span>%</p>
<p id="c15Reward38" alt="c15Reward38" label="c15Reward38" class="challengePortion" style="color: orange;">38. Offering II: +<span id="c15Reward38Num" alt="c15Reward38Num" label="c15Reward38Num" class="challengeNumber" style="color:orange"></span>%</p>
<p id="c15Reward39" alt="c15Reward39" label="c15Reward39" class="challengePortion" style="color: white;">39. 3-7D Cubes VI: +<span id="c15Reward39Num" alt="c15Reward39Num" label="c15Reward39Num" class="challengeNumber" style="color:white"></span>%</p>
<p id="c15Reward40" alt="c15Reward40" label="c15Reward40" class="challengePortion" style="color: orchid;">40. 8D Cubes (Octeracts): +<span id="c15Reward40Num" alt="c15Reward40Num" label="c15Reward40Num" class="challengeNumber" style="color:orchid"></span>%</p>
<p id="c15Reward41" alt="c15Reward41" label="c15Reward41" class="challengePortion" style="color: limegreen;">41. Ambrosia Luck: +<span id="c15Reward41Num" alt="c15Reward41Num" label="c15Reward41Num" class="challengeNumber" style="color:limegreen"></span></p>
<p id="c15Reward42" alt="c15Reward42" label="c15Reward42" class="challengePortion" style="color: purple;">42. Ambrosia Generation Threshold Power: -<span id="c15Reward42Num" alt="c15Reward42Num" label="c15Reward42Num" class="challengeNumber" style="color:purple"></span></p>
<p id="c15Reward43" alt="c15Reward43" label="c15Reward43" class="challengePortion" style="color: lightgoldenrodyellow;">43. Quarks II: +<span id="c15Reward43Num" alt="c15Reward43Num" label="c15Reward43Num" class="challengeNumber" style="color:lightgoldenrodyellow"></span>%</p>
<p id="c15Reward44" alt="c15Reward44" label="c15Reward44" class="challengePortion" style="color: lightgoldenrodyellow;">44. Quark Hepteract DR: +<span id="c15Reward44Num" alt="c15Reward44Num" label="c15Reward44Num" class="challengeNumber" style="color:lightgoldenrodyellow"></span></p>
<p id="c15Reward45" alt="c15Reward45" label="c15Reward45" class="challengePortion" style="color: aquamarine;">45. Free Ambrosia Tree Levels: +<span id="c15Reward45Num" alt="c15Reward45Num" label="c15Reward45Num" class="challengeNumber" style="color:aquamarine"></span></p>

</div>
<div class="platonicUpgradesContainer">
Expand Down Expand Up @@ -3043,6 +3053,7 @@ <h1>Artists</h1>
<button class="statsNerds" id="kFreeAccel" alt="kFreeAccel" label="kFreeAccel" style="border: 2px solid yellow">Free Accelerators</button>
<button class="statsNerds" id="kFreeMult" alt="kFreeMult" label="kFreeMult" style="border: 2px solid lawngreen">Free Multipliers</button>
<button class="statsNerds" id="kOfferingMult" alt="kOfferingMult" label="kOfferingMult" style="border: 2px solid palegreen">Offering Multipliers</button>
<button class="statsNerds" id="kObtainiumMult" alt="kObtainiumMult" label="kObtainiumMult" style="border: 2px solid rgb(21, 98, 206)">Obtainium Multipliers</button>
<button class="statsNerds" id="kQuarkMult" alt="kQuarkMult" label="kQuarkMult" style="border: 2px solid white">Global Quark Multipliers</button>
<button class="statsNerds reincarnationunlock" id="kGSpeedMult" alt="kGSpeedMult" label="kGSpeedMult" style="border: 2px solid blue">Global Speed Multipliers</button>
<button class="statsNerds ascendunlock" id="kASCMult" alt="kASCMult" label="kASCMult" style="border: 2px solid orange">Ascension Speed Multipliers</button>
Expand Down Expand Up @@ -3151,9 +3162,66 @@ <h1>Artists</h1>
<p id="statOff37" alt="statOff37" class="statPortion">a<span id="sOff37" alt="sOff37" class="statNumber">b</span></p>
<p id="statOff38" alt="statOff38" class="statPortion">a<span id="sOff38" alt="sOff38" class="statNumber">b</span></p>
<p id="statOff39" alt="statOff39" class="statPortion">a<span id="sOff39" alt="sOff39" class="statNumber">b</span></p>
<p id="statOff40" alt="statOff40" class="statPortion">a<span id="sOff40" alt="sOff40" class="statNumber">b</span></p>

<p id="statOffT" alt="statOffT" label="statOffT" class="statPortion statTotal" style='color: gold'>TOTAL OFFERING MULTIPLIER: <span id="sOffT" alt="sOffT" label="sOffT" class="statNumber statTotal">0</span></p>
</div>
<div id="obtainiumMultiplierStats" alt="obtainiumMultiplierStats" label="obtainiumMultiplierStats" class="statContainer" style="display: none;">
<p id="obtainiumStatTitle" alt="obtainiumStatTitle" label="obtainiumStatTitle" class="statPortion" style="font-size: 1.2em; color: pink">Obtainium Multipliers</p>
<p id="statObt1" alt="statObt1" class="statPortion">-<span id="sObt1" alt="sObt1" class="statNumber">-</span></p>
<p id="statObt2" alt="statObt2" class="statPortion">-<span id="sObt2" alt="sObt2" class="statNumber">-</span></p>
<p id="statObt3" alt="statObt3" class="statPortion">-<span id="sObt3" alt="sObt3" class="statNumber">-</span></p>
<p id="statObt4" alt="statObt4" class="statPortion">-<span id="sObt4" alt="sObt4" class="statNumber">-</span></p>
<p id="statObt5" alt="statObt5" class="statPortion">-<span id="sObt5" alt="sObt5" class="statNumber">-</span></p>
<p id="statObt6" alt="statObt6" class="statPortion">-<span id="sObt6" alt="sObt6" class="statNumber">-</span></p>
<p id="statObt7" alt="statObt7" class="statPortion">-<span id="sObt7" alt="sObt7" class="statNumber">-</span></p>
<p id="statObt8" alt="statObt8" class="statPortion">-<span id="sObt8" alt="sObt8" class="statNumber">-</span></p>
<p id="statObt9" alt="statObt9" class="statPortion">-<span id="sObt9" alt="sObt9" class="statNumber">-</span></p>
<p id="statObt10" alt="statObt10" class="statPortion">-<span id="sObt10" alt="sObt10" class="statNumber">-</span></p>
<p id="statObt11" alt="statObt11" class="statPortion">-<span id="sObt11" alt="sObt11" class="statNumber">-</span></p>
<p id="statObt12" alt="statObt12" class="statPortion">-<span id="sObt12" alt="sObt12" class="statNumber">-</span></p>
<p id="statObt13" alt="statObt13" class="statPortion">-<span id="sObt13" alt="sObt13" class="statNumber">-</span></p>
<p id="statObt14" alt="statObt14" class="statPortion">-<span id="sObt14" alt="sObt14" class="statNumber">-</span></p>
<p id="statObt15" alt="statObt15" class="statPortion">-<span id="sObt15" alt="sObt15" class="statNumber">-</span></p>
<p id="statObt16" alt="statObt16" class="statPortion">-<span id="sObt16" alt="sObt16" class="statNumber">-</span></p>
<p id="statObt17" alt="statObt17" class="statPortion">-<span id="sObt17" alt="sObt17" class="statNumber">-</span></p>
<p id="statObt18" alt="statObt18" class="statPortion">-<span id="sObt18" alt="sObt18" class="statNumber">-</span></p>
<p id="statObt19" alt="statObt19" class="statPortion">-<span id="sObt19" alt="sObt19" class="statNumber">-</span></p>
<p id="statObt20" alt="statObt20" class="statPortion">-<span id="sObt20" alt="sObt20" class="statNumber">-</span></p>
<p id="statObt21" alt="statObt21" class="statPortion">-<span id="sObt21" alt="sObt21" class="statNumber">-</span></p>
<p id="statObt22" alt="statObt22" class="statPortion">-<span id="sObt22" alt="sObt22" class="statNumber">-</span></p>
<p id="statObt23" alt="statObt23" class="statPortion">-<span id="sObt23" alt="sObt23" class="statNumber">-</span></p>
<p id="statObt24" alt="statObt24" class="statPortion">-<span id="sObt24" alt="sObt24" class="statNumber">-</span></p>
<p id="statObt25" alt="statObt25" class="statPortion">-<span id="sObt25" alt="sObt25" class="statNumber">-</span></p>
<p id="statObt26" alt="statObt26" class="statPortion">-<span id="sObt26" alt="sObt26" class="statNumber">-</span></p>
<p id="statObt27" alt="statObt27" class="statPortion">-<span id="sObt27" alt="sObt27" class="statNumber">-</span></p>
<p id="statObt28" alt="statObt28" class="statPortion">-<span id="sObt28" alt="sObt28" class="statNumber">-</span></p>
<p id="statObt29" alt="statObt29" class="statPortion">-<span id="sObt29" alt="sObt29" class="statNumber">-</span></p>
<p id="statObt30" alt="statObt30" class="statPortion">-<span id="sObt30" alt="sObt30" class="statNumber">-</span></p>
<p id="statObt31" alt="statObt31" class="statPortion">-<span id="sObt31" alt="sObt31" class="statNumber">-</span></p>
<p id="statObt32" alt="statObt32" class="statPortion">-<span id="sObt32" alt="sObt32" class="statNumber">-</span></p>
<p id="statObt33" alt="statObt33" class="statPortion">-<span id="sObt33" alt="sObt33" class="statNumber">-</span></p>
<p id="statObt34" alt="statObt34" class="statPortion">-<span id="sObt34" alt="sObt34" class="statNumber">-</span></p>
<p id="statObt35" alt="statObt35" class="statPortion">-<span id="sObt35" alt="sObt35" class="statNumber">-</span></p>
<p id="statObt36" alt="statObt36" class="statPortion">-<span id="sObt36" alt="sObt36" class="statNumber">-</span></p>
<p id="statObt37" alt="statObt37" class="statPortion">-<span id="sObt37" alt="sObt37" class="statNumber">-</span></p>
<p id="statObt38" alt="statObt38" class="statPortion">-<span id="sObt38" alt="sObt38" class="statNumber">-</span></p>
<p id="statObt39" alt="statObt39" class="statPortion">-<span id="sObt39" alt="sObt39" class="statNumber">-</span></p>
<p id="statObt40" alt="statObt40" class="statPortion">-<span id="sObt40" alt="sObt40" class="statNumber">-</span></p>
<p id="statObt41" alt="statObt41" class="statPortion">-<span id="sObt41" alt="sObt41" class="statNumber">-</span></p>
<p id="statObt42" alt="statObt42" class="statPortion">-<span id="sObt42" alt="sObt42" class="statNumber">-</span></p>
<p id="statObt43" alt="statObt43" class="statPortion">-<span id="sObt43" alt="sObt43" class="statNumber">-</span></p>
<p id="statObt44" alt="statObt44" class="statPortion">-<span id="sObt44" alt="sObt44" class="statNumber">-</span></p>
<p id="statObt45" alt="statObt45" class="statPortion">-<span id="sObt45" alt="sObt45" class="statNumber">-</span></p>
<p id="statObt46" alt="statObt46" class="statPortion">-<span id="sObt46" alt="sObt46" class="statNumber">-</span></p>
<p id="statObt47" alt="statObt47" class="statPortion">-<span id="sObt47" alt="sObt47" class="statNumber">-</span></p>
<p id="statObt48" alt="statObt48" class="statPortion">-<span id="sObt48" alt="sObt48" class="statNumber">-</span></p>
<p id="statObt49" alt="statObt49" class="statPortion">-<span id="sObt49" alt="sObt49" class="statNumber">-</span></p>
<p id="statObt50" alt="statObt50" class="statPortion">-<span id="sObt50" alt="sObt50" class="statNumber">-</span></p>
<p id="statObt51" alt="statObt51" class="statPortion">-<span id="sObt51" alt="sObt51" class="statNumber">-</span></p>
<p id="statObt52" alt="statObt52" class="statPortion">-<span id="sObt52" alt="sObt52" class="statNumber">-</span></p>
<p id="statObtT" alt="statObtT" label="statObtT" class="statPortion statTotal" style='color: pink'>TOTAL OBTAINIUM MULTIPLIER: <span id="sObtT" alt="sObtT" label="sObtT" class="statNumber statTotal">0</span></p>
</div>
<div id="globalSpeedMultiplierStats" alt="globalSpeedMultiplierStats" label="globalSpeedMultiplierStats" class="statContainer" style="display: none;">
<p id="GlobalSpeedStatTitle" alt="GlobalSpeedStatTitle" label="GlobalSpeedStatTitle" class='statPortion' style="color: blue; font-size: 1.2em">Global Speed Multipliers</p>

Expand Down Expand Up @@ -3489,6 +3557,7 @@ <h1>Artists</h1>
<p id="statALuckM8" class="statPortion">a<span id="sALuckM8" class="statNumber">0</span></p>
<p id="statALuckM9" class="statPortion">a<span id="sALuckM9" class="statNumber">0</span></p>
<p id="statALuckM10" class="statPortion">a<span id="sALuckM10" class="statNumber">0</span></p>
<p id="statALuckM11" class="statPortion">a<span id="sALuckM11" class="statNumber">0</span></p>
<p id="statALuckMT" class="statPortion statTotal" style="color: orange">TOTAL AMBROSIA LUCK:
<span id="sALuckMT" class="statNumber statTotal">0</span></p>
</div>
Expand All @@ -3502,6 +3571,7 @@ <h1>Artists</h1>
<p id="statAGenM5" class="statPortion">a<span id="sAGenM5" class="statNumber">0</span></p>
<p id="statAGenM6" class="statPortion">a<span id="sAGenM6" class="statNumber">0</span></p>
<p id="statAGenM7" class="statPortion">a<span id="sAGenM7" class="statNumber">0</span></p>
<p id="statAGenM8" class="statPortion">a<span id="sAGenM8" class="statNumber">0</span></p>
<p id="statAGenMT" class="statPortion statTotal" style="color: orange">BLUEBERRY TIME /S:
<span id="sAGenMT" class="statNumber statTotal">0</span></p>
</div>
Expand Down
19 changes: 15 additions & 4 deletions src/BlueberryUpgrades.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { DOMCacheGetOrSet } from './Cache/DOM'
import { visualUpdateAmbrosia } from './UpdateVisuals'
import { exportData, saveFilename } from './ImportExport'
import { getTotalCubeDigits } from './DynamicCubes'
import { Globals } from './Variables'

export type blueberryUpgradeNames = 'ambrosiaTutorial' | 'ambrosiaQuarks1' | 'ambrosiaCubes1' | 'ambrosiaLuck1' |
'ambrosiaCubeLuck1' | 'ambrosiaQuarkLuck1' | 'ambrosiaQuarkCube1' | 'ambrosiaLuckCube1' |
Expand Down Expand Up @@ -137,8 +138,8 @@ export class BlueberryUpgrade extends DynamicUpgrade {
const isMaxLevel = this.maxLevel === this.level
const color = isMaxLevel ? 'plum' : 'white'

let freeLevelInfo = this.freeLevels > 0 ?
`<span style="color: orange"> [+${format(this.freeLevels, 1, true)}]</span>` : ''
let freeLevelInfo = this.freeLv > 0 ?
`<span style="color: aquamarine"> [+${format(this.freeLv, 1, true)}]</span>` : ''

if (this.freeLevels > this.level) {
freeLevelInfo = freeLevelInfo + `<span style="color: var(--maroon-text-color)">${i18next.t('general.softCapped')}</span>`
Expand Down Expand Up @@ -205,16 +206,26 @@ export class BlueberryUpgrade extends DynamicUpgrade {
this.blueberriesInvested = 0
}

public get freeLv(): number {
if (this.level === 0) return 0
if (this.maxLevel === 1) return 0
else {
let extraFree = 0
extraFree += Globals.challenge15Rewards.freeAmbrosiaLevel // 1e111 challenge 15 score
return this.freeLevels + extraFree
}
}

public get rewardDesc(): string {
if ('desc' in this.rewards(0)) {
return String(this.rewards(this.level).desc)
return String(this.rewards(this.level + this.freeLv).desc)
} else {
return 'Contact Platonic or Khafra if you see this (should never occur!)'
}
}

public get bonus() {
return this.rewards(this.level)
return this.rewards(this.level + this.freeLv)
}
}

Expand Down
Loading

0 comments on commit 2997458

Please sign in to comment.