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

225 Commits

Author SHA1 Message Date
ynerant 2b3a8279b8 Merge branch 'fix-settings' into 'master' 
Fix settings

Closes #57 et #58

See merge request ynerant/squirrel-battle!56
 2021-01-08 11:30:02 +01:00
Yohann D'ANELLO 75e93611c3
Capture all mouse events and take into account mouse attributes, fixes #58 2021-01-08 11:21:40 +01:00
Yohann D'ANELLO b42f1277b1
Exit the game on KeyboardInterrupt (don't log this error) 2021-01-08 11:10:10 +01:00
eichhornchen 196e3708d2 Merge branch 'master' into 'doc' 
# Conflicts:
#   squirrelbattle/entities/items.py
#   squirrelbattle/interfaces.py
 2021-01-08 11:10:09 +01:00
Yohann D'ANELLO ac8c7a0a4c
Only read required keys in settings file 2021-01-08 11:07:38 +01:00
eichhornchen 6673b67ffe Repaired spawn of trumpets. 2021-01-08 10:58:40 +01:00
Yohann D'ANELLO affc1bae59
Fix merge 2021-01-08 02:15:13 +01:00
ynerant 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
Yohann D'ANELLO 7aeb659cf5
Fix french translation 2021-01-08 02:00:22 +01:00
Yohann D'ANELLO 6c6a44fb18
More tests 2021-01-08 01:56:54 +01:00
Yohann D'ANELLO 478a655751
Fix fg/bg custom colors 2021-01-07 16:49:40 +01:00
ynerant 4acf6804d4 Merge branch 'master' into 'lighting' 
# Conflicts:
#   squirrelbattle/display/mapdisplay.py
#   squirrelbattle/interfaces.py
 2021-01-07 16:36:54 +01:00
Yohann D'ANELLO c36e68d6e4
Reduce player vision 2021-01-07 16:34:12 +01:00
Yohann D'ANELLO e9c8f43e7e
Use ternary conditions to add coverage 2021-01-07 16:31:39 +01:00
Yohann D'ANELLO 1a78ad584c
Move equip functions for items 2021-01-06 18:31:28 +01:00
Yohann D'ANELLO a8c0c197ed
Linting 2021-01-06 18:02:58 +01:00
Eichhornchen 5ef12bef3d Changed the prices of armor 2021-01-06 17:57:23 +01:00
Yohann D'ANELLO 093c105120
The broken test is mysteriously working now 2021-01-06 17:54:43 +01:00
Yohann D'ANELLO ae505166b7
Disable critical hits during tests 2021-01-06 17:39:13 +01:00
ynerant 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
Yohann D'ANELLO 0c2b10b031
Use ternary conditions to gain coverage 2021-01-06 17:21:17 +01:00
Yohann D'ANELLO 887a190f11
Less complexity on the handle key function 2021-01-06 17:00:43 +01:00
Yohann D'ANELLO 41548504de
Test ladders 2021-01-06 16:09:53 +01:00
Yohann D'ANELLO a48e6325fe
Add log message when the player switches floor 2021-01-06 15:55:44 +01:00
Eichhornchen 15ef6af998 Put the texturepack in alphabetical order again. 2021-01-06 15:49:54 +01:00
Yohann D'ANELLO 4cd4bc9005
Display the current floor in the StatsDisplay 2021-01-06 15:17:02 +01:00
Yohann D'ANELLO d06a405120
Use a key to use ladders 2021-01-06 14:55:16 +01:00
Eichhornchen 2dc178d67c Merge branch 'equipment' into doc 2021-01-06 14:49:09 +01:00
Eichhornchen 77d501c389 Merge branch 'master' into doc 2021-01-06 14:39:23 +01:00
eichhornchen 4ad7d6c37c Added rings that can augment the player's statistics. Also added a new statistic : xp_buff, which helps the player level up sooner. 2021-01-06 11:44:52 +01:00
eichhornchen a9aeb9ca3a Repaired the use functionnality of the main item, as well as the load system for Armor items. 2021-01-06 11:13:17 +01:00
eichhornchen f3fe04e13a The player now has two hands and a slot for a helmet and a chestplate. Accordingly, new classes of items have been added. 2021-01-06 10:46:36 +01:00
eichhornchen 601062237d Repairing part of the tests. 2021-01-05 19:50:25 +01:00
eichhornchen 424044a5e4 Added an overpowered eagle boss. To avoid seing it too often, entities now have a certain chance of being spawned. Closes #19. 2021-01-05 19:40:11 +01:00
eichhornchen 3ace133037 Critical hit chance is now displayed along with the other stats. 2021-01-05 19:23:25 +01:00
eichhornchen 4bddf076ea Fighting now takes into account the constitution. Closes #51 2021-01-05 19:18:25 +01:00
eichhornchen 9b8dfb00da Added critical hit system: the player and rabbit entities have a chance of making x4 damage! Closes #52 2021-01-05 19:08:29 +01:00
eichhornchen 9cb5c9157f Linting 2021-01-05 10:59:17 +01:00
eichhornchen bb77dab628 Fixed a error induced by the merge: creditsdisplay did not have an update function 2021-01-05 10:49:04 +01:00
eichhornchen 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
eichhornchen 6341f39fb0 Linting 2021-01-05 10:20:55 +01:00
eichhornchen c378eead74 Fixed the game loading tests : removed trumpets from the test. 2021-01-05 10:11:55 +01:00
eichhornchen f821fef430 added tests 2021-01-05 09:38:49 +01:00
eichhornchen c329150aac Linting again 2020-12-31 17:15:24 +01:00
eichhornchen 73952a42f3 Added tests for familiars 2020-12-31 15:43:38 +01:00
eichhornchen 8e0b8d4fee Added a test for lines 106-107 of game.py 2020-12-31 15:16:40 +01:00
eichhornchen 7cd4721daa linting 2020-12-31 15:00:20 +01:00
eichhornchen de3aba396d Re-changed familiar's inheritance from friendlyEntity to FightingEntity (just a leftover from debug) 2020-12-31 14:51:17 +01:00
Yohann D'ANELLO 663fc0eecd
Better teleport 2020-12-26 21:13:17 +01:00
Yohann D'ANELLO 6b7f8867fa
Tile colors can be overwritten 2020-12-26 14:02:35 +01:00