62ce2b5c71
Merge remote-tracking branch 'origin/master' into lighting
2020-12-17 21:24:32 +01:00
646e0063be
Fixed grammar, unified the docstring's format and added documentation to some classes that did not have any. Closes #32 .
2020-12-13 21:29:25 +01:00
288a6ac2c9
Some translations were missing concerning sunflowers, fixes #44
2020-12-12 17:39:12 +01:00
1cf5e7bd8b
First implementation of visibility, not tested, nor used for now
2020-12-11 19:23:21 +01:00
7179346e2b
Add a InventoryHolder superclass for player and merchants
2020-12-11 17:20:50 +01:00
4dbd4f7912
Don't buy hearts, use them instant instead. Fixes #38
2020-12-09 16:57:46 +01:00
19b82ff71a
Test merchants
2020-12-09 15:32:37 +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
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
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
ea672272f5
Add body snatch potion
2020-12-05 14:20:58 +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
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
70ae60b9a4
Translate entities
2020-11-27 22:33:58 +01:00
8f85093eb8
One string was missing
2020-11-27 22:21:52 +01:00
4287b4f045
Add possibility to change the language
2020-11-27 20:53:24 +01:00
2498fd2a61
Translate strings
2020-11-27 20:42:19 +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
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
6b72f4b284
Added a friendly entity class.
2020-11-20 17:42:56 +01:00
1e5bb26f57
Test logs
2020-11-19 20:02:44 +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
Nicolas Margulies