Fixed compat. issues with python ver. 3.8

jamesbrq · Apr 21, 2024 · 7176e53 · 7176e53
1 parent f0d109e
commit 7176e53
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/worlds/mlss/Client.py b/worlds/mlss/Client.py
@@ -1,3 +1,4 @@
+import typing
 from typing import TYPE_CHECKING, Optional, Set
 import struct
 
@@ -23,9 +24,9 @@ class MLSSClient(BizHawkClient):
     goal_flag: int
     rom_slot_name: Optional[str]
     eCount: int
-    eUsed: [int]
+    eUsed: []
     player_name: Optional[str]
-    checked_flags: dict[int, list] = {}
+    checked_flags: typing.Dict[int, list] = {}
 
     def __init__(self) -> None:
         super().__init__()

diff --git a/worlds/mlss/Locations.py b/worlds/mlss/Locations.py
@@ -17,7 +17,7 @@ class MLSSLocation(Location):
     game: str = "Mario & Luigi Superstar Saga"
 
 
-hidden: typing.List[int] = [
+hidden = [
     0x39D8C5,
     0x39D90F,
     0x39D9E9,
@@ -774,7 +774,7 @@ class MLSSLocation(Location):
     LocationData("Oho Oasis Thunderhand", 0x1e9409, 2)
 ]
 
-nonBlock: list[(int, int, int)] = [
+nonBlock = [
     (0x434B, 0x1, 0x243844),  # Farm Mole 1
     (0x434B, 0x1, 0x24387d),  # Farm Mole 2
     (0x4373, 0x8, 0x2779C8),  # Simulblock Mole
@@ -856,7 +856,7 @@ class MLSSLocation(Location):
     (0x433D, 0x10, 0xDA0008)  # Birdo
 ]
 
-roomException: dict[int, list[int]] = {
+roomException = {
     0x1e9437: [0xFE, 0xFF, 0x100],
     0x24ed74: [0x94, 0x95, 0x96, 0x99],
     0x250621: [0x94, 0x95, 0x96, 0x99],
@@ -867,7 +867,7 @@ class MLSSLocation(Location):
     0x2578e7: [0x79, 0x192, 0x193]
 }
 
-beanstones: dict[int, int] = {
+beanstones = {
     0x229345: 0x39dc72,  # Bean fruit 1 - 6
     0x22954D: 0x39dcb4,
     0x228A17: 0x39dbd1,
@@ -886,7 +886,7 @@ class MLSSLocation(Location):
     0x25181F: 0x39d78b
 }
 
-roomCount: dict[int, int] = {
+roomCount = {
     0x15: 2,
     0x18: 4,
     0x19: 3,
@@ -1091,17 +1091,17 @@ class MLSSLocation(Location):
     0x1F7: 1,
 }
 
-shop: dict[int, []] = {
+shop = {
     0x3c05f0: [0x3c05f0, 0x3c05f2, 0x3c05f4, 0x3c05f8, 0x3c05fc, 0x3c05fe, 0x3c0600, 0x3c0602, 0x3c0606, 0x3c0608, 0x3c060c, 0x3c060e, 0x3c0610, 0x3c0614],
     0x3c066a: [0x3c066a, 0x3c066c, 0x3c066e, 0x3c0670, 0x3c0672, 0x3c0674, 0x3c0676, 0x3c0678, 0x3c067c, 0x3c0680]
 }
 
-badge: dict[int, []] = {
+badge = {
     0x3c0618: [0x3c0618, 0x3c061a, 0x3c0624, 0x3c0626, 0x3c0628, 0x3c0632, 0x3c0634, 0x3c0636, 0x3c0640, 0x3c0642, 0x3c0644, 0x3c064e, 0x3c0650, 0x3c0652, 0x3c065c, 0x3c065e, 0x3c0660],
     0x3c0684: [0x3c0684, 0x3c0686, 0x3c0688, 0x3c0692, 0x3c0694, 0x3c069c, 0x3c069e]
 }
 
-pants: dict[int, []] = {
+pants = {
     0x3c0618: [0x3c061C, 0x3c061E, 0x3c0620, 0x3c062a, 0x3c062c, 0x3c062e, 0x3c0638, 0x3c063a, 0x3c063c, 0x3c0646, 0x3c0648, 0x3c064a, 0x3c0654, 0x3c0656, 0x3c0658, 0x3c0662, 0x3c0664, 0x3c0666],
     0x3c0684: [0x3c068a, 0x3c068c, 0x3c068e, 0x3c0696, 0x3c0698, 0x3c06a0, 0x3c06a2]
 }