Commit Graph

213 Commits

Author SHA1 Message Date
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
eichhornchen
4115363b74 glargh 2020-11-06 17:17:10 +01:00
eichhornchen
3e1eca8f39 import name 2020-11-06 17:13:27 +01:00
eichhornchen
fe77f903d1 put back the ":" where it belongs 2020-11-06 17:10:38 +01:00
eichhornchen
3502acd8d6 put back the ":" where it belongs 2020-11-06 17:09:39 +01:00
eichhornchen
a6b93cacfb Changed Tiles to take into account the texturepack 2020-11-06 17:04:42 +01:00
eichhornchen
4a54609bad changed a few errors 2020-11-06 17:03:06 +01:00
Nicolas Margulies
6e5cd9084b Finished cleaning conflicts 2020-11-06 17:02:59 +01:00
eichhornchen
38ed5259d5 added a squirrel unicode texturepack 2020-11-06 16:50:18 +01:00
Nicolas Margulies
065f648118 Merged master into game 2020-11-06 16:49:39 +01:00
eichhornchen
3d98eac74b Added refresh function 2020-11-06 16:43:07 +01:00
Nicolas Margulies
901406351e Better menus 2020-11-06 16:40:43 +01:00
eichhornchen
85a006e7b6 added coordinates of camera view in map 2020-11-06 16:38:32 +01:00
Nicolas Margulies
60ca00b8fa Generic menu implementation 2020-11-06 16:20:07 +01:00
eichhornchen
bcdbd0a471 changed the name of the texturepack 2020-11-06 16:16:30 +01:00
Yohann D'ANELLO
ff435dc328 More tests and more coverage 2020-11-06 16:13:28 +01:00
eichhornchen
420ebe79f5 passed settings to mapDisplay call 2020-11-06 16:10:46 +01:00
eichhornchen
6bfb8c080c added name to entities 2020-11-06 16:05:01 +01:00
Nicolas Margulies
d43a1de2c3 Moved texturepacks into display 2020-11-06 15:58:07 +01:00
Nicolas Margulies
cf70c2d1b7 Merged master into display (settings added) 2020-11-06 15:52:17 +01:00
Nicolas Margulies
31ae39ab15 basic display wrapper 2020-11-06 15:34:24 +01:00
Yohann D'ANELLO
8ccb74ea54 Linting 2020-11-06 15:33:26 +01:00
Yohann D'ANELLO
e00d98739a Move tests in a new directory, closes #8 2020-11-06 15:13:18 +01:00
Yohann D'ANELLO
7469f4855f We don't use tuples for settings now 2020-11-06 15:08:29 +01:00
Yohann D'ANELLO
9f6c946279 Test settings 2020-11-06 15:05:10 +01:00
Yohann D'ANELLO
5ca2827706 Write and load settings at the start of the game 2020-11-06 14:59:27 +01:00
Yohann D'ANELLO
af363dabfe Add write and load settings 2020-11-06 14:56:21 +01:00
eichhornchen
bfce9487c5 repaired the texture pack 2020-11-06 14:41:05 +01:00
eichhornchen
dadd1fd146 added texture pack 2020-11-06 14:32:05 +01:00
Yohann D'ANELLO
2728612699 Create settings class 2020-11-06 14:29:05 +01:00
Nicolas Margulies
bbbcb1b10e Corrigé la merde de Charles 2020-11-06 14:23:12 +01:00
Charles Peyrat
37c9fd5267 Merge branch 'master' into game. 2020-10-23 18:15:21 +02:00
nicomarg
514a3fcb64 Merge branch 'entities' into 'master'
Basic entities

See merge request ynerant/dungeon-battle!4
2020-10-23 18:10:13 +02:00
Nicolas Margulies
2ba7330ff5 An example of item 2020-10-23 18:02:57 +02:00
Charles Peyrat
f3bc3101f0 Code refactoring in game.Game 2020-10-23 18:01:39 +02:00
Charles Peyrat
9c8a352ecd Removed unwanted code from mapdisplay.MapDisplay; the player should be drawn as a map entity, not on its own 2020-10-23 17:46:44 +02:00
Nicolas Margulies
343e107b86 Basic item and monster interface 2020-10-23 16:51:48 +02:00