[OOT] Fix unnecessary int conversions for collision properties (#435)

Fix OOT collision properties with unnecessary int conversions
Fast-64 · Aug 26, 2024 · 9ac36e2 · 9ac36e2
1 parent fb91d53
commit 9ac36e2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/fast64_internal/oot/exporter/collision/__init__.py b/fast64_internal/oot/exporter/collision/__init__.py
@@ -156,14 +156,14 @@ def getCollisionData(dataHolder: Optional[Object], transform: Matrix, useMacros:
                     surfaceType = SurfaceType(
                         colProp.cameraID,
                         colProp.exitID,
-                        int(Utility.getPropValue(colProp, "floorProperty"), base=16),
+                        Utility.getPropValue(colProp, "floorProperty"),
                         0,  # unused?
-                        int(Utility.getPropValue(colProp, "wallSetting"), base=16),
-                        int(Utility.getPropValue(colProp, "floorSetting"), base=16),
+                        Utility.getPropValue(colProp, "wallSetting"),
+                        Utility.getPropValue(colProp, "floorSetting"),
                         colProp.decreaseHeight,
                         colProp.eponaBlock,
-                        int(Utility.getPropValue(colProp, "sound"), base=16),
-                        int(Utility.getPropValue(colProp, "terrain"), base=16),
+                        Utility.getPropValue(colProp, "sound"),
+                        Utility.getPropValue(colProp, "terrain"),
                         colProp.lightingSetting,
                         int(colProp.echo, base=16),
                         colProp.hookshotable,

diff --git a/fast64_internal/oot/exporter/collision/surface.py b/fast64_internal/oot/exporter/collision/surface.py
@@ -9,16 +9,16 @@ class SurfaceType:
     # surface type 0
     bgCamIndex: int
     exitIndex: int
-    floorType: int
+    floorType: str
     unk18: int  # unused?
-    wallType: int
-    floorProperty: int
+    wallType: str
+    floorProperty: str
     isSoft: bool
     isHorseBlocked: bool
 
     # surface type 1
-    material: int
-    floorEffect: int
+    material: str
+    floorEffect: str
     lightSetting: int
     echo: int
     canHookshot: bool