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

359 Commits

Author SHA1 Message Date
Charles Peyrat c854d41579 Fix merging mistakes and chunk rooms 2021-01-11 01:18:20 +01:00
Charles Peyrat 5aaef15b2b Add new room type : chunk rooms 2021-01-10 23:38:29 +01:00
Charles Peyrat ca67d5d7f4 Merge remote branch 2021-01-10 23:02:34 +01:00
Charles Peyrat 099a0eab31 Add comments and docstring 2021-01-10 22:54:48 +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
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
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
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
Nicolas Margulies 16ddbd31f3 also prevent updating seen tiles when checking vision 2021-01-10 19:41:51 +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
ynerant 10a1b59b24 Merge branch 'EvenmoreDoc' into 'moredocs' 
# Conflicts:
#   docs/entities/items.rst
 2021-01-10 18:49:25 +01:00
eichhornchen c9994423cb Added dance to doc. 2021-01-10 18:44:17 +01:00
eichhornchen e96c50e81a Doc for new items. 2021-01-10 18:36:46 +01:00
Yohann D'ANELLO 1795d62294 Update merchant prices 2021-01-10 18:09:09 +01:00
eichhornchen 93e51d9240 Testing + linting (yes there remains two linting errors, i don't know what to do. 2021-01-10 18:04:33 +01:00
eichhornchen 3d48c43886 Player can now dance! Closes #69. 2021-01-10 17:10:00 +01:00
eichhornchen dfb591d410 The player's stats now get better when levelling up. The strength level and frequency of appearance of entities have been changed to offer bettter game experience. 2021-01-10 16:31:46 +01:00
eichhornchen 841c7b9f90 Chest can be destroyed by bombs. 2021-01-10 16:31:16 +01:00
eichhornchen 5eb7699301 Rearranged the display class files, related to issue #56. 2021-01-10 12:35:50 +01:00
eichhornchen 8d0d0883a3 Merge branch 'master' into clean 2021-01-10 12:12:40 +01:00
eichhornchen dd37c2f62f Renamed the title's ascii art file. 2021-01-10 11:54:49 +01:00
Yohann D'ANELLO d738029335
Fix import order 2021-01-10 11:25:53 +01:00
Yohann D'ANELLO 94c12541ef
Happy new year! 2021-01-10 10:46:17 +01:00
Yohann D'ANELLO 391fe6897b
Drop unusued english translation file 2021-01-10 10:29:43 +01:00
ynerant 5b5180d44a Merge branch 'fix-tty-colors' into 'master' 
Don't use custom colors on unsupported screens, fixes #67

Closes #67

See merge request ynerant/squirrel-battle!61
 2021-01-09 21:52:03 +01:00
Nicolas Margulies 7bf1789239 Removed debug code 2021-01-09 18:45:55 +01:00
Yohann D'ANELLO 8cb2b2388f
Don't use custom colors on unsupported screens, fixes #67 2021-01-09 18:42:11 +01:00
eichhornchen ac4a73b2cb Final linting 2021-01-09 00:01:02 +01:00
eichhornchen cbe3e226b4 Repaired a merge error, tests now work. 2021-01-08 23:51:47 +01:00
eichhornchen 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
eichhornchen 2eb42668c8 Linting and tests for chests 2021-01-08 23:32:47 +01:00
eichhornchen bdbf214d8d Added chests, they are immortal and contain objects the player can take for free. 2021-01-08 23:15:48 +01:00