From 1ed8e19f4f07349c5311c06a5e08845a2b741002 Mon Sep 17 00:00:00 2001 From: yannis300307 Date: Thu, 28 Dec 2023 22:33:27 +0100 Subject: [PATCH] Ajout d'une map 4 --- maps/map4.tmj | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/main.py | 2 +- 2 files changed, 173 insertions(+), 1 deletion(-) create mode 100644 maps/map4.tmj diff --git a/maps/map4.tmj b/maps/map4.tmj new file mode 100644 index 0000000..954ac18 --- /dev/null +++ b/maps/map4.tmj @@ -0,0 +1,172 @@ +{ "compressionlevel":-1, + "height":20, + "infinite":true, + "layers":[ + { + "chunks":[ + { + "data":[34, 34, 34, 34, 34, 34, 34, 5, 5, 5, 5, 34, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 36, 7, 8, 8, 9, 38, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 35, 40, 40, 40, 41, 38, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 35, 40, 40, 40, 41, 38, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 35, 40, 40, 72, 73, 38, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 34, 2, 2, 34, 34, 4, 6, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 4, 37, 37, 6, 34, 34, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 68, 37, 37, 37, 6, 34, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 68, 69, 69, 70, 34, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34], + "height":16, + "width":16, + "x":0, + "y":0 + }, + { + "data":[34, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 34, 34, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 40, 40, 40, 40, 40, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 40, 40, 40, 40, 40, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 40, 40, 40, 40, 40, 40, 40, + 34, 34, 34, 34, 34, 34, 34, 34, 40, 40, 40, 40, 40, 40, 40, 40, + 34, 34, 34, 34, 34, 34, 34, 37, 37, 40, 40, 40, 40, 40, 40, 40, + 34, 34, 34, 34, 34, 34, 37, 37, 37, 37, 40, 40, 40, 40, 40, 40, + 34, 34, 34, 34, 37, 37, 37, 37, 37, 37, 37, 40, 40, 40, 40, 40, + 34, 34, 34, 37, 37, 37, 37, 37, 37, 37, 37, 40, 40, 40, 40, 40, + 34, 34, 37, 37, 37, 37, 37, 37, 37, 40, 40, 40, 40, 40, 40, 40, + 34, 34, 37, 37, 37, 37, 37, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 34, 34, 37, 37, 37, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 34, 34, 37, 37, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 34, 34, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 34, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40], + "height":16, + "width":16, + "x":16, + "y":0 + }], + "height":16, + "id":1, + "name":"Calque de Tuiles 1", + "opacity":1, + "startx":0, + "starty":0, + "type":"tilelayer", + "visible":true, + "width":32, + "x":0, + "y":0 + }, + { + "chunks":[ + { + "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 40, 40, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 40, 40, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + "height":16, + "width":16, + "x":16, + "y":0 + }], + "height":16, + "id":2, + "name":"Calque de Tuiles 2", + "opacity":1, + "startx":16, + "starty":0, + "type":"tilelayer", + "visible":true, + "width":16, + "x":0, + "y":0 + }, + { + "chunks":[ + { + "data":[0, 0, 0, 0, 965, 966, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 963, 964, 0, 997, 998, 0, 0, 0, 0, 0, 0, 0, 0, 965, 966, + 0, 995, 996, 963, 964, 0, 0, 0, 961, 962, 0, 0, 0, 0, 997, 998, + 965, 966, 0, 995, 996, 0, 0, 0, 993, 994, 0, 0, 0, 0, 0, 0, + 997, 998, 967, 968, 0, 0, 0, 0, 0, 0, 0, 0, 0, 965, 966, 0, + 963, 964, 999, 1000, 0, 965, 966, 0, 0, 0, 0, 0, 0, 997, 998, 0, + 995, 996, 963, 964, 0, 997, 998, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 995, 996, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 963, 964, 0, 967, 968, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 995, 996, 0, 999, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 969, 970, + 965, 966, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1001, 1002, + 997, 998, 0, 0, 0, 965, 966, 0, 969, 970, 0, 0, 0, 969, 970, 0, + 0, 0, 0, 963, 964, 997, 998, 0, 1001, 1002, 0, 969, 970, 1001, 1002, 0, + 0, 0, 0, 995, 996, 0, 0, 0, 0, 0, 0, 1001, 1002, 0, 0, 967, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 999, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + "height":16, + "width":16, + "x":0, + "y":0 + }, + { + "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 969, 970, 0, 0, + 0, 0, 0, 0, 0, 0, 963, 964, 0, 0, 0, 0, 1001, 1002, 0, 0, + 0, 0, 0, 0, 0, 0, 995, 996, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 967, 968, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 999, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 969, 970, 0, 0, + 0, 0, 0, 0, 0, 0, 965, 966, 0, 0, 0, 0, 1001, 1002, 0, 0, + 0, 0, 0, 0, 0, 0, 997, 998, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 969, 970, 0, 0, + 968, 0, 0, 0, 0, 0, 969, 970, 0, 0, 0, 0, 1001, 1002, 0, 0, + 1000, 0, 0, 0, 0, 0, 1001, 1002, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + "height":16, + "width":16, + "x":16, + "y":0 + }], + "height":16, + "id":3, + "name":"Calque de Tuiles 3", + "opacity":1, + "startx":0, + "starty":0, + "type":"tilelayer", + "visible":true, + "width":32, + "x":0, + "y":0 + }], + "nextlayerid":4, + "nextobjectid":1, + "orientation":"orthogonal", + "renderorder":"right-down", + "tiledversion":"1.10.1", + "tileheight":16, + "tilesets":[ + { + "firstgid":1, + "source":"..\/assets\/textures\/tiles.tsj" + }], + "tilewidth":16, + "type":"map", + "version":"1.10", + "width":30 +} \ No newline at end of file diff --git a/src/main.py b/src/main.py index 030aebd..c99a985 100644 --- a/src/main.py +++ b/src/main.py @@ -7,7 +7,7 @@ from src.engine.engine import Engine class Game(Engine): def __init__(self): super().__init__() - self.map_manager.load_new("maps/map3.tmj") + self.map_manager.load_new("maps/map4.tmj") self.renderer.load_tile_set("assets/textures/tiles.png", 16)