From bf7c27c2cbf3eb56a0a4c5141e39b152c51614b5 Mon Sep 17 00:00:00 2001
From: historia <[not public]>
Date: Wed, 1 Jul 2026 04:53:56 -0400
Subject: feat: admin gui map, item, and objects mostly complete

---
 internal/game/act_combine.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/internal/game/act_combine.go b/internal/game/act_combine.go
index 8937d38..db7fee1 100644
--- a/internal/game/act_combine.go
+++ b/internal/game/act_combine.go
@@ -38,7 +38,7 @@ func (g *Game) startCombine(sess *net.Session, p *player.Player, item *item.Item
 			Remaining:    count,
 			StartMessage: startMsg,
 			EndMessage:   endMsg,
-			Wait:         craft.Wait,
+			TicksPerCycle: craft.TicksPerCycle,
 		},
 		WaitLeft: engine.ToTicks(1),
 	}
@@ -69,7 +69,7 @@ func (g *Game) advanceCombine(sess *net.Session, p *player.Player) {
 		if len(craft.Steps) > 0 {
 			p.Action.WaitLeft = engine.ToTicks(craft.Steps[0].Delay)
 		} else {
-			firstWait := craft.Wait
+			firstWait := craft.TicksPerCycle
 			if firstWait <= 0 {
 				firstWait = 4
 			}
-- 
cgit v1.2.3