smol fix

6 files changed, 27 insertions, 3 deletions

diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonDoor.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonDoor.java
index 39d53931..cdfc7c37 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonDoor.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonDoor.java
@@ -102,6 +102,14 @@ public class DungeonDoor implements DungeonMechanic, RouteBlocker {
 
     @Override
     public OffsetPoint getRepresentingPoint() {
-        return secretPoint.getOffsetPointList().size() == 0 ? null : secretPoint.getOffsetPointList().get(0);
+        int leastY = Integer.MAX_VALUE;
+        OffsetPoint thatPt = null;
+        for (OffsetPoint offsetPoint : secretPoint.getOffsetPointList()) {
+            if (offsetPoint.getY() < leastY) {
+                thatPt = offsetPoint;
+                leastY = offsetPoint.getY();
+            }
+        }
+        return thatPt;
     }
 }
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonDummy.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonDummy.java
index 41e591c1..3fe6ef46 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonDummy.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonDummy.java
@@ -31,9 +31,14 @@ public class DungeonDummy implements DungeonMechanic {
             preRequisites.add(actionMove);
             preRequisites = actionMove.getPreRequisite();
         } else if (state.equalsIgnoreCase("click")) {
-            ActionClick actionMove = new ActionClick(secretPoint);
+            ActionClick actionClick = new ActionClick(secretPoint);
+            preRequisites.add(actionClick);
+            preRequisites = actionClick.getPreRequisite();
+
+            ActionMove actionMove = new ActionMove(secretPoint);
             preRequisites.add(actionMove);
             preRequisites = actionMove.getPreRequisite();
+
         }
         {
             for (String str : preRequisite) {
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonLever.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonLever.java
index 787208cc..7dd69af3 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonLever.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonLever.java
@@ -20,6 +20,7 @@ public class DungeonLever implements DungeonMechanic {
 
     @Override
     public Set<Action> getAction(String state, DungeonRoom dungeonRoom) {
+        if (state.equals(getCurrentState(dungeonRoom))) return Collections.emptySet();
         if (state.equalsIgnoreCase("navigate")) {
             Set<Action> base;
             Set<Action> preRequisites = base = new HashSet<Action>();
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonOnewayDoor.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonOnewayDoor.java
index 2e279b64..803f7c5b 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonOnewayDoor.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonOnewayDoor.java
@@ -104,6 +104,14 @@ public class DungeonOnewayDoor implements DungeonMechanic, RouteBlocker {
 
     @Override
     public OffsetPoint getRepresentingPoint() {
-        return secretPoint.getOffsetPointList().size() == 0 ? null : secretPoint.getOffsetPointList().get(0);
+        int leastY = Integer.MAX_VALUE;
+        OffsetPoint thatPt = null;
+        for (OffsetPoint offsetPoint : secretPoint.getOffsetPointList()) {
+            if (offsetPoint.getY() < leastY) {
+                thatPt = offsetPoint;
+                leastY = offsetPoint.getY();
+            }
+        }
+        return thatPt;
     }
 }
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonOnewayLever.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonOnewayLever.java
index 926c989d..bddfa231 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonOnewayLever.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonOnewayLever.java
@@ -20,6 +20,7 @@ public class DungeonOnewayLever implements DungeonMechanic {
 
     @Override
     public Set<Action> getAction(String state, DungeonRoom dungeonRoom) {
+        if (state.equals(getCurrentState(dungeonRoom))) return Collections.emptySet();
         if (state.equalsIgnoreCase("navigate")) {
             Set<Action> base;
             Set<Action> preRequisites = base = new HashSet<Action>();
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonPressurePlate.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonPressurePlate.java
index 3574c8c9..79ef4bda 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonPressurePlate.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonPressurePlate.java
@@ -20,6 +20,7 @@ public class DungeonPressurePlate implements DungeonMechanic {
 
     @Override
     public Set<Action> getAction(String state, DungeonRoom dungeonRoom) {
+        if (state.equals(getCurrentState(dungeonRoom))) return Collections.emptySet();
         if (state.equalsIgnoreCase("navigate")) {
             Set<Action> base;
             Set<Action> preRequisites = base = new HashSet<Action>();