|
|
e9374c5e6b
|
Merge branch 'map_generation' into 'master'
Map generation
Closes #5
See merge request ynerant/squirrel-battle!35
|
2021-01-10 23:54:28 +01:00 |
|
|
|
65ae99a26d
|
The logs of the map was not updated
|
2021-01-10 23:41:51 +01:00 |
|
|
|
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 |
|
|
|
519504fc32
|
Mark equipped items and allow unequipping
|
2021-01-10 22:26:43 +01:00 |
|
|
|
0ea10546ac
|
Fix merge issues
|
2021-01-10 22:19:15 +01:00 |
|
|
|
4c7a2e9f3b
|
Merge branch 'master' into map_generation
# Conflicts:
# squirrelbattle/entities/player.py
# squirrelbattle/game.py
# squirrelbattle/interfaces.py
# squirrelbattle/tests/game_test.py
|
2021-01-10 22:16:11 +01:00 |
|
|
|
9df1ac7883
|
Linting
|
2021-01-10 22:08:42 +01:00 |
|
|
|
01cdea6edc
|
Don't spawn random entities on each level anymore
|
2021-01-10 21:57:51 +01:00 |
|
|
|
d2af345c0c
|
Fix linting
|
2021-01-10 21:01:43 +01:00 |
|
|
|
3758cb1336
|
Fix the GiantSeaEagle registration, fixes #76
|
2021-01-10 20:20:12 +01:00 |
|
|
|
5694dd4dff
|
Update the player inventory when opening the menu/loading the game, fixes #72
|
2021-01-10 19:52:28 +01:00 |
|
|
|
01ee49ddd4
|
Entities are updated after a bow shot, fixes #70
|
2021-01-10 19:25:12 +01:00 |
|
|
|
93e51d9240
|
Testing + linting (yes there remains two linting errors, i don't know what to do.
|
2021-01-10 18:04:33 +01:00 |
|
|
|
3d48c43886
|
Player can now dance! Closes #69.
|
2021-01-10 17:10:00 +01:00 |
|
|
|
d738029335
|
Fix import order
|
2021-01-10 11:25:53 +01:00 |
|
|
|
94c12541ef
|
Happy new year!
|
2021-01-10 10:46:17 +01:00 |
|
|
|
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 |
|
|
|
2eb42668c8
|
Linting and tests for chests
|
2021-01-08 23:32:47 +01:00 |
|
|
|
bdbf214d8d
|
Added chests, they are immortal and contain objects the player can take for free.
|
2021-01-08 23:15:48 +01:00 |
|
|
|
9ff615a6b0
|
Linting and tests...
|
2021-01-08 22:25:00 +01:00 |
|
|
|
ad3cce116e
|
Load map floor index when loading a new game
|
2021-01-08 21:23:12 +01:00 |
|
|
|
571857b063
|
Generate a random map when changing floor
|
2021-01-08 20:00:42 +01:00 |
|
|
|
f6210a6356
|
Added a Bow, related to #64
|
2021-01-08 18:06:26 +01:00 |
|
|
|
1ab63434f6
|
Merge branch 'master' into map_generation
# Conflicts:
# squirrelbattle/game.py
# squirrelbattle/interfaces.py
# squirrelbattle/tests/game_test.py
|
2021-01-08 17:02:10 +01:00 |
|
|
|
9b853324ad
|
Drop first version of random walk
|
2021-01-08 16:52:38 +01:00 |
|
|
|
7a4936e6a5
|
Test monocles
|
2021-01-08 15:58:54 +01:00 |
|
|
|
a497d08f31
|
Implement the monocle of truth, closes #62
|
2021-01-08 15:48:12 +01:00 |
|
|
|
f48377e055
|
Save floors and visibility, fixes #61
|
2021-01-08 14:23:57 +01:00 |
|
|
|
75e93611c3
|
Capture all mouse events and take into account mouse attributes, fixes #58
|
2021-01-08 11:21:40 +01:00 |
|
|
|
b42f1277b1
|
Exit the game on KeyboardInterrupt (don't log this error)
|
2021-01-08 11:10:10 +01:00 |
|
|
|
c6947fab44
|
Integrate the new map generation into the game ! Closes #5
|
2021-01-08 07:39:52 +01:00 |
|
|
|
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 |
|
|
|
093c105120
|
The broken test is mysteriously working now
|
2021-01-06 17:54:43 +01:00 |
|
|
|
d49c138257
|
Merge branch 'master' into 'ladders'
# Conflicts:
# squirrelbattle/game.py
# squirrelbattle/interfaces.py
# squirrelbattle/tests/game_test.py
|
2021-01-06 17:29:26 +01:00 |
|
|
|
887a190f11
|
Less complexity on the handle key function
|
2021-01-06 17:00:43 +01:00 |
|
|
|
a48e6325fe
|
Add log message when the player switches floor
|
2021-01-06 15:55:44 +01:00 |
|
|
|
4cd4bc9005
|
Display the current floor in the StatsDisplay
|
2021-01-06 15:17:02 +01:00 |
|
|
|
d06a405120
|
Use a key to use ladders
|
2021-01-06 14:55:16 +01:00 |
|
|
|
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 |
|
|
|
7f63ab2357
|
Merge branch 'master' into 'familiars'
# Conflicts:
# squirrelbattle/display/display_manager.py
# squirrelbattle/display/logsdisplay.py
# squirrelbattle/display/mapdisplay.py
# squirrelbattle/display/menudisplay.py
# squirrelbattle/menus.py
|
2021-01-05 10:27:39 +01:00 |
|
|
|
663fc0eecd
|
Better teleport
|
2020-12-26 21:13:17 +01:00 |
|
|
|
9a56b4d7e9
|
Navigate through different maps while climbing ladders
|
2020-12-26 01:08:43 +01:00 |
|
|
|
ad5ae22e5f
|
Manage multiple maps in one game
|
2020-12-26 00:45:17 +01:00 |
|
|
|
411744bf10
|
Add credits menu, see #42
|
2020-12-18 22:24:41 +01:00 |
|
|
|
9aa684fb77
|
Use directly equipped items outside the inventory
|
2020-12-18 17:57:42 +01:00 |
|
|
|
fe769c4488
|
We can equip items
|
2020-12-18 17:30:03 +01:00 |
|
|
|
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 |
|
|
|
77f52b6276
|
Screen is refreshed only when pads are all refreshed, fixes #50
|
2020-12-18 16:40:52 +01:00 |
|
|
|
46ce7c33bf
|
Merchant menu is updated through its update function, and does not access globally to the Game instance
|
2020-12-18 15:15:47 +01:00 |
|
