From 5139de28002375f66ad2b9a74f2371ac30a26717 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 3 Jul 2024 14:55:37 -0400 Subject: [PATCH] v2.5.0: code improvements to item desc vs. item info methods --- .../shatteredpixeldungeon/items/Waterskin.java | 2 +- .../shatteredpixeldungeon/items/armor/Armor.java | 2 +- .../shatteredpixeldungeon/items/artifacts/Artifact.java | 6 +++--- .../shatteredpixeldungeon/items/food/Pasty.java | 4 ++-- .../shatteredpixeldungeon/items/potions/Potion.java | 6 +++--- .../shatteredpixeldungeon/items/rings/Ring.java | 9 +++++++-- .../shatteredpixeldungeon/items/scrolls/Scroll.java | 8 +++----- .../shatteredpixeldungeon/items/trinkets/Trinket.java | 6 +++--- .../shatteredpixeldungeon/items/wands/Wand.java | 2 +- .../shatteredpixeldungeon/items/weapon/SpiritBow.java | 2 +- .../items/weapon/melee/MeleeWeapon.java | 2 +- .../items/weapon/missiles/MissileWeapon.java | 2 +- .../shatteredpixeldungeon/plants/Plant.java | 2 +- 13 files changed, 28 insertions(+), 25 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Waterskin.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Waterskin.java index f341fda30..ad09306d7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Waterskin.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Waterskin.java @@ -127,7 +127,7 @@ public class Waterskin extends Item { @Override public String info() { - String info = desc(); + String info = super.info(); if (volume == 0){ info += "\n\n" + Messages.get(this, "desc_water"); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java index 0d51bc23b..4128526bb 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java @@ -498,7 +498,7 @@ public class Armor extends EquipableItem { @Override public String info() { - String info = desc(); + String info = super.info(); if (levelKnown) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java index b6f47b3bf..f2490e144 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java @@ -138,13 +138,13 @@ public class Artifact extends KindofMisc { @Override public String info() { if (cursed && cursedKnown && !isEquipped( Dungeon.hero )) { - return desc() + "\n\n" + Messages.get(Artifact.class, "curse_known"); + return super.info() + "\n\n" + Messages.get(Artifact.class, "curse_known"); } else if (!isIdentified() && cursedKnown && !isEquipped( Dungeon.hero)) { - return desc()+ "\n\n" + Messages.get(Artifact.class, "not_cursed"); + return super.info() + "\n\n" + Messages.get(Artifact.class, "not_cursed"); } else { - return desc(); + return super.info(); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java index 37103b896..726991788 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java @@ -198,10 +198,10 @@ public class Pasty extends Food { } @Override - public String info() { + public String desc() { switch(Holiday.getCurrentHoliday()){ case NONE: default: - return super.info(); + return super.desc(); case LUNAR_NEW_YEAR: return Messages.get(this, "fish_desc"); case APRIL_FOOLS: 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 678aee38b..7a6811844 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 @@ -368,10 +368,10 @@ public class Potion extends Item { public String name() { return isKnown() ? super.name() : Messages.get(this, color); } - + @Override - public String info() { - return isKnown() ? desc() : Messages.get(this, "unknown_desc"); + public String desc() { + return isKnown() ? super.desc() : Messages.get(this, "unknown_desc"); } @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 654c6da64..0c6e1ca89 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 @@ -160,11 +160,16 @@ public class Ring extends KindofMisc { public String name() { return isKnown() ? super.name() : Messages.get(Ring.class, gem); } + + @Override + public String desc() { + return isKnown() ? super.desc() : Messages.get(this, "unknown_desc"); + } @Override public String info(){ - - String desc = isKnown() ? super.desc() : Messages.get(this, "unknown_desc"); + + String 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 d70bfa0e6..d83883e8c 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 @@ -229,12 +229,10 @@ public abstract class Scroll extends Item { public String name() { return isKnown() ? super.name() : Messages.get(this, rune); } - + @Override - public String info() { - return isKnown() ? - desc() : - Messages.get(this, "unknown_desc"); + public String desc() { + return isKnown() ? super.desc() : Messages.get(this, "unknown_desc"); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/Trinket.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/Trinket.java index cd57461f3..ed9f3abad 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/Trinket.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/trinkets/Trinket.java @@ -60,9 +60,9 @@ public abstract class Trinket extends Item { @Override public String info() { - String desc = desc(); - desc += "\n\n" + statsDesc(); - return desc; + String info = super.info(); + info += "\n\n" + statsDesc(); + return info; } public abstract String statsDesc(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java index 8393e255f..12b024ce3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java @@ -253,7 +253,7 @@ public abstract class Wand extends Item { @Override public String info() { - String desc = desc(); + String desc = super.info(); desc += "\n\n" + statsDesc(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/SpiritBow.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/SpiritBow.java index 832c78377..4616ccb19 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/SpiritBow.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/SpiritBow.java @@ -135,7 +135,7 @@ public class SpiritBow extends Weapon { @Override public String info() { - String info = desc(); + String info = super.info(); info += "\n\n" + Messages.get( SpiritBow.class, "stats", Math.round(augment.damageFactor(min())), diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java index aa3fd0584..a9dc94670 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java @@ -333,7 +333,7 @@ public class MeleeWeapon extends Weapon { @Override public String info() { - String info = desc(); + String info = super.info(); if (levelKnown) { info += "\n\n" + Messages.get(MeleeWeapon.class, "stats_known", tier, augment.damageFactor(min()), augment.damageFactor(max()), STRReq()); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java index ac27a9bc7..7c6e45aaa 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java @@ -451,7 +451,7 @@ abstract public class MissileWeapon extends Weapon { @Override public String info() { - String info = desc(); + String info = super.info(); info += "\n\n" + Messages.get( MissileWeapon.class, "stats", tier, diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java index 45c670e1d..e2871f10d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java @@ -227,7 +227,7 @@ public abstract class Plant implements Bundlable { @Override public String info() { - return Messages.get( Seed.class, "info", desc() ); + return Messages.get( Seed.class, "info", super.info() ); } public static class PlaceHolder extends Seed {