fix: unify crafting ingredient resolution; fix superheat alternatives, quantity gates, and dropped combine byproducts

1 files changed, 8 insertions, 8 deletions

diff --git a/internal/game/core_login_char.go b/internal/game/core_login_char.go
index c21ea87..70746fc 100644
--- a/internal/game/core_login_char.go
+++ b/internal/game/core_login_char.go
@@ -46,7 +46,7 @@ func (g *Game) handleNewCharName(sess *net.Session, input string) {
 	p, err := g.createCharacterTxn(sess.Account.Name, name, g.StartingRoom)
 	if err != nil {
 		sess.WriteLine(fmt.Sprintf("Error creating character: %v", err))
-		sess.State = net.StateMenu
+		sess.SetState(net.StateMenu)
 		g.showMenu(sess)
 		return
 	}
@@ -73,13 +73,13 @@ func (g *Game) connectCharacter(sess *net.Session, name string) {
 	actualName, err := g.canonicalChar(name)
 	if err != nil {
 		sess.WriteLine(fmt.Sprintf("Error loading character: %v", err))
-		sess.State = net.StateMenu
+		sess.SetState(net.StateMenu)
 		g.showMenu(sess)
 		return
 	}
 	if !g.isMemberOf(sess.Account.Name, actualName) {
 		sess.WriteLine("That character does not belong to this account.")
-		sess.State = net.StateMenu
+		sess.SetState(net.StateMenu)
 		g.showMenu(sess)
 		return
 	}
@@ -89,7 +89,7 @@ func (g *Game) connectCharacter(sess *net.Session, name string) {
 	if existing := g.loggedInChars[name]; existing != nil {
 		g.charsMu.Unlock()
 		sess.WriteLine("This character is logged in elsewhere.")
-		sess.State = net.StateMenu
+		sess.SetState(net.StateMenu)
 		g.showMenu(sess)
 		return
 	}
@@ -98,14 +98,14 @@ func (g *Game) connectCharacter(sess *net.Session, name string) {
 	if err != nil {
 		g.charsMu.Unlock()
 		sess.WriteLine(fmt.Sprintf("Error loading character: %v", err))
-		sess.State = net.StateMenu
+		sess.SetState(net.StateMenu)
 		g.showMenu(sess)
 		return
 	}
 	g.adoptCharacterIdentity(p, sess.Account.Name)
 
 	sess.Player = p
-	sess.State = net.StateGame
+	sess.SetState(net.StateGame)
 	g.loggedInChars[name] = sess
 	g.charsMu.Unlock()
 
@@ -155,7 +155,7 @@ func (g *Game) handleRenameChar(sess *net.Session, input string) {
 		return
 	}
 
-	sess.State = net.StateRenameCharName
+	sess.SetState(net.StateRenameCharName)
 	sess.WriteLine(fmt.Sprintf("Renaming %s.", sess.PendingChar))
 	sess.Write("New name: ")
 }
@@ -230,7 +230,7 @@ func (g *Game) handleRenameCharName(sess *net.Session, input string) {
 }
 
 func (g *Game) showDeleteConfirm(sess *net.Session) {
-	sess.State = net.StateDeleteChar
+	sess.SetState(net.StateDeleteChar)
 	sess.WriteLine(fmt.Sprintf("\nDelete %s? Type DELETE %s to confirm, or anything else to cancel.", sess.PendingChar, sess.PendingChar))
 }