nicomarg
|
96e9612d16
|
Merge branch 'equipment-in-inventory' into 'master'
Resolve "Display equipment in inventory"
Closes #75
See merge request ynerant/squirrel-battle!71
|
2021-01-10 22:45:04 +01:00 |
|
Nicolas Margulies
|
f05652d9b8
|
Fixed tests and reached 100% coverage
|
2021-01-10 22:39:52 +01:00 |
|
Nicolas Margulies
|
519504fc32
|
Mark equipped items and allow unequipping
|
2021-01-10 22:26:43 +01:00 |
|
Nicolas Margulies
|
88471f4361
|
Changed equipment behaviour, now equipped items stay in the inventory
|
2021-01-10 22:15:32 +01:00 |
|
eichhornchen
|
b004dec8c9
|
Merge branch 'translate' into 'master'
Translate
See merge request ynerant/squirrel-battle!73
|
2021-01-10 21:52:39 +01:00 |
|
Yohann D'ANELLO
|
d3607248c0
|
Remove unused translations
|
2021-01-10 21:48:46 +01:00 |
|
eichhornchen
|
236481ae1c
|
linting
|
2021-01-10 21:44:45 +01:00 |
|
eichhornchen
|
18ace5144c
|
Repaired a bug : a variable was not declared before it was used in interfaces.py take_damage
|
2021-01-10 21:41:45 +01:00 |
|
eichhornchen
|
6cf0590586
|
even more translations.
|
2021-01-10 21:38:21 +01:00 |
|
eichhornchen
|
4f4223c514
|
More translations.
|
2021-01-10 21:25:15 +01:00 |
|
eichhornchen
|
893a23f95c
|
Repaired a but : bears dealt 1 damage instead of 0.
|
2021-01-10 21:15:42 +01:00 |
|
eichhornchen
|
a1d69203c9
|
Translations.
|
2021-01-10 21:15:30 +01:00 |
|
Yohann D'ANELLO
|
d2af345c0c
|
Fix linting
|
2021-01-10 21:01:43 +01:00 |
|
Yohann D'ANELLO
|
67a9bda6e1
|
Don't fill the inventory of a chest or a Merchant if it is empty, fixes #73
|
2021-01-10 20:46:01 +01:00 |
|
Yohann D'ANELLO
|
3758cb1336
|
Fix the GiantSeaEagle registration, fixes #76
|
2021-01-10 20:20:12 +01:00 |
|
Yohann D'ANELLO
|
5694dd4dff
|
Update the player inventory when opening the menu/loading the game, fixes #72
|
2021-01-10 19:52:28 +01:00 |
|
Nicolas Margulies
|
16ddbd31f3
|
also prevent updating seen tiles when checking vision
|
2021-01-10 19:41:51 +01:00 |
|
Yohann D'ANELLO
|
01ee49ddd4
|
Entities are updated after a bow shot, fixes #70
|
2021-01-10 19:25:12 +01:00 |
|
Yohann D'ANELLO
|
cddff5c2d9
|
Fix linting
|
2021-01-10 19:17:04 +01:00 |
 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 |
|
eichhornchen
|
5eb7699301
|
Rearranged the display class files, related to issue #56.
|
2021-01-10 12:35:50 +01:00 |
|
eichhornchen
|
8d0d0883a3
|
Merge branch 'master' into clean
|
2021-01-10 12:12:40 +01:00 |
|
eichhornchen
|
dd37c2f62f
|
Renamed the title's ascii art file.
|
2021-01-10 11:54:49 +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 |
|
Yohann D'ANELLO
|
391fe6897b
|
Drop unusued english translation file
|
2021-01-10 10:29:43 +01:00 |
|
ynerant
|
5b5180d44a
|
Merge branch 'fix-tty-colors' into 'master'
Don't use custom colors on unsupported screens, fixes #67
Closes #67
See merge request ynerant/squirrel-battle!61
|
2021-01-09 21:52:03 +01:00 |
|
Nicolas Margulies
|
7bf1789239
|
Removed debug code
|
2021-01-09 18:45:55 +01:00 |
|
Yohann D'ANELLO
|
8cb2b2388f
|
Don't use custom colors on unsupported screens, fixes #67
|
2021-01-09 18:42:11 +01:00 |
|
eichhornchen
|
ac4a73b2cb
|
Final linting
|
2021-01-09 00:01:02 +01:00 |
|
eichhornchen
|
cbe3e226b4
|
Repaired a merge error, tests now work.
|
2021-01-08 23:51:47 +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
|
7a4936e6a5
|
Test monocles
|
2021-01-08 15:58:54 +01:00 |