Added first playing field part 2

Author: sam

source/ev3dev2/simulator/Simulator.py

@@ -73,34 +73,34 @@ def setup(self):
         for s in self.robot.get_sensors():
             self.robot_state.load_sensor(s)
 
-        # self.blue_lake = BlueLake(self.cfg)
-        # self.green_lake = GreenLake(self.cfg)
-        # self.red_lake = RedLake(self.cfg)
+        self.blue_lake = BlueLake(self.cfg)
+        self.green_lake = GreenLake(self.cfg)
+        self.red_lake = RedLake(self.cfg)
 
-        self.rock1 = Rock(apply_scaling(175), apply_scaling(700), apply_scaling(150), apply_scaling(60), arcade.color.DARK_GRAY, 0)
-        self.rock2 = Rock(apply_scaling(1000), apply_scaling(375), apply_scaling(300), apply_scaling(90), arcade.color.DARK_GRAY, 90)
+        # self.rock1 = Rock(apply_scaling(175), apply_scaling(700), apply_scaling(150), apply_scaling(60), arcade.color.DARK_GRAY, 0)
+        self.rock2 = Rock(apply_scaling(1000), apply_scaling(300), apply_scaling(300), apply_scaling(90), arcade.color.DARK_GRAY, 90)
 
-        # self.obstacle_elements.append(self.blue_lake.shape)
-        # self.obstacle_elements.append(self.green_lake.shape)
-        # self.obstacle_elements.append(self.red_lake.shape)
+        self.obstacle_elements.append(self.blue_lake.shape)
+        self.obstacle_elements.append(self.green_lake.shape)
+        self.obstacle_elements.append(self.red_lake.shape)
 
-        self.obstacle_elements.append(self.rock1.shape)
+        # self.obstacle_elements.append(self.rock1.shape)
         self.obstacle_elements.append(self.rock2.shape)
 
         self.border = Border(self.cfg, arcade.color.BLACK_OLIVE)
 
         for s in self.border.shapes:
             self.obstacle_elements.append(s)
 
-        # color_obstacles = [self.blue_lake, self.green_lake, self.red_lake, self.border]
-        color_obstacles = [self.border]
-        touch_obstacles = [self.rock1, self.rock2]
+        color_obstacles = [self.blue_lake, self.green_lake, self.red_lake, self.border]
+        touch_obstacles = [self.rock2]
+        # touch_obstacles = [self.rock1, self.rock2]
 
         self.robot.set_color_obstacles(color_obstacles)
         self.robot.set_touch_obstacles(touch_obstacles)
 
         self.space = Space()
-        self.space.add(self.rock1.poly)
+        # self.space.add(self.rock1.poly)
         self.space.add(self.rock2.poly)
 
 
@@ -179,8 +179,8 @@ def main():
                         required=False,
                         type=check_scale)
     parser.add_argument("-x", "--robot_position_x",
-                        default=450,
-                        help="Starting position x-coordinate of the robot, default is 450",
+                        default=200,
+                        help="Starting position x-coordinate of the robot, default is 200",
                         required=False,
                         type=int)
     parser.add_argument("-y", "--robot_position_y",

source/ev3dev2/simulator/config/config.yaml

@@ -39,12 +39,12 @@ obstacle_settings:
   lake_settings:
     border_width: 29
     inner_radius: 38
-    lake_blue_x: 137
-    lake_blue_y: 922
-    lake_green_x: 1052
-    lake_green_y: 567
-    lake_red_x: 397
-    lake_red_y: 232
+    lake_blue_x: 500
+    lake_blue_y: 170
+    lake_green_x: 250
+    lake_green_y: 600
+    lake_red_x: 850
+    lake_red_y: 500
 
 
 screen_settings:

source/ev3dev2/simulator/obstacle/Lake.py

@@ -2,7 +2,7 @@
 from arcade import Shape, PointList
 
 from ev3dev2.simulator.obstacle.ColorObstacle import ColorObstacle
-from ev3dev2.simulator.util.Color import to_color_code, BLUE, GREEN, RED
+from ev3dev2.simulator.util.Color import to_color_code, BLUE, GREEN, RED, YELLOW
 from ev3dev2.simulator.util.Util import get_circle_points, apply_scaling
 
 
@@ -86,7 +86,7 @@ def __init__(self, cfg):
         x = apply_scaling(lake_cfg['lake_green_x']) + edge_spacing + border_depth
         y = apply_scaling(lake_cfg['lake_green_y']) + edge_spacing + border_depth
 
-        super(GreenLake, self).__init__(x, y, radius, GREEN, border_width)
+        super(GreenLake, self).__init__(x, y, radius, YELLOW, border_width)
 
 
 class RedLake(Lake):

source/ev3dev2/simulator/util/Color.py

@@ -2,13 +2,15 @@
 
 BLUE = (58, 166, 221)
 GREEN = (122, 182, 72)
+YELLOW = (252, 227, 3)
 RED = (201, 45, 57)
 
 
 def to_color_code(color: arcade.Color) -> int:
     switcher = {
         BLUE: 2,
         GREEN: 3,
+        YELLOW: 4,
         RED: 5
     }