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

v0.3.0c: succubi no longer leap into pits and onto traps

Browse Source
This commit is contained in:
Evan Debenham 2015-06-03 11:30:57 -04:00 committed by Evan Debenham
parent fb2c4c40c4
commit 6ec63567a6
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Succubus.java
View File

@ -17,6 +17,7 @@
*/ */
package com.shatteredpixel.shatteredpixeldungeon.actors.mobs; package com.shatteredpixel.shatteredpixeldungeon.actors.mobs;
import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfTeleportation; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfTeleportation;
@ -98,6 +99,20 @@ public class Succubus extends Mob {
//can't occupy the same cell as another char, so move back one. //can't occupy the same cell as another char, so move back one.
if (Actor.findChar( cell ) != null && cell != this.pos) if (Actor.findChar( cell ) != null && cell != this.pos)
cell = route.path.get(route.dist-1); cell = route.path.get(route.dist-1);
if (Level.avoid[ cell ]){
ArrayList<Integer> candidates = new ArrayList<Integer>();
for (int n : Level.NEIGHBOURS8) {
cell = route.collisionPos + n;
if (Level.passable[cell] && Actor.findChar( cell ) == null) {
candidates.add( cell );
}
}
if (candidates.size() > 0)
cell = Random.element(candidates);
else
return;
}
ScrollOfTeleportation.appear( this, cell ); ScrollOfTeleportation.appear( this, cell );