diff --git a/tests/test_data/tilesets/image/expected.py b/tests/test_data/tilesets/image/expected.py index 629ea1c..9ad94d3 100644 --- a/tests/test_data/tilesets/image/expected.py +++ b/tests/test_data/tilesets/image/expected.py @@ -4,7 +4,7 @@ from pytiled_parser import tileset EXPECTED = tileset.TileSet( columns=8, - image=Path("../../maps/images/tmw_desert_spacing.png"), + image=Path("../../images/tmw_desert_spacing.png"), image_height=199, image_width=265, margin=1, diff --git a/tests/test_data/tilesets/image/tileset.json b/tests/test_data/tilesets/image/tileset.json index 279e059..8df9f18 100644 --- a/tests/test_data/tilesets/image/tileset.json +++ b/tests/test_data/tilesets/image/tileset.json @@ -1,21 +1,22 @@ -{ - "columns": 8, - "editorsettings": { - "export": { - "format": "", - "target": "." - } - }, - "image": "../../maps/images/tmw_desert_spacing.png", - "imageheight": 199, - "imagewidth": 265, - "margin": 1, - "name": "tile_set_image", - "spacing": 1, - "tilecount": 48, - "tiledversion": "1.3.5", - "tileheight": 32, - "tilewidth": 32, - "type": "tileset", - "version": 1.2 -} +{ "columns":8, + "editorsettings": + { + "export": + { + "format":"", + "target":"." + } + }, + "image":"..\/..\/images\/tmw_desert_spacing.png", + "imageheight":199, + "imagewidth":265, + "margin":1, + "name":"tile_set_image", + "spacing":1, + "tilecount":48, + "tiledversion":"1.3.5", + "tileheight":32, + "tilewidth":32, + "type":"tileset", + "version":1.2 +} \ No newline at end of file diff --git a/tests/test_data/tilesets/image_background_color/expected.py b/tests/test_data/tilesets/image_background_color/expected.py index 220ee83..458435b 100644 --- a/tests/test_data/tilesets/image_background_color/expected.py +++ b/tests/test_data/tilesets/image_background_color/expected.py @@ -5,7 +5,7 @@ from pytiled_parser.common_types import Color EXPECTED = tileset.TileSet( columns=8, - image=Path("../../maps/images/tmw_desert_spacing.png"), + image=Path("../../images/tmw_desert_spacing.png"), image_height=199, image_width=265, margin=1, diff --git a/tests/test_data/tilesets/image_background_color/tileset.json b/tests/test_data/tilesets/image_background_color/tileset.json index 64fbc87..83ae8dd 100644 --- a/tests/test_data/tilesets/image_background_color/tileset.json +++ b/tests/test_data/tilesets/image_background_color/tileset.json @@ -1,16 +1,23 @@ -{ - "backgroundcolor": "#5500ff", - "columns": 8, - "image": "../../maps/images/tmw_desert_spacing.png", - "imageheight": 199, - "imagewidth": 265, - "margin": 1, - "name": "tile_set_image", - "spacing": 1, - "tilecount": 48, - "tiledversion": "1.3.5", - "tileheight": 32, - "tilewidth": 32, - "type": "tileset", - "version": 1.2 -} +{ "backgroundcolor":"#5500ff", + "columns":8, + "editorsettings": + { + "export": + { + "format":"", + "target":"." + } + }, + "image":"..\/..\/images\/tmw_desert_spacing.png", + "imageheight":199, + "imagewidth":265, + "margin":1, + "name":"tile_set_image", + "spacing":1, + "tilecount":48, + "tiledversion":"1.3.5", + "tileheight":32, + "tilewidth":32, + "type":"tileset", + "version":1.2 +} \ No newline at end of file diff --git a/tests/test_data/tilesets/image_objects/tileset.json b/tests/test_data/tilesets/image_objects/tileset.json index e670b61..f490b17 100644 --- a/tests/test_data/tilesets/image_objects/tileset.json +++ b/tests/test_data/tilesets/image_objects/tileset.json @@ -7,7 +7,7 @@ "target":"." } }, - "image":"..\/..\/maps\/images\/tmw_desert_spacing.png", + "image":"..\/..\/images\/tmw_desert_spacing.png", "imageheight":199, "imagewidth":265, "margin":1, diff --git a/tests/test_data/tilesets/image_properties/expected.py b/tests/test_data/tilesets/image_properties/expected.py index 5ea2fe0..98013d9 100644 --- a/tests/test_data/tilesets/image_properties/expected.py +++ b/tests/test_data/tilesets/image_properties/expected.py @@ -5,7 +5,7 @@ from pytiled_parser.common_types import Color EXPECTED = tileset.TileSet( columns=8, - image=Path("../../maps/images/tmw_desert_spacing.png"), + image=Path("../../images/tmw_desert_spacing.png"), image_height=199, image_width=265, margin=1, diff --git a/tests/test_data/tilesets/image_properties/tileset.json b/tests/test_data/tilesets/image_properties/tileset.json index 785c164..a5aa95b 100644 --- a/tests/test_data/tilesets/image_properties/tileset.json +++ b/tests/test_data/tilesets/image_properties/tileset.json @@ -7,7 +7,7 @@ "target":"..\/image" } }, - "image":"..\/..\/maps\/images\/tmw_desert_spacing.png", + "image":"..\/..\/images\/tmw_desert_spacing.png", "imageheight":199, "imagewidth":265, "margin":1, diff --git a/tests/test_data/tilesets/image_tile_offset/expected.py b/tests/test_data/tilesets/image_tile_offset/expected.py index 3d57844..78a36bf 100644 --- a/tests/test_data/tilesets/image_tile_offset/expected.py +++ b/tests/test_data/tilesets/image_tile_offset/expected.py @@ -5,7 +5,7 @@ from pytiled_parser.common_types import Color, OrderedPair EXPECTED = tileset.TileSet( columns=8, - image=Path("../../maps/images/tmw_desert_spacing.png"), + image=Path("../../images/tmw_desert_spacing.png"), image_height=199, image_width=265, margin=1, diff --git a/tests/test_data/tilesets/image_tile_offset/tileset.json b/tests/test_data/tilesets/image_tile_offset/tileset.json index a5893b2..61e3017 100644 --- a/tests/test_data/tilesets/image_tile_offset/tileset.json +++ b/tests/test_data/tilesets/image_tile_offset/tileset.json @@ -7,7 +7,7 @@ "target":"..\/image" } }, - "image":"..\/..\/maps\/images\/tmw_desert_spacing.png", + "image":"..\/..\/images\/tmw_desert_spacing.png", "imageheight":199, "imagewidth":265, "margin":1, diff --git a/tests/test_data/tilesets/image_transparent_color/expected.py b/tests/test_data/tilesets/image_transparent_color/expected.py index 6583b5a..7fa5bd3 100644 --- a/tests/test_data/tilesets/image_transparent_color/expected.py +++ b/tests/test_data/tilesets/image_transparent_color/expected.py @@ -5,7 +5,7 @@ from pytiled_parser.common_types import Color EXPECTED = tileset.TileSet( columns=8, - image=Path("../../maps/images/tmw_desert_spacing.png"), + image=Path("../../images/tmw_desert_spacing.png"), image_height=199, image_width=265, margin=1, diff --git a/tests/test_data/tilesets/image_transparent_color/tileset.json b/tests/test_data/tilesets/image_transparent_color/tileset.json index 6d3ec40..fe318c3 100644 --- a/tests/test_data/tilesets/image_transparent_color/tileset.json +++ b/tests/test_data/tilesets/image_transparent_color/tileset.json @@ -1,5 +1,13 @@ { "columns":8, - "image":"..\/..\/maps\/images\/tmw_desert_spacing.png", + "editorsettings": + { + "export": + { + "format":"", + "target":"." + } + }, + "image":"..\/..\/images\/tmw_desert_spacing.png", "imageheight":199, "imagewidth":265, "margin":1,