v0.7.1a: traps now check if chars on them are flying when appropriate

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/CursingTrap.java

@@ -65,7 +65,7 @@ public class CursingTrap extends Trap {
 			}
 		}
 
-		if (Dungeon.hero.pos == pos){
+		if (Dungeon.hero.pos == pos && !Dungeon.hero.flying){
 			curse(Dungeon.hero);
 		}
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisarmingTrap.java

@@ -61,7 +61,7 @@ public class DisarmingTrap extends Trap{
 			}
 		}
 
-		if (Dungeon.hero.pos == pos){
+		if (Dungeon.hero.pos == pos && !Dungeon.hero.flying){
 			Hero hero = Dungeon.hero;
 			KindOfWeapon weapon = hero.belongings.weapon;
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrippingTrap.java

@@ -56,7 +56,7 @@ public class GrippingTrap extends Trap {
 
 		Char c = Actor.findChar( pos );
 
-		if (c != null) {
+		if (c != null && !c.flying) {
 			int damage = Math.max( 0,  (2 + Dungeon.depth) - c.drRoll() );
 			Buff.affect( c, Bleeding.class ).set( damage );
 			Buff.prolong( c, Cripple.class, Cripple.DURATION);

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/OozeTrap.java

@@ -38,7 +38,7 @@ public class OozeTrap extends Trap {
 	public void activate() {
 		Char ch = Actor.findChar( pos );
 
-		if (ch != null){
+		if (ch != null && !ch.flying){
 			Buff.affect(ch, Ooze.class).set( 20f );
 			Splash.at( pos, 0x000000, 5);
 		}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PitfallTrap.java

@@ -52,12 +52,14 @@ public class PitfallTrap extends Trap {
 
 		Char ch = Actor.findChar( pos );
 
+		if (ch != null && !ch.flying) {
 			if (ch == Dungeon.hero) {
 				Chasm.heroFall(pos);
-		} else if (ch != null){
+			} else {
 				Chasm.mobFall((Mob) ch);
 			}
 		}
+	}
 
 	//TODO these used to become chasms when disarmed, but the functionality was problematic
 	//because it could block routes, perhaps some way to make this work elegantly?

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/TeleportationTrap.java

@@ -50,9 +50,10 @@ public class TeleportationTrap extends Trap {
 		Sample.INSTANCE.play( Assets.SND_TELEPORT );
 
 		Char ch = Actor.findChar( pos);
+		if (ch != null && !ch.flying) {
 			if (ch instanceof Hero) {
 				ScrollOfTeleportation.teleportHero((Hero) ch);
-		} else if (ch != null){
+			} else {
 				int count = 10;
 				int pos;
 				do {
@@ -77,6 +78,7 @@ public class TeleportationTrap extends Trap {
 					
 				}
 			}
+		}
 
 		Heap heap = Dungeon.level.heaps.get(pos);
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WarpingTrap.java

@@ -51,6 +51,7 @@ public class WarpingTrap extends Trap {
 		Sample.INSTANCE.play(Assets.SND_TELEPORT);
 		
 		Char ch = Actor.findChar(pos);
+		if (ch != null && !ch.flying) {
 			if (ch instanceof Hero) {
 				ScrollOfTeleportation.teleportHero((Hero) ch);
 				BArray.setFalse(Dungeon.level.visited);
@@ -58,7 +59,7 @@ public class WarpingTrap extends Trap {
 				GameScene.updateFog();
 				Dungeon.observe();
 				
-		} else if (ch != null){
+			} else {
 				int count = 10;
 				int pos;
 				do {
@@ -83,6 +84,7 @@ public class WarpingTrap extends Trap {
 					
 				}
 			}
+		}
 		
 		Heap heap = Dungeon.level.heaps.get(pos);
 		

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WeakeningTrap.java

@@ -43,7 +43,7 @@ public class WeakeningTrap extends Trap{
 		}
 
 		Char ch = Actor.findChar( pos );
-		if (ch == Dungeon.hero){
+		if (ch != null && !ch.flying){
 			Buff.prolong( ch, Weakness.class, Weakness.DURATION*2f );
 		}
 	}