9d3e8a9822
Merge branch 'village' into 'master'
...
Village
Closes #41 , #38 , #37 , #36 , and #18
See merge request ynerant/squirrel-battle!44
2020-12-11 18:23:10 +01:00
45f420aaef
Linting
2020-12-11 18:17:08 +01:00
99352bc1d5
Test buying an item when we don't have enough of money
2020-12-11 17:28:16 +01:00
7179346e2b
Add a InventoryHolder superclass for player and merchants
2020-12-11 17:20:50 +01:00
98b5dd64a8
Linting
2020-12-11 17:06:30 +01:00
b9b776b7ad
Player now pays for what he buys and buying a heart does not put it in the inventory. Solves #38 and #36
2020-12-11 16:49:17 +01:00
01cc77e146
Fixed a bug when trying to pathfind when player is surrounded by inaccessible tiles
2020-12-10 22:28:12 +01:00
cc6033e8e4
New pathfinding that avoids most of the mobs getting stuck, closes #35
2020-12-10 22:21:09 +01:00
4dbd4f7912
Don't buy hearts, use them instant instead. Fixes #38
2020-12-09 16:57:46 +01:00
2d5a2e4c87
Display hazels in the StatsDisplay
2020-12-09 16:54:53 +01:00
19b82ff71a
Test merchants
2020-12-09 15:32:37 +01:00
657f4e5209
Remove dead code: friendly entities are fighting entities
2020-12-09 15:10:28 +01:00
50d806cdcf
Working Dijkstra
2020-12-08 22:22:20 +01:00
7823a422b9
Start f new pathfinding, not working
2020-12-08 00:59:19 +01:00
2bb99a707e
Merchant inventory is well-saved
2020-12-07 21:48:56 +01:00
57fab7db51
Linting
2020-12-07 21:22:06 +01:00
b24cc1877f
Merchant inventory is working!
2020-12-07 21:13:55 +01:00
8540a8f354
Work in progress on printing a store menu. Its buggy though
2020-12-07 20:54:53 +01:00
d39427f978
Merge branch 'master' into village
2020-12-06 11:50:11 +01:00
866af98fe4
Merging master into village, conflicts were solved
2020-12-06 11:43:48 +01:00
38842cee68
There was a import error
2020-12-05 21:50:02 +01:00
ba68e68584
Added a Gamemode for selling interfaces, as well as the base of the player/merchant interaction, related to issue #18
2020-12-05 21:43:13 +01:00
f8ca5b2cc5
Recalculate the path finder when the player exchanges its body
2020-12-05 14:48:43 +01:00
7ad2cad77c
Add a message in the logs when a body-snap potion is used
2020-12-05 14:47:54 +01:00
c38f8cdc53
Save the inventory of the player when saving the game, fixes #33
2020-12-05 14:35:59 +01:00
f887a1f0aa
Entity name is a parameter since it can be changed through body snatch potion
2020-12-05 14:25:22 +01:00
ea672272f5
Add body snatch potion
2020-12-05 14:20:58 +01:00
4b9399c687
Test inventory
2020-12-04 18:16:46 +01:00
27fd73c96b
Add log messages when a bomb is exploding
2020-12-04 17:10:23 +01:00
c7545e53f7
Items can be dropped/equipped/used
2020-12-04 16:53:27 +01:00
3886bee1ba
Friendly entities are now a subclass of fighting entities, and can die. The T key is now used to talk to friendly entities
2020-12-04 00:27:25 +01:00
da0d7e7055
Fix lag when monsters try to move in a random direction
2020-12-02 16:04:43 +01:00
654bab7c1d
Translate sun flower messages
2020-12-01 17:12:22 +01:00
29142cd91c
Merge remote-tracking branch 'origin/master' into village
...
# Conflicts:
# squirrelbattle/display/texturepack.py
# squirrelbattle/interfaces.py
2020-12-01 17:07:40 +01:00
fbd9f0045b
Friendly entities can now talk to the player, a sunflower entity was added to test this new feature. Related to issue #22
2020-11-27 18:38:48 +01:00
ca86572677
Added a weapon class and a sword subclass
2020-11-27 17:56:01 +01:00
4fdf08cab9
Added a currency : the hazel (for hazelnuts). The player and the merchants possess a certain quantity of hazel
2020-11-27 17:11:59 +01:00
76bbee7e6d
Added a merchant class and a talk_to method to interact with friendly entities
2020-11-27 16:56:22 +01:00
0d3e33d960
Declare the license, we use GNU GPL
2020-11-27 16:33:17 +01:00
fb3f3ee5e8
Beaver is a tiger
2020-11-20 18:02:08 +01:00
b7207bb738
Merge branch 'game-logs' into 'master'
...
Game logs, see #12
See merge request ynerant/squirrel-battle!18
2020-11-19 22:48:39 +01:00
a3821676f4
The strength of the player is now increased when he levels up
2020-11-19 16:17:02 +01:00
6e71146aa2
First pass on the logs
...
The newly-added logs manage a list of messages. Entities do register a
message to it when hitting each other. Display is created, but not yet
added to the layout actually displayed.
2020-11-19 12:03:05 +01:00
d0ee9ec562
Rename dungeonbattle to squirrelbattle
2020-11-19 02:18:16 +01:00
eichhornchen