Commit Graph

105 Commits

Author SHA1 Message Date
ynerant 10a1b59b24 Merge branch 'EvenmoreDoc' into 'moredocs'
# Conflicts:
#   docs/entities/items.rst
2021-01-10 18:49:25 +01:00
eichhornchen c9994423cb Added dance to doc. 2021-01-10 18:44:17 +01:00
eichhornchen e96c50e81a Doc for new items. 2021-01-10 18:36:46 +01:00
Yohann D'ANELLO 1795d62294 Update merchant prices 2021-01-10 18:09:09 +01:00
eichhornchen 93e51d9240 Testing + linting (yes there remains two linting errors, i don't know what to do. 2021-01-10 18:04:33 +01:00
eichhornchen 3d48c43886 Player can now dance! Closes #69. 2021-01-10 17:10:00 +01:00
eichhornchen dfb591d410 The player's stats now get better when levelling up. The strength level and frequency of appearance of entities have been changed to offer bettter game experience. 2021-01-10 16:31:46 +01:00
eichhornchen 841c7b9f90 Chest can be destroyed by bombs. 2021-01-10 16:31:16 +01:00
Yohann D'ANELLO d738029335
Fix import order 2021-01-10 11:25:53 +01:00
Yohann D'ANELLO 94c12541ef
Happy new year! 2021-01-10 10:46:17 +01:00
eichhornchen ac4a73b2cb Final linting 2021-01-09 00:01:02 +01:00
eichhornchen eac9057f31 Merge branch 'master' into 'moreitems'
# Conflicts:
#   squirrelbattle/entities/items.py
#   squirrelbattle/interfaces.py
#   squirrelbattle/tests/game_test.py
2021-01-08 23:41:21 +01:00
eichhornchen 2eb42668c8 Linting and tests for chests 2021-01-08 23:32:47 +01:00
eichhornchen bdbf214d8d Added chests, they are immortal and contain objects the player can take for free. 2021-01-08 23:15:48 +01:00
eichhornchen 175706b1e4 Merchants had default maxhealth. 2021-01-08 22:30:30 +01:00
eichhornchen 9ff615a6b0 Linting and tests... 2021-01-08 22:25:00 +01:00
eichhornchen 746379bad6 Now with EXPLOSIONS! 2021-01-08 19:18:29 +01:00
eichhornchen 591630b8a7 Added a fire ball staff, closes #64 2021-01-08 19:05:02 +01:00
eichhornchen 903a06c36c Subclassed and removed some debugging code 2021-01-08 18:38:54 +01:00
eichhornchen f6210a6356 Added a Bow, related to #64 2021-01-08 18:06:26 +01:00
Nicolas Margulies 46a5dc6931 Made mobs check if they can see the player 2021-01-08 17:26:56 +01:00
eichhornchen bde33e9232 Added a second scroll object closes #60 2021-01-08 16:14:40 +01:00
Yohann D'ANELLO a497d08f31
Implement the monocle of truth, closes #62 2021-01-08 15:48:12 +01:00
Yohann D'ANELLO 571e9db3e8
Fix french translations 2021-01-08 12:06:28 +01:00
Yohann D'ANELLO e56bdc16c2
Add item description, closes #59 2021-01-08 11:55:25 +01:00
eichhornchen 5736c2300b Added a scroll object that deals damage based on the player intelligence. Related to #60 2021-01-08 11:54:39 +01:00
eichhornchen 196e3708d2 Merge branch 'master' into 'doc'
# Conflicts:
#   squirrelbattle/entities/items.py
#   squirrelbattle/interfaces.py
2021-01-08 11:10:09 +01:00
Yohann D'ANELLO 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
Yohann D'ANELLO 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
Yohann D'ANELLO c36e68d6e4
Reduce player vision 2021-01-07 16:34:12 +01:00
Yohann D'ANELLO 1a78ad584c
Move equip functions for items 2021-01-06 18:31:28 +01:00
Yohann D'ANELLO a8c0c197ed
Linting 2021-01-06 18:02:58 +01:00
Eichhornchen 5ef12bef3d Changed the prices of armor 2021-01-06 17:57:23 +01:00
Eichhornchen 2dc178d67c Merge branch 'equipment' into doc 2021-01-06 14:49:09 +01:00
eichhornchen 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
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 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 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
eichhornchen 7cd4721daa linting 2020-12-31 15:00:20 +01:00
eichhornchen de3aba396d Re-changed familiar's inheritance from friendlyEntity to FightingEntity (just a leftover from debug) 2020-12-31 14:51:17 +01:00
eichhornchen 505e0a4efb Fixes issue #54, repaired the attribution of the familiars' target 2020-12-21 14:23:58 +01:00
Nicolas Margulies 762bed888a Working visibility (at least relatively good), but a few lines untested 2020-12-18 21:21:00 +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 0394c5d15d Linting 2020-12-18 17:46:38 +01:00