Merge remote-tracking branch 'origin/passingEvents' into passingEvents

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,
+    "isPickupable" : false
-    "effect" : {
-      "hp" : 0,
-      "stamina" : 0,
-      "thirst" : 0,
-      "hunger" : 0
-    }
   }
 ]

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()