diff --git a/dungeonbattle/game.py b/dungeonbattle/game.py index 8be446d..a2ea93a 100644 --- a/dungeonbattle/game.py +++ b/dungeonbattle/game.py @@ -46,12 +46,12 @@ class Game: Create a new game on the screen. """ # TODO generate a new map procedurally - self.map = Map.load("resources/example_map.txt") + self.map = Map.load("resources/example_map_2.txt") self.map.currenty = 1 self.map.currentx = 6 self.player = Player() self.map.add_entity(self.player) - self.player.move(1, 6) + self.player.move(1, 14) self.map.spawn_random_entities(randint(1, 5)) @staticmethod diff --git a/dungeonbattle/interfaces.py b/dungeonbattle/interfaces.py index 5611795..7b89ec6 100644 --- a/dungeonbattle/interfaces.py +++ b/dungeonbattle/interfaces.py @@ -2,7 +2,7 @@ from enum import Enum, auto from math import sqrt from random import randint -from typing import List, Tuple +from typing import List from dungeonbattle.display.texturepack import TexturePack @@ -186,9 +186,6 @@ class Entity: """ return sqrt(self.distance_squared(other)) - def vector(self, other: "Entity") -> Tuple[int, int]: - return other.y - self.y, other.x - self.x - class FightingEntity(Entity): maxhealth: int diff --git a/resources/example_map_2.txt b/resources/example_map_2.txt new file mode 100644 index 0000000..bcb4b60 --- /dev/null +++ b/resources/example_map_2.txt @@ -0,0 +1,40 @@ + ########### ######### + #.........# #.......# + #.........# ############.......# + #.........###############..........#.......############## + #.........#........................#....................# + #.........#.............#..........#.......#............# + ########.########.............#..................#............# + #.........# #.............####.#######.......#............# + #.........# #.............##.........###################### + #.........# #####.##########.........# ########### + #.........# #......# #.........# #.........# + ########.##########......# #.........# #.........# + #...........##......# #.........# #.........# + #...........##......# #.........# #.........# + #...........##......# #.........# ################.###### + #...........##......# #.........# #.................############ + #...........##......# ########.########.......#.........#..........# + #...........##......# #...............#.......#.........#..........# + #...........######### #...............#.......#.........#..........# + #...........# #...............#.......#....................# + #####.####### #.......................#.........#..........# + #.........# #...............###################..........# + #.........############ #...............# #..........# + #.........#..........# #...............# ############ + #....................#####.###########.############# + ########.#########...................# #.............# + #........# #..........#........# #.............######### + #........# ######.##########........# #.............#.......# + #........# #..........# #........# #.....................# + #........# #..........# #........# #.............#.......# + #........# #..........# #........# #.............#.......# + #........# #..........# #........# #.............#.......# + #........# #..........#########.##### #.............#.......# + #........# #..........#.........# ##########.############.####### + #........# #..........#.........# #..............# #..........# + ########## #..........#.........# #..............# #..........# + ############.........# #..............# #..........# + #.........# #..............# #..........# + ########### #..............# #..........# + ################ ############