The idea of world_generator reversed for now.

ocadotechnology · Sep 26, 2017 · c574164 · c574164
1 parent dfb3bd9
commit c574164
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/aimmo-game/simulation/custom_map.py b/aimmo-game/simulation/custom_map.py
@@ -7,7 +7,7 @@
 from simulation.pickups import DeliveryPickup
 from simulation.world_map import WorldMap
 from simulation.world_map import world_map_static_spawn_decorator
-from simulation.maps.world_generator import DEFAULT_LEVEL_SETTINGS
+from simulation.world_map import DEFAULT_LEVEL_SETTINGS
 
 
 class BaseGenerator(object):

diff --git a/aimmo-game/simulation/map_generator.py b/aimmo-game/simulation/map_generator.py
@@ -10,7 +10,7 @@
 from simulation.location import Location
 from simulation.world_map import WorldMap
 from simulation.world_map import world_map_static_spawn_decorator
-from simulation.maps.world_generator import DEFAULT_LEVEL_SETTINGS
+from simulation.world_map import DEFAULT_LEVEL_SETTINGS
 
 from simulation.custom_map import BaseGenerator
 from simulation.custom_map import BaseLevelGenerator

diff --git a/aimmo-game/simulation/maps/world_generator.py b/aimmo-game/simulation/maps/world_generator.py
diff --git a/aimmo-game/simulation/world_map.py b/aimmo-game/simulation/world_map.py
@@ -6,11 +6,20 @@
 from simulation.pickups import ALL_PICKUPS
 from simulation.location import Location
 from simulation.maps.cell import Cell
-from simulation.maps.world_generator import DEFAULT_LEVEL_SETTINGS
 
 LOGGER = getLogger(__name__)
 
 
+DEFAULT_LEVEL_SETTINGS = {
+    'TARGET_NUM_CELLS_PER_AVATAR': 0,
+    'TARGET_NUM_SCORE_LOCATIONS_PER_AVATAR': 0,
+    'SCORE_DESPAWN_CHANCE': 0,
+    'TARGET_NUM_PICKUPS_PER_AVATAR': 0,
+    'PICKUP_SPAWN_CHANCE': 0,
+    'NO_FOG_OF_WAR_DISTANCE': 1000,
+    'PARTIAL_FOG_OF_WAR_DISTANCE': 1000,
+}
+
 class WorldMap(object):
     """
     The non-player world state.