[OOT] Use Room objects to set which room to use for entrances

fast64_internal/oot/actor/properties.py

@@ -206,23 +206,29 @@ def draw_props(
 
 
 class OOTEntranceProperty(PropertyGroup):
-    # This is also used in entrance list, and roomIndex is obtained from the room this empty is parented to.
+    # This is also used in entrance list.
     spawnIndex: IntProperty(min=0)
     customActor: BoolProperty(name="Use Custom Actor")
     actor: PointerProperty(type=OOTActorProperty)
 
+    tiedRoom: PointerProperty(
+        type=Object,
+        poll=lambda self, object: self.isRoomEmptyObject(object),
+        description="Used to set the room index",
+    )
+
+    def isRoomEmptyObject(self, obj: Object):
+        return obj.type == "EMPTY" and obj.ootEmptyType == "Room"
+
     def draw_props(self, layout: UILayout, obj: Object, altSceneProp: OOTAlternateSceneHeaderProperty, objName: str):
         box = layout.column()
         # box.box().label(text = "Properties")
         roomObj = getRoomObj(obj)
-        if roomObj is not None:
-            split = box.split(factor=0.5)
-            split.label(text="Room Index")
-            split.label(text=str(roomObj.ootRoomHeader.roomIndex))
-        else:
+        if roomObj is None:
             box.label(text="This must be part of a Room empty's hierarchy.", icon="OUTLINER")
 
         entranceProp = obj.ootEntranceProperty
+        prop_split(box, entranceProp, "tiedRoom", "Room")
         prop_split(box, entranceProp, "spawnIndex", "Spawn Index")
         prop_split(box, entranceProp.actor, "actorParam", "Actor Param")
         box.prop(entranceProp, "customActor")

fast64_internal/oot/oot_level_parser.py

@@ -824,6 +824,7 @@ def parseSpawnList(
             spawnObj.ootEmptyType = "Entrance"
             spawnObj.name = "Entrance"
             spawnProp = spawnObj.ootEntranceProperty
+            spawnProp.tiedRoom = roomObjs[roomIndex]
             spawnProp.spawnIndex = spawnIndex
             spawnProp.customActor = actorID != "ACTOR_PLAYER"
             actorProp = spawnProp.actor

fast64_internal/oot/oot_level_writer.py

@@ -819,8 +819,14 @@ def ootProcessEmpties(scene, room, sceneObj, obj, transformMatrix):
                 )
         elif obj.ootEmptyType == "Entrance":
             entranceProp = obj.ootEntranceProperty
-            spawnIndex = obj.ootEntranceProperty.spawnIndex
-            addActor(scene, OOTEntrance(room.roomIndex, spawnIndex), entranceProp.actor, "entranceList", obj.name)
+            spawnIndex = entranceProp.spawnIndex
+
+            if entranceProp.tiedRoom is not None:
+                roomIndex = entranceProp.tiedRoom.ootRoomHeader.roomIndex
+            else:
+                raise PluginError("ERROR: The room isn't set!")
+
+            addActor(scene, OOTEntrance(roomIndex, spawnIndex), entranceProp.actor, "entranceList", obj.name)
             addStartPosition(
                 scene,
                 spawnIndex,

fast64_internal/oot/oot_upgrade.py

@@ -41,7 +41,15 @@ def upgradeRoomHeaders(roomObj: Object, objData: OoT_ObjectData):
 
 
 def upgradeActors(actorObj: Object):
-    if actorObj.ootEmptyType == "Transition Actor":
+    if actorObj.ootEmptyType == "Entrance":
+        entranceProp = actorObj.ootEntranceProperty
+
+        for obj in bpy.data.objects:
+            if obj.type == "EMPTY" and obj.ootEmptyType == "Room":
+                if actorObj in obj.children_recursive:
+                    entranceProp.tiedRoom = obj
+                    break
+    elif actorObj.ootEmptyType == "Transition Actor":
         transActorProp = actorObj.ootTransitionActorProperty
         transActorProp.isRoomTransition = actorObj["ootTransitionActorProperty"]["dontTransition"] == False
         del actorObj["ootTransitionActorProperty"]["dontTransition"]

fast64_internal/oot/props_panel_main.py

@@ -198,7 +198,7 @@ def upgrade_changed_props():
             if obj.type == "EMPTY":
                 if obj.ootEmptyType == "Room":
                     OOTObjectProperty.upgrade_object(obj)
-                if obj.ootEmptyType == "Transition Actor":
+                if obj.ootEmptyType in {"Entrance", "Transition Actor"}:
                     OOTActorProperty.upgrade_object(obj)
                 if any(obj.name.startswith(elem) for elem in ["ActionList.", "Point.", "Preview."]):
                     OOTCutsceneMotionProperty.upgrade_object(obj)

fast64_internal/oot/tools/operators.py

@@ -96,6 +96,7 @@ def execute(self, context):
         roomObj = context.view_layer.objects.active
         roomObj.ootEmptyType = "Room"
         roomObj.name = "Room"
+        entranceObj.ootEntranceProperty.tiedRoom = roomObj
         parentObject(roomObj, planeObj)
 
         location += Vector([0, 0, 2])