|
@@ -2040,7 +2040,8 @@ class PlanetUpScript(object):
|
|
|
self.state = 5
|
|
|
self.queue_player.put("C")
|
|
|
elif self.state == 5:
|
|
|
- if prompt.startswith('Do you wish to construct one? '):
|
|
|
+ if re.match(r'Do you wish to construct .+\?', prompt):
|
|
|
+
|
|
|
|
|
|
|
|
|
ready = True
|
|
@@ -2058,9 +2059,13 @@ class PlanetUpScript(object):
|
|
|
self.queue_player.put('YQ')
|
|
|
self.deactivate()
|
|
|
return
|
|
|
- self.queue_player.put("N")
|
|
|
+ if 'construct one' in prompt:
|
|
|
+ self.queue_player.put("N")
|
|
|
+ else:
|
|
|
+ self.queue_player.put("NQ")
|
|
|
|
|
|
-
|
|
|
+ elif prompt.startswith('Citadel command (?=help)'):
|
|
|
+ self.queue_player.put('U')
|
|
|
if prompt.startswith('Planet command (?=help) [D] '):
|
|
|
|
|
|
|
|
@@ -2327,7 +2332,7 @@ class PlanetUpScript(object):
|
|
|
""" Data from player (in bytes). """
|
|
|
chunk = chunk.decode("latin-1", "ignore")
|
|
|
key = chunk.upper()
|
|
|
- log.warn("PlanetUpScript.player({0}) : I AM stopping...".format(key))
|
|
|
+ log.warn("PlanetUpScript.player({0}) : I AM stopping...(user input)".format(key))
|
|
|
|
|
|
if not self.defer is None:
|
|
|
|