Commit Graph

111 Commits

Author SHA1 Message Date
7b019ce149 Linting 2021-01-11 01:21:52 +01:00
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
60675d7859 Cover doors code 2021-01-10 23:21:28 +01:00
b0ca1d4edf Cover everytime the map generation test 2021-01-10 23:05:49 +01:00
8f845d1e4c Doors don't break the connexity of map 2021-01-10 23:03:24 +01:00
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
f05652d9b8 Fixed tests and reached 100% coverage 2021-01-10 22:39:52 +01:00
0ea10546ac Fix merge issues 2021-01-10 22:19:15 +01:00
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
88471f4361 Changed equipment behaviour, now equipped items stay in the inventory 2021-01-10 22:15:32 +01:00
9df1ac7883 Linting 2021-01-10 22:08:42 +01:00
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
6cf0590586 even more translations. 2021-01-10 21:38:21 +01:00
96bbc5088f Add a test case for non connex maps in distance computation 2021-01-10 21:32:58 +01:00
26e66a5796 Implement method add_loops along with tests 2021-01-10 21:30:18 +01:00
4f4223c514 More translations. 2021-01-10 21:25:15 +01:00
cddff5c2d9 Fix linting 2021-01-10 19:17:04 +01:00
93e51d9240 Testing + linting (yes there remains two linting errors, i don't know what to do. 2021-01-10 18:04:33 +01:00
d738029335 Fix import order 2021-01-10 11:25:53 +01:00
94c12541ef Happy new year! 2021-01-10 10:46:17 +01:00
cbe3e226b4 Repaired a merge error, tests now work. 2021-01-08 23:51:47 +01:00
eac9057f31 Merge branch 'master' into 'moreitems'
# Conflicts:
#   squirrelbattle/entities/items.py
#   squirrelbattle/interfaces.py
#   squirrelbattle/tests/game_test.py
2021-01-08 23:41:21 +01:00
2eb42668c8 Linting and tests for chests 2021-01-08 23:32:47 +01:00
9ff615a6b0 Linting and tests... 2021-01-08 22:25:00 +01:00
949555ffff Map at floor -1 is now not deterministic 2021-01-08 20:06:32 +01:00
1ab63434f6 Merge branch 'master' into map_generation
# Conflicts:
#	squirrelbattle/game.py
#	squirrelbattle/interfaces.py
#	squirrelbattle/tests/game_test.py
2021-01-08 17:02:10 +01:00
afaa9d17cd Linting 2021-01-08 16:55:02 +01:00
9b853324ad Drop first version of random walk 2021-01-08 16:52:38 +01:00
a390f4f5e9 Fix is_connex tests 2021-01-08 16:21:16 +01:00
0aa4eb9c0b Refactoring in tests to allow for easy connexity verification 2021-01-08 16:11:17 +01:00
7a4936e6a5 Test monocles 2021-01-08 15:58:54 +01:00
f240cafa83 Fixing syntax in tests 2021-01-08 15:55:26 +01:00
a497d08f31 Implement the monocle of truth, closes #62 2021-01-08 15:48:12 +01:00
156e4a7e3a Add a hint to tell the user how to use ladders 2021-01-08 14:51:56 +01:00
571e9db3e8 Fix french translations 2021-01-08 12:06:28 +01:00
75e93611c3 Capture all mouse events and take into account mouse attributes, fixes #58 2021-01-08 11:21:40 +01:00
c959a9d865 Update tests because Map.neighbourhood became a static method 2021-01-08 05:42:12 +01:00
451dd9cba7 Merge branch 'master' into 'equipment'
# Conflicts:
#   squirrelbattle/display/statsdisplay.py
#   squirrelbattle/entities/items.py
#   squirrelbattle/entities/player.py
#   squirrelbattle/interfaces.py
#   squirrelbattle/locale/de/LC_MESSAGES/squirrelbattle.po
#   squirrelbattle/locale/es/LC_MESSAGES/squirrelbattle.po
#   squirrelbattle/locale/fr/LC_MESSAGES/squirrelbattle.po
#   squirrelbattle/tests/game_test.py
2021-01-08 02:11:40 +01:00
6c6a44fb18 More tests 2021-01-08 01:56:54 +01:00
4acf6804d4 Merge branch 'master' into 'lighting'
# Conflicts:
#   squirrelbattle/display/mapdisplay.py
#   squirrelbattle/interfaces.py
2021-01-07 16:36:54 +01:00
093c105120 The broken test is mysteriously working now 2021-01-06 17:54:43 +01:00
ae505166b7 Disable critical hits during tests 2021-01-06 17:39:13 +01:00
d49c138257 Merge branch 'master' into 'ladders'
# Conflicts:
#   squirrelbattle/game.py
#   squirrelbattle/interfaces.py
#   squirrelbattle/tests/game_test.py
2021-01-06 17:29:26 +01:00
41548504de Test ladders 2021-01-06 16:09:53 +01:00
d06a405120 Use a key to use ladders 2021-01-06 14:55:16 +01:00
601062237d Repairing part of the tests. 2021-01-05 19:50:25 +01:00
7f63ab2357 Merge branch 'master' into 'familiars'
# Conflicts:
#   squirrelbattle/display/display_manager.py
#   squirrelbattle/display/logsdisplay.py
#   squirrelbattle/display/mapdisplay.py
#   squirrelbattle/display/menudisplay.py
#   squirrelbattle/menus.py
2021-01-05 10:27:39 +01:00
6341f39fb0 Linting 2021-01-05 10:20:55 +01:00
c378eead74 Fixed the game loading tests : removed trumpets from the test. 2021-01-05 10:11:55 +01:00
f821fef430 added tests 2021-01-05 09:38:49 +01:00