ScriptExplore Update

We now check to see if we have a scanner and if so is it able to do a
Holo scan or not!

flexible.py

@@ -1074,32 +1074,29 @@ class ScriptExplore(object):
         log.msg("{0} : {1}".format(self.state, prompt))
         if self.state == 2:
             if "Select (H)olo Scan or (D)ensity Scan or (Q)uit" in prompt:
-                if not self.didDense:
-                    self.send2game("D")
-                    self.didDense = True
-                    self.state += 1
+                self.send2game("D")
+                self.state += 1
             else:
                 log.msg("Possibly no Holo Scanner Installed.")
-                self.deactivate()
         if self.state == 5:
             log.msg("dense is {0} sectors big".format(len(self.dense)))
             if "Select (H)olo Scan or (D)ensity Scan or (Q)uit" in prompt:
-                if not self.didHolo:
-                    self.send2game("H")
-                    self.didHolo = True
-                    self.state += 1
+                self.send2game("H")
+                self.state += 1
             else:
                 log.msg("FATAL: No Holo Scanner Installed!")
                 self.deactivate()
     
     def game_line(self, line: str):
         log.msg("{0} | {1}".format(self.state, line))
-        if "Mine Control" in line: # If we don't have a Holo-Scanner and we attempted to do a Holo-scan, abort
-            self.deactivate()
+        #if "Mine Control" in line: # If we don't have a Holo-Scanner and we attempted to do a Holo-scan, abort
+        #    self.deactivate()
 
         if self.state == 1:
-            # Density Scan, (Assume we have the Holo-Scanner)
-            self.send2game("S")
+            # Density Scan
+            if not self.didDense:
+                self.send2game("S")
+                self.didDense = True
             
             if "Relative Density Scan" in line:
                 self.state = 3
@@ -1109,8 +1106,10 @@ class ScriptExplore(object):
             elif "Long Range Scan" in line:
                 self.state += 1
         elif self.state == 4:
-            # Holo Scan, (Assume we have the Holo-Scanner)
-            self.send2game("S")
+            # Holo Scan
+            if not self.didHolo:
+                self.send2game("S")
+                self.didHolo = True
             
             if "You don't have a long range scanner." in line:
                 log.msg("FATAL: No Long Range Scanner Installed!")
@@ -1119,6 +1118,7 @@ class ScriptExplore(object):
                 self.state += 1
 
         elif self.state == 3:
+            # Get the Density Data!
             if line.startswith("Sector"):
                 work = line.replace(':', '').replace(')', '').replace('%', '').replace('==>', '')
                 work = re.split(r"\s+", work)
@@ -1753,8 +1753,7 @@ class ProxyMenu(object):
 
         elif key == "X":
             self.queue_game.put(self.c + key + self.r + self.nl)
-            self.queue_game.put(Boxes.alert("Proxy done.", base="green"))
-            # self.queue_game.put("Proxy done." + self.nl)
+            self.queue_game.put("Proxy done." + self.nl)
             self.observer.load(self.save)
             self.save = None
             # It isn't running (NOW), so don't try to stop it.