diff options
| author | historia <[not public]> | 2026-06-26 02:52:31 -0400 |
|---|---|---|
| committer | historia <[not public]> | 2026-06-26 02:52:31 -0400 |
| commit | 3102525d97aa6f1ad152c74b2ccfbd4b3a9b83f5 (patch) | |
| tree | 65610fa4fb8abe1dc7a46d00658e85e0525d397c /internal/game/combat_attack.go | |
| parent | e2d5b081f27141bb3dd89dbe595860b8a1345d55 (diff) | |
| download | thehouseoficarus-3102525d97aa6f1ad152c74b2ccfbd4b3a9b83f5.tar.gz | |
feat: simplified conversation trees and output won't overwrite prompts now
Diffstat (limited to 'internal/game/combat_attack.go')
| -rw-r--r-- | internal/game/combat_attack.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/internal/game/combat_attack.go b/internal/game/combat_attack.go index 61eb9c1..36a496b 100644 --- a/internal/game/combat_attack.go +++ b/internal/game/combat_attack.go @@ -182,9 +182,9 @@ func (g *Game) startCombat(sess *net.Session, p *player.Player, mob *world.MobIn } } if isTask { - g.broadcastAction(sess, "\n%s begins working on %s.", p.Name, mobDisplayName(mob, true)) + g.broadcastAction(sess, "%s begins working on %s.", p.Name, mobDisplayName(mob, true)) } else { - g.broadcastAction(sess, "\n%s attacks %s!", p.Name, mobDisplayName(mob, true)) + g.broadcastAction(sess, "%s attacks %s!", p.Name, mobDisplayName(mob, true)) } g.Ticks.Subscribe(1, func() bool { @@ -208,13 +208,13 @@ func (g *Game) startCombat(sess *net.Session, p *player.Player, mob *world.MobIn if mod != nil && g.hasJunkCost(p, mod) { g.scienceAttack(sess, p, currentMob, mod) } else if mod != nil { - sess.WriteLine(g.colorize(sess, "error", - fmt.Sprintf("\nYou're out of junk for %s!! You flail with your fists in desperation!", mod.Name))) + sess.WriteLine(g.colorize(sess, "error", + fmt.Sprintf("You're out of junk for %s!! You flail with your fists in desperation!", mod.Name))) g.playerAttackUnarmed(sess, p, currentMob) } else { p.AutotriggerMod = "" - sess.WriteLine(g.colorize(sess, "error", - "\nNo autotrigger set! Set a module with the 'autotrigger' command.")) + sess.WriteLine(g.colorize(sess, "error", + "No autotrigger set! Set a module with the 'autotrigger' command.")) g.playerAttackUnarmed(sess, p, currentMob) } } else { |