Reorganize more code

aoe/times.py

@@ -5,6 +5,12 @@ from aoe.types import *
 class Times():
 
 
+    def compute_build_time(self, building, num_builders):
+        solo_build_time = self.build_times[building]
+        build_time = 3*solo_build_time/(num_builders + 2)
+        return build_time
+
+
     def __init__(self):
         self.build_times = {
                              Ages.FEUDAL: 130,
@@ -130,8 +136,3 @@ class Times():
                              Units.SKIRMISHER: 22,
                              Units.ARCHER: 35,
                            }
-
-        self.exist_duration = {
-                               Buildings.FARM: 0,
-                               Buildings.FISHTRAP: 0,
-                              }

aoe/world.py

@@ -231,9 +231,8 @@ class World():
 
         villagers_to_count = Counter(villagers_to)
 
-        num_villagers_building = len(villagers_from)
+        num_builders = len(villagers_from)
-        solo_build_time = self.build_times.build_times[building]
+        build_time = self.build_times.compute_build_time(building, num_builders)
-        build_time = 3*solo_build_time/(num_villagers_building + 2)
         update_time = self.current_time + build_time
 
         self.events[update_time].append((self._add_building,