Nixyri/AntimatterDimensionsSourceCode
1
0
Fork 0
mirror of https://github.com/IvarK/AntimatterDimensionsSourceCode.git synced 2024-11-28 23:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove old Enslaved-25 reward

Browse Source
This commit is contained in:
SpectralFlame 2019-07-16 17:19:18 -05:00 committed by Andrei Andreev
parent 591e80785e
commit 36d32e531e
3 changed files with 4 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
javascripts/components/celestials/subtabs/enslaved-tab.js
View File

@ -6,10 +6,8 @@ Vue.component("enslaved-tab", {
isStoringReal: false,
autoStoreReal: false,
hasAmplifyStoredReal: false,
hasStoredTimeSpeedBoost: false,
canAdjustStoredTime: false,
storedFraction: 0,
storedTimeSpeedValue: 1,
inEnslaved: false,
completed: false,
storedBlackHole: 0,
@ -24,10 +22,7 @@ Vue.component("enslaved-tab", {
}),
computed: {
amplifiedGameDesc() {
return `^${RA_UNLOCKS.IMPROVED_STORED_TIME.effect.gameTimeAmplification().toFixed(2)}`;
},
storedTimeBoostDesc() {
return formatX(this.storedTimeSpeedValue, 2, 2);
return `${formatPow(RA_UNLOCKS.IMPROVED_STORED_TIME.effect.gameTimeAmplification(), 2, 2)}`;
},
storedRealEfficiencyDesc() {
return formatPercents(this.storedRealEffiency);
@ -67,9 +62,7 @@ Vue.component("enslaved-tab", {
this.isStoringReal = player.celestials.enslaved.isStoringReal;
this.autoStoreReal = player.celestials.enslaved.autoStoreReal;
this.hasAmplifyStoredReal = Ra.has(RA_UNLOCKS.IMPROVED_STORED_TIME);
this.hasStoredTimeSpeedBoost = Ra.has(RA_UNLOCKS.GAMESPEED_BOOST);
this.canAdjustStoredTime = Ra.has(RA_UNLOCKS.ADJUSTABLE_STORED_TIME);
this.storedTimeSpeedValue = Ra.gamespeedStoredTimeMult();
this.inEnslaved = Enslaved.isRunning;
this.completed = Enslaved.isCompleted;
this.storedReal = player.celestials.enslaved.storedReal;
@ -157,7 +150,6 @@ Vue.component("enslaved-tab", {
<p v-if="inEnslaved">{{timeDisplayShort(nerfedBlackHoleTime)}} in this reality</p>
</button>
<div v-if="hasAmplifyStoredReal"> Amplified: {{ amplifiedGameDesc }} </div>
<div v-if="hasStoredTimeSpeedBoost"> Game speed: {{ storedTimeBoostDesc }} </div>
</div>
<div class="l-enslaved-top-container__half">
<button :class="['o-enslaved-mechanic-button',

33
javascripts/core/celestials/ra/ra.js
View File

@ -237,33 +237,6 @@ const Ra = {
if (!Ra.has(RA_UNLOCKS.PEAK_GAMESPEED)) return 1;
return Math.max(Math.pow(Math.log10(player.celestials.ra.peakGamespeed) - 90, 3), 1);
},
// In some sense we're cheating here for the sake of balance since gamespeed has historically been hard to keep
// under wraps. So the way we buff gamespeed in a relatively controlled way here is by manually calculating a
// sensible "maximum possible gamespeed" on top of the CURRENT black hole power based on a game state which is
// slightly farther than the player will be when first unlocking this upgrade (hence the "magic numbers"). The
// state in question is one with a glyph set with two time glyphs and effarig gamespeed pow + achievement pow
// (due to V), all level 10k with celestial rarity, and Lv20 Enslaved + all achievements. The boost is simply 2x
// for any stored time at all if it's below this threshold, but will start scaling up at gamespeeds higher than this.
// It should be a lot harder for this to cause an unchecked runaway since black hole scaling won't feed into this
// upgrade's scaling. There is also an eventual softcap of 1e10 just in case. If I did the math correctly, the
// speed boost should scale with (real time)^(effarig gamespeed pow) before the softcap and worse than that after.
gamespeedStoredTimeMult() {
let assumedBlackHoleBoost = 1;
for (const blackHole of BlackHoles.list) {
assumedBlackHoleBoost *= blackHole.power;
assumedBlackHoleBoost *= Math.pow(GameDatabase.achievements.normal.length, 2.69);
}
const assumedTimeGlyphBoost = Math.pow(2.79, 2);
const baselineGamespeed = Math.pow(assumedBlackHoleBoost * assumedTimeGlyphBoost, 1.22);
const baselineStoredTime = Math.pow(baselineGamespeed, 1.2);
const scaledStoredTime = player.celestials.enslaved.stored / baselineStoredTime;
if (player.celestials.enslaved.stored === 0) return 1;
const softcap = 1e10;
if (scaledStoredTime > softcap) {
return softcap * Math.pow(10, Math.pow(Math.log10(scaledStoredTime / softcap), 0.4));
}
return Math.max(2, scaledStoredTime);
},
// This gets widely used in lots of places since the relevant upgrade is "all forms of continuous non-dimension
// production", which in this case is infinities, eternities, replicanti, dilated time, and time theorem generation.
// It also includes the 1% IP time study, Teresa's 1% EP upgrade, and the charged RM generation upgrade. Note that
@ -422,10 +395,10 @@ const RA_UNLOCKS = {
pet: Ra.pets.enslaved,
level: 15
},
GAMESPEED_BOOST: {
TIME_COMPRESSION: {
id: 17,
description: "Get Enslaved to level 25",
reward: "Game speed increases based on current stored time",
reward: "Unlock Time Compression",
pet: Ra.pets.enslaved,
level: 25
},
@ -487,4 +460,4 @@ const RA_LAITELA_UNLOCK = {
id: 24,
description: "Get all celestials to level 20",
reward: "Unlock Lai'tela, the Celestial of Dimensions",
};
};

4
javascripts/game.js
View File

@ -387,10 +387,6 @@ function getGameSpeedupFactor(effectsToConsider, blackHoleOverride, blackHolesAc
}
}
if (Ra.has(RA_UNLOCKS.GAMESPEED_BOOST)) {
factor *= Ra.gamespeedStoredTimeMult();
}
factor *= Math.pow(AlchemyResource.momentum.effectValue, Time.thisRealityRealTime.totalMinutes);
factor = Math.pow(factor, getAdjustedGlyphEffect("effarigblackhole"));