ynerant/squirrel-battle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity
502 Commits 4 Branches 3 Tags
0394c5d15dde312d32769503322aad029a94cfea
Commit Graph

53 Commits

Author SHA1 Message Date
Yohann D'ANELLO
0394c5d15d Linting 2020-12-18 17:46:38 +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
eichhornchen
8ecbf13eae Being able to calculate paths is now a property of fighting entities. 2020-12-18 15:31:23 +01:00
eichhornchen
646e0063be Fixed grammar, unified the docstring's format and added documentation to some classes that did not have any. Closes #32. 2020-12-13 21:29:25 +01:00
Yohann D'ANELLO
7971a1f70e Add waiting key, fixes #16 2020-12-12 18:12:37 +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
8608ce346f Add a small bomb exploding animation, fixes #31 2020-12-12 16:50:01 +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
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
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
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
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
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
2bb99a707e Merchant inventory is well-saved 2020-12-07 21:48:56 +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
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
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
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
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
eichhornchen
3886bee1ba Friendly entities are now a subclass of fighting entities, and can die. The T key is now used to talk to friendly entities 2020-12-04 00:27:25 +01:00
Yohann D'ANELLO
da0d7e7055 Fix lag when monsters try to move in a random direction 2020-12-02 16:04:43 +01:00
Yohann D'ANELLO
654bab7c1d Translate sun flower messages 2020-12-01 17:12:22 +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
fbd9f0045b Friendly entities can now talk to the player, a sunflower entity was added to test this new feature. Related to issue #22 2020-11-27 18:38:48 +01:00
eichhornchen
ca86572677 Added a weapon class and a sword subclass 2020-11-27 17:56:01 +01:00
eichhornchen
4fdf08cab9 Added a currency : the hazel (for hazelnuts). The player and the merchants possess a certain quantity of hazel 2020-11-27 17:11:59 +01:00
eichhornchen
76bbee7e6d Added a merchant class and a talk_to method to interact with friendly entities 2020-11-27 16:56:22 +01:00
Yohann D'ANELLO
0d3e33d960 Declare the license, we use GNU GPL 2020-11-27 16:33:17 +01:00
Yohann D'ANELLO
fb3f3ee5e8 Beaver is a tiger 2020-11-20 18:02:08 +01:00
ynerant
b7207bb738 Merge branch 'game-logs' into 'master' 
Game logs, see #12

See merge request ynerant/squirrel-battle!18
 2020-11-19 22:48:39 +01:00