konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merging Source v1.7.2: corrected sleeping typo

Browse Source
This commit is contained in:
Evan Debenham
2014-10-21 00:41:44 -04:00
parent 13afc9df8d
commit f352efded2
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java
+6 -6
View File
@@ -49,12 +49,12 @@ public abstract class Mob extends Char {
protected static final String TXT_RAGE = "#$%^";
protected static final String TXT_EXP = "%+dEXP";
public AiState SLEEPEING = new Sleeping();
public AiState SLEEPING = new Sleeping();
public AiState HUNTING = new Hunting();
public AiState WANDERING = new Wandering();
public AiState FLEEING = new Fleeing();
public AiState PASSIVE = new Passive();
public AiState state = SLEEPEING;
public AiState state = SLEEPING;
public Class<? extends CharSprite> spriteClass;
@@ -89,7 +89,7 @@ public abstract class Mob extends Char {
super.storeInBundle( bundle );
if (state == SLEEPEING) {
if (state == SLEEPING) {
bundle.put( STATE, Sleeping.TAG );
} else if (state == WANDERING) {
bundle.put( STATE, Wandering.TAG );
@@ -110,7 +110,7 @@ public abstract class Mob extends Char {
String state = bundle.getString( STATE );
if (state.equals( Sleeping.TAG )) {
this.state = SLEEPEING;
this.state = SLEEPING;
} else if (state.equals( Wandering.TAG )) {
this.state = WANDERING;
} else if (state.equals( Hunting.TAG )) {
@@ -206,7 +206,7 @@ public abstract class Mob extends Char {
} else if (buff instanceof Terror) {
state = FLEEING;
} else if (buff instanceof Sleep) {
state = SLEEPEING;
state = SLEEPING;
this.sprite().showSleep();
postpone( Sleep.SWS );
}
@@ -318,7 +318,7 @@ public abstract class Mob extends Char {
Terror.recover( this );
if (state == SLEEPEING) {
if (state == SLEEPING) {
state = WANDERING;
}
alerted = true;