v0.7.4: refactored interaction code. Places can now be swapped with any ally

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java

@@ -132,6 +132,39 @@ public abstract class Char extends Actor {
 		return false;
 	}
 	
+	//swaps places by default
+	public boolean interact(){
+		
+		if (!Dungeon.level.passable[pos] && !Dungeon.hero.flying){
+			return true;
+		}
+		
+		int curPos = pos;
+		
+		moveSprite( pos, Dungeon.hero.pos );
+		move( Dungeon.hero.pos );
+		
+		Dungeon.hero.sprite.move( Dungeon.hero.pos, curPos );
+		Dungeon.hero.move( curPos );
+		
+		Dungeon.hero.spend( 1 / Dungeon.hero.speed() );
+		Dungeon.hero.busy();
+		
+		return true;
+	}
+	
+	protected boolean moveSprite( int from, int to ) {
+		
+		if (sprite.isVisible() && (Dungeon.level.heroFOV[from] || Dungeon.level.heroFOV[to])) {
+			sprite.move( from, to );
+			return true;
+		} else {
+			sprite.turnTo(from, to);
+			sprite.place( to );
+			return true;
+		}
+	}
+	
 	protected static final String POS       = "pos";
 	protected static final String TAG_HP    = "HP";
 	protected static final String TAG_HT    = "HT";

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java

@@ -628,17 +628,17 @@ public class Hero extends Char {
 	
 	private boolean actInteract( HeroAction.Interact action ) {
 		
-		NPC npc = action.npc;
+		Char ch = action.ch;
 
-		if (Dungeon.level.adjacent( pos, npc.pos )) {
+		if (Dungeon.level.adjacent( pos, ch.pos )) {
 			
 			ready();
-			sprite.turnTo( pos, npc.pos );
+			sprite.turnTo( pos, ch.pos );
-			return npc.interact();
+			return ch.interact();
 			
 		} else {
 			
-			if (fieldOfView[npc.pos] && getCloser( npc.pos )) {
+			if (fieldOfView[ch.pos] && getCloser( ch.pos )) {
 
 				return true;
 
@@ -1192,8 +1192,8 @@ public class Hero extends Char {
 			
 		} else if (fieldOfView[cell] && (ch = Actor.findChar( cell )) instanceof Mob) {
 
-			if (ch instanceof NPC) {
+			if (ch.alignment != Alignment.ENEMY) {
-				curAction = new HeroAction.Interact( (NPC)ch );
+				curAction = new HeroAction.Interact( ch );
 			} else {
 				curAction = new HeroAction.Attack( ch );
 			}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroAction.java

@@ -53,9 +53,9 @@ public class HeroAction {
 	}
 	
 	public static class Interact extends HeroAction {
-		public NPC npc;
+		public Char ch;
-		public Interact( NPC npc ) {
+		public Interact( Char ch ) {
-			this.npc = npc;
+			this.ch = ch;
 		}
 	}
 	

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java

@@ -308,18 +308,6 @@ public abstract class Mob extends Char {
 			return enemy;
 	}
 	
-	protected boolean moveSprite( int from, int to ) {
-
-		if (sprite.isVisible() && (Dungeon.level.heroFOV[from] || Dungeon.level.heroFOV[to])) {
-			sprite.move( from, to );
-			return true;
-		} else {
-			sprite.turnTo(from, to);
-			sprite.place( to );
-			return true;
-		}
-	}
-	
 	@Override
 	public void add( Buff buff ) {
 		super.add( buff );

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/MirrorImage.java

@@ -180,27 +180,6 @@ public class MirrorImage extends NPC {
 		return s;
 	}
 	
-	@Override
-	public boolean interact() {
-		
-		if (!Dungeon.level.passable[pos]){
-			return true;
-		}
-		
-		int curPos = pos;
-		
-		moveSprite( pos, Dungeon.hero.pos );
-		move( Dungeon.hero.pos );
-		
-		Dungeon.hero.sprite.move( Dungeon.hero.pos, curPos );
-		Dungeon.hero.move( curPos );
-		
-		Dungeon.hero.spend( 1 / Dungeon.hero.speed() );
-		Dungeon.hero.busy();
-
-		return true;
-	}
-	
 	{
 		immunities.add( ToxicGas.class );
 		immunities.add( CorrosiveGas.class );

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/NPC.java

@@ -52,5 +52,4 @@ public abstract class NPC extends Mob {
 	public void beckon( int cell ) {
 	}
 	
-	abstract public boolean interact();
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/PrismaticImage.java

@@ -213,27 +213,6 @@ public class PrismaticImage extends NPC {
 		return s;
 	}
 	
-	@Override
-	public boolean interact() {
-		
-		if (!Dungeon.level.passable[pos]){
-			return true;
-		}
-		
-		int curPos = pos;
-		
-		moveSprite( pos, Dungeon.hero.pos );
-		move( Dungeon.hero.pos );
-		
-		Dungeon.hero.sprite.move( Dungeon.hero.pos, curPos );
-		Dungeon.hero.move( curPos );
-		
-		Dungeon.hero.spend( 1 / Dungeon.hero.speed() );
-		Dungeon.hero.busy();
-		
-		return true;
-	}
-	
 	{
 		immunities.add( ToxicGas.class );
 		immunities.add( CorrosiveGas.class );

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java

@@ -650,20 +650,8 @@ public class DriedRose extends Artifact {
 				rose.talkedTo = true;
 				GameScene.show(new WndQuest(this, Messages.get(this, "introduce") ));
 				return false;
-			} else if (Dungeon.level.passable[pos] || Dungeon.hero.flying) {
-				int curPos = pos;
-
-				moveSprite( pos, Dungeon.hero.pos );
-				move( Dungeon.hero.pos );
-
-				Dungeon.hero.sprite.move( Dungeon.hero.pos, curPos );
-				Dungeon.hero.move( curPos );
-
-				Dungeon.hero.spend( 1 / Dungeon.hero.speed() );
-				Dungeon.hero.busy();
-				return true;
 			} else {
-				return false;
+				return super.interact();
 			}
 		}