v0.6.1: fixed items being added to catalogs on death.
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
+3
-1
@@ -253,7 +253,9 @@ public class Potion extends Item {
|
||||
updateQuickslot();
|
||||
}
|
||||
|
||||
Catalogs.setSeen(getClass());
|
||||
if (Dungeon.hero.isAlive()) {
|
||||
Catalogs.setSeen(getClass());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -143,7 +143,9 @@ public class Ring extends KindofMisc {
|
||||
handler.know( this );
|
||||
}
|
||||
|
||||
Catalogs.setSeen(getClass());
|
||||
if (Dungeon.hero.isAlive()) {
|
||||
Catalogs.setSeen(getClass());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+4
-1
@@ -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());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user