diff options
Diffstat (limited to 'internal/game/act_effects.go')
| -rw-r--r-- | internal/game/act_effects.go | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/internal/game/act_effects.go b/internal/game/act_effects.go index d1effac..a49bd84 100644 --- a/internal/game/act_effects.go +++ b/internal/game/act_effects.go @@ -5,7 +5,6 @@ import ( "strconv" "thehouseoficarus/internal/behavior" - "thehouseoficarus/internal/color" "thehouseoficarus/internal/net" "thehouseoficarus/internal/player" ) @@ -75,8 +74,7 @@ func (g *Game) applyStep(sess *net.Session, p *player.Player, step *behavior.Ste if step.Broadcast != "" { raw := expandTemplate(step.Broadcast, playerName, flagValue) for _, other := range g.Hub.PlayersInRoom(roomID) { - otherMode := g.colorMode(other) - rendered := color.ExpandTagsDefault(otherMode, broadcastSpec, raw) + rendered := g.expandTagsDefault(other, broadcastSpec, raw) other.WriteLine(g.colorize(other, "broadcast", rendered)) } } @@ -86,8 +84,7 @@ func (g *Game) applyStep(sess *net.Session, p *player.Player, step *behavior.Ste if other.Player == nil { continue } - otherMode := g.colorMode(other) - rendered := color.ExpandTagsDefault(otherMode, broadcastSpec, raw) + rendered := g.expandTagsDefault(other, broadcastSpec, raw) other.WriteLine(g.colorize(other, "broadcast", rendered)) } } @@ -212,8 +209,7 @@ func (g *Game) writePlayerMessage(sess *net.Session, msg string, playerName stri } rendered := expandTemplate(msg, playerName, flagValue) seqSpec := g.resolveColor(sess, "sequence") - mode := g.colorMode(sess) - rendered = color.ExpandTagsDefault(mode, seqSpec, rendered) + rendered = g.expandTagsDefault(sess, seqSpec, rendered) sess.WriteLine(rendered) } |