From f03af516c086d76c1d7a4741641e9099d6104ccc Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 27 Aug 2024 14:20:56 -0400 Subject: [PATCH] v2.5.0: fixed catalog showing notes for unknown pots/scrolls/rings --- .../shatteredpixeldungeon/items/potions/Potion.java | 2 +- .../shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java | 2 +- .../shatteredpixeldungeon/items/scrolls/Scroll.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java index 2c8ade946..6542e3279 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java @@ -379,7 +379,7 @@ public class Potion extends Item { @Override public String info() { //skip custom notes if anonymized and un-Ided - return (anonymous && !isIdentified()) ? super.desc() : super.info(); + return (anonymous && !handler.isKnown( this )) ? super.desc() : super.info(); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java index 7535e832c..ead2a93a1 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java @@ -177,7 +177,7 @@ public class Ring extends KindofMisc { public String info(){ //skip custom notes if anonymized and un-Ided - String desc = (anonymous && !isIdentified()) ? super.desc() : super.info(); + String desc = (anonymous && !handler.isKnown( this )) ? super.desc() : super.info(); if (cursed && isEquipped( Dungeon.hero )) { desc += "\n\n" + Messages.get(Ring.class, "cursed_worn"); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java index d8b31cf99..742a6eafb 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java @@ -242,7 +242,7 @@ public abstract class Scroll extends Item { @Override public String info() { //skip custom notes if anonymized and un-Ided - return (anonymous && !isIdentified()) ? super.desc() : super.info(); + return (anonymous && !handler.isKnown( this )) ? super.desc() : super.info(); } @Override