Skip to content

Commit

Permalink
April 2 Hotbalance
Browse files Browse the repository at this point in the history
  • Loading branch information
Pseudonian committed Apr 3, 2024
1 parent 4fa03e3 commit 21e853c
Show file tree
Hide file tree
Showing 11 changed files with 29 additions and 6 deletions.
1 change: 1 addition & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3475,6 +3475,7 @@ <h1>Artists</h1>
<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="statAGenM9" class="statPortion">a<span id="sAGenM9" 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
2 changes: 1 addition & 1 deletion src/BlueberryUpgrades.ts
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@ export const blueberryUpgradeData: Record<
costPerLevel: 33333,
blueberryCost: 3,
costFormula: (level: number, baseCost: number): number => {
return (baseCost + 33333 * level) * Math.max(1, Math.pow(4, level - 4))
return (baseCost + 33333 * Math.min(4, level)) * Math.max(1, Math.pow(3, level - 4))
},
rewards: (n: number) => {
const fourByFourBase = n
Expand Down
5 changes: 5 additions & 0 deletions src/CheckVariables.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1655,4 +1655,9 @@ export const checkVariablesOnLoad = (data: PlayerSave) => {
player.shopUpgrades.shopAmbrosiaLuckMultiplier4 = 0
player.shopUpgrades.shopOcteractAmbrosiaLuck = 0
}

if (player.ultimatePixels === undefined) {
player.ultimatePixels = 0
player.ultimateProgress = 0
}
}
2 changes: 1 addition & 1 deletion src/Config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export const version = '3.0.0 pt 4.1: April 1: Unsmith III'
export const version = '3.0.0 pt 4.11: April 2: Unsmith III'

