feat: overhauled ansi color, added prompt options

1 files changed, 7 insertions, 8 deletions

diff --git a/internal/game/cmd_drop.go b/internal/game/cmd_drop.go
index 2bf00ce..b08eadf 100644
--- a/internal/game/cmd_drop.go
+++ b/internal/game/cmd_drop.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"strings"
 
-	"thirdcollapse/internal/color"
 	"thirdcollapse/internal/net"
 	"thirdcollapse/internal/player"
 )
@@ -54,6 +53,7 @@ func (g *Game) doDropAllNamed(sess *net.Session, input string) {
 	if def != nil {
 		name = def.Name
 	}
+	coloredName := g.itemColorize(sess, def, name)
 	p.ActionState = &ActionState{Type: ActionDropping, TargetName: name}
 
 	if def != nil && def.Stackable {
@@ -63,9 +63,9 @@ func (g *Game) doDropAllNamed(sess *net.Session, input string) {
 		g.World.AddGroundItem(p.RoomID, itemID, qty)
 		g.AccountStore.SaveCharacter(p)
 		if qty == 1 {
-			sess.WriteLine(fmt.Sprintf("You drop a %s.", name))
+			sess.WriteLine(fmt.Sprintf("You drop a %s.", coloredName))
 		} else {
-			sess.WriteLine(fmt.Sprintf("You drop %d x %s.", qty, name))
+			sess.WriteLine(fmt.Sprintf("You drop %d x %s.", qty, coloredName))
 		}
 		return
 	}
@@ -82,16 +82,15 @@ func (g *Game) doDropAllNamed(sess *net.Session, input string) {
 	}
 	g.AccountStore.SaveCharacter(p)
 	if total == 1 {
-		sess.WriteLine(fmt.Sprintf("You drop a %s.", name))
+		sess.WriteLine(fmt.Sprintf("You drop a %s.", coloredName))
 	} else {
-		sess.WriteLine(fmt.Sprintf("You drop %d x %s.", total, name))
+		sess.WriteLine(fmt.Sprintf("You drop %d x %s.", total, coloredName))
 	}
 }
 
 func (g *Game) doDrop(sess *net.Session, input string) {
 	p := sess.Player.(*player.Player)
 	g.CancelAction(p)
-	mode := g.colorMode(sess)
 
 	qty, itemName := parseQty(input)
 
@@ -151,9 +150,9 @@ func (g *Game) doDrop(sess *net.Session, input string) {
 		g.World.AddGroundItem(p.RoomID, itemID, qty)
 		g.AccountStore.SaveCharacter(p)
 		if qty == 1 {
-			sess.WriteLine(fmt.Sprintf("You drop a %s.", color.Wrap(mode, "green", name)))
+			sess.WriteLine(fmt.Sprintf("You drop a %s.", g.itemColorize(sess, def, name)))
 		} else {
-			sess.WriteLine(fmt.Sprintf("You drop %d x %s.", qty, color.Wrap(mode, "green", name)))
+			sess.WriteLine(fmt.Sprintf("You drop %d x %s.", qty, g.itemColorize(sess, def, name)))
 		}
 		return
 	}