Have conditional rules applied after checking if player is alive

So we do not get "arcane boots" warning immediately after respawn
cannawen · Nov 26, 2023 · 8aceb32 · 8aceb32
1 parent b5fd0bc
commit 8aceb32
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/src/assistants/arcaneBoots.ts b/src/assistants/arcaneBoots.ts
@@ -29,8 +29,8 @@ export default [
         then: () => new Fact(topics.configurableEffect, "arcane boots"),
     }),
 ]
+    .map(alive)
     .map((rule) =>
         conditionalEveryIntervalSeconds(REMINDER_INTERVAL_SECONDS, rule)
     )
-    .map((rule) => configurable(configInfo.ruleIndentifier, rule))
-    .map(alive);
+    .map((rule) => configurable(configInfo.ruleIndentifier, rule));
diff --git a/src/assistants/arcaneRing.ts b/src/assistants/arcaneRing.ts
@@ -29,8 +29,8 @@ export default [
         then: () => new Fact(topics.configurableEffect, "arcane ring"),
     }),
 ]
+    .map(alive)
     .map((rule) =>
         conditionalEveryIntervalSeconds(REMINDER_INTERVAL_SECONDS, rule)
     )
-    .map((rule) => configurable(configInfo.ruleIndentifier, rule))
-    .map(alive);
+    .map((rule) => configurable(configInfo.ruleIndentifier, rule));
diff --git a/src/assistants/lotus.ts b/src/assistants/lotus.ts
@@ -31,12 +31,12 @@ export default [
     }),
 ]
     .map((rule) => configurable(configInfo.ruleIndentifier, rule))
+    .map(inRegularGame)
     .map((rule) =>
         everyIntervalSeconds(
             LOTUS_START_WARNING_TIME,
             LOTUS_STOP_WARNING_TIME,
             LOTUS_SPAWN_INTERVAL,
             rule
         )
-    )
-    .map(inRegularGame);
+    );
diff --git a/src/assistants/midas.ts b/src/assistants/midas.ts
@@ -49,6 +49,6 @@ export default [
         })
     ),
 ]
-    .map((rule) => configurable(configInfo.ruleIndentifier, rule))
+    .map(alive)
     .map(inGame)
-    .map(alive);
+    .map((rule) => configurable(configInfo.ruleIndentifier, rule));
diff --git a/src/assistants/neutralItemDigReminder.ts b/src/assistants/neutralItemDigReminder.ts
@@ -28,9 +28,9 @@ export default ["item_trusty_shovel", "item_pirate_hat"]
                 then: () => new Fact(topics.configurableEffect, "dig"),
             })
     )
+    .map(alive)
+    .map(inGame)
     .map((rule) =>
         conditionalEveryIntervalSeconds(TIME_BETWEEN_REMINDERS, rule)
     )
-    .map(inGame)
-    .map((rule) => configurable(configInfo.ruleIndentifier, rule))
-    .map(alive);
+    .map((rule) => configurable(configInfo.ruleIndentifier, rule));
diff --git a/src/assistants/neutralItemReminder.ts b/src/assistants/neutralItemReminder.ts
@@ -34,11 +34,11 @@ export default [
         },
     }),
 ]
+    .map(alive)
     .map((rule) =>
-        conditionalEveryIntervalSeconds(TIME_BETWEEN_REMINDERS, rule)
+        betweenSeconds(NEUTRAL_ITEM_REMINDER_START_TIME, undefined, rule)
     )
     .map((rule) =>
-        betweenSeconds(NEUTRAL_ITEM_REMINDER_START_TIME, undefined, rule)
+        conditionalEveryIntervalSeconds(TIME_BETWEEN_REMINDERS, rule)
     )
-    .map((rule) => configurable(configInfo.ruleIndentifier, rule))
-    .map(alive);
+    .map((rule) => configurable(configInfo.ruleIndentifier, rule));