Commit Graph

534 Commits

Author SHA1 Message Date
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
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
ynerant 292a63c16d Merge branch 'game' into 'master'
Game

See merge request ynerant/dungeon-battle!3
2020-10-23 15:44:22 +02:00
Yohann D'ANELLO c85166ff89 Remove proof of concept, <3 eichornchen 2020-10-23 15:41:17 +02:00
Yohann D'ANELLO 8437482139 Clear screen before redrawing 2020-10-23 15:40:32 +02:00
eichhornchen 6c675fbac9 added player actions for going up, down, left and right 2020-10-23 15:15:37 +02:00
Yohann D'ANELLO d264bb45cf Handle player position in game display 2020-10-23 15:14:19 +02:00
Yohann D'ANELLO eea9b45f6c Use map display 2020-10-23 15:00:59 +02:00
Yohann D'ANELLO 7d97befee4 Load game externally 2020-10-23 14:53:08 +02:00
Nicolas Margulies 2fc864ed18 Fixed error 2020-10-23 14:48: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 d264fb7dfe Test got broken 2020-10-23 14:34:29 +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 ce0d5d8ffd :squirrel: Main character is a squirrel 2020-10-23 14:34:29 +02:00
Yohann D'ANELLO cadc8c161e Use Map interface in proof of concept 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
Yohann D'ANELLO d2f8a3b623 Also use arrow keys in example 2020-10-23 14:33:25 +02:00
Yohann D'ANELLO 12413746fd Cleaner proof of concept 2020-10-23 14:33:25 +02:00
eichhornchen 4175238297 Now uses TermManager 2020-10-23 14:33:25 +02:00
Yohann D'ANELLO e448697e6b Replace the dot cursor after the player moved, not before 2020-10-23 14:33:25 +02:00
eichhornchen 6e544bf02e Added a map example 2020-10-23 14:33:25 +02:00
eichhornchen 11a7ce9825 Added a first try for player movement 2020-10-23 14:33:25 +02:00
Nicolas Margulies 9d0971b35e Merged master 2020-10-16 18:33:31 +02:00
ynerant dd88782a4c Merge branch 'player_move' into 'master'
Modularity on interfaces

See merge request ynerant/dungeon-battle!2
2020-10-16 18:31:59 +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
ynerant 6f64646a7a Merge branch 'map_display' into 'master'
Implemented basic map display

Closes #1

See merge request ynerant/dungeon-battle!1
2020-10-16 18:28:01 +02:00
Yohann D'ANELLO a0027ece64 Test got broken 2020-10-16 18:22:20 +02:00
Yohann D'ANELLO 2947ffd0c1 Replace # by walls 2020-10-16 18:20:26 +02:00
Charles Peyrat 5bf4857d99 Merge branch 'map_display' of gitlab.crans.org:ynerant/dungeon-battle into map_display 2020-10-16 18:15:18 +02:00
Charles Peyrat 14f93fd596 Corrected equations in mapdisplay.MapDisplay.display. Closes #1 2020-10-16 18:14:47 +02:00
Yohann D'ANELLO 8818073fc0 Add some comments 2020-10-16 18:05:49 +02:00
Nicolas Margulies 63660707d1 A basic fighting mechanic and a few entities 2020-10-16 17:58:00 +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