Commit Graph

249 Commits

Author SHA1 Message Date
Yohann D'ANELLO
1eee45a0fd Forgot one unused import 2020-11-11 22:51:02 +01:00
Yohann D'ANELLO
cde0b19c72 KeyValues.translate_key returns a KeyValues object 2020-11-11 22:47:51 +01:00
Yohann D'ANELLO
edecb7eb90 I felt frustrated to don't have 100% of coverage 2020-11-11 22:45:57 +01:00
Yohann D'ANELLO
caef8dc9b2 Cover settings 2020-11-11 22:45:15 +01:00
Yohann D'ANELLO
0c17e74d6a Key handler does not depend on curses's screen anymore 2020-11-11 22:36:42 +01:00
Yohann D'ANELLO
748561e87d More separation on menu code 2020-11-11 22:22:33 +01:00
Yohann D'ANELLO
17edb6a645 Don't resize map pad: it has already the good size (the map dimensions) 2020-11-11 22:12:05 +01:00
Yohann D'ANELLO
4b8acc0597 Don't resize pads when resizing window. For an unknown reason, pads don't want to be displayed on small screens. 2020-11-11 21:55:57 +01:00
Yohann D'ANELLO
53077aacb0 Linting 2020-11-11 20:36:43 +01:00
Yohann D'ANELLO
f33d8b8170 Merge branch 'inventory' into entities 2020-11-11 20:34:30 +01:00
Yohann D'ANELLO
c329ec927f Add rabbits, beavers and teddy bears 2020-11-11 17:39:48 +01:00
Yohann D'ANELLO
a4eaab0db6 Linting 2020-11-11 17:24:57 +01:00
Yohann D'ANELLO
af39a305b1 Test entity movements and fights with players 2020-11-11 17:23:31 +01:00
Yohann D'ANELLO
e88b4ee775 Render game when we are dead 2020-11-11 17:17:28 +01:00
Yohann D'ANELLO
61714a5129 Test heart healing 2020-11-11 17:15:28 +01:00
Yohann D'ANELLO
8db00bcaa6 Fix broken tests 2020-11-11 16:58:20 +01:00
Yohann D'ANELLO
ac22aef860 Items can be put in inventory by default 2020-11-11 16:57:09 +01:00
Yohann D'ANELLO
d35331fdb0 Add items in inventory 2020-11-11 16:49:04 +01:00
Yohann D'ANELLO
f11fb31c28 Interact with items 2020-11-11 16:47:19 +01:00
Yohann D'ANELLO
2b5d82db57 Spawn also items 2020-11-11 16:23:27 +01:00
Yohann D'ANELLO
d75f4290ff Store the start position in a map 2020-11-11 16:10:28 +01:00
Yohann D'ANELLO
279ef2439d Limit the complexity of the dijkstra to eight 2020-11-11 16:02:32 +01:00
Yohann D'ANELLO
0f53407b3d Use a larger example map 2020-11-11 16:00:40 +01:00
Yohann D'ANELLO
d08ff7061f Use Dijkstra algorithm to describe monster paths 2020-11-11 15:25:50 +01:00
Yohann D'ANELLO
2f3a03dbf7 The camera position should consider the width of a tile 2020-11-11 15:10:46 +01:00
Yohann D'ANELLO
1e66e263bc Use bricks for walls 2020-11-11 15:09:28 +01:00
eichhornchen
e3d28409f5 Repaired tthe display problem for settings menu 2020-11-11 14:56:00 +01:00
eichhornchen
d9b7db742a Added settings diplay and ability to change the keys (there is a refreshing problem though) 2020-11-11 14:46:25 +01:00
Yohann D'ANELLO
56ba9d186e Display message if we are dead 2020-11-11 01:17:00 +01:00
Yohann D'ANELLO
6e8cfdcb1a Spawn new entities on each level (will be removed, only for tests) 2020-11-11 01:07:19 +01:00
Yohann D'ANELLO
c5e6459d37 Fight other entities while bumping them, without any weapon 2020-11-11 01:04:30 +01:00
Yohann D'ANELLO
9909b12501 Fight other entities 2020-11-11 00:50:47 +01:00
Yohann D'ANELLO
5addd42535 Only refresh entities if the player moved, ignore most events 2020-11-11 00:38:02 +01:00
Yohann D'ANELLO
279d9d9f58 Monsters can hit the player. No respect for unarmed people... 2020-11-10 23:00:09 +01:00
Yohann D'ANELLO
f9f02b6621 Move to closest player if it is close 2020-11-10 22:59:02 +01:00
Yohann D'ANELLO
12ee436f4d Fix broken game test 2020-11-10 22:44:53 +01:00
Yohann D'ANELLO
d26b66f337 Add possibility to define the background color of entities (black in ASCII, white in Unicode) 2020-11-10 22:34:12 +01:00
Yohann D'ANELLO
a8223aab2e Add possibility to define the background color of entities (black in ASCII, white in Unicode) 2020-11-10 22:30:55 +01:00
Yohann D'ANELLO
ec6b90fba2 All entities can move, not only players 2020-11-10 22:10:28 +01:00
Yohann D'ANELLO
2045a57907 Don't add any additional space to unicode entities 2020-11-10 22:07:03 +01:00
Yohann D'ANELLO
1684647ea2 Missing type 2020-11-10 22:04:38 +01:00
Yohann D'ANELLO
26196a7dca Move the camera with the player 2020-11-10 22:02:41 +01:00
Yohann D'ANELLO
d5ef041f48 Tiles can have multiple width according to the used texture pack for a better support of unicode 2020-11-10 22:01:57 +01:00
Yohann D'ANELLO
3f4c809db6 Monsters are hedgehogs 🦔 2020-11-10 21:47:36 +01:00
Yohann D'ANELLO
3f374d2558 Spawn a random amount of squirrels on the map 2020-11-10 21:41:54 +01:00
Yohann D'ANELLO
3416ce2ac3 Ignore unreachable code in test environment, we have now 99% of coverage 2020-11-10 21:32:42 +01:00
Yohann D'ANELLO
7173d13495 Slightly cover bootstrap, to increase more and more coverage. Ensure that there is no associated shell 2020-11-10 21:32:10 +01:00
Yohann D'ANELLO
e9ac448854 Screen is resizable (but please be nice with it) 2020-11-10 21:20:11 +01:00
Yohann D'ANELLO
d50c775e0f Mysteriously fix tests 2020-11-10 20:43:30 +01:00
Yohann D'ANELLO
f9c3fc1517 Example map was moved 2020-11-10 20:37:01 +01:00
Yohann D'ANELLO
9b925672ca Drop some tests 2020-11-10 20:36:09 +01:00
Yohann D'ANELLO
5c95bf11e7 Linting 2020-11-10 20:34:22 +01:00
Yohann D'ANELLO
1ff2e26cd4 Set good menu names 2020-11-10 20:22:53 +01:00
Nicolas Margulies
1a1b906c8e Added main menu when launching the game, and fixed menus 2020-11-10 19:40:59 +01:00
Nicolas Margulies
17530f386c Reworked graphics to make it more modular 2020-11-10 18:08:06 +01:00
eichhornchen
e522047c74 Now the tests should trully be repaired 2020-11-10 11:39:32 +01:00
eichhornchen
2e7c12b770 Trying to repair the test 2020-11-10 11:22:09 +01:00
eichhornchen
cb33d97cb7 Fixed game <-> display interaction (the game prints correctly \o/ ) 2020-11-10 10:57:27 +01:00
eichhornchen
002de68a0a Corrected bugs(some still remain) 2020-11-10 10:49:11 +01:00
eichhornchen
91a8919a01 Added a MainMenuDisplay class and fixed errors in display 2020-11-10 10:01:31 +01:00
eichhornchen
10bbb28471 Yet again 2020-11-09 01:39:15 +01:00
eichhornchen
a4876bb7af repaired display 2020-11-09 01:33:23 +01:00
eichhornchen
8d5d9d38ff cleaned the arguments 2020-11-09 01:11:13 +01:00
Yohann D'ANELLO
e9c8640159 Width and height are managed dynamically: we can almost freely resize the window 2020-11-09 00:44:08 +01:00
Yohann D'ANELLO
0ab0e6a00c More tests 2020-11-08 23:48:26 +01:00
Yohann D'ANELLO
3486c865a1 Use a fake pad to make tests runnable 2020-11-08 23:40:03 +01:00
Yohann D'ANELLO
65d89b7f9f Add some comments 2020-11-08 23:31:17 +01:00
Yohann D'ANELLO
259bde81a4 Back to menu by pressing space button 2020-11-08 23:26:54 +01:00
Yohann D'ANELLO
7e92086601 Start game button is working 2020-11-08 23:08:38 +01:00
Yohann D'ANELLO
715fad1817 StatsDisplay extends Display 2020-11-08 23:05:06 +01:00
Yohann D'ANELLO
dc3f55cff3 MapDisplay extends Display 2020-11-08 23:03:59 +01:00
Yohann D'ANELLO
8ccf8c7b67 Display main menu by default 2020-11-08 22:59:11 +01:00
Yohann D'ANELLO
933385e79d Linting 2020-11-08 22:48:50 +01:00
eichhornchen
e0366b4719 Menu display is now supported 2020-11-08 16:36:21 +01:00
eichhornchen
4ea3d20b28 Better stats display (tested) 2020-11-07 15:00:24 +01:00
Yohann D'ANELLO
aeb43a0cec Test player level up 2020-11-06 21:23:17 +01:00
Yohann D'ANELLO
0de11abfa8 Fix circulary import 2020-11-06 21:17:31 +01:00
Yohann D'ANELLO
0bd26a1bd0 Linting 2020-11-06 21:15:09 +01:00
Yohann D'ANELLO
2e667cdebe Fix tests 2020-11-06 20:28:10 +01:00
Yohann D'ANELLO
dbd5f6a1fd Unicode texture pack is squirrel texture pack 2020-11-06 20:26:10 +01:00
Yohann D'ANELLO
b5b76fd07b Make the game start 2020-11-06 20:24:19 +01:00
Yohann D'ANELLO
b3d789e3e7 Fix texture packs 2020-11-06 20:18:27 +01:00
Yohann D'ANELLO
02d3394439 Merge remote-tracking branch 'origin/master' into display
# Conflicts:
#	dungeonbattle/entities/player.py
#	dungeonbattle/game.py
#	dungeonbattle/interfaces.py
#	dungeonbattle/mapdisplay.py
#	dungeonbattle/settings.py
#	dungeonbattle/tests/settings_test.py
#	dungeonbattle/texturepack.py
2020-11-06 20:04:24 +01:00
eichhornchen
760e322389 re-statsdisplay 2020-11-06 19:53:27 +01:00
eichhornchen
1e2ff8a8ea Class for displaying the player statistics (not yet tested) 2020-11-06 19:50:26 +01:00
Yohann D'ANELLO
c97a9a2e6c Test some functions in the game 2020-11-06 19:12:56 +01:00
Yohann D'ANELLO
dc0d478d1e init -> __init__ 2020-11-06 18:39:55 +01:00
Yohann D'ANELLO
a1731dc9f7 Default coordinates are (1, 6) 2020-11-06 18:38:10 +01:00
ynerant
9c344790a1 Merge branch 'master' into 'game'
# Conflicts:
#   dungeonbattle/game.py
#   dungeonbattle/mapdisplay.py
2020-11-06 18:36:59 +01:00
Yohann D'ANELLO
30a01108b8 Test main menu scrolling 2020-11-06 18:32:51 +01:00
Yohann D'ANELLO
60d6c7509a Bind Return key to menus 2020-11-06 18:25:02 +01:00
eichhornchen
bd9dd122f4 Added experience system 2020-11-06 18:12:17 +01:00
Yohann D'ANELLO
8d9b5166b7 Linting 2020-11-06 18:11:59 +01:00
eichhornchen
b1282c107d added player carachteristics 2020-11-06 18:08:10 +01:00
Nicolas Margulies
43001f6ede Basic menu handling 2020-11-06 18:06:28 +01:00
Yohann D'ANELLO
d06a42469a Collisions are working 2020-11-06 18:03:30 +01:00
Yohann D'ANELLO
54bb2d1416 Collisions are working 2020-11-06 17:59:19 +01:00
Yohann D'ANELLO
8641e7d13d User player entity instead of temporary Player class 2020-11-06 17:48:47 +01:00
Yohann D'ANELLO
f9dcc8f1c1 Texture packs are working 2020-11-06 17:43:30 +01:00
Nicolas Margulies
e3a1bf96c2 Used settings for keys 2020-11-06 17:24:20 +01:00