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

v0.3.1: quickslot autotarget now targets the closet enemy in multi-enemy situations

Browse Source
This commit is contained in:
Evan Debenham 2015-08-14 17:01:55 -04:00
parent 9b906353ad
commit d7e849b3ab
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
View File

@ -939,18 +939,27 @@ public class Hero extends Char {
ArrayList<Mob> visible = new ArrayList<Mob>(); ArrayList<Mob> visible = new ArrayList<Mob>();
boolean newMob = false; boolean newMob = false;
Mob closest = null;
for (Mob m : Dungeon.level.mobs) { for (Mob m : Dungeon.level.mobs) {
if (Level.fieldOfView[ m.pos ] && m.hostile) { if (Level.fieldOfView[ m.pos ] && m.hostile) {
visible.add( m ); visible.add( m );
if (!visibleEnemies.contains( m )) { if (!visibleEnemies.contains( m )) {
newMob = true; newMob = true;
} }
if (closest == null){
closest = m;
} else if (distance(closest) > distance(m)) {
closest = m;
}
} }
} }
if (visible.size() == 1){ if (closest != null && (QuickSlotButton.lastTarget == null ||
QuickSlotButton.target(visible.get(0)); !QuickSlotButton.lastTarget.isAlive() ||
!Dungeon.visible[QuickSlotButton.lastTarget.pos])){
QuickSlotButton.target(closest);
} }
if (newMob) { if (newMob) {

2
src/com/shatteredpixel/shatteredpixeldungeon/ui/QuickSlotButton.java
View File

@ -48,7 +48,7 @@ public class QuickSlotButton extends Button implements WndBag.Listener {
private static Image crossM; private static Image crossM;
private static boolean targeting = false; private static boolean targeting = false;
private static Char lastTarget= null; public static Char lastTarget = null;
public QuickSlotButton( int slotNum ) { public QuickSlotButton( int slotNum ) {
super(); super();