Commit Graph

38 Commits

Author SHA1 Message Date
Yohann D'ANELLO
0bd26a1bd0 Linting 2020-11-06 21:15:09 +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
b1282c107d added player carachteristics 2020-11-06 18:08:10 +01:00
Yohann D'ANELLO
54bb2d1416 Collisions are working 2020-11-06 17:59:19 +01:00
Yohann D'ANELLO
f9dcc8f1c1 Texture packs are working 2020-11-06 17:43:30 +01:00
eichhornchen
4115363b74 glargh 2020-11-06 17:17:10 +01:00
eichhornchen
fe77f903d1 put back the ":" where it belongs 2020-11-06 17:10:38 +01:00
eichhornchen
a6b93cacfb Changed Tiles to take into account the texturepack 2020-11-06 17:04:42 +01:00
eichhornchen
85a006e7b6 added coordinates of camera view in map 2020-11-06 16:38:32 +01:00
Yohann D'ANELLO
ff435dc328 More tests and more coverage 2020-11-06 16:13:28 +01:00
eichhornchen
6bfb8c080c added name to entities 2020-11-06 16:05:01 +01:00
Yohann D'ANELLO
8ccb74ea54 Linting 2020-11-06 15:33:26 +01:00
Nicolas Margulies
2ba7330ff5 An example of item 2020-10-23 18:02:57 +02:00
Nicolas Margulies
7c1c427892 Deleted unwanted code in Player
It isn't the player's role to check whether they can move to a tile,
check it beforehands and use the move method from its Entity superclass.
2020-10-23 16:17:48 +02:00
eichhornchen
230a7ec432 Cleaned an error in interfaces.py 2020-10-23 15:55:30 +02:00
Nicolas Margulies
759ddf7685 Merged master 2020-10-23 14:45:03 +02:00
Nicolas Margulies
7a2e1173d9 Made the entities optional when creating maps 2020-10-23 14:42:46 +02:00
Yohann D'ANELLO
3467fb622c Replace # by walls 2020-10-23 14:34:29 +02:00
Yohann D'ANELLO
d8bd500349 Add some comments 2020-10-23 14:34:29 +02:00
Yohann D'ANELLO
d8401d9920 More modularity, add properties in tiles 2020-10-23 14:34:29 +02:00
Yohann D'ANELLO
9c6f22ccf8 Better usage of enumerations 2020-10-23 14:34:29 +02:00
Yohann D'ANELLO
1054d8e57a Get a tile from its representation 2020-10-23 14:34:29 +02:00
Yohann D'ANELLO
eb1e125d4e Draw a map in a string to make the render in the screen easier 2020-10-23 14:34:29 +02:00
Nicolas Margulies
182af96da0 Tiles are now an enumeration 2020-10-23 14:34:24 +02:00
Nicolas Margulies
e65a486b78 A basic fighting mechanic and a few entities 2020-10-16 18:31:49 +02:00
Yohann D'ANELLO
008773c01e Merge remote-tracking branch 'origin/master' into player_move
# Conflicts:
#	dungeonbattle/interfaces.py
#	dungeonbattle/interfaces_test.py
2020-10-16 18:29:55 +02:00
Yohann D'ANELLO
2947ffd0c1 Replace # by walls 2020-10-16 18:20:26 +02:00
Yohann D'ANELLO
8818073fc0 Add some comments 2020-10-16 18:05:49 +02:00
Yohann D'ANELLO
e84a5efee2 More modularity, add properties in tiles 2020-10-16 17:47:52 +02:00
Yohann D'ANELLO
c9d136929b Better usage of enumerations 2020-10-16 17:41:37 +02:00
Yohann D'ANELLO
c0e5fe4400 Get a tile from its representation 2020-10-16 16:41:38 +02:00
Charles Peyrat
ba4bb78166 Added entities management to class Map 2020-10-16 15:52:47 +02:00
Yohann D'ANELLO
a0530b67fb Draw a map in a string to make the render in the screen easier 2020-10-16 15:47:49 +02:00
Nicolas Margulies
1e7ca6026f Tiles are now an enumeration 2020-10-16 15:44:11 +02:00
Charles Peyrat
5728abc02c Sanitizing data structure 2020-10-11 15:24:51 +02:00
Yohann D'ANELLO
2cea53f519 💚 Fix pipeline 2020-10-09 18:24:13 +02:00
Yohann D'ANELLO
c2eb3c054c Create basic interfaces, see #3, #4, #6 2020-10-09 18:17:41 +02:00