Commit Graph

651 Commits

Author SHA1 Message Date
Yohann D'ANELLO 7ab4213273 Fix french translation file 2020-12-07 22:03:48 +01:00
Yohann D'ANELLO e3ae7bcacf Resolve merge conflicts on german translation file 2020-12-07 22:00:27 +01:00
Yohann D'ANELLO ca17bf424a Inventory displays were not updated when the texture pack changed 2020-12-07 21:51:51 +01:00
Yohann D'ANELLO 2bb99a707e Merchant inventory is well-saved 2020-12-07 21:48:56 +01:00
Yohann D'ANELLO 099508d4c0 Don't call screen.getkey() at a wrong place 2020-12-07 21:29:57 +01:00
Yohann D'ANELLO 57fab7db51 Linting 2020-12-07 21:22:06 +01:00
Yohann D'ANELLO b24cc1877f Merchant inventory is working! 2020-12-07 21:13:55 +01:00
eichhornchen 8540a8f354 Work in progress on printing a store menu. Its buggy though 2020-12-07 20:54:53 +01:00
ynerant f648bcd7fb Merge branch 'es-translation' into 'master'
Add spanish translation

See merge request ynerant/squirrel-battle!42
2020-12-07 01:04:55 +01:00
Yohann D'ANELLO fdc2bcab8d Add spanish translation 2020-12-07 01:01:39 +01:00
eichhornchen d39427f978 Merge branch 'master' into village 2020-12-06 11:50:11 +01:00
eichhornchen 866af98fe4 Merging master into village, conflicts were solved 2020-12-06 11:43:48 +01:00
eichhornchen 38842cee68 There was a import error 2020-12-05 21:50:02 +01:00
eichhornchen 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
ynerant 6fa11d9dfe Merge branch 'body-snatch' into 'master'
Body snatch

Closes #34 et #33

See merge request ynerant/squirrel-battle!38
2020-12-05 14:52:47 +01:00
Yohann D'ANELLO f8ca5b2cc5 Recalculate the path finder when the player exchanges its body 2020-12-05 14:48:43 +01:00
Yohann D'ANELLO 7ad2cad77c Add a message in the logs when a body-snap potion is used 2020-12-05 14:47:54 +01:00
Yohann D'ANELLO f39113fd0b Test body snatch potion, fixes #34 2020-12-05 14:42:13 +01:00
Yohann D'ANELLO c38f8cdc53 Save the inventory of the player when saving the game, fixes #33 2020-12-05 14:35:59 +01:00
Yohann D'ANELLO f887a1f0aa Entity name is a parameter since it can be changed through body snatch potion 2020-12-05 14:25:22 +01:00
Yohann D'ANELLO ea672272f5 Add body snatch potion 2020-12-05 14:20:58 +01:00
ynerant 3985751bd1 Merge branch 'stack-items' into 'master'
Stack items in the inventory

Closes #29

See merge request ynerant/squirrel-battle!37
2020-12-05 13:45:53 +01:00
Yohann D'ANELLO ca2ae15117 Stack items in the inventory, closes #29 2020-12-05 13:42:33 +01:00
ynerant 4d60e95165 Merge branch 'inventory' into 'master'
Inventory

Closes #10

See merge request ynerant/squirrel-battle!36
2020-12-05 13:28:05 +01:00
Yohann D'ANELLO fb8b2aff01 The player must be alive to interact with the inventory 2020-12-05 13:20:52 +01:00
Yohann D'ANELLO bc40f8d0e6 Some translations were missing in the settings menu 2020-12-05 13:19:04 +01:00
Yohann D'ANELLO 013e81b3c0 Better sort in translation files, remove unwanted headers 2020-12-05 13:13:04 +01:00
Yohann D'ANELLO 25c42ea9e8 Don't translate in english since it is the main language 2020-12-05 13:07:37 +01:00
Yohann D'ANELLO 4b9399c687 Test inventory 2020-12-04 18:16:46 +01:00
Yohann D'ANELLO 91a4514649 'D' is not an intelligent key to drop an item 2020-12-04 17:19:06 +01:00
Yohann D'ANELLO 5b4dc601bc Fix broken tests 2020-12-04 17:15:41 +01:00
Yohann D'ANELLO 27fd73c96b Add log messages when a bomb is exploding 2020-12-04 17:10:23 +01:00
Yohann D'ANELLO 056ca5cca8 Ensure that the inventory is not empty before interacting with an item 2020-12-04 17:01:00 +01:00
Yohann D'ANELLO c7545e53f7 Items can be dropped/equipped/used 2020-12-04 16:53:27 +01:00
Yohann D'ANELLO 0da7486750 Navigate through inventory menu 2020-12-04 16:31:15 +01:00
Yohann D'ANELLO a68b3a6d08 Display full inventory 2020-12-04 16:28:37 +01:00
Yohann D'ANELLO fbfcd5dae0 Inventory title 2020-12-04 16:02:03 +01:00
Yohann D'ANELLO cdd527a7fd Close the inventory using the same key 2020-12-04 14:57:53 +01:00
Yohann D'ANELLO 067570fd1a The inventory is a popup 2020-12-04 14:51:41 +01:00
Yohann D'ANELLO 39af791012 We can open an empty inventory! 2020-12-04 14:45:18 +01:00
eichhornchen 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
ynerant 268e2d0dd2 Merge branch 'fix-lag' into 'master'
Fix lag when monsters try to move in a random direction

Closes #25

See merge request ynerant/squirrel-battle!32
2020-12-02 16:07:13 +01:00
Yohann D'ANELLO da0d7e7055 Fix lag when monsters try to move in a random direction 2020-12-02 16:04:43 +01:00
Yohann D'ANELLO 654bab7c1d Translate sun flower messages 2020-12-01 17:12:22 +01:00
Yohann D'ANELLO 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
ynerant e5886bbe44 Merge branch 'translations' into 'master'
Translations

Closes #14

See merge request ynerant/squirrel-battle!31
2020-11-28 16:23:12 +01:00
Yohann D'ANELLO 9f0a29302d Add german translation 2020-11-28 16:22:06 +01:00
Yohann D'ANELLO 6b09d488b6 Documentation on translation 2020-11-28 16:00:17 +01:00
Yohann D'ANELLO aade89de7b Tests and the CI are compiling messages 2020-11-28 14:10:31 +01:00
Yohann D'ANELLO f78c73a703 Tests and the CI are compiling messages 2020-11-28 14:02:23 +01:00