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

v3.0.1: adjusted bees to target the closest enemy (like other mobs)

Browse Source
This commit is contained in:
Evan Debenham
2025-03-09 20:04:37 -04:00
parent 88caf16b9b
commit 0d045f8620
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bee.java
View File

@@ -32,8 +32,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.BeeSprite;
import com.watabou.utils.Bundle; import com.watabou.utils.Bundle;
import com.watabou.utils.Random; import com.watabou.utils.Random;
import java.util.HashSet;
//FIXME the AI for these things is becoming a complete mess, should refactor //FIXME the AI for these things is becoming a complete mess, should refactor
public class Bee extends Mob { public class Bee extends Mob {
@@ -161,20 +159,22 @@ public class Bee extends Mob {
|| (alignment == Alignment.ALLY && enemy.alignment == Alignment.ALLY) || (alignment == Alignment.ALLY && enemy.alignment == Alignment.ALLY)
|| (buff( Amok.class ) == null && enemy.isInvulnerable(getClass()))){ || (buff( Amok.class ) == null && enemy.isInvulnerable(getClass()))){
//find all mobs near the pot //target closest potential enemy near the pot
HashSet<Char> enemies = new HashSet<>(); Char closest = null;
for (Mob mob : Dungeon.level.mobs) { for (Mob mob : Dungeon.level.mobs) {
if (!(mob == this) if (!(mob == this)
&& Dungeon.level.distance(mob.pos, potPos) <= 3 && Dungeon.level.distance(mob.pos, potPos) <= 3
&& mob.alignment != Alignment.NEUTRAL && mob.alignment != Alignment.NEUTRAL
&& !mob.isInvulnerable(getClass()) && !mob.isInvulnerable(getClass())
&& !(alignment == Alignment.ALLY && mob.alignment == Alignment.ALLY)) { && !(alignment == Alignment.ALLY && mob.alignment == Alignment.ALLY)) {
enemies.add(mob); if (closest == null || Dungeon.level.distance(closest.pos, pos) > Dungeon.level.distance(mob.pos, pos)){
closest = mob;
}
} }
} }
if (!enemies.isEmpty()){ if (closest != null){
return Random.element(enemies); return closest;
} else { } else {
if (alignment != Alignment.ALLY && Dungeon.level.distance(Dungeon.hero.pos, potPos) <= 3){ if (alignment != Alignment.ALLY && Dungeon.level.distance(Dungeon.hero.pos, potPos) <= 3){
return Dungeon.hero; return Dungeon.hero;