From 7cbb73ff4c5da8d4f0b470e61ba4f632c7865812 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Wed, 24 Apr 2019 12:31:18 -0400 Subject: [PATCH] Clean up some announcemrnt emissions. --- sst.py | 6 +++--- test/test03.chk | 5 +++-- test/test04.chk | 16 ++++++++++------ test/test05.chk | 6 ++++-- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/sst.py b/sst.py index 925643b..daf42f8 100755 --- a/sst.py +++ b/sst.py @@ -803,7 +803,7 @@ def movescom(iq, avoid): if communicating(): announce() prout(_("Lt. Uhura- \"Captain, Starfleet Intelligence reports")) - proutn(_(" a planet in Quadrant %s has been destroyed") % game.state.kscmdr) + prout(_(" a planet in Quadrant %s has been destroyed") % game.state.kscmdr) prout(_(" by the Super-commander.\"")) break return True # looks good! @@ -909,7 +909,7 @@ def supercommander(): prout(_("Lt. Uhura- \"Captain, the starbase in Quadrant %s") \ % game.state.kscmdr) prout(_(" reports that it is under attack from the Klingon Super-commander.")) - proutn(_(" It can survive until stardate %d.\"") \ + prout(_(" It can survive until stardate %d.\"") \ % int(scheduled(FSCDBAS))) if not game.resting: return @@ -927,7 +927,7 @@ def supercommander(): return announce() prout(_("Lt. Uhura- \"Captain, Starfleet Intelligence reports")) - proutn(_(" the Super-commander is in Quadrant %s,") % game.state.kscmdr) + prout(_(" the Super-commander is in Quadrant %s.") % game.state.kscmdr) return def movetholian(): diff --git a/test/test03.chk b/test/test03.chk index 9c681f9..7c175cb 100644 --- a/test/test03.chk +++ b/test/test03.chk @@ -176,7 +176,8 @@ Message from Starfleet Command Stardate 2416.51 [ANNOUNCEMENT ARRIVING...] Lt. Uhura- "Captain, Starfleet Intelligence reports - the Super-commander is in Quadrant 3 - 1, + the Super-commander is in Quadrant 3 - 1. + [ANNOUNCEMENT ARRIVING...] Message from Starfleet Command Stardate 2416.77 @@ -185,7 +186,6 @@ Message from Starfleet Command Stardate 2416.77 [ANNOUNCEMENT ARRIVING...] ***Enterprise caught in long range tractor beam-- -Enterprise is pulled to Quadrant 4 - 7, Sector 4 - 9 [CONTINUE?] @@ -211,6 +211,7 @@ Enterprise is pulled to Quadrant 4 - 7, Sector 4 - 9 +Enterprise is pulled to Quadrant 4 - 7, Sector 4 - 9 Shields raised. 61 unit hit from Klingon at 8 - 2 diff --git a/test/test04.chk b/test/test04.chk index b4ca162..1cd9679 100644 --- a/test/test04.chk +++ b/test/test04.chk @@ -96,7 +96,8 @@ Collision detected [ANNOUNCEMENT ARRIVING...] Lt. Uhura- "Captain, Starfleet Intelligence reports - the Super-commander is in Quadrant 1 - 5, + the Super-commander is in Quadrant 1 - 5. + [ANNOUNCEMENT ARRIVING...] Lt. Uhura- "Captain, the starbase in Quadrant 7 - 4 @@ -521,7 +522,8 @@ Energy left 1985 shields up 42%, torpedoes left 3 [ANNOUNCEMENT ARRIVING...] Lt. Uhura- "Captain, Starfleet Intelligence reports - the Super-commander is in Quadrant 5 - 7, + the Super-commander is in Quadrant 5 - 7. + [ANNOUNCEMENT ARRIVING...] Message from Starfleet Command Stardate 4782.57 @@ -529,9 +531,8 @@ Message from Starfleet Command Stardate 4782.57 [ANNOUNCEMENT ARRIVING...] Lt. Uhura- "Captain, Starfleet Intelligence reports - the Super-commander is in Quadrant 6 - 6, -[ANNOUNCEMENT ARRIVING...] -Lt. Uhura- "Captain, Starfleet Intelligence reports + the Super-commander is in Quadrant 6 - 6. + [CONTINUE?] @@ -557,7 +558,10 @@ Lt. Uhura- "Captain, Starfleet Intelligence reports - the Super-commander is in Quadrant 7 - 5, +[ANNOUNCEMENT ARRIVING...] +Lt. Uhura- "Captain, Starfleet Intelligence reports + the Super-commander is in Quadrant 7 - 5. + [ANNOUNCEMENT ARRIVING...] ***Enterprise caught in long range tractor beam-- diff --git a/test/test05.chk b/test/test05.chk index 8c42e5f..fbe9407 100644 --- a/test/test05.chk +++ b/test/test05.chk @@ -124,7 +124,8 @@ Lt. Uhura- "The deep space probe has left the galaxy." Lt. Uhura- "Captain, Starfleet Intelligence reports - a planet in Quadrant 1 - 3 has been destroyed by the Super-commander." + a planet in Quadrant 1 - 3 has been destroyed + by the Super-commander." [ANNOUNCEMENT ARRIVING...] @@ -295,7 +296,8 @@ COMMAND> m a 1 1 [ANNOUNCEMENT ARRIVING...] Lt. Uhura- "Captain, Starfleet Intelligence reports - the Super-commander is in Quadrant 2 - 5,COMMAND> chart + the Super-commander is in Quadrant 2 - 5. +COMMAND> chart STAR CHART FOR THE KNOWN GALAXY 1 2 3 4 5 6 7 8 1 | ... ... ... ... 8 5 106 5 | -- 2.31.1