/**
* PSEUDO DO NOT CHANGE THIS LINE
Expand Down
2 changes: 2 additions & 0 deletions src/Reset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1307,6 +1307,8 @@ export const singularity = async (setSingNumber = -1): Promise<void> => {
hold.autoCubeUpgradesToggle = player.autoCubeUpgradesToggle
hold.autoPlatonicUpgradesToggle = player.autoPlatonicUpgradesToggle
hold.insideSingularityChallenge = player.insideSingularityChallenge
hold.ultimatePixels = player.ultimatePixels
hold.ultimateProgress = player.ultimateProgress
hold.singularityChallenges = Object.fromEntries(
Object.entries(player.singularityChallenges).map(([key, value]) => {
return [key, {
Expand Down
2 changes: 2 additions & 0 deletions src/SingularityChallenges.ts
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ export const singularityChallengeData: Record<
effect: (n: number) => {
return {
corrScoreIncrease: 0.03 * n,
blueberrySpeedMult: (1 + n/100),
capIncrease: 3 * +(n > 0),
freeCorruptionLevel: n >= 20,
shopUpgrade: n >= 20
Expand Down Expand Up @@ -315,6 +316,7 @@ export const singularityChallengeData: Record<
},
effect: (n: number) => {
return {
ultimateProgressBarUnlock: (n > 0),
ascensionSpeedMult: (0.1 * n) / 100,
hepteractCap: n > 0,
shopUpgrade: n >= 25
Expand Down
6 changes: 6 additions & 0 deletions src/StatCache.ts
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ type AmbrosiaGeneration =
| 'Event'
| 'OcteractBerries'
| 'BlueberryPatreon'
| 'Exalt2'
| 'CashGrabUltra'

type BlueberryInventory = 'Exalt1' | 'SingularityUpgrade' | 'SingularityPerk'
Expand Down Expand Up @@ -305,6 +306,7 @@ export class AmbrosiaGenerationCache extends MultiplicationCache<AmbrosiaGenerat
SingularityBerries: 1,
OcteractBerries: 1,
BlueberryPatreon: 1,
Exalt2: 1,
CashGrabUltra: 1,
Event: 1
}
Expand Down Expand Up @@ -338,6 +340,10 @@ export class AmbrosiaGenerationCache extends MultiplicationCache<AmbrosiaGenerat
this.vals[key] = +player.blueberryUpgrades.ambrosiaPatreon.bonus.blueberryGeneration
break
}
case 'Exalt2': {
this.vals[key] = +player.singularityChallenges.oneChallengeCap.rewards.blueberrySpeedMult
break
}
case 'Event': {
this.vals[key] = Globals.isEvent
? 1 + calculateEventBuff(BuffType.BlueberryTime)
Expand Down
5 changes: 3 additions & 2 deletions src/Statistics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1315,8 +1315,9 @@ export const loadStatisticsAmbrosiaGeneration = () => {
4: { acc: 4, desc: 'Singularity Ambrosia Generation Upgrades' },
5: { acc: 4, desc: 'Octeract Ambrosia Generation Upgrades' },
6: { acc: 4, desc: 'Patreon Bonus' },
7: { acc: 4, desc: 'Cash-Grab ULTIMATE' },
8: { acc: 4, desc: 'Event Bonus'}
7: { acc: 4, desc: 'One Ascension Challenge'},
8: { acc: 4, desc: 'Cash-Grab ULTIMATE' },
9: { acc: 4, desc: 'Event Bonus'}
}
for (let i = 0; i < arr.length - 1; i++) {
const statAGenMi = DOMCacheGetOrSet(`statAGenM${i + 1}`)
Expand Down
3 changes: 3 additions & 0 deletions src/Synergism.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1477,6 +1477,9 @@ export const player: Player = {
},
blueberryLoadoutMode: 'saveTree',

ultimateProgress: 0,
ultimatePixels: 0,

caches: {
ambrosiaLuckAdditiveMult: new AmbrosiaLuckAdditiveMultCache(),
ambrosiaLuck: new AmbrosiaLuckCache(),
Expand Down
3 changes: 3 additions & 0 deletions src/types/Synergism.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -634,6 +634,9 @@ export interface Player {
blueberryLoadouts: Record<number, BlueberryOpt>
blueberryLoadoutMode: BlueberryLoadoutMode

ultimateProgress: number
ultimatePixels: number

caches: {
ambrosiaLuckAdditiveMult: AmbrosiaLuckAdditiveMultCache
ambrosiaLuck: AmbrosiaLuckCache
Expand Down
4 changes: 2 additions & 2 deletions translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -3076,7 +3076,7 @@
"oneChallengeCap": {
"name": "One Challenge Caps",
"description": "Beat the target Singularity, but the first 14 Challenges have cap of only 1!",
"rewardDescription": "Each completion increases Corruption Multiplier Values by 0.03, no matter what. First Completion gives +3 to Reincarnation Challenge Cap. 20th completion grants +1 free Corruption level and an exclusive shop upgrade!"
"rewardDescription": "Each completion increases Corruption Multiplier Values by 0.03, no matter what, and adds +1% Blueberry Generation Speed! First Completion gives +3 to Reincarnation Challenge Cap. 20th completion grants +1 free Corruption level and an exclusive shop upgrade!"
},
"noOcteracts": {
"name": "No Octeract Effects",
Expand All @@ -3086,7 +3086,7 @@
"limitedAscensions": {
"name": "Twenty Ascensions Challenge",
"description": "Derpsmith put an embargo on Ascensions. Only (20 - completions) are allowed throughout the entire Singularity, before Ascensions trigger massive debuffs! Ascension Count Multiplier is hardcapped at 1. Oh and Delta is disabled. Ha.",
"rewardDescription": "Each completion grants 0.1% Ascension Speed per completion per digit in your Ascension count! First completion doubles the cap of all hepteract. Final completion adds another calculator in the shop!"
"rewardDescription": "Each completion grants 0.1% Ascension Speed per completion per digit in your Ascension count. First completion doubles the cap of all hepteract, plus a new feature ;) Final completion adds another calculator in the shop!"
}
},
"intro": "Do you have what it takes to earn EXALT from Ant God?"
Expand Down

0 comments on commit 21e853c

Please sign in to comment.