EvilTrade: Detecting and tracking bust

  In proxy.py we needed to add another linestate to track the player in
thievery... (All that just so we can automatically add the sector to the
bust list)

  Up nexted... changing the bust list to a dict so we can track when the
bust occured, so we can process what busts need to be cleared out.

galaxy.py

@@ -250,6 +250,7 @@ class GameData(object):
         self.warps = {}
         self.ports = {}
         self.config = {}
+        self.busts = []
         if os.path.exists(filename):
             # Load it
             with jsonlines.open(filename) as reader:
@@ -329,6 +330,8 @@ class GameData(object):
         if sect not in self.busts:
             self.busts.append(sect)
             log.debug("completed {0} : {1}".format(sect, self.busts))
+        else:
+            log.debug("{0} already found in bust list".format(sect))
 
     def port_buying(self, sector: int, cargo: str):
         """ Given a sector, is this port buying this? 
@@ -420,19 +423,8 @@ class GameData(object):
         if port1 in ("Special", "StarDock") or port2 in ("Special", "StarDock"):
             return False
 
-        if port1 in self.busts:
-            log.warn("port_trading({0}, {1}) port1 is busted".format(port1, port2))
-            return False
-        elif port2 in self.busts:
-            log.warn("port_trading({0}, {1}) port2 is busted".format(port1, port2))
-            return False
-        elif port1 in self.busts and port2 in self.busts:
-            log.warn(
-                "port_trading({0}, {1}) both port1 and port2 are busted".format(
-                    port1, port2
-                )
-            )
-            return False
+        # Oops, hey, we are given port settings not a sector a port is in,
+        # So don't try to check it against the busted list.
 
         p1 = [c for c in port1]
         p2 = [c for c in port2]

proxy.py

@@ -193,8 +193,8 @@ class Game(protocol.Protocol):
                 _, _, class_port = line.partition(", Class ")
                 c, port = class_port.split(" ", maxsplit=1)
                 c = int(c)
-                if 'StarDock' in port:
-                    port = 'StarDock'
+                if "StarDock" in port:
+                    port = "StarDock"
                 port = port.replace("(", "").replace(")", "")
                 data = {"port": port, "class": c}
                 self.gamedata.set_port(self.current_sector, data)
@@ -255,16 +255,34 @@ class Game(protocol.Protocol):
             self.gamedata.set_port(self.current_sector, data)
             # log.debug("NOW: {0}".format(self.gamedata.ports[self.current_sector]))
 
+    def theifline(self, line: str):
+        self.log.debug("theifline({0}): {1}".format(self.current_sector, line))
+        if "Suddenly you're Busted!" in line:
+            # Lets add it into the bust list
+            self.gamedata.set_bust(self.current_sector)
+        elif "(You realize the guards saw you last time!)" in line:
+            self.linestate = ""
+
     def goodbye(self):
         # hey hey hey, goodbye!
-        self.connectionLost("We don't go there.")        
+        self.connectionLost("We don't go there.")
 
     def chicken(self):
         if not self.received:
             self.log.debug("checking ... FAILED (chicken!)")
             # this should force the proxy to save
             self.observer.emit("user-game", (self.factory.player.user, None))
-            self.queue_game.put("\r\n" + merge(Style.NORMAL + Fore.MAGENTA) + "...Now leaving " + merge(Style.BRIGHT + Fore.BLUE) + "Trade Wars 2002" + merge(Style.NORMAL + Fore.MAGENTA) + " and returning to system." + Style.RESET_ALL + "\r\n")
+            self.queue_game.put(
+                "\r\n"
+                + merge(Style.NORMAL + Fore.MAGENTA)
+                + "...Now leaving "
+                + merge(Style.BRIGHT + Fore.BLUE)
+                + "Trade Wars 2002"
+                + merge(Style.NORMAL + Fore.MAGENTA)
+                + " and returning to system."
+                + Style.RESET_ALL
+                + "\r\n"
+            )
             reactor.callLater(2, self.goodbye)
         else:
             self.log.debug("check -- PASSED.  WOOT.")
@@ -292,14 +310,14 @@ class Game(protocol.Protocol):
             if game >= "A" and game < "Q":
                 self.game = game
                 log.info("Game: {0}".format(self.game))
-                self.observer.emit("user-game", (self.factory.player.user, self.game))            
+                self.observer.emit("user-game", (self.factory.player.user, self.game))
         elif "Confirmed? (Y/N)? Yes" in line:
             # Ok, here's what we going to do.
             # Set timer for 5 seconds.  If we don't receive anything before that --
             # hang up the server connection.  :P
             # 008c:fixme:file:UnlockFileEx Unimplemented overlapped operation
             self.received = False
-            reactor.callLater( 5, self.chicken)
+            reactor.callLater(5, self.chicken)
 
         # Process.pas parse line
         if line.startswith("Command [TL=]"):
@@ -314,6 +332,8 @@ class Game(protocol.Protocol):
             self.lastwarp = 0
         elif line.startswith(" Items     Status  Trading % of max OnBoard"):
             self.linestate = "port"
+        elif line.startswith("<Thievery>"):
+            self.linestate = "thievery"
         elif self.linestate == "warpline":
             if line == "":
                 self.linestate = ""
@@ -338,6 +358,8 @@ class Game(protocol.Protocol):
                 else:
                     self.linestate = "warpcim"
                 self.cimline(line)
+        elif self.linestate == "thievery":
+            self.theifline(line)
         # elif line.startswith(": "):
         elif line == ": ":
             self.linestate = "cim"
@@ -580,4 +602,3 @@ class GlueFactory(protocol.ClientFactory):
         # syncterm gets cranky/locks up if we close this here.
         # (Because it is still sending rlogin information?)
         reactor.callLater(2, self.closeIt)
-