Nixyri/AntimatterDimensionsSourceCode
1
0
Fork 0
mirror of https://github.com/IvarK/AntimatterDimensionsSourceCode.git synced 2024-09-20 11:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve glyph-related modals

Browse Source
This commit is contained in:
SpectralFlame 2023-05-25 12:20:56 -05:00 committed by cyip92
parent 1d11d82c3a
commit 2a433149d6
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/components/modals/prestige/ResetRealityModal.vue
View File

@ -8,7 +8,8 @@ export default {
},
data() {
return {
isDoomed: false
isDoomed: false,
canReality: false,
};
},
computed: {
@ -17,6 +18,7 @@ export default {
methods: {
update() {
this.isDoomed = Pelle.isDoomed;
this.canReality = isRealityAvailable();
},
handleYesClick() {
beginProcessReality(getRealityProps(true));
@ -40,9 +42,26 @@ export default {
<br>
<br>
Are you sure you want to do this?
<div
v-if="canReality"
class="c-has-rewards"
>
<br>
You can currently complete a Reality for all its normal rewards, which you will not receive if you
Reset here. To get rewards, use the "Make a new Reality" button.
</div>
<br>
</div>
<template #confirm-text>
Reset
</template>
</ModalWrapperChoice>
</template>
<style scoped>
.c-has-rewards {
font-weight: bold;
font-size: 1.5rem;
color: var(--color-bad);
}
</style>

18
src/core/glyphs/glyph-core.js
View File

@ -288,6 +288,7 @@ export const Glyphs = {
this.removeVisualFlag("unseen", glyph);
this.removeVisualFlag("unequipped", glyph);
},
// We only ever force when draining rifts causes the single slot to be lost (which will never show the modal)
unequipAll(forceToUnprotected = false) {
const targetRegion = forceToUnprotected ? false : player.options.respecIntoProtected;
while (player.reality.glyphs.active.length) {
@ -299,6 +300,23 @@ export const Glyphs = {
}
this.updateRealityGlyphEffects();
this.updateMaxGlyphCount(true);
// We need to add a slight delay as a setTimeout in order to make sure that the EventHub calls following this
// don't immediately close this modal after it's shown. Additionally, we want to prevent the modal from appearing
// for realities shorter than a few seconds in order to stop a UI-based softlock; however at this point the time
// has already been reset, so we just use the most recent real time record (this leads to some inconsistent behavior
// when restarting, but that's not easily avoidable)
const stillEquipped = player.reality.glyphs.active.length;
const fastReality = player.records.recentRealities[0][1] < 3000;
if (stillEquipped && !fastReality) {
const target = player.options.respecIntoProtected ? "Protected slots" : "Main Inventory";
const hasOther = this.findFreeIndex(!player.options.respecIntoProtected) !== -1;
setTimeout(() => Modal.message.show(`${quantifyInt("Glyph", stillEquipped)} could not be unequipped due to lack
of space. Free up some space in your ${target}${hasOther ? " or switch where you are unequipping to" : ""}
in order to unequip ${stillEquipped === 1 ? "it" : "them"}.`, { closeEvent: GAME_EVENT.GLYPHS_CHANGED }),
50);
}
EventHub.dispatch(GAME_EVENT.GLYPHS_EQUIPPED_CHANGED);
EventHub.dispatch(GAME_EVENT.GLYPHS_CHANGED);
return !player.reality.glyphs.active.length;