diff --git a/data/images/entities/herb1.png b/data/images/entities/herb1.png index f24b264..ec07c87 100644 Binary files a/data/images/entities/herb1.png and b/data/images/entities/herb1.png differ diff --git a/data/images/entities/herb10.png b/data/images/entities/herb10.png new file mode 100644 index 0000000..b820b9f Binary files /dev/null and b/data/images/entities/herb10.png differ diff --git a/data/images/entities/herb2.png b/data/images/entities/herb2.png index a129e70..b1f857a 100644 Binary files a/data/images/entities/herb2.png and b/data/images/entities/herb2.png differ diff --git a/data/images/entities/herb3.png b/data/images/entities/herb3.png new file mode 100644 index 0000000..3c8cdf9 Binary files /dev/null and b/data/images/entities/herb3.png differ diff --git a/data/images/entities/herb4.png b/data/images/entities/herb4.png new file mode 100644 index 0000000..fd7e63d Binary files /dev/null and b/data/images/entities/herb4.png differ diff --git a/data/images/entities/herb5.png b/data/images/entities/herb5.png new file mode 100644 index 0000000..dfaf8fc Binary files /dev/null and b/data/images/entities/herb5.png differ diff --git a/data/images/entities/herb6.png b/data/images/entities/herb6.png new file mode 100644 index 0000000..0bf159b Binary files /dev/null and b/data/images/entities/herb6.png differ diff --git a/data/images/entities/herb7.png b/data/images/entities/herb7.png new file mode 100644 index 0000000..133b9b9 Binary files /dev/null and b/data/images/entities/herb7.png differ diff --git a/data/images/entities/herb8.png b/data/images/entities/herb8.png new file mode 100644 index 0000000..48de873 Binary files /dev/null and b/data/images/entities/herb8.png differ diff --git a/data/images/entities/herb9.png b/data/images/entities/herb9.png new file mode 100644 index 0000000..ddfe622 Binary files /dev/null and b/data/images/entities/herb9.png differ diff --git a/data/mapdata/mapEntities.json b/data/mapdata/mapEntities.json index 0c3e617..3657b5b 100644 --- a/data/mapdata/mapEntities.json +++ b/data/mapdata/mapEntities.json @@ -464,7 +464,7 @@ "name" : "herb1", "position" : { "x": 12, - "y": 12 + "y": 2 }, "isPickupable": true, "effect" : { @@ -477,9 +477,129 @@ }, { "name" : "herb2", + "position" : { + "x": 16, + "y": 2 + }, + "isPickupable": true, + "effect" : { + "hp" : 0, + "stamina" : 0, + "thirst" : 0, + "hunger" : 0 + }, + "type" : "herb" + }, + { + "name" : "herb3", + "position" : { + "x": 17, + "y": 5 + }, + "isPickupable": true, + "effect" : { + "hp" : 0, + "stamina" : 0, + "thirst" : 0, + "hunger" : 0 + }, + "type" : "herb" + }, + { + "name" : "herb4", "position" : { "x": 14, - "y": 8 + "y": 7 + }, + "isPickupable": true, + "effect" : { + "hp" : 0, + "stamina" : 0, + "thirst" : 0, + "hunger" : 0 + }, + "type" : "herb" + }, + { + "name" : "herb5", + "position" : { + "x": 17, + "y": 17 + }, + "isPickupable": true, + "effect" : { + "hp" : 0, + "stamina" : 0, + "thirst" : 0, + "hunger" : 0 + }, + "type" : "herb" + }, + { + "name" : "herb6", + "position" : { + "x": 13, + "y": 17 + }, + "isPickupable": true, + "effect" : { + "hp" : 0, + "stamina" : 0, + "thirst" : 0, + "hunger" : 0 + }, + "type" : "herb" + }, + { + "name" : "herb7", + "position" : { + "x": 5, + "y": 15 + }, + "isPickupable": true, + "effect" : { + "hp" : 0, + "stamina" : 0, + "thirst" : 0, + "hunger" : 0 + }, + "type" : "herb" + }, + { + "name" : "herb8", + "position" : { + "x": 2, + "y": 9 + }, + "isPickupable": true, + "effect" : { + "hp" : 0, + "stamina" : 0, + "thirst" : 0, + "hunger" : 0 + }, + "type" : "herb" + }, + { + "name" : "herb9", + "position" : { + "x": 8, + "y": 5 + }, + "isPickupable": true, + "effect" : { + "hp" : 0, + "stamina" : 0, + "thirst" : 0, + "hunger" : 0 + }, + "type" : "herb" + }, + { + "name" : "herb10", + "position" : { + "x": 11, + "y": 10 }, "isPickupable": true, "effect" : { diff --git a/src/entities/Interactable.py b/src/entities/Interactable.py index 484994c..2edffdb 100644 --- a/src/entities/Interactable.py +++ b/src/entities/Interactable.py @@ -44,7 +44,7 @@ class Interactable(Entity): Player.herbs += 1 print(Player.herbs) - if Player.herbs == 2: + if Player.herbs == 10: Player.statistics.set_hp(100) Player.statistics.set_stamina(100) Player.statistics.set_thirst(0)