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

v0.6.4: start scene now shows hero subclasses

Browse Source
This commit is contained in:
Evan Debenham 2018-03-18 14:19:47 -04:00
parent 8aa55c4aad
commit ca3393cf33
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/StartScene.java
View File

@ -26,6 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Chrome;
import com.shatteredpixel.shatteredpixeldungeon.GamesInProgress;
import com.shatteredpixel.shatteredpixeldungeon.SPDSettings;
import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass;
import com.shatteredpixel.shatteredpixeldungeon.journal.Journal;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.ui.ActionIndicator;
@ -162,7 +163,12 @@ public class StartScene extends PixelScene {
level = null;
}
} else {
if (info.subClass != HeroSubClass.NONE){
name.text(Messages.titleCase(info.subClass.title()));
} else {
name.text(Messages.titleCase(info.heroClass.title()));
}
if (hero == null){
hero = new Image(info.heroClass.spritesheet(), 0, 15*info.armorTier, 12, 15);

10
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndGameInProgress.java
View File

@ -25,6 +25,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.GamesInProgress;
import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.scenes.InterlevelScene;
import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
@ -52,9 +53,16 @@ public class WndGameInProgress extends Window {
final GamesInProgress.Info info = GamesInProgress.check(slot);
String className = null;
if (info.subClass != HeroSubClass.NONE){
className = info.subClass.title();
} else {
className = info.heroClass.title();
}
IconTitle title = new IconTitle();
title.icon( HeroSprite.avatar(info.heroClass, info.armorTier) );
title.label((Messages.get(this, "title", info.level, info.heroClass.title())).toUpperCase(Locale.ENGLISH));
title.label((Messages.get(this, "title", info.level, className)).toUpperCase(Locale.ENGLISH));
title.color(Window.SHPX_COLOR);
title.setRect( 0, 0, WIDTH, 0 );
add(title);