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

Merging 1.7.5 Source: items/artifacts changes

Browse Source
This commit is contained in:
Evan Debenham 2015-02-04 01:20:37 -05:00
parent 37e1c8b8ff
commit 8b1ffd9a72
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java
View File

@ -278,7 +278,7 @@ public class DriedRose extends Artifact {
flying = true; flying = true;
state = WANDERING; state = WANDERING;
enemy = DUMMY; enemy = null;
ally = true; ally = true;
} }
@ -297,7 +297,7 @@ public class DriedRose extends Artifact {
public void saySpawned(){ public void saySpawned(){
int i = (Dungeon.depth - 1) / 5; int i = (Dungeon.depth - 1) / 5;
if (chooseEnemy() == DUMMY) if (chooseEnemy() == null)
yell( Random.element( VOICE_AMBIENT[i] ) ); yell( Random.element( VOICE_AMBIENT[i] ) );
else else
yell( Random.element( VOICE_ENEMIES[i][ Dungeon.bossLevel() ? 1 : 0 ] ) ); yell( Random.element( VOICE_ENEMIES[i][ Dungeon.bossLevel() ? 1 : 0 ] ) );
@ -352,7 +352,7 @@ public class DriedRose extends Artifact {
@Override @Override
protected Char chooseEnemy() { protected Char chooseEnemy() {
if (enemy == DUMMY || !enemy.isAlive() || state == WANDERING) { if (enemy == null || !enemy.isAlive() || state == WANDERING) {
HashSet<Mob> enemies = new HashSet<Mob>(); HashSet<Mob> enemies = new HashSet<Mob>();
for (Mob mob : Dungeon.level.mobs) { for (Mob mob : Dungeon.level.mobs) {
@ -360,7 +360,7 @@ public class DriedRose extends Artifact {
enemies.add(mob); enemies.add(mob);
} }
} }
enemy = enemies.size() > 0 ? Random.element( enemies ) : DUMMY; enemy = enemies.size() > 0 ? Random.element( enemies ) : null;
} }
return enemy; return enemy;
} }