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 |
|
ynerant
|
00a4dec6a4
|
Merge branch 'ladders' into 'master'
Ladders
See merge request ynerant/squirrel-battle!53
|
2021-01-06 18:01:36 +01:00 |
|
Yohann D'ANELLO
|
093c105120
|
The broken test is mysteriously working now
|
2021-01-06 17:54:43 +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 |
|
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
|
2f95ce3d5f
|
Merge branch 'familiars' into 'master'
Familiars
Closes #54, #46, and #32
See merge request ynerant/squirrel-battle!52
|
2021-01-05 11:03:39 +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 |
|
Yohann D'ANELLO
|
9a56b4d7e9
|
Navigate through different maps while climbing ladders
|
2020-12-26 01:08:43 +01:00 |
|
Yohann D'ANELLO
|
8636d571b5
|
Add ladders in the map
|
2020-12-26 00:52:47 +01:00 |
|
Yohann D'ANELLO
|
ad5ae22e5f
|
Manage multiple maps in one game
|
2020-12-26 00:45:17 +01:00 |
|
eichhornchen
|
505e0a4efb
|
Fixes issue #54, repaired the attribution of the familiars' target
|
2020-12-21 14:23:58 +01:00 |
|
Yohann D'ANELLO
|
ed6457e94d
|
Test credits menu
|
2020-12-18 23:39:56 +01:00 |
|
Yohann D'ANELLO
|
4b174f26e4
|
Better colors
|
2020-12-18 23:36:08 +01:00 |
|
Yohann D'ANELLO
|
411744bf10
|
Add credits menu, see #42
|
2020-12-18 22:24:41 +01:00 |
|
eichhornchen
|
ea5f5c1428
|
Added an original text art to serve as the project's logo.
|
2020-12-18 21:30:16 +01:00 |
|
Nicolas Margulies
|
762bed888a
|
Working visibility (at least relatively good), but a few lines untested
|
2020-12-18 21:21:00 +01:00 |
|
Yohann D'ANELLO
|
b876dab156
|
Register Trumpet as savable entity
|
2020-12-18 18:13:39 +01:00 |
|
Yohann D'ANELLO
|
0394c5d15d
|
Linting
|
2020-12-18 17:46:38 +01:00 |
|
Yohann D'ANELLO
|
e1918ab066
|
tick function takes the player as argument
|
2020-12-18 17:40:52 +01:00 |
|
eichhornchen
|
dadafc84eb
|
Added a familiar class that follows the player around and hits monsters when it sees one. Added a trumpet, an instance of familiar. Closes #46.
|
2020-12-18 17:29:59 +01:00 |
|
Nicolas Margulies
|
86628fdea6
|
Working visibility and displaying it, still need to hide things that aren't visible
|
2020-12-18 17:04:45 +01:00 |
|
ynerant
|
330d78702a
|
Merge branch 'capitalism' into 'master'
Sell items
Closes #50, #49 et #47
See merge request ynerant/squirrel-battle!51
|
2020-12-18 16:44:55 +01:00 |
|
Yohann D'ANELLO
|
77f52b6276
|
Screen is refreshed only when pads are all refreshed, fixes #50
|
2020-12-18 16:40:52 +01:00 |
|
Yohann D'ANELLO
|
5ae49e71ff
|
Display the amount of hazels in the store menu, closes #49
|
2020-12-18 15:36:25 +01:00 |
|
eichhornchen
|
8ecbf13eae
|
Being able to calculate paths is now a property of fighting entities.
|
2020-12-18 15:31:23 +01:00 |
|
Yohann D'ANELLO
|
46ce7c33bf
|
Merchant menu is updated through its update function, and does not access globally to the Game instance
|
2020-12-18 15:15:47 +01:00 |
|
Yohann D'ANELLO
|
85870494a0
|
More generic display update
|
2020-12-18 15:07:09 +01:00 |
|
Yohann D'ANELLO
|
b8d32b29c8
|
Test selling items
|
2020-12-18 02:17:06 +01:00 |
|
Yohann D'ANELLO
|
c55a7451e7
|
Display more precisely where we are in the store menu
|
2020-12-18 01:50:11 +01:00 |
|
Yohann D'ANELLO
|
9a556ba669
|
We can now buy items to merchants, closes #47
|
2020-12-18 01:05:50 +01:00 |