Merging Source v1.7.2: window changes

This commit is contained in:
Evan Debenham
2014-10-20 03:24:59 -04:00
parent 735af276c8
commit 33db534e25
8 changed files with 363 additions and 49 deletions
@@ -28,12 +28,6 @@ import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
public class WndInfoMob extends WndTitledMessage {
private static final String TXT_SLEEPNIG = "\n\nThis %s is sleeping.";
private static final String TXT_HUNTING = "\n\nThis %s is hunting.";
private static final String TXT_WANDERING = "\n\nThis %s is wandering.";
private static final String TXT_FLEEING = "\n\nThis %s is fleeing.";
private static final String TXT_PASSIVE = "\n\nThe %s is passive.";
public WndInfoMob( Mob mob ) {
super( new MobTitle( mob ), desc( mob ) );
@@ -43,24 +37,8 @@ public class WndInfoMob extends WndTitledMessage {
private static String desc( Mob mob ) {
StringBuilder builder = new StringBuilder( mob.description() );
switch (mob.state) {
case SLEEPING:
builder.append( String.format( TXT_SLEEPNIG, mob.name ) );
break;
case HUNTING:
builder.append( String.format( TXT_HUNTING, mob.name ) );
break;
case WANDERING:
builder.append( String.format( TXT_WANDERING, mob.name ) );
break;
case FLEEING:
builder.append( String.format( TXT_FLEEING, mob.name ) );
break;
case PASSIVE:
builder.append( String.format( TXT_PASSIVE, mob.name ) );
break;
}
builder.append( "\n\n" + mob.state.status() + "." );
return builder.toString();
}