From afcafa5e439a8d55d6e46228cc6b0ef1286c86f9 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Wed, 26 Jun 2024 15:23:36 -0400
Subject: [PATCH] v2.5.0: targeted traps now have a max range of 8 tiles

---
 .../levels/traps/DisintegrationTrap.java                      | 4 ++++
 .../shatteredpixeldungeon/levels/traps/GrimTrap.java          | 4 ++++
 .../shatteredpixeldungeon/levels/traps/PoisonDartTrap.java    | 4 ++++
 .../shatteredpixeldungeon/levels/traps/WornDartTrap.java      | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisintegrationTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisintegrationTrap.java
index 49c9114d1..00d50d6c1 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisintegrationTrap.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisintegrationTrap.java
@@ -63,6 +63,10 @@ public class DisintegrationTrap extends Trap {
 					closestDist = curDist;
 				}
 			}
+			//max targeting range of 8 tiles
+			if (closestDist > 8){
+				target = null;
+			}
 		}
 		
 		Heap heap = Dungeon.level.heaps.get(pos);
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrimTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrimTrap.java
index c45f91eb4..4e3629094 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrimTrap.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrimTrap.java
@@ -74,6 +74,10 @@ public class GrimTrap extends Trap {
 							closestDist = curDist;
 						}
 					}
+					//max targeting range of 8 tiles
+					if (closestDist > 8){
+						target = null;
+					}
 				}
 
 				if (target != null) {
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PoisonDartTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PoisonDartTrap.java
index 5e9c0c14c..d1b27b63f 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PoisonDartTrap.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PoisonDartTrap.java
@@ -86,6 +86,10 @@ public class PoisonDartTrap extends Trap {
 							closestDist = curDist;
 						}
 					}
+					//max targeting range of 8 tiles
+					if (closestDist > 8){
+						target = null;
+					}
 				}
 
 				if (target != null) {
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WornDartTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WornDartTrap.java
index d1bce6b10..d94ee9135 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WornDartTrap.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WornDartTrap.java
@@ -71,6 +71,10 @@ public class WornDartTrap extends Trap {
 							closestDist = curDist;
 						}
 					}
+					//max targeting range of 8 tiles
+					if (closestDist > 8){
+						target = null;
+					}
 				}
 
 				if (target != null) {