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 |
|
Yohann D'ANELLO
|
45f420aaef
|
Linting
|
2020-12-11 18:17:08 +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 |
|
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 |
|
Yohann D'ANELLO
|
4dbd4f7912
|
Don't buy hearts, use them instant instead. Fixes #38
|
2020-12-09 16:57:46 +01:00 |
|
Yohann D'ANELLO
|
19b82ff71a
|
Test merchants
|
2020-12-09 15:32:37 +01:00 |
|
Yohann D'ANELLO
|
57fab7db51
|
Linting
|
2020-12-07 21:22:06 +01:00 |
|
Yohann D'ANELLO
|
b24cc1877f
|
Merchant inventory is working!
|
2020-12-07 21:13:55 +01:00 |
|
eichhornchen
|
8540a8f354
|
Work in progress on printing a store menu. Its buggy though
|
2020-12-07 20:54:53 +01:00 |
|
eichhornchen
|
d39427f978
|
Merge branch 'master' into village
|
2020-12-06 11:50:11 +01:00 |
|
eichhornchen
|
866af98fe4
|
Merging master into village, conflicts were solved
|
2020-12-06 11:43:48 +01:00 |
|
Yohann D'ANELLO
|
f8ca5b2cc5
|
Recalculate the path finder when the player exchanges its body
|
2020-12-05 14:48:43 +01:00 |
|
Yohann D'ANELLO
|
7ad2cad77c
|
Add a message in the logs when a body-snap potion is used
|
2020-12-05 14:47:54 +01:00 |
|
Yohann D'ANELLO
|
f887a1f0aa
|
Entity name is a parameter since it can be changed through body snatch potion
|
2020-12-05 14:25:22 +01:00 |
|
Yohann D'ANELLO
|
ea672272f5
|
Add body snatch potion
|
2020-12-05 14:20:58 +01:00 |
|
Yohann D'ANELLO
|
4b9399c687
|
Test inventory
|
2020-12-04 18:16:46 +01:00 |
|
Yohann D'ANELLO
|
27fd73c96b
|
Add log messages when a bomb is exploding
|
2020-12-04 17:10:23 +01:00 |
|
Yohann D'ANELLO
|
c7545e53f7
|
Items can be dropped/equipped/used
|
2020-12-04 16:53:27 +01:00 |
|
Yohann D'ANELLO
|
29142cd91c
|
Merge remote-tracking branch 'origin/master' into village
# Conflicts:
# squirrelbattle/display/texturepack.py
# squirrelbattle/interfaces.py
|
2020-12-01 17:07:40 +01:00 |
|
eichhornchen
|
ca86572677
|
Added a weapon class and a sword subclass
|
2020-11-27 17:56:01 +01:00 |
|
Yohann D'ANELLO
|
0d3e33d960
|
Declare the license, we use GNU GPL
|
2020-11-27 16:33:17 +01:00 |
|
Yohann D'ANELLO
|
d0ee9ec562
|
Rename dungeonbattle to squirrelbattle
|
2020-11-19 02:18:16 +01:00 |