Update TileType Enum and add Enum for Icon_Priority

randovania · Oct 27, 2023 · 2161fc0 · 2161fc0
1 parent fb052ae
commit 2161fc0
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/src/mercury_engine_data_structures/formats/bmsmsd.py b/src/mercury_engine_data_structures/formats/bmsmsd.py
@@ -9,9 +9,20 @@
 
 TileType = Enum(
     Int32ul,
-    BLUE=1,
-    RED=2,
-    PURPLE=4
+    NORMAL=1,
+    HEAT=2,
+    ACID=4,
+    ACID_RISE=8,
+    ACID_FALL=12
+)
+
+IconPriority = Enum(
+    Int32sl,
+    METROID=-1,
+    ACTOR=0,
+    DOOR=3,
+    CHOZO_SEAL=4,
+    HIDDEN_ITEM=5
 )
 
 # BMSMSD
@@ -29,7 +40,7 @@
     "tiles" / make_vector(
         Struct(
             "tile_coordinates" / construct.Array(2, Int32sl),
-            "dimension" / Struct(
+            "tile_dimension" / Struct(
                 "bottom_left" / CVector2D,
                 "top_right" / CVector2D,
             ),
@@ -40,7 +51,7 @@
                     "actor_name" / StrId,
                     "clear_condition" / StrId,
                     "icon" / StrId,
-                    "icon_priority" / Int32sl,
+                    "icon_priority" / IconPriority,
                     "coordinates" / CVector3D,
                 )
             ),