cleaner logic on local to global

thatguy11325 · Apr 15, 2024 · 9335909 · 9335909
1 parent 94408fa
commit 9335909
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/pokemonred_puffer/global_map.py b/pokemonred_puffer/global_map.py
@@ -18,10 +18,10 @@ def local_to_global(r: int, c: int, map_n: int):
         ) = MAP_DATA[map_n]["coordinates"]
         gy = r + map_y
         gx = c + map_x
-        if 0 > gy >= GLOBAL_MAP_SHAPE[0] or 0 > gx >= GLOBAL_MAP_SHAPE[1]:
-            print(f"coord out of bounds! global: ({gx}, {gy}) game: ({r}, {c}, {map_n})")
-            return 0, 0
-        return gy, gx
+        if 0 <= gy < GLOBAL_MAP_SHAPE[0] and 0 <= gx < GLOBAL_MAP_SHAPE[1]:
+            return gy, gx
+        print(f"coord out of bounds! global: ({gx}, {gy}) game: ({r}, {c}, {map_n})")
+        return 0, 0
     except KeyError:
         print(f"Map id {map_n} not found in map_data.json.")
         return 0, 0