diff --git a/Makefile b/Makefile
index 5e01bce..da5e861 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ tracy_build:
 	meson compile -j 10 -C builddir
 
 test: build
-	./builddir/runtests "[rituals]"
+	./builddir/runtests "[combat]"
 
 run: build test
 	powershell "cp ./builddir/zedcaster.exe ."
@@ -41,7 +41,7 @@ clean:
 	meson compile --clean -C builddir
 
 debug_test: build
-	gdb --nx -x .gdbinit --ex run --args builddir/runtests.exe -e "[rituals]"
+	gdb --nx -x .gdbinit --ex run --args builddir/runtests.exe -e "[combat]"
 
 win_installer:
 	powershell 'start "C:\Program Files (x86)\solicus\InstallForge\bin\ifbuilderenvx86.exe" win_installer.ifp'
diff --git a/assets/ai.json b/assets/ai.json
index 7bbc107..817cbef 100644
--- a/assets/ai.json
+++ b/assets/ai.json
@@ -31,11 +31,8 @@
       "needs": {
         "tough_personality": false,
         "in_combat": true,
-        "no_more_enemies": false,
         "have_healing": false,
-        "health_good": false,
-        "enemy_found": true,
-        "enemy_dead": false
+        "health_good": false
       },
       "effects": {
         "in_combat": false
diff --git a/goap.cpp b/goap.cpp
index 5204c17..43393e7 100644
--- a/goap.cpp
+++ b/goap.cpp
@@ -111,43 +111,34 @@ namespace ai {
     return distance_to_goal(start, goal);
   }
 
-  using FScorePair = std::pair<int, ActionState>;
-  auto FScorePair_cmp = [](const FScorePair& l, const FScorePair& r) {
-      return l.first < r.first;
-  };
-  using FScoreQueue = std::vector<FScorePair>;
-
-  ActionState find_lowest(std::unordered_map<ActionState, int>& open_set,
-      FScoreQueue& f_scores)
-  {
+  ActionState find_lowest(std::unordered_map<ActionState, int>& open_set) {
     check(!open_set.empty(), "open set can't be empty in find_lowest");
+    int found_score = SCORE_MAX;
+    ActionState found_as;
 
-    for(auto& [score, astate] : f_scores) {
-      if(open_set.contains(astate)) {
-        return astate;
+    for(auto& kv : open_set) {
+      if(kv.second < found_score) {
+        found_score = kv.second;
+        found_as = kv.first;
       }
     }
 
-    dbc::sentinel("lowest not found!");
+    return found_as;
   }
 
   ActionPlan plan_actions(std::vector<Action>& actions, State start, State goal) {
     std::unordered_map<ActionState, int> open_set;
     std::unordered_map<Action, Action> came_from;
     std::unordered_map<State, int> g_score;
-    FScoreQueue f_score;
     std::unordered_map<State, bool> closed_set;
     ActionState current{FINAL_ACTION, start};
 
     g_score.insert_or_assign(start, 0);
-    f_score.emplace_back(h(start, goal), current);
-    std::push_heap(f_score.begin(), f_score.end(), FScorePair_cmp);
-
     open_set.insert_or_assign(current, h(start, goal));
 
     while(!open_set.empty()) {
       // current := the node in openSet having the lowest fScore[] value
-      current = find_lowest(open_set, f_score);
+      current = find_lowest(open_set);
 
       if(is_subset(current.state, goal)) {
         return {true,
@@ -175,9 +166,7 @@ namespace ai {
           g_score.insert_or_assign(neighbor, tentative_g_score);
           ActionState neighbor_as{neighbor_action, neighbor};
 
-          int score = tentative_g_score + h(neighbor, goal);
-          f_score.emplace_back(score, neighbor_as);
-          std::push_heap(f_score.begin(), f_score.end(), FScorePair_cmp);
+          int score = tentative_g_score + h(neighbor, goal) + neighbor_action.cost;
 
           // this maybe doesn't need score
           open_set.insert_or_assign(neighbor_as, score);
diff --git a/goap.hpp b/goap.hpp
index 0f88fa3..4e5224b 100644
--- a/goap.hpp
+++ b/goap.hpp
@@ -58,6 +58,8 @@ namespace ai {
     ActionState(Action action, State state) :
       action(action), state(state) {}
 
+    ActionState() : action(FINAL_ACTION), state(0) {}
+
     bool operator==(const ActionState& other) const {
       return other.action == action && other.state == state;
     }
diff --git a/tests/rituals.cpp b/tests/rituals.cpp
index f904f92..6294cba 100644
--- a/tests/rituals.cpp
+++ b/tests/rituals.cpp
@@ -27,10 +27,10 @@ TEST_CASE("RitualEngine basic tests", "[rituals]") {
 
   fmt::println("\n\n------------ TEST WILL DO MAGICK TOO");
   ritual.dump();
-  REQUIRE(ritual.will_do("pierce_type"));
+  REQUIRE(ritual.will_do("magick_type"));
 
   ritual.pop();
-  REQUIRE(ritual.will_do("magick_type"));
+  REQUIRE(ritual.will_do("pierce_type"));
 
   re.reset(ritual);
   re.set_state(ritual, "has_magick", true);