ynerant
/
squirrel-battle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity
445 Commits 4 Branches 3 Tags 893 KiB
Commit Graph

445 Commits

Author SHA1 Message Date
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
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
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
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
Charles Peyrat 3717429549 Added some test default parameters for the random walk generator 2020-12-04 18:04:50 +01:00
Charles Peyrat bc9c7cd7f7 Finalised implementation of the walker class with method split 2020-12-04 18:03:41 +01:00
Charles Peyrat a5c53c898e Implemented walker class and methods random_turn, next_pos, move_in_bounds 2020-12-04 18:01:54 +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
Charles Peyrat 428bbae736 Added base files for map generation and main loop for random walk generation 2020-12-04 16:02:48 +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
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
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