LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v1.2.0: fixed plant names persisting between language changes

Browse Source
This commit is contained in:
Evan Debenham 2022-02-23 13:26:30 -05:00
parent 31bf347df7
commit b1a697916c
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java
View File

@ -50,8 +50,6 @@ import com.watabou.utils.Reflection;
import java.util.ArrayList; import java.util.ArrayList;
public abstract class Plant implements Bundlable { public abstract class Plant implements Bundlable {
public String plantName = Messages.get(this, "name");
public int image; public int image;
public int pos; public int pos;
@ -113,7 +111,11 @@ public abstract class Plant implements Bundlable {
public void storeInBundle( Bundle bundle ) { public void storeInBundle( Bundle bundle ) {
bundle.put( POS, pos ); bundle.put( POS, pos );
} }
public String name(){
return Messages.get(this, "name");
}
public String desc() { public String desc() {
String desc = Messages.get(this, "desc"); String desc = Messages.get(this, "desc");
if (Dungeon.hero.subClass == HeroSubClass.WARDEN){ if (Dungeon.hero.subClass == HeroSubClass.WARDEN){

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
View File

@ -1329,7 +1329,7 @@ public class GameScene extends PixelScene {
if (obj instanceof Hero) names.add(((Hero) obj).className().toUpperCase(Locale.ENGLISH)); 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 Mob) names.add(Messages.titleCase( ((Mob)obj).name() ));
else if (obj instanceof Heap) names.add(Messages.titleCase( ((Heap)obj).toString() )); 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() )); else if (obj instanceof Trap) names.add(Messages.titleCase( ((Trap) obj).name() ));
} }
return names; return names;

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoPlant.java
View File

@ -31,7 +31,7 @@ public class WndInfoPlant extends WndTitledMessage {
public WndInfoPlant( Plant plant ) { public WndInfoPlant( Plant plant ) {
super(TerrainFeaturesTilemap.tile( plant.pos, Dungeon.level.map[plant.pos]), super(TerrainFeaturesTilemap.tile( plant.pos, Dungeon.level.map[plant.pos]),
Messages.titleCase(plant.plantName), plant.desc()); Messages.titleCase(plant.name()), plant.desc());
} }
} }