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
|
8cb2b2388f
|
Don't use custom colors on unsupported screens, fixes #67
|
2021-01-09 18:42:11 +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 |
|
eichhornchen
|
591630b8a7
|
Added a fire ball staff, closes #64
|
2021-01-08 19:05:02 +01:00 |
|
eichhornchen
|
f6210a6356
|
Added a Bow, related to #64
|
2021-01-08 18:06:26 +01:00 |
|
eichhornchen
|
bde33e9232
|
Added a second scroll object closes #60
|
2021-01-08 16:14:40 +01:00 |
|
Yohann D'ANELLO
|
a497d08f31
|
Implement the monocle of truth, closes #62
|
2021-01-08 15:48:12 +01:00 |
|
Yohann D'ANELLO
|
1270640619
|
Change hint whenever the T key is pressed or not
|
2021-01-08 15:07:35 +01:00 |
|
Yohann D'ANELLO
|
28a6532a21
|
Add a hint to tell the user how to talk to friendly entities
|
2021-01-08 14:59:44 +01:00 |
|
Yohann D'ANELLO
|
156e4a7e3a
|
Add a hint to tell the user how to use ladders
|
2021-01-08 14:51:56 +01:00 |
|
Yohann D'ANELLO
|
120ec82d09
|
Helmet needs only one character in squirrel mode, add a trailing space
|
2021-01-08 12:07:13 +01:00 |
|
Yohann D'ANELLO
|
e56bdc16c2
|
Add item description, closes #59
|
2021-01-08 11:55:25 +01:00 |
|
eichhornchen
|
5736c2300b
|
Added a scroll object that deals damage based on the player intelligence. Related to #60
|
2021-01-08 11:54:39 +01:00 |
|
|
|
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 |
|
eichhornchen
|
196e3708d2
|
Merge branch 'master' into 'doc'
# Conflicts:
# squirrelbattle/entities/items.py
# squirrelbattle/interfaces.py
|
2021-01-08 11:10:09 +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 |
|
Yohann D'ANELLO
|
478a655751
|
Fix fg/bg custom colors
|
2021-01-07 16:49:40 +01:00 |
|
|
|
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
|
a8c0c197ed
|
Linting
|
2021-01-06 18:02:58 +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 |
|
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 |
|
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
|
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
|
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
|
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
|
7cd4721daa
|
linting
|
2020-12-31 15:00:20 +01:00 |
|
Yohann D'ANELLO
|
6b7f8867fa
|
Tile colors can be overwritten
|
2020-12-26 14:02:35 +01:00 |
|
Yohann D'ANELLO
|
8636d571b5
|
Add ladders in the map
|
2020-12-26 00:52:47 +01:00 |
|
Yohann D'ANELLO
|
8afa082708
|
Add Python 3.6 and 3.10 support, fixes #53
|
2020-12-20 18:02:39 +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 |
|
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
|
c01307202a
|
Add shields to be more protected, see #48
|
2020-12-18 20:01:52 +01:00 |
|
Yohann D'ANELLO
|
fe769c4488
|
We can equip items
|
2020-12-18 17:30:03 +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 |
|
Yohann D'ANELLO
|
77f52b6276
|
Screen is refreshed only when pads are all refreshed, fixes #50
|
2020-12-18 16:40:52 +01:00 |
|
