Commit Graph

225 Commits

Author SHA1 Message Date
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
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 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 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
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 795623e1c9 :squirrel: Main character is a squirrel 2020-10-16 17:15:17 +02:00
Yohann D'ANELLO cae7ab3beb Use Map interface in proof of concept 2020-10-16 16:46:40 +02:00
Yohann D'ANELLO c0e5fe4400 Get a tile from its representation 2020-10-16 16:41:38 +02:00
Nicolas Margulies cfbe612192 Merge branch 'map_display' of gitlab.crans.org:ynerant/dungeon-battle into map_display 2020-10-16 16:02:47 +02:00
Nicolas Margulies 16121b55f6 Merge branch 'map_display' of gitlab.crans.org:ynerant/dungeon-battle into map_display 2020-10-16 16:02:38 +02:00
Charles Peyrat 722ff07952 Fixed method display from mapdisplay.MapDisplay 2020-10-16 16:00:57 +02:00
Charles Peyrat 7d13a78235 New class MapDisplay implements displaying maps to terminal. See #1 2020-10-16 15:57:13 +02:00
Charles Peyrat 42c9957ceb Added entities management to class Map 2020-10-16 15:57:13 +02:00
Charles Peyrat 2e82849395 Sanitizing data structure 2020-10-16 15:57:13 +02:00
Charles Peyrat 1b635502c4 New class MapDisplay implements displaying maps to terminal. See #1 2020-10-16 15:54:33 +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
Yohann D'ANELLO c8de541eee Also use arrow keys in example 2020-10-16 15:32:15 +02:00
Yohann D'ANELLO ef6e5d66ca Cleaner proof of concept 2020-10-16 15:23:58 +02:00
eichhornchen 4b0554a913 Now uses TermManager 2020-10-16 15:00:33 +02:00
Yohann D'ANELLO 57dd733c54 Replace the dot cursor after the player moved, not before 2020-10-16 14:23:11 +02:00
eichhornchen 3daf58f51c Added a map example 2020-10-16 14:18:33 +02:00
eichhornchen 03560f4407 Added a first try for player movement 2020-10-16 14:12:39 +02:00
Yohann D'ANELLO b12764b355 Draw a map in a string to make the render in the screen easier 2020-10-16 14:00:38 +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
Yohann D'ANELLO bec53dbf1e Linting... 2020-10-09 17:04:50 +02:00
Charles Peyrat c161f924e9 Context manager for wrapping the use of a curses terminal 2020-10-09 16:14:23 +02:00
Yohann D'ANELLO 95bb99d42c 🎉 Init repo 2020-10-02 15:48:39 +02:00