Merge master into map_generation, there were some commit behind

squirrelbattle/game.py

@@ -11,6 +11,7 @@ import sys
 from .entities.player import Player
 from .enums import GameMode, KeyValues, DisplayActions
 from .interfaces import Map, Logs
+from .mapgeneration import randomwalk
 from .resources import ResourceManager
 from .settings import Settings
 from . import menus
@@ -47,8 +48,7 @@ class Game:
         """
         Create a new game on the screen.
         """
-        # TODO generate a new map procedurally
-        self.map = Map.load(ResourceManager.get_asset_path("example_map.txt"))
+        self.map = randomwalk.Generator().run()
         self.map.logs = self.logs
         self.logs.clear()
         self.player = Player()

squirrelbattle/mapgeneration/randomwalk.py

@@ -1,6 +1,6 @@
 from enum import auto, Enum
 from random import choice, random, randint
-from dungeonbattle.interfaces import Map, Tile
+from ..interfaces import Map, Tile
 
 
 DEFAULT_PARAMS = {"split_chance" : .15,