From 6fd5de91c7ae8ab977361fde87bcff996d73e630 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 11 Jul 2017 23:52:20 -0400 Subject: [PATCH] v0.6.1: fixed items being added to catalogs on death. --- .../shatteredpixel/shatteredpixeldungeon/items/Item.java | 4 +++- .../shatteredpixeldungeon/items/potions/Potion.java | 4 +++- .../shatteredpixeldungeon/items/rings/Ring.java | 4 +++- .../shatteredpixeldungeon/items/scrolls/Scroll.java | 5 ++++- .../shatteredpixeldungeon/windows/WndJournal.java | 8 ++++---- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java index 9711ebb38..83c7ba12f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java @@ -338,7 +338,9 @@ public class Item implements Bundlable { levelKnown = true; cursedKnown = true; - Catalogs.setSeen(getClass()); + if (Dungeon.hero.isAlive()) { + Catalogs.setSeen(getClass()); + } return this; } 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 326e6264e..5ad95d736 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 @@ -253,7 +253,9 @@ public class Potion extends Item { updateQuickslot(); } - Catalogs.setSeen(getClass()); + if (Dungeon.hero.isAlive()) { + Catalogs.setSeen(getClass()); + } } } 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 a5b4460ff..64461f072 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 @@ -143,7 +143,9 @@ public class Ring extends KindofMisc { handler.know( this ); } - Catalogs.setSeen(getClass()); + if (Dungeon.hero.isAlive()) { + Catalogs.setSeen(getClass()); + } } @Override 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 49fe0c02b..541a95483 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 @@ -21,6 +21,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.scrolls; +import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Blindness; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.items.Item; @@ -169,7 +170,9 @@ public abstract class Scroll extends Item { updateQuickslot(); } - Catalogs.setSeen(getClass()); + if (Dungeon.hero.isAlive()) { + Catalogs.setSeen(getClass()); + } } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java index 8609799d1..9ed397715 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java @@ -392,10 +392,10 @@ public class WndJournal extends WndTabbed { int result = 0; //specifically known items appear first, then seen items, then unknown items. - if (known.get(a)) result -= 2; - if (known.get(b)) result += 2; - if (Catalogs.isSeen(a)) result --; - if (Catalogs.isSeen(b)) result ++; + if (known.get(a) && Catalogs.isSeen(a)) result -= 2; + if (known.get(b) && Catalogs.isSeen(b)) result += 2; + if (Catalogs.isSeen(a)) result --; + if (Catalogs.isSeen(b)) result ++; return result; }