aboutsummaryrefslogtreecommitdiff
path: root/internal/game/sys_safespot.go
diff options
context:
space:
mode:
Diffstat (limited to 'internal/game/sys_safespot.go')
-rw-r--r--internal/game/sys_safespot.go9
1 files changed, 4 insertions, 5 deletions
diff --git a/internal/game/sys_safespot.go b/internal/game/sys_safespot.go
index 41fe19f..d833b62 100644
--- a/internal/game/sys_safespot.go
+++ b/internal/game/sys_safespot.go
@@ -4,7 +4,6 @@ import (
"fmt"
"math/rand"
- "thehouseoficarus/internal/color"
"thehouseoficarus/internal/engine"
"thehouseoficarus/internal/net"
"thehouseoficarus/internal/object"
@@ -183,7 +182,7 @@ func (g *Game) degradeSafespot(st *world.ObjState, objDef *object.ObjectDef, cfg
if msg != "" {
for _, rs := range roomSessions {
rs.WriteLine("")
- rs.WriteLine(color.ExpandTags(g.colorMode(rs), msg))
+ rs.WriteLine(g.expandTags(rs, msg))
}
}
}
@@ -195,7 +194,7 @@ func (g *Game) degradeSafespot(st *world.ObjState, objDef *object.ObjectDef, cfg
for _, name := range st.SafespotOccupants {
g.safespot.Delete(name)
if occSess := g.sessionInRoom(name, roomSessions); occSess != nil {
- occSess.WriteLine(color.ExpandTags(g.colorMode(occSess),
+ occSess.WriteLine(g.expandTags(occSess,
fmt.Sprintf("The %s crumbles away!", objDef.Name)))
occSess.WriteLine(g.colorize(occSess, "safespot_alert", "Your safespot has been compromised!"))
g.writePrompt(occSess)
@@ -216,7 +215,7 @@ func (g *Game) degradeSafespot(st *world.ObjState, objDef *object.ObjectDef, cfg
for _, name := range st.SafespotOccupants {
if occSess := g.sessionInRoom(name, roomSessions); occSess != nil {
occSess.WriteLine("")
- occSess.WriteLine(color.ExpandTags(g.colorMode(occSess), msg))
+ occSess.WriteLine(g.expandTags(occSess, msg))
}
}
}
@@ -237,7 +236,7 @@ func (g *Game) scheduleSafespotRespawn(st *world.ObjState, objDef *object.Object
respawnSt.SafespotTicksAtLevel = 0
for _, sess := range g.Hub.PlayersInRoom(roomID) {
sess.WriteLine("")
- sess.WriteLine(color.ExpandTags(g.colorMode(sess),
+ sess.WriteLine(g.expandTags(sess,
fmt.Sprintf("The %s reforms and looks stable again.", objDef.Name)))
}
return false