From 38b6adc8a10e5ee884f0968b810be96f53634c07 Mon Sep 17 00:00:00 2001 From: Wirus Date: Mon, 6 Apr 2020 00:01:16 +0200 Subject: [PATCH 1/2] add bush and rabbit in mapEntities --- data/images/entities/bush.jpg | Bin 0 -> 4012 bytes data/images/entities/bush.png | Bin 3446 -> 0 bytes data/images/entities/rabbit.jpg | Bin 0 -> 2999 bytes data/images/entities/rabbit.png | Bin 630 -> 0 bytes data/images/entities/treasure.png | Bin 7840 -> 0 bytes data/mapdata/mapEntities.json | 25 +++++++++++++++++++++++++ src/entities/Entity.py | 1 + 7 files changed, 26 insertions(+) create mode 100644 data/images/entities/bush.jpg delete mode 100644 data/images/entities/bush.png create mode 100644 data/images/entities/rabbit.jpg delete mode 100644 data/images/entities/rabbit.png delete mode 100644 data/images/entities/treasure.png diff --git a/data/images/entities/bush.jpg b/data/images/entities/bush.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e894c0ff482069cef7edffd6f564a95b0b8ef8eb GIT binary patch literal 4012 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 dKbxIy{SV#Joj?Ep literal 0 HcmV?d00001 diff --git a/data/images/entities/bush.png b/data/images/entities/bush.png deleted file mode 100644 index a59627dd4b4326f04b095ce40cff836a37cc8da7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3446 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 DH6fHC literal 0 HcmV?d00001 diff --git a/data/images/entities/rabbit.png b/data/images/entities/rabbit.png deleted file mode 100644 index 0a67152aa820a5f6a78dae1bd3c435df506c7f00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 630 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 Date: Mon, 6 Apr 2020 00:07:13 +0200 Subject: [PATCH 2/2] delete ',' after false --- data/mapdata/mapEntities.json | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/data/mapdata/mapEntities.json b/data/mapdata/mapEntities.json index 6401e4b..a0c8a32 100644 --- a/data/mapdata/mapEntities.json +++ b/data/mapdata/mapEntities.json @@ -13,6 +13,7 @@ "hunger" : 20 } }, + { "name" : "cranberry", "position" : { @@ -49,7 +50,7 @@ "x": 15, "y": 9 }, - "isPickupable" : false, + "isPickupable" : false }, { "name" : "rock", @@ -57,12 +58,6 @@ "x": 13, "y": 1 }, - "isPickupable" : false, - "effect" : { - "hp" : 0, - "stamina" : 0, - "thirst" : 0, - "hunger" : 0 - } + "isPickupable" : false } ] \ No newline at end of file