ynerant
/
squirrel-battle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Merge master into map_generation, there were some commit behind

This commit is contained in:
Yohann D'ANELLO 2020-12-11 02:17:00 +01:00
parent 7db2dd2b46
commit 8751120fe1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
squirrelbattle/game.py
View File

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

2
squirrelbattle/mapgeneration/randomwalk.py
View File

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