From 2161fc0c3401959cbd1310d53750a41796789769 Mon Sep 17 00:00:00 2001 From: dyceron <38679103+dyceron@users.noreply.github.com> Date: Thu, 26 Oct 2023 23:00:00 -0400 Subject: [PATCH] Update TileType Enum and add Enum for Icon_Priority --- .../formats/bmsmsd.py | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/mercury_engine_data_structures/formats/bmsmsd.py b/src/mercury_engine_data_structures/formats/bmsmsd.py index c8dd9ad3..be20d4e1 100644 --- 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, ) ),