From 8d81f25a74af028357f33c4a44f73fc929ad5338 Mon Sep 17 00:00:00 2001
From: syeyoung <cyong06@naver.com>
Date: Wed, 10 Feb 2021 19:50:58 +0900
Subject: AY PATHFINDER GO BRRRRR

---
 .../dungeonsguide/dungeon/mechanics/DungeonBreakableWall.java  | 10 +++-------
 .../dungeonsguide/dungeon/mechanics/DungeonSecret.java         |  1 +
 .../syeyoung/dungeonsguide/dungeon/mechanics/DungeonTomb.java  | 10 +++-------
 3 files changed, 7 insertions(+), 14 deletions(-)

(limited to 'src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics')

diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonBreakableWall.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonBreakableWall.java
index a6c1341b..19f711cb 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonBreakableWall.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonBreakableWall.java
@@ -1,12 +1,9 @@
 package kr.syeyoung.dungeonsguide.dungeon.mechanics;
 
 import com.google.common.collect.Sets;
+import kr.syeyoung.dungeonsguide.dungeon.actions.*;
 import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint;
 import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPointSet;
-import kr.syeyoung.dungeonsguide.dungeon.actions.Action;
-import kr.syeyoung.dungeonsguide.dungeon.actions.ActionChangeState;
-import kr.syeyoung.dungeonsguide.dungeon.actions.ActionClickSet;
-import kr.syeyoung.dungeonsguide.dungeon.actions.ActionMoveNearestAir;
 import kr.syeyoung.dungeonsguide.dungeon.mechanics.predicates.PredicateSuperBoom;
 import kr.syeyoung.dungeonsguide.dungeon.roomfinder.DungeonRoom;
 import kr.syeyoung.dungeonsguide.utils.RenderUtils;
@@ -34,9 +31,8 @@ public class DungeonBreakableWall implements DungeonMechanic, RouteBlocker {
         Set<Action> base;
         Set<Action> preRequisites = base = new HashSet<Action>();
         {
-            ActionClickSet actionClick;
-            preRequisites.add(actionClick = new ActionClickSet(secretPoint));
-            actionClick.setPredicate(PredicateSuperBoom.INSTANCE);
+            ActionBreakWithSuperBoom actionClick;
+            preRequisites.add(actionClick = new ActionBreakWithSuperBoom(secretPoint.getOffsetPointList().get(0)));
             preRequisites = actionClick.getPreRequisite();
         }
         {
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonSecret.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonSecret.java
index 610ca94d..4e8d8658 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonSecret.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonSecret.java
@@ -58,6 +58,7 @@ public class DungeonSecret implements DungeonMechanic {
             ActionKill actionKill;
             preRequisites.add(actionKill = new ActionKill(secretPoint));
             actionKill.setPredicate(PredicateBat.INSTANCE);
+            actionKill.setRadius(10);
             preRequisites = actionKill.getPreRequisite();
         }
         {
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonTomb.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonTomb.java
index 9b5a84fa..9fad7caf 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonTomb.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonTomb.java
@@ -1,10 +1,7 @@
 package kr.syeyoung.dungeonsguide.dungeon.mechanics;
 
 import com.google.common.collect.Sets;
-import kr.syeyoung.dungeonsguide.dungeon.actions.Action;
-import kr.syeyoung.dungeonsguide.dungeon.actions.ActionChangeState;
-import kr.syeyoung.dungeonsguide.dungeon.actions.ActionClickSet;
-import kr.syeyoung.dungeonsguide.dungeon.actions.ActionMoveNearestAir;
+import kr.syeyoung.dungeonsguide.dungeon.actions.*;
 import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint;
 import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPointSet;
 import kr.syeyoung.dungeonsguide.dungeon.mechanics.predicates.PredicateSuperBoom;
@@ -34,9 +31,8 @@ public class DungeonTomb implements DungeonMechanic, RouteBlocker {
         Set<Action> base;
         Set<Action> preRequisites = base = new HashSet<Action>();
         {
-            ActionClickSet actionClick;
-            preRequisites.add(actionClick = new ActionClickSet(secretPoint));
-            actionClick.setPredicate(PredicateSuperBoom.INSTANCE);
+            ActionBreakWithSuperBoom actionClick;
+            preRequisites.add(actionClick = new ActionBreakWithSuperBoom(secretPoint.getOffsetPointList().get(0)));
             preRequisites = actionClick.getPreRequisite();
         }
         {
-- 
cgit