diff --git a/gamedata/maps/TulipFields/map.json b/gamedata/maps/TulipFields/map.json index d07b669..6f7c141 100644 --- a/gamedata/maps/TulipFields/map.json +++ b/gamedata/maps/TulipFields/map.json @@ -2498,7 +2498,12 @@ {"name": "Crate", "id": 16, "_eid": "16023910", "x": 592, "y": 208, "originX": 0, "originY": 0}, {"name": "Balloon", "id": 18, "_eid": "16494694", "x": 912, "y": 160, "originX": 0, "originY": 0}, {"name": "Balloon", "id": 19, "_eid": "16494694", "x": 976, "y": 144, "originX": 0, "originY": 0}, - {"name": "Balloon", "id": 20, "_eid": "16494694", "x": 816, "y": 144, "originX": 0, "originY": 0} + {"name": "Balloon", "id": 20, "_eid": "16494694", "x": 800, "y": 160, "originX": 0, "originY": 0}, + {"name": "Crate", "id": 21, "_eid": "16023910", "x": 864, "y": 192, "originX": 0, "originY": 0}, + {"name": "Crate", "id": 22, "_eid": "16023910", "x": 864, "y": 176, "originX": 0, "originY": 0}, + {"name": "Crate", "id": 23, "_eid": "16023910", "x": 864, "y": 160, "originX": 0, "originY": 0}, + {"name": "Crate", "id": 24, "_eid": "16023910", "x": 864, "y": 144, "originX": 0, "originY": 0}, + {"name": "Crate", "id": 25, "_eid": "16023910", "x": 864, "y": 128, "originX": 0, "originY": 0} ] } ] diff --git a/gamedata/objects/combat/ennemies/crate.py b/gamedata/objects/combat/ennemies/crate.py index 6427d6f..c93bf1b 100644 --- a/gamedata/objects/combat/ennemies/crate.py +++ b/gamedata/objects/combat/ennemies/crate.py @@ -9,12 +9,21 @@ class Crate(Ennemy): self.sprite = game.sprite_lib["crate/crate.png"] self.deadsprite = game.sprite_lib["crate/broke.png"] - self.rect[2],self.rect[3] = self.sprite.get_size() + self.size = self.sprite.get_size() + self.rect[2],self.rect[3] = self.size self.canhit = False + # Add his own rects to the solid list + self.collisionrects.append(self.rect) + def step(self): super().step() + if self.dead: + # Remove his own solid + self.rect[2],self.rect[3] = 0,0 + else: + self.rect[2],self.rect[3] = self.size def draw(self): if not self.dead: