From f3144be47bc5ed3907d9d88e6d28150296a0ca47 Mon Sep 17 00:00:00 2001 From: glitchyfishys <152113769+glitchyfishys@users.noreply.github.com> Date: Sun, 16 Jun 2024 09:49:14 +1200 Subject: [PATCH 01/14] Update glyph-core.js i forgot something i think --- src/core/glyphs/glyph-core.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/glyphs/glyph-core.js b/src/core/glyphs/glyph-core.js index 8e87e5160..ed1e57beb 100644 --- a/src/core/glyphs/glyph-core.js +++ b/src/core/glyphs/glyph-core.js @@ -437,6 +437,7 @@ export const Glyphs = { for(let i=0;i x == null ? false : (x.type == "cursed"))[0],i); }; + this.clearUndo(); // this should work -glitch } From 5ac1ffe340d18b3f07b783832f40800b4a9637ac Mon Sep 17 00:00:00 2001 From: glitchyfishys <152113769+glitchyfishys@users.noreply.github.com> Date: Sun, 16 Jun 2024 11:32:26 +1200 Subject: [PATCH 02/14] Update deploy-master.yml why is this not doing anything? From 09e79d5dcb0237df38ad6ac865da6c39cbffe55d Mon Sep 17 00:00:00 2001 From: glitchyfishys <152113769+glitchyfishys@users.noreply.github.com> Date: Sun, 16 Jun 2024 11:37:08 +1200 Subject: [PATCH 03/14] Update README.md --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a96f6c841..a06e56af3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Antimatter Dimensions +# Antimatter Dimensions (Redemption) ## Run @@ -23,3 +23,6 @@ be displayed in your terminal. The server **doesn't** need to be restarted after you've made changes - just reload the page. The server **can** occasionally crash, so check your terminal from time to time and run `serve` again if needed. + + +also i don't know how to make the page From 5160f4f17a3551318f0c85454c17d2f596dc60ca Mon Sep 17 00:00:00 2001 From: glitchyfishys <152113769+glitchyfishys@users.noreply.github.com> Date: Sun, 16 Jun 2024 13:36:35 +1200 Subject: [PATCH 04/14] Update README.md --- README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index a06e56af3..c06c9ab0b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ -# Antimatter Dimensions (Redemption) - +# Antimatter Dimensions ## Run To run the game locally, you will need to install @@ -23,6 +22,3 @@ be displayed in your terminal. The server **doesn't** need to be restarted after you've made changes - just reload the page. The server **can** occasionally crash, so check your terminal from time to time and run `serve` again if needed. - - -also i don't know how to make the page From d248486e94ae80ff7ad73b75beff54cee448958b Mon Sep 17 00:00:00 2001 From: glitchyfishys <152113769+glitchyfishys@users.noreply.github.com> Date: Sun, 16 Jun 2024 13:37:05 +1200 Subject: [PATCH 05/14] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c06c9ab0b..a96f6c841 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # Antimatter Dimensions + ## Run To run the game locally, you will need to install From b4ef40738516cccf1e87fd9f42c32b97a7675024 Mon Sep 17 00:00:00 2001 From: glitchyfishys <152113769+glitchyfishys@users.noreply.github.com> Date: Mon, 17 Jun 2024 09:49:01 +1200 Subject: [PATCH 06/14] Update deploy-master.yml update? From a66bbc6ef683558c1ffd1bcb4a5e029b37c4cefd Mon Sep 17 00:00:00 2001 From: glitchyfishys <152113769+glitchyfishys@users.noreply.github.com> Date: Mon, 17 Jun 2024 09:51:16 +1200 Subject: [PATCH 07/14] Update deploy-master.yml --- .github/workflows/deploy-master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-master.yml b/.github/workflows/deploy-master.yml index 42eb927d8..d9d702f7d 100644 --- a/.github/workflows/deploy-master.yml +++ b/.github/workflows/deploy-master.yml @@ -1,4 +1,4 @@ -name: Deploy master +name: Deploy masterr env: FIREBASE_CONFIG: ${{ secrets.FIREBASE_CONFIG }} From f1810284d1d904bb0464df7776c20eea66d97ba3 Mon Sep 17 00:00:00 2001 From: glitchyfishys <152113769+glitchyfishys@users.noreply.github.com> Date: Mon, 17 Jun 2024 09:51:29 +1200 Subject: [PATCH 08/14] Update deploy-master.yml --- .github/workflows/deploy-master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-master.yml b/.github/workflows/deploy-master.yml index d9d702f7d..42eb927d8 100644 --- a/.github/workflows/deploy-master.yml +++ b/.github/workflows/deploy-master.yml @@ -1,4 +1,4 @@ -name: Deploy masterr +name: Deploy master env: FIREBASE_CONFIG: ${{ secrets.FIREBASE_CONFIG }} From f2cd6d6967a24accb7d6be37bf2a3a3b59beccb7 Mon Sep 17 00:00:00 2001 From: glitchyfishys <152113769+glitchyfishys@users.noreply.github.com> Date: Mon, 17 Jun 2024 10:14:57 +1200 Subject: [PATCH 09/14] Update deploy-master.yml --- .github/workflows/deploy-master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-master.yml b/.github/workflows/deploy-master.yml index 42eb927d8..bbee1f14e 100644 --- a/.github/workflows/deploy-master.yml +++ b/.github/workflows/deploy-master.yml @@ -1,4 +1,4 @@ -name: Deploy master +name: Deploy env: FIREBASE_CONFIG: ${{ secrets.FIREBASE_CONFIG }} From 9d3f9023390e9638d2b6758b69064f3274b99e2e Mon Sep 17 00:00:00 2001 From: glitchyfishys <152113769+glitchyfishys@users.noreply.github.com> Date: Mon, 17 Jun 2024 10:15:33 +1200 Subject: [PATCH 10/14] Update deploy-master.yml --- .github/workflows/deploy-master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-master.yml b/.github/workflows/deploy-master.yml index bbee1f14e..79a93a8f7 100644 --- a/.github/workflows/deploy-master.yml +++ b/.github/workflows/deploy-master.yml @@ -1,4 +1,4 @@ -name: Deploy +name: Deploy Master env: FIREBASE_CONFIG: ${{ secrets.FIREBASE_CONFIG }} From 8d22c9a89e1a1ff178bc57413666cfbac8a1a3b3 Mon Sep 17 00:00:00 2001 From: glitchyfishys <152113769+glitchyfishys@users.noreply.github.com> Date: Mon, 17 Jun 2024 10:17:10 +1200 Subject: [PATCH 11/14] Update deploy-master.yml From c56443ea1382765ab168163c871ec0532017d66c Mon Sep 17 00:00:00 2001 From: glitchyfishys <152113769+glitchyfishys@users.noreply.github.com> Date: Mon, 17 Jun 2024 10:20:51 +1200 Subject: [PATCH 12/14] Update deploy-master.yml --- .github/workflows/deploy-master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-master.yml b/.github/workflows/deploy-master.yml index 79a93a8f7..42eb927d8 100644 --- a/.github/workflows/deploy-master.yml +++ b/.github/workflows/deploy-master.yml @@ -1,4 +1,4 @@ -name: Deploy Master +name: Deploy master env: FIREBASE_CONFIG: ${{ secrets.FIREBASE_CONFIG }} From 62710d9ced0f45e4d4b6969639590233a6c27e06 Mon Sep 17 00:00:00 2001 From: glitchyfishys <152113769+glitchyfishys@users.noreply.github.com> Date: Tue, 18 Jun 2024 09:44:04 +1200 Subject: [PATCH 13/14] Update glyph-core.js some changes --- src/core/glyphs/glyph-core.js | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/src/core/glyphs/glyph-core.js b/src/core/glyphs/glyph-core.js index ed1e57beb..2de8d3ddb 100644 --- a/src/core/glyphs/glyph-core.js +++ b/src/core/glyphs/glyph-core.js @@ -53,25 +53,8 @@ export const Glyphs = { factorsOpen: false, bestUndoGlyphCount: 0, get maxSlots() { - if (Pelle.isDoomed){ - let p = PelleRifts.vacuum.milestones[0].canBeApplied ? 1 : 0; - if(CorruptionUpgrade(6).isBought) p+=1; - return p; - } - else{ - let i = 3; - if (RealityUpgrade(9).isBought){ - i++ - } - if (RealityUpgrade(24).isBought){ - i++ - } - if (MendingMilestone.five.isReached){ - i += 3; - } - return i - } - //return MendingMilestone.five.isReached ? 8 : 5 + return this.activeSlotCount; + // can't you just do this? }, //will be a function later for further upgrades get inventoryList() { return player.reality.glyphs.inventory; @@ -109,6 +92,7 @@ export const Glyphs = { if(CorruptionUpgrade(6).isBought) p+=1; return p; } + // it would be funny to have 12 glyphs for a challenge return MendingMilestone.five.isReached ? 6 + Effects.sum(RealityUpgrade(9), RealityUpgrade(24)) : 3 + Effects.sum(RealityUpgrade(9), RealityUpgrade(24)) }, get protectedSlots() { @@ -370,11 +354,6 @@ export const Glyphs = { */ //Hexa saved me from a ton of spagetti code, so thanks to him if (!Pelle.isDoomed) { - if (player.mending.corruptionChallenge.corruptedMend && ["cursed"].includes(this.active[targetSlot].type) && this.active[targetSlot].id>=3 && this.active[targetSlot].id<=2+corruptionPenalties.compGlyphs.hiddenFour[player.mending.corruption[4]]) { //1.already force cursed number? 2.target is cursed? 3.the swapper is NOT cursed? - Modal.message.show(`The forced Cursed Glyphs cannot be touched!`, - { closeEvent: GAME_EVENT.GLYPHS_CHANGED }); - return; - }//here for swap I think--sxy if (!canEquipSpecial && ["effarig", "reality"].includes(glyph.type)) { // Can we not equip a Special and is the glyph we are trying to equip a special? if (!(this.active[targetSlot].type == glyph.type)) { // Is the glyph we are trying to equip not replacing its own type? Modal.message.show(`You have the max amount of ${glyph.type.capitalize()} Glyphs equipped!`, @@ -438,7 +417,7 @@ export const Glyphs = { Glyphs.equip(Glyphs.inventory.filter(x => x == null ? false : (x.type == "cursed"))[0],i); }; this.clearUndo(); - // this should work -glitch + // this should work -glitch } this.updateRealityGlyphEffects(); @@ -607,13 +586,13 @@ export const Glyphs = { removeFromInventory(glyph) { // This can get called on a glyph not in inventory, during auto sacrifice. if (glyph.idx === null) return; - this.validate(); + this.idate(); const index = player.reality.glyphs.inventory.indexOf(glyph); if (index < 0) return; this.inventory[glyph.idx] = null; player.reality.glyphs.inventory.splice(index, 1); EventHub.dispatch(GAME_EVENT.GLYPHS_CHANGED); - this.validate(); + this.idate(); }, validate() { for (const glyph of player.reality.glyphs.inventory) { From d9388f2690109c4d7f48ee6b89808a0be3779b67 Mon Sep 17 00:00:00 2001 From: glitchyfishys <152113769+glitchyfishys@users.noreply.github.com> Date: Tue, 18 Jun 2024 09:48:16 +1200 Subject: [PATCH 14/14] Update glyph-core.js --- src/core/glyphs/glyph-core.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/glyphs/glyph-core.js b/src/core/glyphs/glyph-core.js index 2de8d3ddb..eaf73bb3f 100644 --- a/src/core/glyphs/glyph-core.js +++ b/src/core/glyphs/glyph-core.js @@ -586,13 +586,13 @@ export const Glyphs = { removeFromInventory(glyph) { // This can get called on a glyph not in inventory, during auto sacrifice. if (glyph.idx === null) return; - this.idate(); + this.validate(); const index = player.reality.glyphs.inventory.indexOf(glyph); if (index < 0) return; this.inventory[glyph.idx] = null; player.reality.glyphs.inventory.splice(index, 1); EventHub.dispatch(GAME_EVENT.GLYPHS_CHANGED); - this.idate(); + this.validate(); }, validate() { for (const glyph of player.reality.glyphs.inventory) {