konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.5.0: fixed incorrect catalog 'count' text for artifs and trinkets

Browse Source
This commit is contained in:
Evan Debenham
2024-08-29 15:15:29 -04:00
parent 73129585e9
commit e3fae42450
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/assets/messages/windows/windows.properties
View File

@@ -132,6 +132,7 @@ windows.wndjournal$catalogtab.not_seen_ally=You haven't encountered this charact
windows.wndjournal$catalogtab.not_seen_trap=You haven't triggered this trap in any of your runs yet.
windows.wndjournal$catalogtab.not_seen_plant=You haven't trampled this plant in any of your runs yet.
windows.wndjournal$catalogtab.upgrade_count=You have upgraded this item a total of _%,d_ times.
windows.wndjournal$catalogtab.trinket_count=You have crafted or upgraded this item a total of _%,d_ times.
windows.wndjournal$catalogtab.use_count=You have used this item a total of _%,d_ times.
windows.wndjournal$catalogtab.gold_count=You have spent a total of _%,d_ gold.
windows.wndjournal$catalogtab.energy_count=You have used a total of _%,d_ energy crystals.

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java
View File

@@ -37,9 +37,11 @@ import com.shatteredpixel.shatteredpixeldungeon.items.Gold;
import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.ClassArmor;
import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.Artifact;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion;
import com.shatteredpixel.shatteredpixeldungeon.items.rings.Ring;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll;
import com.shatteredpixel.shatteredpixeldungeon.items.trinkets.Trinket;
import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfWarding;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.SpiritBow;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon;
@@ -765,8 +767,10 @@ public class WndJournal extends WndTabbed {
}
if (Catalog.useCount(itemClass) > 1) {
if (item.isUpgradable()) {
if (item.isUpgradable() || item instanceof Artifact) {
desc += "\n\n" + Messages.get(CatalogTab.class, "upgrade_count", Catalog.useCount(itemClass));
} else if (item instanceof Trinket) {
desc += "\n\n" + Messages.get(CatalogTab.class, "trinket_count", Catalog.useCount(itemClass));
} else if (item instanceof Gold) {
desc += "\n\n" + Messages.get(CatalogTab.class, "gold_count", Catalog.useCount(itemClass));
} else if (item instanceof EnergyCrystal) {