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 |
|
eichhornchen
|
7ba49277a9
|
Added a symbol for hazels in the ascii texturepack
|
2020-12-11 15:52:36 +01:00 |
|
nicomarg
|
53cb6a89ae
|
Merge branch '35-better-pathfinding' into 'master'
Resolve "Better pathfinding"
Closes #35
See merge request ynerant/squirrel-battle!43
|
2020-12-10 22:31:40 +01:00 |
|
Nicolas Margulies
|
01cc77e146
|
Fixed a bug when trying to pathfind when player is surrounded by inaccessible tiles
|
2020-12-10 22:28:12 +01:00 |
|
Nicolas Margulies
|
cc6033e8e4
|
New pathfinding that avoids most of the mobs getting stuck, closes #35
|
2020-12-10 22:21:09 +01:00 |
|
Yohann D'ANELLO
|
6d4c0b2ca3
|
Testing the merchant must handle two cases: the bought item is a heart or not
|
2020-12-09 17:04:29 +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
|
2d5a2e4c87
|
Display hazels in the StatsDisplay
|
2020-12-09 16:54:53 +01:00 |
|
Yohann D'ANELLO
|
56627f3e84
|
Reorder texture pack entries
|
2020-12-09 16:50:47 +01:00 |
|
Yohann D'ANELLO
|
05e79c14e3
|
Translate the settings entry that change the chat key
|
2020-12-09 15:45:50 +01:00 |
|
Yohann D'ANELLO
|
405ee895d8
|
When an item is bought, remove it from the merchant inventory. Fixes #37
|
2020-12-09 15:35:53 +01:00 |
|
Yohann D'ANELLO
|
19b82ff71a
|
Test merchants
|
2020-12-09 15:32:37 +01:00 |
|
Yohann D'ANELLO
|
657f4e5209
|
Remove dead code: friendly entities are fighting entities
|
2020-12-09 15:10:28 +01:00 |
|
Yohann D'ANELLO
|
cea015d015
|
In load&save test, force to have a merchant
|
2020-12-09 15:09:07 +01:00 |
|
Yohann D'ANELLO
|
39787861dc
|
Test sunflowers interaction
|
2020-12-09 15:05:19 +01:00 |
|
Nicolas Margulies
|
50d806cdcf
|
Working Dijkstra
|
2020-12-08 22:22:20 +01:00 |
|
Nicolas Margulies
|
7823a422b9
|
Start f new pathfinding, not working
|
2020-12-08 00:59:19 +01:00 |
|
Yohann D'ANELLO
|
7ab4213273
|
Fix french translation file
|
2020-12-07 22:03:48 +01:00 |
|
Yohann D'ANELLO
|
e3ae7bcacf
|
Resolve merge conflicts on german translation file
|
2020-12-07 22:00:27 +01:00 |
|
Yohann D'ANELLO
|
ca17bf424a
|
Inventory displays were not updated when the texture pack changed
|
2020-12-07 21:51:51 +01:00 |
|
Yohann D'ANELLO
|
2bb99a707e
|
Merchant inventory is well-saved
|
2020-12-07 21:48:56 +01:00 |
|
Yohann D'ANELLO
|
099508d4c0
|
Don't call screen.getkey() at a wrong place
|
2020-12-07 21:29:57 +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 |
|
ynerant
|
f648bcd7fb
|
Merge branch 'es-translation' into 'master'
Add spanish translation
See merge request ynerant/squirrel-battle!42
|
2020-12-07 01:04:55 +01:00 |
|
Yohann D'ANELLO
|
fdc2bcab8d
|
Add spanish translation
|
2020-12-07 01:01:39 +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 |
|
eichhornchen
|
38842cee68
|
There was a import error
|
2020-12-05 21:50:02 +01:00 |
|
eichhornchen
|
ba68e68584
|
Added a Gamemode for selling interfaces, as well as the base of the player/merchant interaction, related to issue #18
|
2020-12-05 21:43:13 +01:00 |
|
ynerant
|
6fa11d9dfe
|
Merge branch 'body-snatch' into 'master'
Body snatch
Closes #34 et #33
See merge request ynerant/squirrel-battle!38
|
2020-12-05 14:52:47 +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
|
f39113fd0b
|
Test body snatch potion, fixes #34
|
2020-12-05 14:42:13 +01:00 |
|
Yohann D'ANELLO
|
c38f8cdc53
|
Save the inventory of the player when saving the game, fixes #33
|
2020-12-05 14:35:59 +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 |