Commit Graph

776 Commits

Author SHA1 Message Date
ynerant 6294f9c07f Merge branch 'v23.14' into 'master'
Bump to version 23.14

See merge request ynerant/squirrel-battle!76
2021-01-10 23:58:31 +01:00
Yohann D'ANELLO 57605c969f
Bump to version 23.14 2021-01-10 23:57:39 +01:00
ynerant e9374c5e6b Merge branch 'map_generation' into 'master'
Map generation

Closes #5

See merge request ynerant/squirrel-battle!35
2021-01-10 23:54:28 +01:00
ynerant b72e41d14d Merge branch 'doors' into 'map_generation'
Doors

See merge request ynerant/squirrel-battle!75
2021-01-10 23:54:13 +01:00
Yohann D'ANELLO 588357e5bf
Linting 2021-01-10 23:49:43 +01:00
ynerant 2031d7fa67 Merge branch 'map_generation' into 'doors'
# Conflicts:
#   squirrelbattle/mapgeneration/broguelike.py
2021-01-10 23:43:54 +01:00
Yohann D'ANELLO 65ae99a26d
The logs of the map was not updated 2021-01-10 23:41:51 +01:00
Yohann D'ANELLO 60675d7859
Cover doors code 2021-01-10 23:21:28 +01:00
Yohann D'ANELLO b0ca1d4edf
Cover everytime the map generation test 2021-01-10 23:05:49 +01:00
Yohann D'ANELLO 8f845d1e4c
Doors don't break the connexity of map 2021-01-10 23:03:24 +01:00
Charles Peyrat ca67d5d7f4 Merge remote branch 2021-01-10 23:02:34 +01:00
Yohann D'ANELLO 11daa8573c
The players can open doors 2021-01-10 22:59:34 +01:00
Charles Peyrat 099a0eab31 Add comments and docstring 2021-01-10 22:54:48 +01:00
Yohann D'ANELLO 6c0aaffd77
Doors are walls 2021-01-10 22:53:27 +01:00
Yohann D'ANELLO e744310861
Place doors at the beginning of the corridor 2021-01-10 22:51:01 +01:00
nicomarg 96e9612d16 Merge branch 'equipment-in-inventory' into 'master'
Resolve "Display equipment in inventory"

Closes #75

See merge request ynerant/squirrel-battle!71
2021-01-10 22:45:04 +01:00
Nicolas Margulies f05652d9b8 Fixed tests and reached 100% coverage 2021-01-10 22:39:52 +01:00
Yohann D'ANELLO 5e378fc2d0
Update game rules 2021-01-10 22:27:46 +01:00
Nicolas Margulies 519504fc32 Mark equipped items and allow unequipping 2021-01-10 22:26:43 +01:00
Yohann D'ANELLO 0ea10546ac
Fix merge issues 2021-01-10 22:19:15 +01:00
Yohann D'ANELLO 4c7a2e9f3b
Merge branch 'master' into map_generation
# Conflicts:
#	squirrelbattle/entities/player.py
#	squirrelbattle/game.py
#	squirrelbattle/interfaces.py
#	squirrelbattle/tests/game_test.py
2021-01-10 22:16:11 +01:00
Nicolas Margulies 88471f4361 Changed equipment behaviour, now equipped items stay in the inventory 2021-01-10 22:15:32 +01:00
Yohann D'ANELLO 9df1ac7883
Linting 2021-01-10 22:08:42 +01:00
Yohann D'ANELLO 01cdea6edc
Don't spawn random entities on each level anymore 2021-01-10 21:57:51 +01:00
eichhornchen b004dec8c9 Merge branch 'translate' into 'master'
Translate

See merge request ynerant/squirrel-battle!73
2021-01-10 21:52:39 +01:00
Charles Peyrat 13e3628668 Merge branch 'map_generation' of https://gitlab.crans.org/ynerant/squirrel-battle into map_generation 2021-01-10 21:50:01 +01:00
Charles Peyrat 12e19759aa Implement populate method, so map generation also handles entity spawn 2021-01-10 21:49:39 +01:00
Yohann D'ANELLO d3607248c0
Remove unused translations 2021-01-10 21:48:46 +01:00
Charles Peyrat e639ad6255 Getting to full cover, and minor fix to bug that allowed corridors to create loops in a room, resulting in implacability 2021-01-10 21:48:12 +01:00
eichhornchen 236481ae1c linting 2021-01-10 21:44:45 +01:00
eichhornchen 18ace5144c Repaired a bug : a variable was not declared before it was used in interfaces.py take_damage 2021-01-10 21:41:45 +01:00
eichhornchen 6cf0590586 even more translations. 2021-01-10 21:38:21 +01:00
Charles Peyrat 96bbc5088f Add a test case for non connex maps in distance computation 2021-01-10 21:32:58 +01:00
Charles Peyrat 26e66a5796 Implement method add_loops along with tests 2021-01-10 21:30:18 +01:00
eichhornchen 4f4223c514 More translations. 2021-01-10 21:25:15 +01:00
eichhornchen 893a23f95c Repaired a but : bears dealt 1 damage instead of 0. 2021-01-10 21:15:42 +01:00
eichhornchen a1d69203c9 Translations. 2021-01-10 21:15:30 +01:00
ynerant b6a448b39b Merge branch 'fix-load' into 'master'
Fix load

Closes #73 et #76

See merge request ynerant/squirrel-battle!72
2021-01-10 21:05:13 +01:00
Yohann D'ANELLO d2af345c0c
Fix linting 2021-01-10 21:01:43 +01:00
Yohann D'ANELLO 67a9bda6e1
Don't fill the inventory of a chest or a Merchant if it is empty, fixes #73 2021-01-10 20:46:01 +01:00
Yohann D'ANELLO 3758cb1336 Fix the GiantSeaEagle registration, fixes #76 2021-01-10 20:20:12 +01:00
ynerant 44b967625c Merge branch 'fix-player-inventory' into 'master'
Update the player inventory when opening the menu/loading the game, fixes #72

Closes #72

See merge request ynerant/squirrel-battle!70
2021-01-10 19:57:17 +01:00
Yohann D'ANELLO 5694dd4dff Update the player inventory when opening the menu/loading the game, fixes #72 2021-01-10 19:52:28 +01:00
nicomarg 2efa9d4575 Merge branch 'fix-mobs-vision-bug' into 'master'
Resolve "Fix mobs vision bug"

Closes #71

See merge request ynerant/squirrel-battle!69
2021-01-10 19:48:01 +01:00
Nicolas Margulies 16ddbd31f3 also prevent updating seen tiles when checking vision 2021-01-10 19:41:51 +01:00
ynerant 0821a5fa7a Merge branch 'broken-bows' into 'master'
Broken bows

Closes #70

See merge request ynerant/squirrel-battle!68
2021-01-10 19:30:46 +01:00
Yohann D'ANELLO 01ee49ddd4 Entities are updated after a bow shot, fixes #70 2021-01-10 19:25:12 +01:00
Yohann D'ANELLO cddff5c2d9 Fix linting 2021-01-10 19:17:04 +01:00
eichhornchen f4965039ee Merge branch 'EvenmoreDoc' into 'master'
Evenmore doc

See merge request ynerant/squirrel-battle!67
2021-01-10 19:03:47 +01:00
ynerant ce1d299de7 Merge branch 'moredocs' into 'EvenmoreDoc'
More docs

See merge request ynerant/squirrel-battle!66
2021-01-10 18:56:15 +01:00