From 87dacfbb3dd16e7f55a82361eace98f9a39d75c8 Mon Sep 17 00:00:00 2001
From: historia <[not public]>
Date: Sat, 27 Jun 2026 21:25:20 -0400
Subject: feat: room-specific objects can be defined inline in room yaml

---
 internal/game/cmd_move.go | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'internal/game/cmd_move.go')

diff --git a/internal/game/cmd_move.go b/internal/game/cmd_move.go
index a1b492e..4bf227c 100644
--- a/internal/game/cmd_move.go
+++ b/internal/game/cmd_move.go
@@ -7,6 +7,7 @@ import (
 	"thehouseoficarus/internal/engine"
 	"thehouseoficarus/internal/item"
 	"thehouseoficarus/internal/net"
+	"thehouseoficarus/internal/object"
 	"thehouseoficarus/internal/player"
 )
 
@@ -245,9 +246,15 @@ func (g *Game) seedRoomObjects(roomID int) {
 	}
 	g.World.EnsureObjectStates(roomID, ids)
 	for _, obj := range room.Objects {
-		def, err := g.ObjectStore.Load(obj.ID)
-		if err != nil {
-			continue
+		var def *object.ObjectDef
+		if obj.Inline != nil {
+			def = obj.Inline
+		} else {
+			var err error
+			def, err = g.ObjectStore.Load(obj.ID)
+			if err != nil {
+				continue
+			}
 		}
 		g.World.SetObjName(roomID, obj.ID, def.Name)
 		if len(def.Aliases) > 0 {
-- 
cgit v1.2.3