diff --git a/data/images/entities/bush.jpg b/data/images/entities/bush.jpg new file mode 100644 index 0000000..e894c0f Binary files /dev/null and b/data/images/entities/bush.jpg differ diff --git a/data/images/entities/bush.png b/data/images/entities/bush.png deleted file mode 100644 index a59627d..0000000 Binary files a/data/images/entities/bush.png and /dev/null differ diff --git a/data/images/entities/rabbit.jpg b/data/images/entities/rabbit.jpg new file mode 100644 index 0000000..d9510d6 Binary files /dev/null and b/data/images/entities/rabbit.jpg differ diff --git a/data/images/entities/rabbit.png b/data/images/entities/rabbit.png deleted file mode 100644 index 0a67152..0000000 Binary files a/data/images/entities/rabbit.png and /dev/null differ diff --git a/data/images/entities/treasure.png b/data/images/entities/treasure.png deleted file mode 100644 index a795552..0000000 Binary files a/data/images/entities/treasure.png and /dev/null differ diff --git a/data/mapdata/mapEntities.json b/data/mapdata/mapEntities.json index ca37741..a0c8a32 100644 --- a/data/mapdata/mapEntities.json +++ b/data/mapdata/mapEntities.json @@ -13,6 +13,7 @@ "hunger" : 20 } }, + { "name" : "cranberry", "position" : { @@ -27,18 +28,36 @@ "hunger" : 10 } }, + + { + "name" : "rabbit", + "position" : { + "x": 12, + "y": 16 + }, + "isPickupable" : true, + "effect" : { + "hp": 30, + "stamina": -5, + "thirst": -5, + "hunger": 40 + } + }, + + { + "name" : "bush", + "position" : { + "x": 15, + "y": 9 + }, + "isPickupable" : false + }, { "name" : "rock", "position" : { "x": 13, "y": 1 }, - "isPickupable" : false, - "effect" : { - "hp" : 0, - "stamina" : 0, - "thirst" : 0, - "hunger" : 0 - } + "isPickupable" : false } ] \ No newline at end of file diff --git a/src/entities/Entity.py b/src/entities/Entity.py index 857f664..fee6d5f 100644 --- a/src/entities/Entity.py +++ b/src/entities/Entity.py @@ -8,6 +8,7 @@ class Entity(pygame.sprite.Sprite): def __init__(self, texture, size, pos): super().__init__() self.image, self.rect = self.getTexture(texture, size) + self.image.set_colorkey((255, 255, 255)) self.rect.x = pos[0] self.rect.y = pos[1] self.id = self.getId()