Commit Graph

68 Commits

Author SHA1 Message Date
ynerant 2f5db125e0 Merge branch 'master' into 'new_game'
# Conflicts:
#   dungeonbattle/game.py
#   dungeonbattle/menus.py
#   dungeonbattle/tests/game_test.py
2020-11-19 01:46:25 +01:00
Yohann D'ANELLO 6a2bd64071 Linting 2020-11-19 01:17:46 +01:00
Nicolas Margulies 04d2bc1789 linting 2020-11-13 19:08:40 +01:00
Charles Peyrat ae493337ed Modified main menu to be able to override the current game with a new one 2020-11-13 18:08:48 +01:00
Nicolas Margulies aa81d455f6 Changed settings menu to let the display decide how the settings are printed 2020-11-13 15:40:44 +01:00
Yohann D'ANELLO 1366e6a54d Linting 2020-11-12 01:58:10 +01:00
nicomarg 61d66ac220 Fixed typos 2020-11-12 00:12:30 +01:00
nicomarg 92ab9ae075 Changed the behaviour of DisplayManager to match previous commit and fixed tests and bootstrap accordingly 2020-11-11 23:56:08 +01:00
Yohann D'ANELLO 21e85078a4 Display inventory content in statdisplay 2020-11-11 23:41:06 +01:00
Yohann D'ANELLO ddf0b21e37 Change texture pack 2020-11-11 23:09:15 +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 2b5d82db57 Spawn also items 2020-11-11 16:23:27 +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 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 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 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 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 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
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 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