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 cf061e38d..5ab2be011 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java @@ -50,8 +50,6 @@ import com.watabou.utils.Reflection; import java.util.ArrayList; public abstract class Plant implements Bundlable { - - public String plantName = Messages.get(this, "name"); public int image; public int pos; @@ -113,7 +111,11 @@ public abstract class Plant implements Bundlable { public void storeInBundle( Bundle bundle ) { bundle.put( POS, pos ); } - + + public String name(){ + return Messages.get(this, "name"); + } + public String desc() { String desc = Messages.get(this, "desc"); if (Dungeon.hero.subClass == HeroSubClass.WARDEN){ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java index dcadd666b..fbaae026d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java @@ -1329,7 +1329,7 @@ public class GameScene extends PixelScene { if (obj instanceof Hero) names.add(((Hero) obj).className().toUpperCase(Locale.ENGLISH)); else if (obj instanceof Mob) names.add(Messages.titleCase( ((Mob)obj).name() )); else if (obj instanceof Heap) names.add(Messages.titleCase( ((Heap)obj).toString() )); - else if (obj instanceof Plant) names.add(Messages.titleCase( ((Plant) obj).plantName )); + else if (obj instanceof Plant) names.add(Messages.titleCase( ((Plant) obj).name() )); else if (obj instanceof Trap) names.add(Messages.titleCase( ((Trap) obj).name() )); } return names; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoPlant.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoPlant.java index 7da013d66..feb79e8c0 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoPlant.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoPlant.java @@ -31,7 +31,7 @@ public class WndInfoPlant extends WndTitledMessage { public WndInfoPlant( Plant plant ) { super(TerrainFeaturesTilemap.tile( plant.pos, Dungeon.level.map[plant.pos]), - Messages.titleCase(plant.plantName), plant.desc()); + Messages.titleCase(plant.name()), plant.desc()); } }