Nixyri/AntimatterDimensionsSourceCode
1
0
Fork 0
mirror of https://github.com/IvarK/AntimatterDimensionsSourceCode.git synced 2024-11-25 05:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1750 from IvarK/initial-wave-3-fixes

Browse Source 
Fix various visual issues found in the first couple hours of testing
This commit is contained in:
cyip92 2021-08-15 13:56:29 -05:00 committed by GitHub
commit 5ea44e65e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
javascripts/components/dimensions/antimatter/antimatter-dim-boost-row.js
View File

@ -33,7 +33,7 @@ Vue.component("antimatter-dim-boost-row", {
if (boosts >= DimBoost.maxDimensionsUnlockable - 1) dimensionRange = `to all Dimensions`;
let boostEffects = "";
if (NormalChallenge(8).isRunning) boostEffects = newUnlock;
if (NormalChallenge(8).isRunning) boostEffects = ` to ${newUnlock}`;
else if (newUnlock === "") boostEffects = ` to ${formattedMultText} ${dimensionRange}`;
else boostEffects = ` to ${newUnlock} and ${formattedMultText} ${dimensionRange}`;

2
javascripts/components/modals/modal-eternity.js
View File

@ -67,7 +67,7 @@ Vue.component("modal-eternity", {
<h2>You are about to Eternity</h2>
<div class="c-modal-message__text">
{{ message }}
<br><span style="color: red">TODO: DILATION EXIT MODAL HI GAMER</span>
<!-- TODO: DILATION EXIT MODAL HI GAMER -->
<br>
</div>
<br>

2
javascripts/components/new-ui/dimensions-tab/new-dim-boost-row.js
View File

@ -33,7 +33,7 @@ Vue.component("new-dim-boost-row", {
if (boosts >= DimBoost.maxDimensionsUnlockable - 1) dimensionRange = `to all Dimensions`;
let boostEffects = "";
if (NormalChallenge(8).isRunning) boostEffects = newUnlock;
if (NormalChallenge(8).isRunning) boostEffects = ` to ${newUnlock}`;
else if (newUnlock === "") boostEffects = ` to ${formattedMultText} ${dimensionRange}`;
else boostEffects = ` to ${newUnlock} and ${formattedMultText} ${dimensionRange}`;

3
javascripts/core/dilation.js
View File

@ -22,8 +22,7 @@ function startDilatedEternityRequest() {
if (!PlayerProgress.dilationUnlocked()) return;
const playAnimation = player.options.animations.dilation && document.body.style.animation === "";
if (player.dilation.active) {
GameUI.notify.error("its being worked on sorry", 100000);
GameUI.notify.error("TODO: Exiting Dilation Modal NYI", 100000);
// TODO Dilation modal
if (playAnimation) {
animateAndUndilate();
} else {

9
javascripts/core/secret-formula/h2p.js
View File

@ -722,7 +722,7 @@ The minimum level is ${formatInt(1)}.
<br>
You get exactly ${formatInt(1)} Perk Point per Reality.
`,
isUnlocked: () => PlayerProgress.realityUnlocked(),
isUnlocked: () => PlayerProgress.realityUnlocked() || player.dilation.studies.length >= 6,
tags: ["rm", "machines", "glyph", "perk", "reset", "prestige", "endgame", "lategame"],
tab: "reality/upgrades"
}, {
@ -761,7 +761,7 @@ asking if you are sure you want to delete the Glyph. Holding shift and ctrl toge
dialog. <b>However, deleting Glyphs will give you no benefit beyond clearing up inventory space if you do so before
unlocking Glyph Sacrifice from a Reality upgrade!</b>
`,
isUnlocked: () => PlayerProgress.realityUnlocked(),
isUnlocked: () => PlayerProgress.realityUnlocked() || player.dilation.studies.length >= 6,
tags: ["reality", "sacrifice", "level", "endgame", "lategame"],
tab: "reality/glyphs"
}, {
@ -772,10 +772,11 @@ improvements which you can choose your own path through. All Perks only require
<br>
<br>
Each Reality you gain ${formatInt(1)} Perk Point which can be spent on a upgrade on the tree, starting with
"You can now choose from ${formatInt(3)} glyphs on Reality". You can only unlock Perks which are directly adjacent
"You can now choose from ${formatInt(Perk.firstPerk.config.effect)} glyphs on Reality". You can only unlock Perks
which are directly adjacent
to Perks you already have, although there are loops in the tree which you can go through in either direction.
`,
isUnlocked: () => PlayerProgress.realityUnlocked(),
isUnlocked: () => PlayerProgress.realityUnlocked() || player.dilation.studies.length >= 6,
tags: ["pp", "reality", "tree", "endgame", "lategame"],
tab: "reality/perks"
}, {

3
javascripts/core/secret-formula/tabs.js
View File

@ -318,6 +318,7 @@ GameDatabase.tabs = [
name: "Perks",
symbol: "<i class='fas fa-project-diagram'></i>",
component: "perks-tab",
condition: () => PlayerProgress.realityUnlocked(),
id: 3,
hidable: true,
},
@ -326,6 +327,7 @@ GameDatabase.tabs = [
name: "Automator",
symbol: "<i class='fas fa-cog'></i>",
component: "automator-tab",
condition: () => PlayerProgress.realityUnlocked(),
id: 4,
hidable: true,
},
@ -334,6 +336,7 @@ GameDatabase.tabs = [
name: "Black Hole",
symbol: "<i class='fas fa-circle'></i>",
component: "black-hole-tab",
condition: () => PlayerProgress.realityUnlocked(),
id: 5,
hidable: true,
},

3
javascripts/core/storage/migrations.js
View File

@ -763,10 +763,13 @@ GameStorage.migrations = {
player.records.lastTenEternities[i][1] = new Decimal(player.lastTenEternities[i][1]);
}
player.records.thisInfinity.time = player.thisInfinityTime;
player.records.thisInfinity.realTime = player.thisInfinityTime;
player.records.bestInfinity.time = player.bestInfinityTime;
player.records.thisEternity.time = player.thisEternity;
player.records.thisEternity.realTime = player.thisEternity;
player.records.bestEternity.time = player.bestEternity;
player.records.thisReality.time = player.thisReality;
player.records.thisReality.realTime = player.thisReality;
},
deleteOldRecords(player) {

4
stylesheets/styles.css
View File

@ -1318,6 +1318,10 @@ screen and (max-width: 480px) {
width: 20rem;
height: 5.5rem;
box-sizing: border-box;
display: flex;
justify-content: center;
align-content: center;
flex-direction: column;
}
.o-primary-btn--option-wide {