s444409/DSZI_Survival
s444409/DSZI_Survival
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed removeSprite method

Browse Source
This commit is contained in:
Marcin Kostrzewski 2020-05-14 11:13:09 +02:00
parent 57b95e10df
commit ce50622b89
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/game/Map.py
View File

@ -10,6 +10,7 @@ from src.entities.Entity import Entity
from src.entities.Pickupable import Pickupable from src.entities.Pickupable import Pickupable
from src.entities.Statistics import Statistics from src.entities.Statistics import Statistics
# TODO: Map should determine entities' position # TODO: Map should determine entities' position
class Map: class Map:
def __init__(self, filename, screen): def __init__(self, filename, screen):
@ -53,7 +54,9 @@ class Map:
if entity["isPickupable"]: if entity["isPickupable"]:
actualEntities.append(Pickupable(entity["name"] + ".png", actualEntities.append(Pickupable(entity["name"] + ".png",
self.tileSize, self.tileSize,
(entity["position"]["x"] * self.tileSize, entity["position"]["y"] * self.tileSize), # TODO: change to relative coords
(entity["position"]["x"] * self.tileSize,
entity["position"]["y"] * self.tileSize),
Statistics(entity["effect"]["hp"], Statistics(entity["effect"]["hp"],
entity["effect"]["hunger"], entity["effect"]["hunger"],
entity["effect"]["thirst"], entity["effect"]["thirst"],
@ -61,18 +64,21 @@ class Map:
# Creates an interactable object # Creates an interactable object
elif "effect" in entity: elif "effect" in entity:
actualEntities.append(Interactable(entity["name"] + ".png", actualEntities.append(Interactable(entity["name"] + ".png",
self.tileSize, self.tileSize,
(entity["position"]["x"] * self.tileSize, # TODO: Change to relative coords
entity["position"]["y"] * self.tileSize), (entity["position"]["x"] * self.tileSize,
Statistics(entity["effect"]["hp"], entity["position"]["y"] * self.tileSize),
entity["effect"]["hunger"], Statistics(entity["effect"]["hp"],
entity["effect"]["thirst"], entity["effect"]["hunger"],
entity["effect"]["stamina"]))) entity["effect"]["thirst"],
entity["effect"]["stamina"])))
# Creates plain entity # Creates plain entity
else: else:
actualEntities.append(Entity(entity["name"] + ".png", actualEntities.append(Entity(entity["name"] + ".png",
self.tileSize, self.tileSize,
(entity["position"]["x"] * self.tileSize, entity["position"]["y"] * self.tileSize))) # TODO: Change to relative coords
(entity["position"]["x"] * self.tileSize,
entity["position"]["y"] * self.tileSize)))
except KeyError: except KeyError:
print("Failed to load entity " + entity) print("Failed to load entity " + entity)
return actualEntities return actualEntities
@ -120,7 +126,6 @@ class Map:
result = tile result = tile
return result return result
def getTileOnCoord(self, coord): def getTileOnCoord(self, coord):
result = None result = None
for tile in self.terrainTilesList: for tile in self.terrainTilesList:
@ -138,17 +143,6 @@ class Map:
if not DONTADD: if not DONTADD:
self.entities.append(entity) self.entities.append(entity)
# Usuwa entity lub teren z mapy
def removeSpriteFromMap(self, sprite):
if self.collidables.has(sprite):
self.collidables.remove(sprite)
if sprite in self.entities:
self.entities.remove(sprite)
if sprite in self.terrainTilesList:
self.terrainTilesList.remove(sprite)
# TODO: Suspicious?
self.screen.removeSprite(sprite)
# add object to map.collidables list to be collidable # add object to map.collidables list to be collidable
def collision(self, x, y): def collision(self, x, y):
for b in self.collidables: for b in self.collidables: