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

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

Browse Source 
# Conflicts:
#	src/entities/Player.py
This commit is contained in:
Michał Czekański 2020-04-06 00:01:04 +02:00
commit 73ef580489
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/images/entities/rock.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 78 KiB

14
data/mapdata/mapEntities.json
View File

@ -26,5 +26,19 @@
"thirst" : 2, "thirst" : 2,
"hunger" : 10 "hunger" : 10
} }
},
{
"name" : "rock",
"position" : {
"x": 13,
"y": 1
},
"isPickupable" : false,
"effect" : {
"hp" : 0,
"stamina" : 0,
"thirst" : 0,
"hunger" : 0
}
} }
] ]