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 |
|
Yohann D'ANELLO
|
c01307202a
|
Add shields to be more protected, see #48
|
2020-12-18 20:01:52 +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
|
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 |
|
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 |
|
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 |
|
Yohann D'ANELLO
|
a5890a341d
|
Display inventory menu next to the merchant menu
|
2020-12-17 23:46:20 +01:00 |
|
ynerant
|
3f62fbaa2b
|
Merge branch 'erase-pads' into 'master'
Erase pad before resizing
Closes #45
See merge request ynerant/squirrel-battle!50
|
2020-12-12 21:20:45 +01:00 |
|
Yohann D'ANELLO
|
599f75b676
|
Erase pad before resizing, fixes #45
|
2020-12-12 21:19:55 +01:00 |
|
ynerant
|
cd5b7086f2
|
Merge branch 'wait' into 'master'
Add waiting key, fixes #16
Closes #16
See merge request ynerant/squirrel-battle!49
|
2020-12-12 18:16:31 +01:00 |
|
Yohann D'ANELLO
|
7971a1f70e
|
Add waiting key, fixes #16
|
2020-12-12 18:12:37 +01:00 |
|
ynerant
|
5eefe1937a
|
Merge branch 'pretty_boxes' into 'master'
Pretty boxes
Closes #44 et #28
See merge request ynerant/squirrel-battle!48
|
2020-12-12 17:42:38 +01:00 |
|
Yohann D'ANELLO
|
288a6ac2c9
|
Some translations were missing concerning sunflowers, fixes #44
|
2020-12-12 17:39:12 +01:00 |
|
Yohann D'ANELLO
|
73e1fac89a
|
Add title to boxes to have pretty boxes, fixes #28
|
2020-12-12 17:15:08 +01:00 |
|
ynerant
|
158338637a
|
Merge branch 'exploding_bomb' into 'master'
Add a small bomb exploding animation
Closes #31
See merge request ynerant/squirrel-battle!47
|
2020-12-12 16:53:26 +01:00 |
|
Yohann D'ANELLO
|
8608ce346f
|
Add a small bomb exploding animation, fixes #31
|
2020-12-12 16:50:01 +01:00 |
|
ynerant
|
1986630da1
|
Merge branch 'change_image_color' into 'master'
Better color support
Closes #43
See merge request ynerant/squirrel-battle!46
|
2020-12-12 13:53:04 +01:00 |
|
Yohann D'ANELLO
|
04ae56e451
|
Higher abstraction level on addmsg, fixes #43
|
2020-12-12 13:46:45 +01:00 |
|
Yohann D'ANELLO
|
48318a91fe
|
Give more hazels to the player when testing the interaction with merchants
|
2020-12-11 21:19:25 +01:00 |
|
Yohann D'ANELLO
|
777668848e
|
Clicking on the main image changes its color
|
2020-12-11 21:17:21 +01:00 |
|
ynerant
|
81de0d8eb0
|
Merge branch 'mouse_interaction' into 'master'
Mouse interaction
Closes #40
See merge request ynerant/squirrel-battle!45
|
2020-12-11 18:47:20 +01:00 |
|
Yohann D'ANELLO
|
a4a10e340d
|
Test clicking on the merchant pad
|
2020-12-11 18:44:05 +01:00 |
|
ynerant
|
53d090a9c8
|
Merge branch 'master' into 'mouse_interaction'
# Conflicts:
# squirrelbattle/display/display_manager.py
# squirrelbattle/display/menudisplay.py
# squirrelbattle/entities/items.py
|
2020-12-11 18:38:13 +01:00 |
|
Yohann D'ANELLO
|
f453b82a58
|
Test clicking on the screen
|
2020-12-11 18:33:47 +01:00 |
|
eichhornchen
|
9d3e8a9822
|
Merge branch 'village' into 'master'
Village
Closes #41, #38, #37, #36, and #18
See merge request ynerant/squirrel-battle!44
|
2020-12-11 18:23:10 +01:00 |
|
Yohann D'ANELLO
|
d9912cacad
|
Listen to mouse clicks in the main loop
|
2020-12-11 18:17:59 +01:00 |
|
Yohann D'ANELLO
|
45f420aaef
|
Linting
|
2020-12-11 18:17:08 +01:00 |
|
eichhornchen
|
e7f24c2371
|
The store menu now displays the price of objects, fixes #41
|
2020-12-11 18:08:10 +01:00 |
|
Yohann D'ANELLO
|
1afa397fec
|
Better interaction with inventory menu
|
2020-12-11 18:07:39 +01:00 |
|
Yohann D'ANELLO
|
089a247b2f
|
Maybe mouse clicks may use the game
|
2020-12-11 17:43:46 +01:00 |
|
Yohann D'ANELLO
|
d50f6701f4
|
Open a menu with the mouse
|
2020-12-11 17:40:56 +01:00 |
|
Yohann D'ANELLO
|
99352bc1d5
|
Test buying an item when we don't have enough of money
|
2020-12-11 17:28:16 +01:00 |
|
Yohann D'ANELLO
|
7179346e2b
|
Add a InventoryHolder superclass for player and merchants
|
2020-12-11 17:20:50 +01:00 |
|
Yohann D'ANELLO
|
98b5dd64a8
|
Linting
|
2020-12-11 17:06:30 +01:00 |
|
Yohann D'ANELLO
|
bbe37eab97
|
Listen for clicks, detect which display was clicked
|
2020-12-11 16:56:22 +01:00 |
|
eichhornchen
|
b9b776b7ad
|
Player now pays for what he buys and buying a heart does not put it in the inventory. Solves #38 and #36
|
2020-12-11 16:49:17 +01:00 |
|