s444409/DSZI_Survival
s444409/DSZI_Survival
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

spawn 10 transparent herbs

Browse Source
This commit is contained in:
Mateusz 2020-05-26 13:23:13 +02:00
parent 1eb62c3382
commit 87a341744c
12 changed files with 123 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/images/entities/herb1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
data/images/entities/herb10.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
data/images/entities/herb2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
data/images/entities/herb3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
data/images/entities/herb4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
data/images/entities/herb5.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
data/images/entities/herb6.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.7 KiB

BIN
data/images/entities/herb7.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.1 KiB

BIN
data/images/entities/herb8.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.1 KiB

BIN
data/images/entities/herb9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.0 KiB

124
data/mapdata/mapEntities.json
View File

@ -464,7 +464,7 @@
"name" : "herb1", "name" : "herb1",
"position" : { "position" : {
"x": 12, "x": 12,
"y": 12 "y": 2
}, },
"isPickupable": true, "isPickupable": true,
"effect" : { "effect" : {
@ -477,9 +477,129 @@
}, },
{ {
"name" : "herb2", "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" : { "position" : {
"x": 14, "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, "isPickupable": true,
"effect" : { "effect" : {

2
src/entities/Interactable.py
View File

@ -44,7 +44,7 @@ class Interactable(Entity):
Player.herbs += 1 Player.herbs += 1
print(Player.herbs) print(Player.herbs)
if Player.herbs == 2: if Player.herbs == 10:
Player.statistics.set_hp(100) Player.statistics.set_hp(100)
Player.statistics.set_stamina(100) Player.statistics.set_stamina(100)
Player.statistics.set_thirst(0) Player.statistics.set_thirst(0)