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

v0.4.1a: corrupt now overrides amok

Browse Source
This commit is contained in:
Evan Debenham 2016-08-08 15:08:28 -04:00
parent 7f8a66b78f
commit c7613926f5
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -185,19 +185,31 @@ public abstract class Mob extends Char {
//we have no enemy, or the current one is dead //we have no enemy, or the current one is dead
if ( enemy == null || !enemy.isAlive() || state == WANDERING) if ( enemy == null || !enemy.isAlive() || state == WANDERING)
newEnemy = true; newEnemy = true;
//We are amoked and current enemy is the hero
else if (buff( Amok.class ) != null && enemy == Dungeon.hero)
newEnemy = true;
//We are corrupted, and current enemy is either the hero or another corrupted character. //We are corrupted, and current enemy is either the hero or another corrupted character.
else if (buff(Corruption.class) != null && (enemy == Dungeon.hero || enemy.buff(Corruption.class) != null)) else if (buff(Corruption.class) != null && (enemy == Dungeon.hero || enemy.buff(Corruption.class) != null))
newEnemy = true; newEnemy = true;
//We are amoked and current enemy is the hero
else if (buff( Amok.class ) != null && enemy == Dungeon.hero)
newEnemy = true;
if ( newEnemy ) { if ( newEnemy ) {
HashSet<Char> enemies = new HashSet<>(); HashSet<Char> enemies = new HashSet<>();
//if the mob is corrupted...
if ( buff(Corruption.class) != null) {
//look for enemy mobs to attack, which are also not corrupted
for (Mob mob : Dungeon.level.mobs)
if (mob != this && Level.fieldOfView[mob.pos] && mob.hostile && mob.buff(Corruption.class) == null)
enemies.add(mob);
if (enemies.size() > 0) return Random.element(enemies);
//otherwise go for nothing
return null;
//if the mob is amoked... //if the mob is amoked...
if ( buff(Amok.class) != null) { } else if ( buff(Amok.class) != null) {
//try to find an enemy mob to attack first. //try to find an enemy mob to attack first.
for (Mob mob : Dungeon.level.mobs) for (Mob mob : Dungeon.level.mobs)
@ -214,18 +226,6 @@ public abstract class Mob extends Char {
//if there is nothing, go for the hero //if there is nothing, go for the hero
else return Dungeon.hero; else return Dungeon.hero;
//if the mob is corrupted...
} else if (buff(Corruption.class) != null) {
//look for enemy mobs to attack, which are also not corrupted
for (Mob mob : Dungeon.level.mobs)
if (mob != this && Level.fieldOfView[mob.pos] && mob.hostile && mob.buff(Corruption.class) == null)
enemies.add(mob);
if (enemies.size() > 0) return Random.element(enemies);
//otherwise go for nothing
return null;
} else { } else {
//try to find ally mobs to attack. //try to find ally mobs to attack.