affc1bae59
Fix merge
2021-01-08 02:15:13 +01:00
ynerant
451dd9cba7
Merge branch 'master' into 'equipment'
...
# Conflicts:
# squirrelbattle/display/statsdisplay.py
# squirrelbattle/entities/items.py
# squirrelbattle/entities/player.py
# squirrelbattle/interfaces.py
# squirrelbattle/locale/de/LC_MESSAGES/squirrelbattle.po
# squirrelbattle/locale/es/LC_MESSAGES/squirrelbattle.po
# squirrelbattle/locale/fr/LC_MESSAGES/squirrelbattle.po
# squirrelbattle/tests/game_test.py
2021-01-08 02:11:40 +01:00
6c6a44fb18
More tests
2021-01-08 01:56:54 +01:00
ynerant
4acf6804d4
Merge branch 'master' into 'lighting'
...
# Conflicts:
# squirrelbattle/display/mapdisplay.py
# squirrelbattle/interfaces.py
2021-01-07 16:36:54 +01:00
c36e68d6e4
Reduce player vision
2021-01-07 16:34:12 +01:00
a8c0c197ed
Linting
2021-01-06 18:02:58 +01:00
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
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
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
762bed888a
Working visibility (at least relatively good), but a few lines untested
2020-12-18 21:21:00 +01:00
9aa684fb77
Use directly equipped items outside the inventory
2020-12-18 17:57:42 +01:00
9475725228
Save equipped item and armor
2020-12-18 17:50:26 +01:00
0394c5d15d
Linting
2020-12-18 17:46:38 +01:00
fe769c4488
We can equip items
2020-12-18 17:30:03 +01:00
86628fdea6
Working visibility and displaying it, still need to hide things that aren't visible
2020-12-18 17:04:45 +01:00
8ecbf13eae
Being able to calculate paths is now a property of fighting entities.
2020-12-18 15:31:23 +01:00
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
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
7179346e2b
Add a InventoryHolder superclass for player and merchants
2020-12-11 17:20:50 +01:00
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
01cc77e146
Fixed a bug when trying to pathfind when player is surrounded by inaccessible tiles
2020-12-10 22:28:12 +01:00
cc6033e8e4
New pathfinding that avoids most of the mobs getting stuck, closes #35
2020-12-10 22:21:09 +01:00
2d5a2e4c87
Display hazels in the StatsDisplay
2020-12-09 16:54:53 +01:00
657f4e5209
Remove dead code: friendly entities are fighting entities
2020-12-09 15:10:28 +01:00
50d806cdcf
Working Dijkstra
2020-12-08 22:22:20 +01:00
7823a422b9
Start f new pathfinding, not working
2020-12-08 00:59:19 +01:00
2bb99a707e
Merchant inventory is well-saved
2020-12-07 21:48:56 +01:00
57fab7db51
Linting
2020-12-07 21:22:06 +01:00
866af98fe4
Merging master into village, conflicts were solved
2020-12-06 11:43:48 +01:00
38842cee68
There was a import error
2020-12-05 21:50:02 +01:00
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
c38f8cdc53
Save the inventory of the player when saving the game, fixes #33
2020-12-05 14:35:59 +01:00
f887a1f0aa
Entity name is a parameter since it can be changed through body snatch potion
2020-12-05 14:25:22 +01:00
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
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
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
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
0d3e33d960
Declare the license, we use GNU GPL
2020-11-27 16:33:17 +01:00
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
a3821676f4
The strength of the player is now increased when he levels up
2020-11-19 16:17:02 +01:00
6e71146aa2
First pass on the logs
...
The newly-added logs manage a list of messages. Entities do register a
message to it when hitting each other. Display is created, but not yet
added to the layout actually displayed.
2020-11-19 12:03:05 +01:00
d0ee9ec562
Rename dungeonbattle to squirrelbattle
2020-11-19 02:18:16 +01:00
Yohann D'ANELLO
