ynerant/squirrel-battle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity
589 Commits 4 Branches 3 Tags 893 KiB
903a06c36c
Commit Graph

83 Commits

Author SHA1 Message Date
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
eichhornchen
bde33e9232 Added a second scroll object closes #60 2021-01-08 16:14:40 +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
Yohann D'ANELLO
1b4612afd0 Swords add strength 2020-12-18 17:39:11 +01:00
Yohann D'ANELLO
fe769c4488 We can equip items 2020-12-18 17:30:03 +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
Nicolas Margulies
86628fdea6 Working visibility and displaying it, still need to hide things that aren't visible 2020-12-18 17:04:45 +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