46ce7c33bf
Merchant menu is updated through its update function, and does not access globally to the Game instance
2020-12-18 15:15:47 +01:00
c55a7451e7
Display more precisely where we are in the store menu
2020-12-18 01:50:11 +01:00
9a556ba669
We can now buy items to merchants, closes #47
2020-12-18 01:05:50 +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
7971a1f70e
Add waiting key, fixes #16
2020-12-12 18:12:37 +01:00
e91deccb6f
Merge branch 'master' into map_generation
...
# Conflicts:
# squirrelbattle/interfaces.py
2020-12-11 19:02:45 +01:00
53d090a9c8
Merge branch 'master' into 'mouse_interaction'
...
# Conflicts:
# squirrelbattle/display/display_manager.py
# squirrelbattle/display/menudisplay.py
# squirrelbattle/entities/items.py
2020-12-11 18:38:13 +01:00
d9912cacad
Listen to mouse clicks in the main loop
2020-12-11 18:17:59 +01:00
99352bc1d5
Test buying an item when we don't have enough of money
2020-12-11 17:28:16 +01:00
98b5dd64a8
Linting
2020-12-11 17:06:30 +01:00
bbe37eab97
Listen for clicks, detect which display was clicked
2020-12-11 16:56:22 +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
8751120fe1
Merge master into map_generation, there were some commit behind
2020-12-11 02:17:00 +01:00
4dbd4f7912
Don't buy hearts, use them instant instead. Fixes #38
2020-12-09 16:57:46 +01:00
405ee895d8
When an item is bought, remove it from the merchant inventory. Fixes #37
2020-12-09 15:35:53 +01:00
19b82ff71a
Test merchants
2020-12-09 15:32:37 +01:00
099508d4c0
Don't call screen.getkey() at a wrong place
2020-12-07 21:29:57 +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
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
fb8b2aff01
The player must be alive to interact with the inventory
2020-12-05 13:20:52 +01:00
91a4514649
'D' is not an intelligent key to drop an item
2020-12-04 17:19:06 +01:00
056ca5cca8
Ensure that the inventory is not empty before interacting with an item
2020-12-04 17:01:00 +01:00
c7545e53f7
Items can be dropped/equipped/used
2020-12-04 16:53:27 +01:00
0da7486750
Navigate through inventory menu
2020-12-04 16:31:15 +01:00
a68b3a6d08
Display full inventory
2020-12-04 16:28:37 +01:00
cdd527a7fd
Close the inventory using the same key
2020-12-04 14:57:53 +01:00
39af791012
We can open an empty inventory!
2020-12-04 14:45:18 +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
7d02604407
Clean the translation module
2020-11-28 02:00:09 +01:00
8f85093eb8
One string was missing
2020-11-27 22:21:52 +01:00
d2d74c97a4
Settings menu was not translated
2020-11-27 22:19:41 +01:00
31b7ece449
Main menu width must be updated when the language got changed
2020-11-27 21:51:54 +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
b0e352444b
Test loading wrong saves
2020-11-27 18:16:54 +01:00
5faebfe556
Test message display
2020-11-27 18:12:27 +01:00
25ba94b9ac
Game displays an error message when a save file could not be loaded.
2020-11-27 18:09:08 +01:00
b7f61d9485
Close popup if there is a message
2020-11-27 17:35:51 +01:00
5cdb12e8a8
Display a message on a popup
2020-11-27 17:32:26 +01:00
0d3e33d960
Declare the license, we use GNU GPL
2020-11-27 16:33:17 +01:00
1e48bd16b3
Erase pads instead of clearing them, fixes #21
2020-11-26 22:20:14 +01:00
589f825765
Added logs to the layout, clear logs on new game (tests still aren't fixed)
2020-11-19 12:55:06 +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
0fbbf4925d
Store configuration in user configuration directory
2020-11-19 03:13:01 +01:00
00f843754a
Use a ResourceManager to find assets
2020-11-19 02:49:59 +01:00
d0ee9ec562
Rename dungeonbattle to squirrelbattle
2020-11-19 02:18:16 +01:00
Yohann D'ANELLO