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

# Conflicts: # src/entities/Player.py
2020-04-06 00:01:04 +02:00 · 2020-04-06 00:01:04 +02:00 · 73ef580489
commit 73ef580489
parent 076a377cda 732d938e9a
2 changed files with 14 additions and 0 deletions
--- a/data/images/entities/rock.jpg
+++ b/data/images/entities/rock.jpg
--- a/data/mapdata/mapEntities.json
+++ b/data/mapdata/mapEntities.json
@ -26,5 +26,19 @@
      "thirst" : 2,
      "hunger" : 10
    }
+  },
+  {
+    "name" : "rock",
+    "position" : {
+      "x": 13,
+      "y": 1
+    },
+    "isPickupable" : false,
+    "effect" : {
+      "hp" : 0,
+      "stamina" : 0,
+      "thirst" : 0,
+      "hunger" : 0
+    }
  }
 ]