aboutsummaryrefslogtreecommitdiff
path: root/internal/game/act_combine.go
diff options
context:
space:
mode:
authorhistoria <[not public]>2026-07-01 04:53:56 -0400
committerhistoria <[not public]>2026-07-01 04:53:56 -0400
commitbf7c27c2cbf3eb56a0a4c5141e39b152c51614b5 (patch)
tree5383c325fafeb34c01ea737a7070402f040fc5af /internal/game/act_combine.go
parentfbe5090ac3325ff8ea6989cdf4515c7f077c975b (diff)
downloadthehouseoficarus-bf7c27c2cbf3eb56a0a4c5141e39b152c51614b5.tar.gz
feat: admin gui map, item, and objects mostly complete
Diffstat (limited to 'internal/game/act_combine.go')
-rw-r--r--internal/game/act_combine.go4
1 files changed, 2 insertions, 2 deletions
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
}