v2.5.0: further tweaked targeting trap max range

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

@@ -63,8 +63,8 @@ public class DisintegrationTrap extends Trap {
 					closestDist = curDist;
 				}
 			}
-			//max targeting range of 8 tiles
+			//can't target beyond view distance, with a min of 6 (torch range)
-			if (closestDist > 8){
+			if (closestDist > Math.max(6, Dungeon.level.viewDistance)){
 				target = null;
 			}
 		}

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

@@ -74,8 +74,8 @@ public class GrimTrap extends Trap {
 							closestDist = curDist;
 						}
 					}
-					//max targeting range of 8 tiles
+					//can't target beyond view distance, with a min of 6 (torch range)
-					if (closestDist > 8){
+					if (closestDist > Math.max(6, Dungeon.level.viewDistance)){
 						target = null;
 					}
 				}

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

@@ -86,8 +86,8 @@ public class PoisonDartTrap extends Trap {
 							closestDist = curDist;
 						}
 					}
-					//max targeting range of 8 tiles
+					//can't target beyond view distance, with a min of 6 (torch range)
-					if (closestDist > 8){
+					if (closestDist > Math.max(6, Dungeon.level.viewDistance)){
 						target = null;
 					}
 				}

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

@@ -71,8 +71,8 @@ public class WornDartTrap extends Trap {
 							closestDist = curDist;
 						}
 					}
-					//max targeting range of 8 tiles
+					//can't target beyond view distance, with a min of 6 (torch range)
-					if (closestDist > 8){
+					if (closestDist > Math.max(6, Dungeon.level.viewDistance)){
 						target = null;
 					}
 				}