LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MagicalSleep.java
View File

@ -41,7 +41,7 @@ public class MagicalSleep extends Buff {
GLog.i("You fall into a deep magical sleep."); GLog.i("You fall into a deep magical sleep.");
} }
else if (target instanceof Mob) else if (target instanceof Mob)
((Mob)target).state = ((Mob)target).SLEEPEING; ((Mob)target).state = ((Mob)target).SLEEPING;
target.paralysed = true; target.paralysed = true;

12
src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java
View File

@ -49,12 +49,12 @@ public abstract class Mob extends Char {
protected static final String TXT_RAGE = "#$%^"; protected static final String TXT_RAGE = "#$%^";
protected static final String TXT_EXP = "%+dEXP"; protected static final String TXT_EXP = "%+dEXP";
public AiState SLEEPEING = new Sleeping(); public AiState SLEEPING = new Sleeping();
public AiState HUNTING = new Hunting(); public AiState HUNTING = new Hunting();
public AiState WANDERING = new Wandering(); public AiState WANDERING = new Wandering();
public AiState FLEEING = new Fleeing(); public AiState FLEEING = new Fleeing();
public AiState PASSIVE = new Passive(); public AiState PASSIVE = new Passive();
public AiState state = SLEEPEING; public AiState state = SLEEPING;
public Class<? extends CharSprite> spriteClass; public Class<? extends CharSprite> spriteClass;
@ -89,7 +89,7 @@ public abstract class Mob extends Char {
super.storeInBundle( bundle ); super.storeInBundle( bundle );
if (state == SLEEPEING) { if (state == SLEEPING) {
bundle.put( STATE, Sleeping.TAG ); bundle.put( STATE, Sleeping.TAG );
} else if (state == WANDERING) { } else if (state == WANDERING) {
bundle.put( STATE, Wandering.TAG ); bundle.put( STATE, Wandering.TAG );
@ -110,7 +110,7 @@ public abstract class Mob extends Char {
String state = bundle.getString( STATE ); String state = bundle.getString( STATE );
if (state.equals( Sleeping.TAG )) { if (state.equals( Sleeping.TAG )) {
this.state = SLEEPEING; this.state = SLEEPING;
} else if (state.equals( Wandering.TAG )) { } else if (state.equals( Wandering.TAG )) {
this.state = WANDERING; this.state = WANDERING;
} else if (state.equals( Hunting.TAG )) { } else if (state.equals( Hunting.TAG )) {
@ -206,7 +206,7 @@ public abstract class Mob extends Char {
} else if (buff instanceof Terror) { } else if (buff instanceof Terror) {
state = FLEEING; state = FLEEING;
} else if (buff instanceof Sleep) { } else if (buff instanceof Sleep) {
state = SLEEPEING; state = SLEEPING;
this.sprite().showSleep(); this.sprite().showSleep();
postpone( Sleep.SWS ); postpone( Sleep.SWS );
} }
@ -318,7 +318,7 @@ public abstract class Mob extends Char {
Terror.recover( this ); Terror.recover( this );
if (state == SLEEPEING) { if (state == SLEEPING) {
state = WANDERING; state = WANDERING;
} }
alerted = true; alerted = true;

5
src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/RatKing.java
View File

@ -20,7 +20,6 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
import com.shatteredpixel.shatteredpixeldungeon.sprites.RatKingSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.RatKingSprite;
@ -30,7 +29,7 @@ public class RatKing extends NPC {
name = "rat king"; name = "rat king";
spriteClass = RatKingSprite.class; spriteClass = RatKingSprite.class;
state = SLEEPEING; state = SLEEPING;
} }
@Override @Override
@ -64,7 +63,7 @@ public class RatKing extends NPC {
@Override @Override
public void interact() { public void interact() {
sprite.turnTo( pos, Dungeon.hero.pos ); sprite.turnTo( pos, Dungeon.hero.pos );
if (state == SLEEPEING) { if (state == SLEEPING) {
notice(); notice();
yell( "I'm not sleeping!" ); yell( "I'm not sleeping!" );
state = WANDERING; state = WANDERING;

2
src/com/shatteredpixel/shatteredpixeldungeon/sprites/MobSprite.java
View File

@ -31,7 +31,7 @@ public class MobSprite extends CharSprite {
@Override @Override
public void update() { public void update() {
sleeping = ch != null && ((Mob)ch).state == ((Mob)ch).SLEEPEING; sleeping = ch != null && ((Mob)ch).state == ((Mob)ch).SLEEPING;
super.update(); super.update();
} }