Commit Graph

538 Commits

Author SHA1 Message Date
Charles Peyrat
6a4d13c726 Walls now generate around the floor 2020-12-11 17:09:59 +01:00
Charles Peyrat
3a8549cfcc Added a method to interfaces.Map to get the neighbours of a given tile 2020-12-11 17:09:27 +01:00
Yohann D'ANELLO
98b5dd64a8 Linting 2020-12-11 17:06:30 +01:00
Charles Peyrat
7fb743eb72 Switching up start_x and start_y so the player spawn is correctly set 2020-12-11 17:02:22 +01:00
Yohann D'ANELLO
bbe37eab97 Listen for clicks, detect which display was clicked 2020-12-11 16:56:22 +01:00
eichhornchen
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
eichhornchen
7ba49277a9 Added a symbol for hazels in the ascii texturepack 2020-12-11 15:52:36 +01:00
Yohann D'ANELLO
3c614dcca9 Linting 2020-12-11 02:19:59 +01:00
Yohann D'ANELLO
8751120fe1 Merge master into map_generation, there were some commit behind 2020-12-11 02:17:00 +01:00
Yohann D'ANELLO
7db2dd2b46 Merge branch 'master' into map_generation
# Conflicts:
#	dungeonbattle/game.py
#	squirrelbattle/mapgeneration/__init__.py
#	squirrelbattle/mapgeneration/randomwalk.py
2020-12-11 02:14:47 +01:00
Charles Peyrat
29798c135e Syntax change for the failsafe 2020-12-11 01:24:20 +01:00
Charles Peyrat
45120d0c2b Integrating procedural generation into the game 2020-12-11 01:13:00 +01:00
Charles Peyrat
302017222d Fixing the sampling of the starting position that caused out of bounds error 2020-12-11 01:11:07 +01:00
Charles Peyrat
021731b740 Switching up the tiles used during generation to the correct ones 2020-12-11 01:09:49 +01:00
Charles Peyrat
d40a61554e Changing the way the tile matrix is declared so that every column is represented by a different list 2020-12-11 01:04:30 +01:00
nicomarg
53cb6a89ae Merge branch '35-better-pathfinding' into 'master'
Resolve "Better pathfinding"

Closes #35

See merge request ynerant/squirrel-battle!43
2020-12-10 22:31:40 +01:00
Nicolas Margulies
01cc77e146 Fixed a bug when trying to pathfind when player is surrounded by inaccessible tiles 2020-12-10 22:28:12 +01:00
Nicolas Margulies
cc6033e8e4 New pathfinding that avoids most of the mobs getting stuck, closes #35 2020-12-10 22:21:09 +01:00
Yohann D'ANELLO
6d4c0b2ca3 Testing the merchant must handle two cases: the bought item is a heart or not 2020-12-09 17:04:29 +01:00
Yohann D'ANELLO
4dbd4f7912 Don't buy hearts, use them instant instead. Fixes #38 2020-12-09 16:57:46 +01:00
Yohann D'ANELLO
2d5a2e4c87 Display hazels in the StatsDisplay 2020-12-09 16:54:53 +01:00
Yohann D'ANELLO
56627f3e84 Reorder texture pack entries 2020-12-09 16:50:47 +01:00
Yohann D'ANELLO
05e79c14e3 Translate the settings entry that change the chat key 2020-12-09 15:45:50 +01:00
Yohann D'ANELLO
405ee895d8 When an item is bought, remove it from the merchant inventory. Fixes #37 2020-12-09 15:35:53 +01:00
Yohann D'ANELLO
19b82ff71a Test merchants 2020-12-09 15:32:37 +01:00
Yohann D'ANELLO
657f4e5209 Remove dead code: friendly entities are fighting entities 2020-12-09 15:10:28 +01:00
Yohann D'ANELLO
cea015d015 In load&save test, force to have a merchant 2020-12-09 15:09:07 +01:00
Yohann D'ANELLO
39787861dc Test sunflowers interaction 2020-12-09 15:05:19 +01:00
Nicolas Margulies
50d806cdcf Working Dijkstra 2020-12-08 22:22:20 +01:00
Nicolas Margulies
7823a422b9 Start f new pathfinding, not working 2020-12-08 00:59:19 +01:00
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
Charles Peyrat
7cfe55f42c Added a failsafe for cases where the walker population randomly dies out 2020-12-07 00:24:31 +01:00
Charles Peyrat
2a1be4233b Fixed syntax error in Walker.split 2020-12-07 00:18:32 +01:00
Charles Peyrat
32e6eab943 Added import enum.auto to mapgeneration.randomwalk 2020-12-06 23:55:57 +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