Merge remote-tracking branch 'upstream/master'

2026-03-16 05:47:23 +08:00 · 2024-06-07 18:00:59 +08:00
parent 5eea0e6fe4 ef4ba50992
commit 2796c85486
50 changed files with 253 additions and 119 deletions
--- a/module/os_combat/combat.py
+++ b/module/os_combat/combat.py
@@ -17,9 +17,11 @@ class Combat(Combat_, MapEventHandler):
        Returns:
            bool: If enter combat.
        """
-        if not self.is_in_map():
-            if self.is_combat_loading():
-                return True
+        if self.is_in_map():
+            return False
+
+        if self.is_combat_loading():
+            return True

        if self.appear(BATTLE_PREPARATION):
            return True