Working on PlanetUp. Xfer existing cargo onto planet.

flexible.py

@@ -1969,11 +1969,11 @@ class PlanetUpScript(object):
             self.game.to_player = True
             # For now we output the information, and exit
             # self.queue_game.put("{0}\r\n".format(self.planets))
-            self.queue_game.put(pformat(self.planets).replace("\n", self.nl) + self.nl)
+            # self.queue_game.put(pformat(self.planets).replace("\n", self.nl) + self.nl)
 
             if len(self.planets) == 0:
                 # Ok, this is easy.
-                self.queue_game.put(Boxes.alert("You don't have any planets?  You poor, poor dear.", base="red"))
+                self.queue_game.put(self.nl + Boxes.alert("You don't have any planets?  You poor, poor dear.", base="red"))
                 self.deactivate()
                 return
 
@@ -2005,8 +2005,6 @@ class PlanetUpScript(object):
 
             ask = PlayerInput(self.game)
             d = ask.prompt("Choose a planet", 3, name="planet", digits=True)
-
-            # Display the user's input
             d.addCallback(self.planet_chosen)
         elif self.state == 3:
             if prompt.startswith('Do you want to engage the TransWarp drive? '):
@@ -2020,6 +2018,7 @@ class PlanetUpScript(object):
                 self.state = 4
                 self.queue_player.put("L")
         elif self.state == 4:
+            # If you have a planet scanner, or if there's more then one planet.
             if prompt.startswith('Land on which planet <Q to abort> ?'):
                 self.queue_player.put("{0}\r".format(self.planet_number))
             if prompt.startswith('Planet command (?=help) [D] '):
@@ -2028,8 +2027,38 @@ class PlanetUpScript(object):
                 self.queue_player.put("C")
         elif self.state == 5:
             if prompt.startswith('Do you wish to construct one? '):
+                # Have we met all the needs?  If so, do it.  ;)
+                # If not, xfer the cargo on the ship to the planet and get moving!
+                ready = True
+                for i in ['F', 'O', 'E']:
+                    if self.need[i] > self.cargo[i]:
+                        ready = False
+                        self.queue_game.put( "Need: {0}".format(i) + self.nl)
+                        # break
+                if self.need['C'] > self.colonists:
+                    self.queue_game.put("Need: people" + self.nl)
+                    ready = False
                 self.queue_game.put(self.nl + "{0}".format(self.need))
+                if ready:
+                    self.queue_player.put('YQ')
+                    self.deactivate()
+                    return
                 self.queue_player.put("N")
+                # Xfer cargo, and get ready to travel...
+
+            if prompt.startswith('Planet command (?=help) [D] '):
+                self.queue_game.put(pformat(self.ship_cargo).replace("\n", self.nl) + self.nl)
+                self.queue_game.put(pformat(self.cargo).replace("\n", self.nl) + self.nl)                
+                for idx, c in enumerate(('F', 'O', 'E')):
+                    if self.ship_cargo[c] > 0:
+                        # Transfer Cargo, (No display), Leave [1,2, or 3], \r = All of it.
+                        self.queue_player.put("TNL{0}\r".format(idx + 1))
+                        self.cargo[c] += self.ship_cargo[c]
+                        self.ship_cargo[c] = 0
+                        break
+                self.queue_player.put("Q")
+                self.queue_game.put(pformat(self.ship_cargo).replace("\n", self.nl) + self.nl)
+                self.queue_game.put(pformat(self.cargo).replace("\n", self.nl) + self.nl)                
                 self.deactivate()
 
 
@@ -2043,9 +2072,11 @@ class PlanetUpScript(object):
                 self.planet_sector = self.planets[self.planet_number]['sector']
                 self.planet_name = self.planets[self.planet_number]['name']
                 if self.current_sector == self.planet_sector:
+                    # We're here.  Land
                     self.state = 4
                     self.queue_player.put("L")
                 else:
+                    # Get moving!
                     self.state = 3
                     self.queue_player.put("{0}\r".format(self.planet_sector))
             else:
@@ -2103,18 +2134,22 @@ class PlanetUpScript(object):
                         self.cargo = {}
                         self.need = {}
                         self.ship_cargo = {}
+                        self.place_people = {}
                     parts = re.split(r'\s+', work)
                     c = int(parts[1])
                     planet_has = int(parts[4])
                     self.colonists += c
                     self.cargo[cargo] = planet_has
-                    self.ship_carg[cargo] = int(parts[5])
+                    self.ship_cargo[cargo] = int(parts[5])
+                    # Boolean, can we place people here?  If N/A, then don't!
+                    self.place_people[cargo] = parts[2] != 'N/A'
+
         elif self.state == 5:
             # [Planet command (?=help) [D] C]
             # [Be patient, your Citadel is not yet finished.]
             if line.startswith('Be patient, your Citadel is not yet finished.'):
                 # Ah HA!
-                self.queue_game.put(self.nl + Boxes.alert("Patience!") + self.nl)
+                self.queue_game.put(self.nl + Boxes.alert("NO, NOT YET!") + self.nl)
                 self.queue_player.put("Q")  # quit Planet menu.
                 self.deactivate()
             else: