v0.6.1: fixed items being added to catalogs on death.

This commit is contained in:
Evan Debenham
2017-07-11 23:52:20 -04:00
parent 460d46a54e
commit 6fd5de91c7
5 changed files with 17 additions and 8 deletions
@@ -338,7 +338,9 @@ public class Item implements Bundlable {
levelKnown = true; levelKnown = true;
cursedKnown = true; cursedKnown = true;
Catalogs.setSeen(getClass()); if (Dungeon.hero.isAlive()) {
Catalogs.setSeen(getClass());
}
return this; return this;
} }
@@ -253,7 +253,9 @@ public class Potion extends Item {
updateQuickslot(); updateQuickslot();
} }
Catalogs.setSeen(getClass()); if (Dungeon.hero.isAlive()) {
Catalogs.setSeen(getClass());
}
} }
} }
@@ -143,7 +143,9 @@ public class Ring extends KindofMisc {
handler.know( this ); handler.know( this );
} }
Catalogs.setSeen(getClass()); if (Dungeon.hero.isAlive()) {
Catalogs.setSeen(getClass());
}
} }
@Override @Override
@@ -21,6 +21,7 @@
package com.shatteredpixel.shatteredpixeldungeon.items.scrolls; package com.shatteredpixel.shatteredpixeldungeon.items.scrolls;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Blindness; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Blindness;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.Item;
@@ -169,7 +170,9 @@ public abstract class Scroll extends Item {
updateQuickslot(); updateQuickslot();
} }
Catalogs.setSeen(getClass()); if (Dungeon.hero.isAlive()) {
Catalogs.setSeen(getClass());
}
} }
} }
@@ -392,10 +392,10 @@ public class WndJournal extends WndTabbed {
int result = 0; int result = 0;
//specifically known items appear first, then seen items, then unknown items. //specifically known items appear first, then seen items, then unknown items.
if (known.get(a)) result -= 2; if (known.get(a) && Catalogs.isSeen(a)) result -= 2;
if (known.get(b)) result += 2; if (known.get(b) && Catalogs.isSeen(b)) result += 2;
if (Catalogs.isSeen(a)) result --; if (Catalogs.isSeen(a)) result --;
if (Catalogs.isSeen(b)) result ++; if (Catalogs.isSeen(b)) result ++;
return result; return result;
} }