Fix bug where water conveyors set COLPOLY_IS_FLOOR_CONVEYOR (#502)

Fast-64 · Mar 4, 2025 · 095696f · 095696f
1 parent 3f476df
commit 095696f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/fast64_internal/oot/exporter/collision/__init__.py b/fast64_internal/oot/exporter/collision/__init__.py
@@ -182,7 +182,7 @@ def getCollisionData(dataHolder: Optional[Object], transform: Matrix, useMacros:
                             colProp.ignoreCameraCollision,
                             colProp.ignoreActorCollision,
                             colProp.ignoreProjectileCollision,
-                            useConveyor,
+                            colProp.conveyorOption == "Land",
                             normal,
                             distance,
                             useMacros,

diff --git a/fast64_internal/oot/exporter/collision/polygons.py b/fast64_internal/oot/exporter/collision/polygons.py
@@ -12,7 +12,7 @@ class CollisionPoly:
     ignoreCamera: bool
     ignoreEntity: bool
     ignoreProjectile: bool
-    enableConveyor: bool
+    isLandConveyor: bool
     normal: Vector
     dist: int
     useMacros: bool
@@ -42,7 +42,7 @@ def getFlags_vIB(self):
         """Returns the value of ``flags_vIB``"""
 
         vtxId = self.indices[1] & 0x1FFF
-        if self.enableConveyor:
+        if self.isLandConveyor:
             flags = "COLPOLY_IS_FLOOR_CONVEYOR" if self.useMacros else "(1 << 0)"
         else:
             flags = "COLPOLY_IGNORE_NONE" if self.useMacros else "0"