sandbox: add green colony

config.py

@@ -2,7 +2,7 @@ from xyzworld.Context import Context as XyzContext
 from intelligine.synergy.Simulation import Simulation
 from intelligine.display.Pygame import Pygame
 from intelligine.display.pygame.visualisation import visualisation as pygame_visualisation
-from intelligine.sandbox.redblue.red_blue_colonys import collections
+from intelligine.sandbox.colored.colors_colonys import collections
 
 """
  TODO:

intelligine/display/pygame/visualisation.py

@@ -2,8 +2,9 @@ from xyworld.display.object.pygame.PygameImage import PygameImage
 from xyworld.display.object.pygame.DirectionnedImage import DirectionnedImage
 from intelligine.synergy.object.Bug import Bug
 from intelligine.synergy.object.ant.Ant import Ant
-from intelligine.sandbox.redblue.BlueAnt import BlueAnt
-from intelligine.sandbox.redblue.RedAnt import RedAnt
+from intelligine.sandbox.colored.BlueAnt import BlueAnt
+from intelligine.sandbox.colored.RedAnt import RedAnt
+from intelligine.sandbox.colored.GreenAnt import GreenAnt
 from intelligine.synergy.object.Rock import Rock
 from os import getcwd
 from synergine.metas import metas
@@ -14,8 +15,10 @@ from intelligine.cst import PREVIOUS_DIRECTION
 ant = PygameImage.from_filepath(getcwd()+'/intelligine/display/pygame/image/ant.png')
 dead_ant = PygameImage.from_filepath(getcwd()+'/intelligine/display/pygame/image/dead_ant.png')
 red_ant = PygameImage.from_filepath(getcwd()+'/intelligine/display/pygame/image/red_ant.png')
+green_ant = PygameImage.from_filepath(getcwd()+'/intelligine/display/pygame/image/green_ant.png')
 blue_ant = PygameImage.from_filepath(getcwd()+'/intelligine/display/pygame/image/blue_ant.png')
 dead_red_ant = PygameImage.from_filepath(getcwd()+'/intelligine/display/pygame/image/dead_red_ant.png')
+dead_green_ant = PygameImage.from_filepath(getcwd()+'/intelligine/display/pygame/image/dead_green_ant.png')
 dead_blue_ant = PygameImage.from_filepath(getcwd()+'/intelligine/display/pygame/image/dead_blue_ant.png')
 bug = PygameImage.from_filepath(getcwd()+'/intelligine/display/pygame/image/ant.png')
 rock = PygameImage.from_filepath(getcwd()+'/intelligine/display/pygame/image/rock.png')
@@ -23,6 +26,7 @@ rock = PygameImage.from_filepath(getcwd()+'/intelligine/display/pygame/image/roc
 directions_ant = DirectionnedImage(ant)
 directions_red_ant = DirectionnedImage(red_ant)
 directions_blue_ant = DirectionnedImage(blue_ant)
+directions_green_ant = DirectionnedImage(green_ant)
 
 def bug_direction(bug):
     if bug.get_life_points() <= 0:
@@ -51,6 +55,15 @@ def blue_ant_direction(bug):
         previous_direction = 14
     return directions_blue_ant.get_for_direction(previous_direction)
 
+def green_ant_direction(bug):
+    if bug.get_life_points() <= 0:
+        return dead_green_ant
+    try:
+        previous_direction = metas.value.get(PREVIOUS_DIRECTION, bug.get_id())
+    except KeyError:
+        previous_direction = 14
+    return directions_green_ant.get_for_direction(previous_direction)
+
 visualisation = {
     'window': {},
     'objects': {
@@ -62,6 +75,10 @@ visualisation = {
             'default': blue_ant,
             'callbacks': [blue_ant_direction]
         },
+        GreenAnt: {
+            'default': green_ant,
+            'callbacks': [green_ant_direction]
+        },
         Ant: {
             'default': ant,
             'callbacks': [bug_direction]

intelligine/sandbox/redblue/BlueColonyConfiguration.py → intelligine/sandbox/colored/BlueColonyConfiguration.py

@@ -1,5 +1,5 @@
 from intelligine.synergy.ColonyConfiguration import ColonyConfiguration
-from intelligine.sandbox.redblue.BlueAnt import BlueAnt
+from intelligine.sandbox.colored.BlueAnt import BlueAnt
 
 
 class BlueColonyConfiguration(ColonyConfiguration):

intelligine/sandbox/colored/GreenAnt.py

@@ -0,0 +1,4 @@
+from intelligine.synergy.object.ant.Ant import Ant
+
+class GreenAnt(Ant):
+    pass

intelligine/sandbox/colored/GreenColonyConfiguration.py

@@ -0,0 +1,8 @@
+from intelligine.synergy.ColonyConfiguration import ColonyConfiguration
+from intelligine.sandbox.colored.GreenAnt import GreenAnt
+
+
+class GreenColonyConfiguration(ColonyConfiguration):
+
+    _start_position = (0, 70, 70)
+    _ant_class = GreenAnt

intelligine/sandbox/redblue/RedColonyConfiguration.py → intelligine/sandbox/colored/RedColonyConfiguration.py

@@ -1,8 +1,8 @@
 from intelligine.synergy.ColonyConfiguration import ColonyConfiguration
-from intelligine.sandbox.redblue.RedAnt import RedAnt
+from intelligine.sandbox.colored.RedAnt import RedAnt
 
 
 class RedColonyConfiguration(ColonyConfiguration):
 
-    _start_position = (0, 70, 20)
+    _start_position = (0, 20, 70)
     _ant_class = RedAnt

intelligine/sandbox/colored/colors_colonys.py

@@ -0,0 +1,11 @@
+from intelligine.sandbox.colored.RedColonyConfiguration import RedColonyConfiguration
+from intelligine.sandbox.colored.BlueColonyConfiguration import BlueColonyConfiguration
+from intelligine.sandbox.colored.GreenColonyConfiguration import GreenColonyConfiguration
+from intelligine.synergy.Colony import Colony
+from intelligine.synergy.Rocks import Rocks
+from intelligine.synergy.RocksConfiguration import RocksConfiguration
+
+collections = [Colony(BlueColonyConfiguration()), \
+               Colony(RedColonyConfiguration()), \
+               Colony(GreenColonyConfiguration()), \
+               Rocks(RocksConfiguration())]

intelligine/sandbox/redblue/red_blue_colonys.py

@@ -1,7 +0,0 @@
-from intelligine.sandbox.redblue.RedColonyConfiguration import RedColonyConfiguration
-from intelligine.sandbox.redblue.BlueColonyConfiguration import BlueColonyConfiguration
-from intelligine.synergy.Colony import Colony
-from intelligine.synergy.Rocks import Rocks
-from intelligine.synergy.RocksConfiguration import RocksConfiguration
-
-collections = [Colony(BlueColonyConfiguration()), Colony(RedColonyConfiguration()), Rocks(RocksConfiguration())]

intelligine/synergy/RocksConfiguration.py

@@ -11,16 +11,22 @@ class RocksConfiguration(Configuration):
 
       for i in range(100):
           rocks_positions.append((0, 0+i, 0))
-          rocks_positions.append((0, 0+i, 50))
+          if i is not 75:
+              rocks_positions.append((0, 0+i, 50))
+          rocks_positions.append((0, 0+i, 100))
 
       for i in range(50):
           rocks_positions.append((0, 0, 0+i))
           if i is not 25:
               rocks_positions.append((0, 50, 0+i))
+          rocks_positions.append((0, 100, 50+i))
+          rocks_positions.append((0, 0, 50+i))
+          rocks_positions.append((0, 50, 50+i))
           rocks_positions.append((0, 100, 0+i))
 
       rocks_positions.append((0, 50, 50))
       rocks_positions.append((0, 100, 50))
+      rocks_positions.append((0, 100, 100))
 
       for rock_position in rocks_positions:
           rock = Rock()