Eichhornchen
|
15ef6af998
|
Put the texturepack in alphabetical order again.
|
2021-01-06 15:49:54 +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 |
|
Yohann D'ANELLO
|
10788a24ec
|
Pin Sphinx version
|
2021-01-06 13:53:42 +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
|
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 |
|
eichhornchen
|
505e0a4efb
|
Fixes issue #54, repaired the attribution of the familiars' target
|
2020-12-21 14:23:58 +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
|
0b9606cbfe
|
Update entities documentation
|
2020-12-20 17:52:44 +01:00 |
|
Yohann D'ANELLO
|
32072ade42
|
Fix some documentation issues
|
2020-12-19 13:37:28 +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 |
|
Yohann D'ANELLO
|
c01307202a
|
Add shields to be more protected, see #48
|
2020-12-18 20:01:52 +01:00 |
|
Yohann D'ANELLO
|
b876dab156
|
Register Trumpet as savable entity
|
2020-12-18 18:13:39 +01:00 |
|
Yohann D'ANELLO
|
9aa684fb77
|
Use directly equipped items outside the inventory
|
2020-12-18 17:57:42 +01:00 |
|
Yohann D'ANELLO
|
9475725228
|
Save equipped item and armor
|
2020-12-18 17:50:26 +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 |
|
Yohann D'ANELLO
|
1b4612afd0
|
Swords add strength
|
2020-12-18 17:39:11 +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 |
|
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 |
|