Add debug output (what sent to game). Fixed warp out bug.

flexible.py

@@ -495,7 +495,8 @@ class ScriptPort(object):
 
         elif self.state == 8:
             # What are we trading
-            if "How many holds of" in prompt:
+            # How many holds of Equipment do you want to buy [75]?
+            if re.match(r"How many holds of .+ do you want to buy \[\d+\]\?", prompt):
                 parts = prompt.split()
                 trade_type = parts[4]
 
@@ -697,6 +698,10 @@ class ScriptPort(object):
                         log.msg("We don't appear to be making any money here {0}.".format(credits))
                         self.deactivate()
                         return
+            if "We're not interested." in line:
+                log.msg("Try, try again.  :(")
+                self.state = 5
+                self.trade()                
 
         elif self.state == 8:
             # Haggle Buy

tcp-proxy.py

@@ -116,14 +116,16 @@ class Game(protocol.Protocol):
             # Pass received data to the server
             if type(chunk) == str:
                 self.transport.write(chunk.encode())
+                log.msg(">> [{0}]".format(chunk))
             else:
                 self.transport.write(chunk)
+                log.msg(">> [{0}]".format(chunk.decode("utf-8", "ignore")))
             self.setPlayerReceived()
 
     def lineReceived(self, line):
         """ line received from the game. """
         if LOG_LINES:
-            log.msg(">> [{0}]".format(line))
+            log.msg("<< [{0}]".format(line))
 
         # if "TWGS v2.20b" in line and "www.eisonline.com" in line:
         # I would still love to "inject" this into the stream