Cleanup, comments, moved building service to city

Author: m3talstorm

foe/main.py

@@ -59,16 +59,10 @@
         refresh = count + random.randrange(config['settings']['update']['min'], config['settings']['update']['max'])
 
     print "Checking... (%s)" % (count)
+    # NOTE: The full update should adjust for any coins/supplies/resources gained from these pickups
+    account.city.pickup()
 
-    buildingService = BuildingService()
-    response = buildingService.multipickup(account.city.buildings)
-
-    account.updateFromResponse(response)
-
-    for building in account.city.buildings:
-        sleep = random.uniform(0.5, 2)
-        time.sleep(sleep)
-        building.produce()
+    account.city.produce()
 
     session.commit()
 

foe/models/building.py

@@ -94,78 +94,55 @@ def populate(self, *args, **kwargs):
             elif self.state == 'UnconnectedState':
                 self.collection_time = 0
             else:
+                # State we don't now about... so print it
                 pprint.pprint(state)
 
-
         return super(Building, self).populate(*args, **kwargs)
 
     def produce(self):
         """
+        Starts production in the building
         """
 
         if self.type == 'residential':
-            return
+            return None
 
         if self.collection_time:
-            return
+            return None
 
         if self.state in ['ProducingState', 'ProductionFinishedState', 'ConstructionState', 'UnconnectedState']:
-            return
+            return None
 
+        # NOTE: '1' means the first slot, which is 5 minutes for supplies or 4 hours for resources
         response = self.request('startProduction', [self.id, 1])
 
         print "%s started production" % (self)
 
-        #
+        # TODO: Resources should be 4 hours ... but should be corrected by the full update
         self.collection_time = time.time() + (5 * 60)
         self.state = 'ProducingState'
 
         return response
 
     def pickup(self):
         """
+        Picks up/gather the coins/supplies/resources from the building
         """
 
         if not self.pickupable():
-            return
+            return None
 
         response = self.request('pickupProduction', [[self.id]])
 
         print "%s picked up production" % (self)
 
-        self.pickupUpdateState()
-
-        return response
-
-    def multipickup(self, buildings):
-        """
-        """
-
-        updateIds = []
-
-        for building in buildings:
-            if not building.pickupable():
-                continue
-
-            updateIds.append(building.id)
-
-        if len(updateIds) == 0:
-            return []
-
-        response = self.request('pickupProduction', [updateIds])
-
-        for building in buildings:
-            if building.id not in updateIds:
-                continue
-
-            print "%s picked up production" % (building)
-
-            building.pickupUpdateState()
+        self.pickedup()
 
         return response
 
     def pickupable(self):
         """
+        Returns True if the build is ready to be picked up
         """
 
         if not self.collection_time:
@@ -179,8 +156,9 @@ def pickupable(self):
 
         return True
 
-    def pickupUpdateState(self):
+    def pickedup(self):
         """
+        Marks the building as being picked up, resetting state and timers
         """
 
         if self.type == 'residential':
@@ -190,12 +168,15 @@ def pickupUpdateState(self):
             self.collection_time = 0
             self.state = 'IdleState'
 
+        return self
+
     def cancel(self):
         """
+        Cancels the current prodution of the building, reverting it to the idle state
         """
 
         if self.type == 'residential':
-            return
+            return None
 
         response = self.request('cancelProduction', [[self.id]])
 

foe/models/buildingService.py

@@ -6,6 +6,7 @@
 import time
 import pprint
 import json
+import random
 from collections import OrderedDict
 
 # 3rd-Party
@@ -14,7 +15,7 @@
 
 import pydash
 
-#
+# Proprietary
 from request import Request
 from models.model import Model
 from models.building import Building
@@ -53,14 +54,12 @@ def __init__(self, *args, **kwargs):
 
         return super(City, self).__init__(*args, **kwargs)
 
-
     def __repr__(self):
         """
         """
 
         return "City"
 
-
     def populate(self, *args, **kwargs):
         """
         """
@@ -84,3 +83,54 @@ def populate(self, *args, **kwargs):
 
 
         return super(City, self).populate(*args, **kwargs)
+
+    def pickup(self):
+        """
+        Picks up (gather resources) all the builds in the city
+        """
+
+        # Get the IDs of all the buildings that can be picked up
+        ids = [building.id for building in self.buildings if building.pickupable()]
+        # No point in going any futher if there is nothing to pickup
+        if not ids:
+            print "No buildings need picking up"
+            return self
+
+        # Pick a random sample (~70%) of the of these buildings
+        count = int(len(ids) * 0.7)
+        # Sample the builds at random
+        sample = random.sample(ids, count)
+        # Pickup all of them at once
+        response = self.request('pickupProduction', [sample], klass='CityProductionService')
+
+        print "Picked up %s/%s buildings at once" % (len(sample), len(ids))
+        # Get the buildings that weren't all picked up at once
+        difference = set(ids).difference(set(sample))
+        # Now pick up the rest one-by-one
+        for building in self.buildings:
+
+            if building.id in difference:
+                # Add a built of time so it looks like a human ;)
+                sleep = random.uniform(0.5, 1)
+                time.sleep(sleep)
+
+                building.pickup()
+            else:
+                # This building was picked up as part of the multi/batch pickup so just update the state
+                building.pickedup()
+
+        return self
+
+    def produce(self):
+        """
+        Starts production of all building in the city
+        """
+
+        for building in self.buildings:
+            # Add a built of time so it looks like a human ;)
+            sleep = random.uniform(0.5, 2)
+            time.sleep(sleep)
+
+            building.produce()
+
+        return self