diff --git a/pytiled_parser/layer.py b/pytiled_parser/layer.py index fac833b..df14bb1 100644 --- a/pytiled_parser/layer.py +++ b/pytiled_parser/layer.py @@ -43,6 +43,7 @@ class Layer: size: Ordered pair of size of map in tiles. properties: Properties for the layer. tint_color: Tint color that is multiplied with any graphics in this layer. + class_: The Tiled class of this Layer. """ name: str @@ -54,6 +55,7 @@ class Layer: offset: OrderedPair = OrderedPair(0, 0) id: Optional[int] = None + class_: Optional[str] = None size: Optional[Size] = None properties: Optional[Properties] = None tint_color: Optional[Color] = None diff --git a/pytiled_parser/parsers/json/layer.py b/pytiled_parser/parsers/json/layer.py index 9bc0d74..b20226e 100644 --- a/pytiled_parser/parsers/json/layer.py +++ b/pytiled_parser/parsers/json/layer.py @@ -40,51 +40,55 @@ else: zstd = None -class RawChunk(TypedDict): - """The keys and their types that appear in a Tiled JSON Chunk Object. +RawChunk = TypedDict("RawChunk", { + "data": Union[List[int], str], + "height": int, + "width": int, + "x": int, + "y": int +}) +RawChunk.__doc__ = """ + The keys and their types that appear in a Tiled JSON Chunk Object. Tiled Doc: https://doc.mapeditor.org/en/stable/reference/json-map-format/#chunk - """ - - data: Union[List[int], str] - height: int - width: int - x: int - y: int +""" -class RawLayer(TypedDict): - """The keys and their types that appear in a Tiled JSON Layer Object. + +RawLayer = TypedDict("RawLayer", { + "chunks": List[RawChunk], + "compression": str, + "data": Union[List[int], str], + "draworder": str, + "encoding": str, + "height": int, + "id": int, + "image": str, + "layers": List[Any], + "name": str, + "objects": List[RawObject], + "offsetx": float, + "offsety": float, + "parallaxx": float, + "parallaxy": float, + "opacity": float, + "properties": List[RawProperty], + "startx": int, + "starty": int, + "tintcolor": str, + "transparentcolor": str, + "class": str, + "type": str, + "visible": bool, + "width": int, + "x": int, + "y": int +}) +RawLayer.__doc__ = """ + The keys and their types that appear in a Tiled JSON Layer Object. Tiled Doc: https://doc.mapeditor.org/en/stable/reference/json-map-format/#layer - """ - - chunks: List[RawChunk] - compression: str - data: Union[List[int], str] - draworder: str - encoding: str - height: int - id: int - image: str - layers: List[Any] - name: str - objects: List[RawObject] - offsetx: float - offsety: float - parallaxx: float - parallaxy: float - opacity: float - properties: List[RawProperty] - startx: int - starty: int - tintcolor: str - transparentcolor: str - type: str - visible: bool - width: int - x: int - y: int +""" def _convert_raw_tile_layer_data(data: List[int], layer_width: int) -> List[List[int]]: @@ -229,6 +233,9 @@ def _parse_common(raw_layer: RawLayer) -> Layer: if raw_layer.get("properties") is not None: common.properties = parse_properties(raw_layer["properties"]) + if raw_layer.get("class") is not None: + common.class_ = raw_layer["class"] + parallax = [1.0, 1.0] if raw_layer.get("parallaxx") is not None: diff --git a/pytiled_parser/parsers/json/tiled_map.py b/pytiled_parser/parsers/json/tiled_map.py index e6398f9..d9bfe9e 100644 --- a/pytiled_parser/parsers/json/tiled_map.py +++ b/pytiled_parser/parsers/json/tiled_map.py @@ -17,39 +17,40 @@ from pytiled_parser.parsers.tmx.tileset import parse as parse_tmx_tileset from pytiled_parser.tiled_map import TiledMap, TilesetDict from pytiled_parser.util import check_format, parse_color - -class RawTilesetMapping(TypedDict): - - firstgid: int - source: str +RawTilesetMapping = TypedDict("RawTilesetMapping", { + "firstgid": int, + "source": str +}) -class RawTiledMap(TypedDict): - """The keys and their types that appear in a Tiled JSON Map Object. +RawTiledMap = TypedDict("RawTiledMap", { + "backgroundcolor": str, + "compressionlevel": int, + "height": int, + "hexsidelength": int, + "infinite": bool, + "layers": List[RawLayer], + "nextlayerid": int, + "nextobjectid": int, + "orientation": str, + "properties": List[RawProperty], + "renderorder": str, + "staggeraxis": str, + "staggerindex": str, + "tiledversion": str, + "tileheight": int, + "tilesets": List[RawTilesetMapping], + "tilewidth": int, + "class": str, + "type": str, + "version": Union[str, float], + "width": int +}) +RawTiledMap.__doc__ = """ + The keys and their types that appear in a Tiled JSON Map Object. Tiled Docs: https://doc.mapeditor.org/en/stable/reference/json-map-format/#map - """ - - backgroundcolor: str - compressionlevel: int - height: int - hexsidelength: int - infinite: bool - layers: List[RawLayer] - nextlayerid: int - nextobjectid: int - orientation: str - properties: List[RawProperty] - renderorder: str - staggeraxis: str - staggerindex: str - tiledversion: str - tileheight: int - tilesets: List[RawTilesetMapping] - tilewidth: int - type: str - version: Union[str, float] - width: int +""" def parse(file: Path) -> TiledMap: @@ -152,6 +153,9 @@ def parse(file: Path) -> TiledMap: tiled_object.new_tileset = None tiled_object.new_tileset_path = None + if raw_tiled_map.get("class") is not None: + map_.class_ = raw_tiled_map["class"] + if raw_tiled_map.get("backgroundcolor") is not None: map_.background_color = parse_color(raw_tiled_map["backgroundcolor"]) diff --git a/pytiled_parser/parsers/json/tiled_object.py b/pytiled_parser/parsers/json/tiled_object.py index 5a07d8b..b731e1e 100644 --- a/pytiled_parser/parsers/json/tiled_object.py +++ b/pytiled_parser/parsers/json/tiled_object.py @@ -22,53 +22,52 @@ from pytiled_parser.tiled_object import ( ) from pytiled_parser.util import load_object_template, parse_color - -class RawText(TypedDict): - """The keys and their types that appear in a Tiled JSON Text Object. +RawText = TypedDict("RawText", { + "text": str, + "color": str, + "fontfamily": str, + "pixelsize": float, # this is `font_size` in Text + "bold": bool, + "italic": bool, + "strikeout": bool, + "underline": bool, + "kerning": bool, + "halign": str, + "valign": str, + "wrap": bool +}) +RawText.__doc__ = """ + The keys and their types that appear in a Tiled JSON Text Object. Tiled Doc: https://doc.mapeditor.org/en/stable/reference/json-map-format/#text-example - """ - - text: str - color: str - - fontfamily: str - pixelsize: float # this is `font_size` in Text - - bold: bool - italic: bool - strikeout: bool - underline: bool - kerning: bool - - halign: str - valign: str - wrap: bool +""" -class RawObject(TypedDict): - """The keys and their types that appear in a Tiled JSON Object. +RawObject = TypedDict("RawObject", { + "id": int, + "gid": int, + "template": str, + "x": float, + "y": float, + "width": float, + "height": float, + "rotation": float, + "visible": bool, + "name": str, + "class": str, + "type": str, + "properties": List[RawProperty], + "ellipse": bool, + "point": bool, + "polygon": List[Dict[str, float]], + "polyline": List[Dict[str, float]], + "text": RawText +}) +RawObject.__doc__ = """ + The keys and their types that appear in a Tiled JSON Object. Tiled Doc: https://doc.mapeditor.org/en/stable/reference/json-map-format/#object - """ - - id: int - gid: int - template: str - x: float - y: float - width: float - height: float - rotation: float - visible: bool - name: str - type: str - properties: List[RawProperty] - ellipse: bool - point: bool - polygon: List[Dict[str, float]] - polyline: List[Dict[str, float]] - text: RawText +""" def _parse_common(raw_object: RawObject) -> TiledObject: @@ -88,9 +87,14 @@ def _parse_common(raw_object: RawObject) -> TiledObject: size=Size(raw_object["width"], raw_object["height"]), rotation=raw_object["rotation"], name=raw_object["name"], - type=raw_object["type"], ) + if raw_object.get("type") is not None: + common.class_ = raw_object["type"] + + if raw_object.get("class") is not None: + common.class_ = raw_object["class"] + if raw_object.get("properties") is not None: common.properties = parse_properties(raw_object["properties"]) diff --git a/pytiled_parser/parsers/json/tileset.py b/pytiled_parser/parsers/json/tileset.py index 208d787..f29cf0b 100644 --- a/pytiled_parser/parsers/json/tileset.py +++ b/pytiled_parser/parsers/json/tileset.py @@ -13,78 +13,91 @@ from pytiled_parser.parsers.json.wang_set import parse as parse_wangset from pytiled_parser.tileset import Frame, Grid, Tile, Tileset, Transformations from pytiled_parser.util import parse_color - -class RawFrame(TypedDict): - """The keys and their types that appear in a Frame JSON Object.""" - - duration: int - tileid: int +RawFrame = TypedDict("RawFrame", { + "duration": int, + "tileid": int +}) +RawFrame.__doc__ = """ + The keys and their types that appear in a Frame JSON Object. +""" -class RawTileOffset(TypedDict): - """The keys and their types that appear in a TileOffset JSON Object.""" - - x: int - y: int +RawTileOffset = TypedDict("RawTileOffset", { + "x": int, + "y": int +}) +RawTileOffset.__doc__ = """ + The keys and their types that appear in a TileOffset JSON Object. +""" -class RawTransformations(TypedDict): - """The keys and their types that appear in a Transformations JSON Object.""" - - hflip: bool - vflip: bool - rotate: bool - preferuntransformed: bool +RawTransformations = TypedDict("RawTransformations", { + "hflip": bool, + "vflip": bool, + "rotate": bool, + "preferuntransformed": bool +}) +RawTransformations.__doc__ = """ + The keys and their types that appear in a Transformations JSON Object. +""" -class RawTile(TypedDict): - """The keys and their types that appear in a Tile JSON Object.""" - - animation: List[RawFrame] - id: int - image: str - imageheight: int - imagewidth: int - opacity: float - properties: List[RawProperty] - objectgroup: RawLayer - type: str +RawTile = TypedDict("RawTile", { + "animation": List[RawFrame], + "class": str, + "id": int, + "image": str, + "imageheight": int, + "imagewidth": int, + "opacity": float, + "type": str, + "properties": List[RawProperty], + "objectgroup": RawLayer, +}) +RawTile.__docs__ = """ + The keys and their types that appear in a Tile JSON Object. +""" -class RawGrid(TypedDict): - """The keys and their types that appear in a Grid JSON Object.""" - - height: int - width: int - orientation: str +RawGrid = TypedDict("RawGrid", { + "height": int, + "width": int, + "orientation": str +}) +RawGrid.__doc__ = """ + The keys and their types that appear in a Grid JSON Object. +""" -class RawTileSet(TypedDict): - """The keys and their types that appear in a TileSet JSON Object.""" - - backgroundcolor: str - columns: int - firstgid: int - grid: RawGrid - image: str - imageheight: int - imagewidth: int - margin: int - name: str - properties: List[RawProperty] - objectalignment: str - source: str - spacing: int - tilecount: int - tiledversion: str - tileheight: int - tileoffset: RawTileOffset - tiles: List[RawTile] - tilewidth: int - transparentcolor: str - transformations: RawTransformations - version: Union[str, float] - wangsets: List[RawWangSet] +RawTileSet = TypedDict("RawTileSet", { + "backgroundcolor": str, + "class": str, + "columns": int, + "firstgid": int, + "grid": RawGrid, + "image": str, + "imageheight": int, + "imagewidth": int, + "margin": int, + "name": str, + "properties": List[RawProperty], + "objectalignment": str, + "source": str, + "spacing": int, + "tilecount": int, + "tiledversion": str, + "tileheight": int, + "tileoffset": RawTileOffset, + "tiles": List[RawTile], + "tilewidth": int, + "transparentcolor": str, + "transformations": RawTransformations, + "version": Union[str, float], + "wangsets": List[RawWangSet] +}) +RawTileSet.__doc__ = """ + The keys and their types that appear in a TileSet JSON Object. +""" def _parse_frame(raw_frame: RawFrame) -> Frame: @@ -189,7 +202,10 @@ def _parse_tile(raw_tile: RawTile, external_path: Optional[Path] = None) -> Tile tile.image_height = raw_tile["imageheight"] if raw_tile.get("type") is not None: - tile.type = raw_tile["type"] + tile.class_ = raw_tile["type"] + + if raw_tile.get("class") is not None: + tile.class_ = raw_tile["class"] return tile @@ -283,4 +299,7 @@ def parse( if raw_tileset.get("transformations") is not None: tileset.transformations = _parse_transformations(raw_tileset["transformations"]) + if raw_tileset.get("class") is not None: + tileset.class_ = raw_tileset["class"] + return tileset diff --git a/pytiled_parser/parsers/json/wang_set.py b/pytiled_parser/parsers/json/wang_set.py index ea68905..a7328a3 100644 --- a/pytiled_parser/parsers/json/wang_set.py +++ b/pytiled_parser/parsers/json/wang_set.py @@ -7,35 +7,42 @@ from pytiled_parser.parsers.json.properties import parse as parse_properties from pytiled_parser.util import parse_color from pytiled_parser.wang_set import WangColor, WangSet, WangTile - -class RawWangTile(TypedDict): - """The keys and their types that appear in a Wang Tile JSON Object.""" - - tileid: int +RawWangTile = TypedDict("RawWangTile", { + "tileid": int, # Tiled stores these IDs as a list represented like so: # [top, top_right, right, bottom_right, bottom, bottom_left, left, top_left] - wangid: List[int] + "wangid": List[int] +}) +RawWangTile.__doc__ = """ + The keys and their types that appear in a Wang Tile JSON Object. +""" -class RawWangColor(TypedDict): - """The keys and their types that appear in a Wang Color JSON Object.""" - - color: str - name: str - probability: float - tile: int - properties: List[RawProperty] +RawWangColor = TypedDict("RawWangColor", { + "color": str, + "class": str, + "name": str, + "probability": float, + "tile": int, + "properties": List[RawProperty] +}) +RawWangColor.__doc__ = """ + The keys and their types that appear in a Wang Color JSON Object. +""" -class RawWangSet(TypedDict): - """The keys and their types that appear in a Wang Set JSON Object.""" - - colors: List[RawWangColor] - name: str - properties: List[RawProperty] - tile: int - type: str - wangtiles: List[RawWangTile] +RawWangSet = TypedDict("RawWangSet", { + "colors": List[RawWangColor], + "class": str, + "name": str, + "properties": List[RawProperty], + "tile": int, + "type": str, + "wangtiles": List[RawWangTile] +}) +RawWangSet.__doc__ = """ + The keys and their types that appear in a Wang Set JSON Object. +""" def _parse_wang_tile(raw_wang_tile: RawWangTile) -> WangTile: diff --git a/pytiled_parser/parsers/tmx/layer.py b/pytiled_parser/parsers/tmx/layer.py index 57ec382..fc232d8 100644 --- a/pytiled_parser/parsers/tmx/layer.py +++ b/pytiled_parser/parsers/tmx/layer.py @@ -192,6 +192,9 @@ def _parse_common(raw_layer: etree.Element) -> Layer: if raw_layer.attrib.get("tintcolor") is not None: common.tint_color = parse_color(raw_layer.attrib["tintcolor"]) + if raw_layer.attrib.get("class") is not None: + common.class_ = raw_layer.attrib["class"] + return common diff --git a/pytiled_parser/parsers/tmx/tiled_map.py b/pytiled_parser/parsers/tmx/tiled_map.py index f12c6e2..6617c59 100644 --- a/pytiled_parser/parsers/tmx/tiled_map.py +++ b/pytiled_parser/parsers/tmx/tiled_map.py @@ -129,4 +129,7 @@ def parse(file: Path) -> TiledMap: if raw_map.attrib.get("staggerindex") is not None: map_.stagger_index = raw_map.attrib["staggerindex"] + if raw_map.attrib.get("class") is not None: + map_.class_ = raw_map.attrib["class"] + return map_ diff --git a/pytiled_parser/parsers/tmx/tiled_object.py b/pytiled_parser/parsers/tmx/tiled_object.py index ceb4e08..de59136 100644 --- a/pytiled_parser/parsers/tmx/tiled_object.py +++ b/pytiled_parser/parsers/tmx/tiled_object.py @@ -50,7 +50,10 @@ def _parse_common(raw_object: etree.Element) -> TiledObject: common.name = raw_object.attrib["name"] if raw_object.attrib.get("type") is not None: - common.type = raw_object.attrib["type"] + common.class_ = raw_object.attrib["type"] + + if raw_object.attrib.get("class") is not None: + common.class_ = raw_object.attrib["class"] properties_element = raw_object.find("./properties") if properties_element: diff --git a/pytiled_parser/parsers/tmx/tileset.py b/pytiled_parser/parsers/tmx/tileset.py index d6b7f69..3fb8cad 100644 --- a/pytiled_parser/parsers/tmx/tileset.py +++ b/pytiled_parser/parsers/tmx/tileset.py @@ -76,7 +76,10 @@ def _parse_tile(raw_tile: etree.Element, external_path: Optional[Path] = None) - tile = Tile(id=int(raw_tile.attrib["id"])) if raw_tile.attrib.get("type") is not None: - tile.type = raw_tile.attrib["type"] + tile.class_ = raw_tile.attrib["type"] + + if raw_tile.attrib.get("class") is not None: + tile.class_ = raw_tile.attrib["class"] animation_element = raw_tile.find("./animation") if animation_element is not None: @@ -141,6 +144,9 @@ def parse( if raw_tileset.attrib.get("objectalignment") is not None: tileset.alignment = raw_tileset.attrib["objectalignment"] + if raw_tileset.attrib.get("class") is not None: + tileset.class_ = raw_tileset.attrib["class"] + image_element = raw_tileset.find("image") if image_element is not None: if external_path: diff --git a/pytiled_parser/parsers/tmx/wang_set.py b/pytiled_parser/parsers/tmx/wang_set.py index b167226..0789cb1 100644 --- a/pytiled_parser/parsers/tmx/wang_set.py +++ b/pytiled_parser/parsers/tmx/wang_set.py @@ -34,6 +34,9 @@ def _parse_wang_color(raw_wang_color: etree.Element) -> WangColor: probability=float(raw_wang_color.attrib["probability"]), ) + if raw_wang_color.attrib.get("class") is not None: + wang_color.class_ = raw_wang_color.attrib["class"] + properties = raw_wang_color.find("./properties") if properties: wang_color.properties = parse_properties(properties) @@ -67,6 +70,9 @@ def parse(raw_wangset: etree.Element) -> WangSet: wang_tiles=tiles, ) + if raw_wangset.attrib.get("class") is not None: + wangset.class_ = raw_wangset.attrib["class"] + properties = raw_wangset.find("./properties") if properties: wangset.properties = parse_properties(properties) diff --git a/pytiled_parser/tiled_map.py b/pytiled_parser/tiled_map.py index edca2f1..6171edc 100644 --- a/pytiled_parser/tiled_map.py +++ b/pytiled_parser/tiled_map.py @@ -51,6 +51,7 @@ class TiledMap: "y") is staggered. stagger_index: For staggered and hexagonal maps, determines whether the "even" or "odd" indexes along the staggered axis are shifted. + class_: The Tiled class of this Map. """ infinite: bool @@ -66,6 +67,7 @@ class TiledMap: version: str map_file: Optional[Path] = None + class_: Optional[str] = None background_color: Optional[Color] = None properties: Optional[Properties] = None hex_side_length: Optional[int] = None diff --git a/pytiled_parser/tiled_object.py b/pytiled_parser/tiled_object.py index 811e1b9..1325279 100644 --- a/pytiled_parser/tiled_object.py +++ b/pytiled_parser/tiled_object.py @@ -26,7 +26,7 @@ class TiledObject: rotation: The rotation of the tiled object in degrees clockwise (default: 0). opacity: The opacity of the tiled object. (default: 1) name: The name of the tiled object. - type: The type of the tiled object. + class_: The Tiled class of the tiled object. properties: The properties of the TiledObject. """ @@ -37,11 +37,10 @@ class TiledObject: rotation: float = 0 visible: bool = True name: str = "" - type: str = "" + class_: str = "" properties: properties_.Properties = {} - @attr.s() class Ellipse(TiledObject): """Elipse shape defined by a point, width, height, and rotation. diff --git a/pytiled_parser/tileset.py b/pytiled_parser/tileset.py index a1c2a97..48ab17c 100644 --- a/pytiled_parser/tileset.py +++ b/pytiled_parser/tileset.py @@ -114,11 +114,12 @@ class Tile: flipped_horizontally: Should this Tile be flipped horizontally? flipped_diagonally: Should this Tile be flipped diagonally? flipped_vertically: Should this Tile be flipped vertically? + class_: The Tiled class of this Tile. """ id: int opacity: int = 1 - type: Optional[str] = None + class_: Optional[str] = None animation: Optional[List[Frame]] = None objects: Optional[layer.Layer] = None image: Optional[Path] = None @@ -181,6 +182,7 @@ class Tileset: wang_sets: List of WangSets, this is used by the terrain system in Tiled. It is unlikely an implementation in a game engine would need to use these values. alignment: Which alignment to use for tile objects from this tileset. + class_: The Tiled class of this TileSet. """ name: str @@ -206,6 +208,7 @@ class Tileset: transformations: Optional[Transformations] = None + class_: Optional[str] = None background_color: Optional[Color] = None tile_offset: Optional[OrderedPair] = None transparent_color: Optional[Color] = None diff --git a/pytiled_parser/wang_set.py b/pytiled_parser/wang_set.py index a2250d9..704c01f 100644 --- a/pytiled_parser/wang_set.py +++ b/pytiled_parser/wang_set.py @@ -45,6 +45,7 @@ class WangColor: name: The name for this color probability: The probability used when randomizing tiles properties: The properties for this wang color + class_: The Tiled class of this Wang Color tile: Tile ID of the tile representing this color """ @@ -52,6 +53,7 @@ class WangColor: name: str probability: float tile: int + class_: Optional[str] = None properties: Optional[Properties] = None @@ -68,6 +70,7 @@ class WangSet: Attributes: name: Name of the WangSet properties: The properties for this wang set + class_: The Tiled class of this Wang Set tile: Tile ID of the tile representing this Wang Set wang_colors: A list of [WangColors][pytiled_parser.wang_set.WangColor] wang_tiles: A list of [WangTiles][pytiled_parser.wang_set.WangTile] @@ -79,4 +82,5 @@ class WangSet: wang_type: str wang_tiles: Dict[int, WangTile] wang_colors: List[WangColor] + class_: Optional[str] = None properties: Optional[Properties] = None diff --git a/tests/test_data/layer_tests/all_layer_types/expected.py b/tests/test_data/layer_tests/all_layer_types/expected.py index 63dc6ab..8bb9068 100644 --- a/tests/test_data/layer_tests/all_layer_types/expected.py +++ b/tests/test_data/layer_tests/all_layer_types/expected.py @@ -100,7 +100,7 @@ EXPECTED = [ size=common_types.Size(69.3333333333333, 52.6666666666667), coordinates=common_types.OrderedPair(46.3333333333333, 39), visible=True, - type="", + class_="", ) ], ), diff --git a/tests/test_data/layer_tests/all_layer_types/map.json b/tests/test_data/layer_tests/all_layer_types/map.json index e564a55..f828ebd 100644 --- a/tests/test_data/layer_tests/all_layer_types/map.json +++ b/tests/test_data/layer_tests/all_layer_types/map.json @@ -3,7 +3,12 @@ "infinite":false, "layers":[ { - "data":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48], + "data":[1, 2, 3, 4, 5, 6, 7, 8, + 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 20, 21, 22, 23, 24, + 25, 26, 27, 28, 29, 30, 31, 32, + 33, 34, 35, 36, 37, 38, 39, 40, + 41, 42, 43, 44, 45, 46, 47, 48], "height":6, "id":1, "name":"Tile Layer 1", @@ -34,11 +39,11 @@ "name":"Object Layer 1", "objects":[ { + "class":"", "height":52.6666666666667, "id":1, "name":"", "rotation":0, - "type":"", "visible":true, "width":69.3333333333333, "x":46.3333333333333, @@ -88,7 +93,7 @@ "nextobjectid":3, "orientation":"orthogonal", "renderorder":"right-down", - "tiledversion":"1.7.2", + "tiledversion":"1.9.0", "tileheight":32, "tilesets":[ { @@ -97,6 +102,6 @@ }], "tilewidth":32, "type":"map", - "version":"1.6", + "version":"1.9", "width":8 } \ No newline at end of file diff --git a/tests/test_data/layer_tests/all_layer_types/map.tmx b/tests/test_data/layer_tests/all_layer_types/map.tmx index c94d181..ce7a3de 100644 --- a/tests/test_data/layer_tests/all_layer_types/map.tmx +++ b/tests/test_data/layer_tests/all_layer_types/map.tmx @@ -1,5 +1,5 @@ - + diff --git a/tests/test_data/layer_tests/all_layer_types/tileset.json b/tests/test_data/layer_tests/all_layer_types/tileset.json index 1a07451..0879fe6 100644 --- a/tests/test_data/layer_tests/all_layer_types/tileset.json +++ b/tests/test_data/layer_tests/all_layer_types/tileset.json @@ -6,9 +6,9 @@ "name":"tile_set_image", "spacing":1, "tilecount":48, - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilewidth":32, "type":"tileset", - "version":"1.6" + "version":"1.8" } \ No newline at end of file diff --git a/tests/test_data/layer_tests/all_layer_types/tileset.tsx b/tests/test_data/layer_tests/all_layer_types/tileset.tsx index 8aee17a..ebde4f1 100644 --- a/tests/test_data/layer_tests/all_layer_types/tileset.tsx +++ b/tests/test_data/layer_tests/all_layer_types/tileset.tsx @@ -1,4 +1,4 @@ - + diff --git a/tests/test_data/layer_tests/b64/expected.py b/tests/test_data/layer_tests/b64/expected.py index 178924b..c55d67d 100644 --- a/tests/test_data/layer_tests/b64/expected.py +++ b/tests/test_data/layer_tests/b64/expected.py @@ -92,7 +92,7 @@ EXPECTED = [ size=common_types.Size(69.3333333333333, 52.6666666666667), coordinates=common_types.OrderedPair(46.3333333333333, 39), visible=True, - type="", + class_="", ) ], ), diff --git a/tests/test_data/layer_tests/b64/map.json b/tests/test_data/layer_tests/b64/map.json index e9f6eb0..88dcb57 100644 --- a/tests/test_data/layer_tests/b64/map.json +++ b/tests/test_data/layer_tests/b64/map.json @@ -25,11 +25,11 @@ "name":"Object Layer 1", "objects":[ { + "class":"", "height":52.6666666666667, "id":1, "name":"", "rotation":0, - "type":"", "visible":true, "width":69.3333333333333, "x":46.3333333333333, @@ -63,7 +63,7 @@ "nextobjectid":3, "orientation":"orthogonal", "renderorder":"right-down", - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilesets":[ { @@ -72,6 +72,6 @@ }], "tilewidth":32, "type":"map", - "version":"1.6", + "version":"1.9", "width":8 } \ No newline at end of file diff --git a/tests/test_data/layer_tests/b64/map.tmx b/tests/test_data/layer_tests/b64/map.tmx index 060ebe1..079bfa3 100644 --- a/tests/test_data/layer_tests/b64/map.tmx +++ b/tests/test_data/layer_tests/b64/map.tmx @@ -1,5 +1,5 @@ - + diff --git a/tests/test_data/layer_tests/b64/tileset.json b/tests/test_data/layer_tests/b64/tileset.json index 1a07451..0879fe6 100644 --- a/tests/test_data/layer_tests/b64/tileset.json +++ b/tests/test_data/layer_tests/b64/tileset.json @@ -6,9 +6,9 @@ "name":"tile_set_image", "spacing":1, "tilecount":48, - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilewidth":32, "type":"tileset", - "version":"1.6" + "version":"1.8" } \ No newline at end of file diff --git a/tests/test_data/layer_tests/b64/tileset.tsx b/tests/test_data/layer_tests/b64/tileset.tsx index 8aee17a..ebde4f1 100644 --- a/tests/test_data/layer_tests/b64/tileset.tsx +++ b/tests/test_data/layer_tests/b64/tileset.tsx @@ -1,4 +1,4 @@ - + diff --git a/tests/test_data/layer_tests/b64_gzip/expected.py b/tests/test_data/layer_tests/b64_gzip/expected.py index 178924b..c55d67d 100644 --- a/tests/test_data/layer_tests/b64_gzip/expected.py +++ b/tests/test_data/layer_tests/b64_gzip/expected.py @@ -92,7 +92,7 @@ EXPECTED = [ size=common_types.Size(69.3333333333333, 52.6666666666667), coordinates=common_types.OrderedPair(46.3333333333333, 39), visible=True, - type="", + class_="", ) ], ), diff --git a/tests/test_data/layer_tests/b64_gzip/map.json b/tests/test_data/layer_tests/b64_gzip/map.json index 6fbde61..a01d7f1 100644 --- a/tests/test_data/layer_tests/b64_gzip/map.json +++ b/tests/test_data/layer_tests/b64_gzip/map.json @@ -25,11 +25,11 @@ "name":"Object Layer 1", "objects":[ { + "class":"", "height":52.6666666666667, "id":1, "name":"", "rotation":0, - "type":"", "visible":true, "width":69.3333333333333, "x":46.3333333333333, @@ -63,7 +63,7 @@ "nextobjectid":3, "orientation":"orthogonal", "renderorder":"right-down", - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilesets":[ { @@ -72,6 +72,6 @@ }], "tilewidth":32, "type":"map", - "version":"1.6", + "version":"1.9", "width":8 } \ No newline at end of file diff --git a/tests/test_data/layer_tests/b64_gzip/map.tmx b/tests/test_data/layer_tests/b64_gzip/map.tmx index 21316ba..30dbe78 100644 --- a/tests/test_data/layer_tests/b64_gzip/map.tmx +++ b/tests/test_data/layer_tests/b64_gzip/map.tmx @@ -1,9 +1,9 @@ - + - H4sIAAAAAAAACg3DBRKCQAAAwDMRA7BQLMTE9v+vY3dmWyGEth279uwbOTB26MixExNTM6fOnLtwae7KtYUbt+7ce7D0aOXJsxev3rxb+/Dpy7cfv/782wAcvDirwAAAAA== + H4sIAAAAAAAAAw3DBRKCQAAAwDMRA7BQLMTE9v+vY3dmWyGEth279uwbOTB26MixExNTM6fOnLtwae7KtYUbt+7ce7D0aOXJsxev3rxb+/Dpy7cfv/782wAcvDirwAAAAA== diff --git a/tests/test_data/layer_tests/b64_gzip/tileset.json b/tests/test_data/layer_tests/b64_gzip/tileset.json index 1a07451..0879fe6 100644 --- a/tests/test_data/layer_tests/b64_gzip/tileset.json +++ b/tests/test_data/layer_tests/b64_gzip/tileset.json @@ -6,9 +6,9 @@ "name":"tile_set_image", "spacing":1, "tilecount":48, - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilewidth":32, "type":"tileset", - "version":"1.6" + "version":"1.8" } \ No newline at end of file diff --git a/tests/test_data/layer_tests/b64_gzip/tileset.tsx b/tests/test_data/layer_tests/b64_gzip/tileset.tsx index 8aee17a..ebde4f1 100644 --- a/tests/test_data/layer_tests/b64_gzip/tileset.tsx +++ b/tests/test_data/layer_tests/b64_gzip/tileset.tsx @@ -1,4 +1,4 @@ - + diff --git a/tests/test_data/layer_tests/b64_zlib/expected.py b/tests/test_data/layer_tests/b64_zlib/expected.py index 178924b..c55d67d 100644 --- a/tests/test_data/layer_tests/b64_zlib/expected.py +++ b/tests/test_data/layer_tests/b64_zlib/expected.py @@ -92,7 +92,7 @@ EXPECTED = [ size=common_types.Size(69.3333333333333, 52.6666666666667), coordinates=common_types.OrderedPair(46.3333333333333, 39), visible=True, - type="", + class_="", ) ], ), diff --git a/tests/test_data/layer_tests/b64_zlib/map.json b/tests/test_data/layer_tests/b64_zlib/map.json index ad9aa14..83144c4 100644 --- a/tests/test_data/layer_tests/b64_zlib/map.json +++ b/tests/test_data/layer_tests/b64_zlib/map.json @@ -25,11 +25,11 @@ "name":"Object Layer 1", "objects":[ { + "class":"", "height":52.6666666666667, "id":1, "name":"", "rotation":0, - "type":"", "visible":true, "width":69.3333333333333, "x":46.3333333333333, @@ -63,7 +63,7 @@ "nextobjectid":3, "orientation":"orthogonal", "renderorder":"right-down", - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilesets":[ { @@ -72,6 +72,6 @@ }], "tilewidth":32, "type":"map", - "version":"1.6", + "version":"1.9", "width":8 } \ No newline at end of file diff --git a/tests/test_data/layer_tests/b64_zlib/map.tmx b/tests/test_data/layer_tests/b64_zlib/map.tmx index 343bd2b..7287d58 100644 --- a/tests/test_data/layer_tests/b64_zlib/map.tmx +++ b/tests/test_data/layer_tests/b64_zlib/map.tmx @@ -1,5 +1,5 @@ - + diff --git a/tests/test_data/layer_tests/b64_zlib/tileset.json b/tests/test_data/layer_tests/b64_zlib/tileset.json index 1a07451..0879fe6 100644 --- a/tests/test_data/layer_tests/b64_zlib/tileset.json +++ b/tests/test_data/layer_tests/b64_zlib/tileset.json @@ -6,9 +6,9 @@ "name":"tile_set_image", "spacing":1, "tilecount":48, - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilewidth":32, "type":"tileset", - "version":"1.6" + "version":"1.8" } \ No newline at end of file diff --git a/tests/test_data/layer_tests/b64_zlib/tileset.tsx b/tests/test_data/layer_tests/b64_zlib/tileset.tsx index 8aee17a..ebde4f1 100644 --- a/tests/test_data/layer_tests/b64_zlib/tileset.tsx +++ b/tests/test_data/layer_tests/b64_zlib/tileset.tsx @@ -1,4 +1,4 @@ - + diff --git a/tests/test_data/layer_tests/b64_zstd/map.json b/tests/test_data/layer_tests/b64_zstd/map.json index facdd25..20163cc 100644 --- a/tests/test_data/layer_tests/b64_zstd/map.json +++ b/tests/test_data/layer_tests/b64_zstd/map.json @@ -25,11 +25,11 @@ "name":"Object Layer 1", "objects":[ { + "class":"", "height":52.6666666666667, "id":1, "name":"", "rotation":0, - "type":"", "visible":true, "width":69.3333333333333, "x":46.3333333333333, @@ -63,7 +63,7 @@ "nextobjectid":3, "orientation":"orthogonal", "renderorder":"right-down", - "tiledversion":"1.8.5", + "tiledversion":"1.9.0", "tileheight":32, "tilesets":[ { @@ -72,6 +72,6 @@ }], "tilewidth":32, "type":"map", - "version":"1.8", + "version":"1.9", "width":8 } \ No newline at end of file diff --git a/tests/test_data/layer_tests/b64_zstd/map.tmx b/tests/test_data/layer_tests/b64_zstd/map.tmx index 6d53144..9f2b962 100644 --- a/tests/test_data/layer_tests/b64_zstd/map.tmx +++ b/tests/test_data/layer_tests/b64_zstd/map.tmx @@ -1,5 +1,5 @@ - + diff --git a/tests/test_data/layer_tests/b64_zstd/tileset.json b/tests/test_data/layer_tests/b64_zstd/tileset.json index b44dbb4..0879fe6 100644 --- a/tests/test_data/layer_tests/b64_zstd/tileset.json +++ b/tests/test_data/layer_tests/b64_zstd/tileset.json @@ -6,7 +6,7 @@ "name":"tile_set_image", "spacing":1, "tilecount":48, - "tiledversion":"1.8.5", + "tiledversion":"1.9.0", "tileheight":32, "tilewidth":32, "type":"tileset", diff --git a/tests/test_data/layer_tests/infinite_map/map.json b/tests/test_data/layer_tests/infinite_map/map.json index b6c2aca..0673656 100644 --- a/tests/test_data/layer_tests/infinite_map/map.json +++ b/tests/test_data/layer_tests/infinite_map/map.json @@ -17,14 +17,28 @@ { "chunks":[ { - "data":[1, 2, 3, 4, 9, 10, 11, 12, 17, 18, 19, 20, 25, 26, 27, 28, 33, 34, 35, 36, 41, 42, 43, 44, 0, 0, 0, 0, 0, 0, 0, 0], + "data":[1, 2, 3, 4, + 9, 10, 11, 12, + 17, 18, 19, 20, + 25, 26, 27, 28, + 33, 34, 35, 36, + 41, 42, 43, 44, + 0, 0, 0, 0, + 0, 0, 0, 0], "height":8, "width":4, "x":0, "y":0 }, { - "data":[5, 6, 7, 8, 13, 14, 15, 16, 21, 22, 23, 24, 29, 30, 31, 32, 37, 38, 39, 40, 45, 46, 47, 48, 0, 0, 0, 0, 0, 0, 0, 0], + "data":[5, 6, 7, 8, + 13, 14, 15, 16, + 21, 22, 23, 24, + 29, 30, 31, 32, + 37, 38, 39, 40, + 45, 46, 47, 48, + 0, 0, 0, 0, + 0, 0, 0, 0], "height":8, "width":4, "x":4, @@ -54,7 +68,7 @@ "nextobjectid":3, "orientation":"orthogonal", "renderorder":"right-down", - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilesets":[ { @@ -63,6 +77,6 @@ }], "tilewidth":32, "type":"map", - "version":"1.6", + "version":"1.9", "width":8 } \ No newline at end of file diff --git a/tests/test_data/layer_tests/infinite_map/map.tmx b/tests/test_data/layer_tests/infinite_map/map.tmx index 2a826bb..1a41074 100644 --- a/tests/test_data/layer_tests/infinite_map/map.tmx +++ b/tests/test_data/layer_tests/infinite_map/map.tmx @@ -1,5 +1,5 @@ - + diff --git a/tests/test_data/layer_tests/infinite_map_b64/map.json b/tests/test_data/layer_tests/infinite_map_b64/map.json index 8c3f26f..ae4b657 100644 --- a/tests/test_data/layer_tests/infinite_map_b64/map.json +++ b/tests/test_data/layer_tests/infinite_map_b64/map.json @@ -37,7 +37,7 @@ "nextobjectid":3, "orientation":"orthogonal", "renderorder":"right-down", - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilesets":[ { @@ -46,6 +46,6 @@ }], "tilewidth":32, "type":"map", - "version":"1.6", + "version":"1.9", "width":8 } \ No newline at end of file diff --git a/tests/test_data/layer_tests/infinite_map_b64/map.tmx b/tests/test_data/layer_tests/infinite_map_b64/map.tmx index d83d427..38c90b1 100644 --- a/tests/test_data/layer_tests/infinite_map_b64/map.tmx +++ b/tests/test_data/layer_tests/infinite_map_b64/map.tmx @@ -1,5 +1,5 @@ - + diff --git a/tests/test_data/layer_tests/no_layers/map.json b/tests/test_data/layer_tests/no_layers/map.json index 2fa7062..258af6c 100644 --- a/tests/test_data/layer_tests/no_layers/map.json +++ b/tests/test_data/layer_tests/no_layers/map.json @@ -42,7 +42,7 @@ "value":"Hello, World!!" }], "renderorder":"right-down", - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilesets":[ { @@ -51,6 +51,6 @@ }], "tilewidth":32, "type":"map", - "version":"1.6", + "version":"1.9", "width":8 } \ No newline at end of file diff --git a/tests/test_data/layer_tests/no_layers/map.tmx b/tests/test_data/layer_tests/no_layers/map.tmx index fb995a3..358a281 100644 --- a/tests/test_data/layer_tests/no_layers/map.tmx +++ b/tests/test_data/layer_tests/no_layers/map.tmx @@ -1,5 +1,5 @@ - + diff --git a/tests/test_data/layer_tests/no_layers/tileset.json b/tests/test_data/layer_tests/no_layers/tileset.json index 1a07451..0879fe6 100644 --- a/tests/test_data/layer_tests/no_layers/tileset.json +++ b/tests/test_data/layer_tests/no_layers/tileset.json @@ -6,9 +6,9 @@ "name":"tile_set_image", "spacing":1, "tilecount":48, - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilewidth":32, "type":"tileset", - "version":"1.6" + "version":"1.8" } \ No newline at end of file diff --git a/tests/test_data/layer_tests/no_layers/tileset.tsx b/tests/test_data/layer_tests/no_layers/tileset.tsx index 8aee17a..ebde4f1 100644 --- a/tests/test_data/layer_tests/no_layers/tileset.tsx +++ b/tests/test_data/layer_tests/no_layers/tileset.tsx @@ -1,4 +1,4 @@ - + diff --git a/tests/test_data/layer_tests/unknown_type/map.json b/tests/test_data/layer_tests/unknown_type/map.json index ae74baa..11b89df 100644 --- a/tests/test_data/layer_tests/unknown_type/map.json +++ b/tests/test_data/layer_tests/unknown_type/map.json @@ -29,7 +29,7 @@ "id":1, "name":"", "rotation":0, - "type":"", + "class":"", "visible":true, "width":69.3333333333333, "x":46.3333333333333, diff --git a/tests/test_data/map_tests/cross_format_tileset/map.json b/tests/test_data/map_tests/cross_format_tileset/map.json index 262aeef..c28c5fc 100644 --- a/tests/test_data/map_tests/cross_format_tileset/map.json +++ b/tests/test_data/map_tests/cross_format_tileset/map.json @@ -38,7 +38,7 @@ "value":"Hello, World!!" }], "renderorder":"right-down", - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilesets":[ { @@ -47,6 +47,6 @@ }], "tilewidth":32, "type":"map", - "version":"1.6", + "version":"1.9", "width":8 } \ No newline at end of file diff --git a/tests/test_data/map_tests/cross_format_tileset/map.tmx b/tests/test_data/map_tests/cross_format_tileset/map.tmx index b7ad3fe..4605e1f 100644 --- a/tests/test_data/map_tests/cross_format_tileset/map.tmx +++ b/tests/test_data/map_tests/cross_format_tileset/map.tmx @@ -1,5 +1,5 @@ - + diff --git a/tests/test_data/map_tests/cross_format_tileset/tileset.json b/tests/test_data/map_tests/cross_format_tileset/tileset.json index 1a07451..0879fe6 100644 --- a/tests/test_data/map_tests/cross_format_tileset/tileset.json +++ b/tests/test_data/map_tests/cross_format_tileset/tileset.json @@ -6,9 +6,9 @@ "name":"tile_set_image", "spacing":1, "tilecount":48, - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilewidth":32, "type":"tileset", - "version":"1.6" + "version":"1.8" } \ No newline at end of file diff --git a/tests/test_data/map_tests/cross_format_tileset/tileset.tsx b/tests/test_data/map_tests/cross_format_tileset/tileset.tsx index 8b1cf24..ebde4f1 100644 --- a/tests/test_data/map_tests/cross_format_tileset/tileset.tsx +++ b/tests/test_data/map_tests/cross_format_tileset/tileset.tsx @@ -1,4 +1,4 @@ - + diff --git a/tests/test_data/map_tests/embedded_tileset/map.json b/tests/test_data/map_tests/embedded_tileset/map.json index a364309..ef31f85 100644 --- a/tests/test_data/map_tests/embedded_tileset/map.json +++ b/tests/test_data/map_tests/embedded_tileset/map.json @@ -6,7 +6,7 @@ "nextobjectid":1, "orientation":"orthogonal", "renderorder":"right-down", - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilesets":[ { @@ -24,6 +24,6 @@ }], "tilewidth":32, "type":"map", - "version":"1.6", + "version":"1.9", "width":8 } \ No newline at end of file diff --git a/tests/test_data/map_tests/embedded_tileset/map.tmx b/tests/test_data/map_tests/embedded_tileset/map.tmx index c39ca67..62683ee 100644 --- a/tests/test_data/map_tests/embedded_tileset/map.tmx +++ b/tests/test_data/map_tests/embedded_tileset/map.tmx @@ -1,5 +1,5 @@ - + diff --git a/tests/test_data/map_tests/external_tileset_dif_dir/expected.py b/tests/test_data/map_tests/external_tileset_dif_dir/expected.py index 6a9005f..40d7945 100644 --- a/tests/test_data/map_tests/external_tileset_dif_dir/expected.py +++ b/tests/test_data/map_tests/external_tileset_dif_dir/expected.py @@ -104,7 +104,7 @@ EXPECTED = tiled_map.TiledMap( image_height=32, image_width=32, properties={"float property": 2.2}, - type="tile", + class_="tile", ), 1: tileset.Tile( id=1, @@ -126,7 +126,7 @@ EXPECTED = tiled_map.TiledMap( 14.4766410408043, 13.7196924896511 ), rotation=0, - type="", + class_="", visible=True, coordinates=common_types.OrderedPair( 13.4358367829687, 13.5304553518628 @@ -139,7 +139,7 @@ EXPECTED = tiled_map.TiledMap( 14.287403903016, 11.070372560615 ), rotation=0, - type="", + class_="", visible=True, coordinates=common_types.OrderedPair( 13.8143110585452, 1.98698994677705 @@ -148,7 +148,7 @@ EXPECTED = tiled_map.TiledMap( ], ), properties={"string property": "testing"}, - type="tile", + class_="tile", ), 2: tileset.Tile( id=2, @@ -158,7 +158,7 @@ EXPECTED = tiled_map.TiledMap( image_height=32, image_width=32, properties={"bool property": True}, - type="tile", + class_="tile", ), 3: tileset.Tile( id=3, @@ -167,7 +167,7 @@ EXPECTED = tiled_map.TiledMap( .resolve(), image_height=32, image_width=32, - type="tile", + class_="tile", ), }, ) diff --git a/tests/test_data/map_tests/external_tileset_dif_dir/map.json b/tests/test_data/map_tests/external_tileset_dif_dir/map.json index f64010f..0ff944b 100644 --- a/tests/test_data/map_tests/external_tileset_dif_dir/map.json +++ b/tests/test_data/map_tests/external_tileset_dif_dir/map.json @@ -52,7 +52,7 @@ "value":"Hello, World!!" }], "renderorder":"right-down", - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilesets":[ { @@ -61,6 +61,6 @@ }], "tilewidth":32, "type":"map", - "version":"1.6", + "version":"1.9", "width":8 } \ No newline at end of file diff --git a/tests/test_data/map_tests/external_tileset_dif_dir/map.tmx b/tests/test_data/map_tests/external_tileset_dif_dir/map.tmx index 9c19e15..908f7ba 100644 --- a/tests/test_data/map_tests/external_tileset_dif_dir/map.tmx +++ b/tests/test_data/map_tests/external_tileset_dif_dir/map.tmx @@ -1,5 +1,5 @@ - + diff --git a/tests/test_data/map_tests/external_tileset_dif_dir/tileset/tileset.json b/tests/test_data/map_tests/external_tileset_dif_dir/tileset/tileset.json index dd51f38..56de699 100644 --- a/tests/test_data/map_tests/external_tileset_dif_dir/tileset/tileset.json +++ b/tests/test_data/map_tests/external_tileset_dif_dir/tileset/tileset.json @@ -9,7 +9,7 @@ "name":"tileset", "spacing":0, "tilecount":4, - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tiles":[ { @@ -30,6 +30,7 @@ "duration":100, "tileid":3 }], + "class":"tile", "id":0, "image":"..\/..\/..\/images\/tile_01.png", "imageheight":32, @@ -39,10 +40,10 @@ "name":"float property", "type":"float", "value":2.2 - }], - "type":"tile" + }] }, { + "class":"tile", "id":1, "image":"..\/..\/..\/images\/tile_02.png", "imageheight":32, @@ -53,23 +54,23 @@ "name":"", "objects":[ { + "class":"", "height":13.7196924896511, "id":2, "name":"", "rotation":0, - "type":"", "visible":true, "width":14.4766410408043, "x":13.4358367829687, "y":13.5304553518628 }, { + "class":"", "ellipse":true, "height":11.070372560615, "id":3, "name":"", "rotation":0, - "type":"", "visible":true, "width":14.287403903016, "x":13.8143110585452, @@ -86,10 +87,10 @@ "name":"string property", "type":"string", "value":"testing" - }], - "type":"tile" + }] }, { + "class":"tile", "id":2, "image":"..\/..\/..\/images\/tile_03.png", "imageheight":32, @@ -99,17 +100,16 @@ "name":"bool property", "type":"bool", "value":true - }], - "type":"tile" + }] }, { + "class":"tile", "id":3, "image":"..\/..\/..\/images\/tile_04.png", "imageheight":32, - "imagewidth":32, - "type":"tile" + "imagewidth":32 }], "tilewidth":32, "type":"tileset", - "version":"1.6" + "version":"1.8" } \ No newline at end of file diff --git a/tests/test_data/map_tests/external_tileset_dif_dir/tileset/tileset.tsx b/tests/test_data/map_tests/external_tileset_dif_dir/tileset/tileset.tsx index 192b15e..d88db42 100644 --- a/tests/test_data/map_tests/external_tileset_dif_dir/tileset/tileset.tsx +++ b/tests/test_data/map_tests/external_tileset_dif_dir/tileset/tileset.tsx @@ -1,7 +1,7 @@ - + - + @@ -13,7 +13,7 @@ - + @@ -25,13 +25,13 @@ - + - + diff --git a/tests/test_data/map_tests/hexagonal/map.json b/tests/test_data/map_tests/hexagonal/map.json index 17f6352..5610b28 100644 --- a/tests/test_data/map_tests/hexagonal/map.json +++ b/tests/test_data/map_tests/hexagonal/map.json @@ -4,7 +4,16 @@ "infinite":false, "layers":[ { - "data":[3, 3, 3, 3, 9, 9, 9, 9, 17, 17, 3, 3, 3, 9, 9, 9, 9, 17, 17, 17, 3, 3, 3, 9, 9, 9, 9, 9, 17, 17, 3, 3, 1, 7, 9, 9, 9, 15, 17, 17, 1, 1, 12, 5, 7, 7, 7, 15, 15, 15, 12, 1, 5, 5, 7, 7, 7, 15, 15, 15, 2, 2, 5, 5, 5, 5, 4, 14, 14, 14, 2, 2, 5, 5, 5, 4, 14, 14, 14, 14, 2, 2, 2, 5, 5, 5, 4, 14, 14, 14, 2, 2, 2, 2, 5, 5, 4, 4, 14, 14], + "data":[3, 3, 3, 3, 9, 9, 9, 9, 17, 17, + 3, 3, 3, 9, 9, 9, 9, 17, 17, 17, + 3, 3, 3, 9, 9, 9, 9, 9, 17, 17, + 3, 3, 1, 7, 9, 9, 9, 15, 17, 17, + 1, 1, 12, 5, 7, 7, 7, 15, 15, 15, + 12, 1, 5, 5, 7, 7, 7, 15, 15, 15, + 2, 2, 5, 5, 5, 5, 4, 14, 14, 14, + 2, 2, 5, 5, 5, 4, 14, 14, 14, 14, + 2, 2, 2, 5, 5, 5, 4, 14, 14, 14, + 2, 2, 2, 2, 5, 5, 4, 4, 14, 14], "height":10, "id":1, "name":"Tile Layer 1", @@ -21,7 +30,7 @@ "renderorder":"right-down", "staggeraxis":"y", "staggerindex":"odd", - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":12, "tilesets":[ { @@ -30,6 +39,6 @@ }], "tilewidth":14, "type":"map", - "version":"1.6", + "version":"1.9", "width":10 } \ No newline at end of file diff --git a/tests/test_data/map_tests/hexagonal/map.tmx b/tests/test_data/map_tests/hexagonal/map.tmx index 482cf3c..aac990c 100644 --- a/tests/test_data/map_tests/hexagonal/map.tmx +++ b/tests/test_data/map_tests/hexagonal/map.tmx @@ -1,5 +1,5 @@ - + diff --git a/tests/test_data/map_tests/hexagonal/tileset.json b/tests/test_data/map_tests/hexagonal/tileset.json index b6bec3c..7927b1a 100644 --- a/tests/test_data/map_tests/hexagonal/tileset.json +++ b/tests/test_data/map_tests/hexagonal/tileset.json @@ -6,7 +6,7 @@ "name":"tileset", "spacing":0, "tilecount":20, - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":18, "tileoffset": { @@ -15,5 +15,5 @@ }, "tilewidth":18, "type":"tileset", - "version":"1.6" + "version":"1.8" } \ No newline at end of file diff --git a/tests/test_data/map_tests/hexagonal/tileset.tsx b/tests/test_data/map_tests/hexagonal/tileset.tsx index cba4d04..84fdee4 100644 --- a/tests/test_data/map_tests/hexagonal/tileset.tsx +++ b/tests/test_data/map_tests/hexagonal/tileset.tsx @@ -1,5 +1,5 @@ - + diff --git a/tests/test_data/map_tests/json_invalid_tileset/map.json b/tests/test_data/map_tests/json_invalid_tileset/map.json index 74476ea..d65ca8e 100644 --- a/tests/test_data/map_tests/json_invalid_tileset/map.json +++ b/tests/test_data/map_tests/json_invalid_tileset/map.json @@ -38,7 +38,7 @@ "value":"Hello, World!!" }], "renderorder":"right-down", - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilesets":[ { @@ -47,6 +47,6 @@ }], "tilewidth":32, "type":"map", - "version":"1.6", + "version":"1.9", "width":8 } \ No newline at end of file diff --git a/tests/test_data/map_tests/no_background_color/map.json b/tests/test_data/map_tests/no_background_color/map.json index 8e2a2d6..d99c0cc 100644 --- a/tests/test_data/map_tests/no_background_color/map.json +++ b/tests/test_data/map_tests/no_background_color/map.json @@ -6,7 +6,7 @@ "nextobjectid":1, "orientation":"orthogonal", "renderorder":"right-down", - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilesets":[ { @@ -15,6 +15,6 @@ }], "tilewidth":32, "type":"map", - "version":"1.6", + "version":"1.9", "width":8 } \ No newline at end of file diff --git a/tests/test_data/map_tests/no_background_color/map.tmx b/tests/test_data/map_tests/no_background_color/map.tmx index 7e71558..5329c56 100644 --- a/tests/test_data/map_tests/no_background_color/map.tmx +++ b/tests/test_data/map_tests/no_background_color/map.tmx @@ -1,4 +1,4 @@ - + diff --git a/tests/test_data/map_tests/no_background_color/tileset.json b/tests/test_data/map_tests/no_background_color/tileset.json index 1a07451..0879fe6 100644 --- a/tests/test_data/map_tests/no_background_color/tileset.json +++ b/tests/test_data/map_tests/no_background_color/tileset.json @@ -6,9 +6,9 @@ "name":"tile_set_image", "spacing":1, "tilecount":48, - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilewidth":32, "type":"tileset", - "version":"1.6" + "version":"1.8" } \ No newline at end of file diff --git a/tests/test_data/map_tests/no_background_color/tileset.tsx b/tests/test_data/map_tests/no_background_color/tileset.tsx index 8b1cf24..ebde4f1 100644 --- a/tests/test_data/map_tests/no_background_color/tileset.tsx +++ b/tests/test_data/map_tests/no_background_color/tileset.tsx @@ -1,4 +1,4 @@ - + diff --git a/tests/test_data/map_tests/no_layers/map.json b/tests/test_data/map_tests/no_layers/map.json index 99c24bc..595a195 100644 --- a/tests/test_data/map_tests/no_layers/map.json +++ b/tests/test_data/map_tests/no_layers/map.json @@ -38,7 +38,7 @@ "value":"Hello, World!!" }], "renderorder":"right-down", - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilesets":[ { @@ -47,6 +47,6 @@ }], "tilewidth":32, "type":"map", - "version":"1.6", + "version":"1.9", "width":8 } \ No newline at end of file diff --git a/tests/test_data/map_tests/no_layers/tileset.json b/tests/test_data/map_tests/no_layers/tileset.json index 1a07451..0879fe6 100644 --- a/tests/test_data/map_tests/no_layers/tileset.json +++ b/tests/test_data/map_tests/no_layers/tileset.json @@ -6,9 +6,9 @@ "name":"tile_set_image", "spacing":1, "tilecount":48, - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilewidth":32, "type":"tileset", - "version":"1.6" + "version":"1.8" } \ No newline at end of file diff --git a/tests/test_data/map_tests/template/expected.py b/tests/test_data/map_tests/template/expected.py index 79f1f16..cb227a5 100644 --- a/tests/test_data/map_tests/template/expected.py +++ b/tests/test_data/map_tests/template/expected.py @@ -21,14 +21,14 @@ EXPECTED = tiled_map.TiledMap( 98.4987608686521, 46.2385012811358 ), visible=True, - type="", + class_="", ), tiled_object.Tile( id=6, coordinates=common_types.OrderedPair(46, 136.666666666667), name="", rotation=0, - type="", + class_="", visible=True, size=common_types.Size(32, 32), gid=49, @@ -38,7 +38,7 @@ EXPECTED = tiled_map.TiledMap( coordinates=common_types.OrderedPair(141.333333333333, 148), name="", rotation=0, - type="", + class_="", visible=True, size=common_types.Size(32, 32), gid=50, diff --git a/tests/test_data/map_tests/template/map.json b/tests/test_data/map_tests/template/map.json index e1d0727..c578be3 100644 --- a/tests/test_data/map_tests/template/map.json +++ b/tests/test_data/map_tests/template/map.json @@ -67,7 +67,7 @@ "value":"Hello, World!!" }], "renderorder":"right-down", - "tiledversion":"1.7.1", + "tiledversion":"1.9.0", "tileheight":32, "tilesets":[ { @@ -80,6 +80,6 @@ }], "tilewidth":32, "type":"map", - "version":"1.6", + "version":"1.9", "width":8 } \ No newline at end of file diff --git a/tests/test_data/map_tests/template/map.tmx b/tests/test_data/map_tests/template/map.tmx index 24cc2f0..255e0d1 100644 --- a/tests/test_data/map_tests/template/map.tmx +++ b/tests/test_data/map_tests/template/map.tmx @@ -1,5 +1,5 @@ - + diff --git a/tests/test_data/map_tests/template/template-rectangle.json b/tests/test_data/map_tests/template/template-rectangle.json index fc39229..3bed3fa 100644 --- a/tests/test_data/map_tests/template/template-rectangle.json +++ b/tests/test_data/map_tests/template/template-rectangle.json @@ -4,7 +4,7 @@ "id":1, "name":"", "rotation":0, - "type":"", + "class":"", "visible":true, "width":63.6585878103079 }, diff --git a/tests/test_data/map_tests/template/template-tile-image.json b/tests/test_data/map_tests/template/template-tile-image.json index 5ba6682..05f52ed 100644 --- a/tests/test_data/map_tests/template/template-tile-image.json +++ b/tests/test_data/map_tests/template/template-tile-image.json @@ -5,7 +5,7 @@ "id":7, "name":"", "rotation":0, - "type":"", + "class":"", "visible":true, "width":32 }, diff --git a/tests/test_data/map_tests/template/template-tile-spritesheet.json b/tests/test_data/map_tests/template/template-tile-spritesheet.json index daba510..da6e00b 100644 --- a/tests/test_data/map_tests/template/template-tile-spritesheet.json +++ b/tests/test_data/map_tests/template/template-tile-spritesheet.json @@ -5,7 +5,7 @@ "id":6, "name":"", "rotation":0, - "type":"", + "class":"", "visible":true, "width":32 }, diff --git a/tests/test_data/map_tests/template/tileset.json b/tests/test_data/map_tests/template/tileset.json index 1a07451..0879fe6 100644 --- a/tests/test_data/map_tests/template/tileset.json +++ b/tests/test_data/map_tests/template/tileset.json @@ -6,9 +6,9 @@ "name":"tile_set_image", "spacing":1, "tilecount":48, - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilewidth":32, "type":"tileset", - "version":"1.6" + "version":"1.8" } \ No newline at end of file diff --git a/tests/test_data/map_tests/template/tileset.tsx b/tests/test_data/map_tests/template/tileset.tsx index 8aee17a..ebde4f1 100644 --- a/tests/test_data/map_tests/template/tileset.tsx +++ b/tests/test_data/map_tests/template/tileset.tsx @@ -1,4 +1,4 @@ - + diff --git a/tests/test_data/tilesets/image/tileset.json b/tests/test_data/tilesets/image/tileset.json index fe47118..af7d40b 100644 --- a/tests/test_data/tilesets/image/tileset.json +++ b/tests/test_data/tilesets/image/tileset.json @@ -7,7 +7,7 @@ "objectalignment":"topleft", "spacing":1, "tilecount":48, - "tiledversion":"1.8.5", + "tiledversion":"1.9.0", "tileheight":32, "tilewidth":32, "type":"tileset", diff --git a/tests/test_data/tilesets/image/tileset.tsx b/tests/test_data/tilesets/image/tileset.tsx index ccff966..3b2c4c0 100644 --- a/tests/test_data/tilesets/image/tileset.tsx +++ b/tests/test_data/tilesets/image/tileset.tsx @@ -1,4 +1,4 @@ - + diff --git a/tests/test_data/tilesets/image_background_color/tileset.json b/tests/test_data/tilesets/image_background_color/tileset.json index db8b40f..a7be39f 100644 --- a/tests/test_data/tilesets/image_background_color/tileset.json +++ b/tests/test_data/tilesets/image_background_color/tileset.json @@ -7,9 +7,9 @@ "name":"tile_set_image", "spacing":1, "tilecount":48, - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilewidth":32, "type":"tileset", - "version":"1.6" + "version":"1.8" } \ No newline at end of file diff --git a/tests/test_data/tilesets/image_background_color/tileset.tsx b/tests/test_data/tilesets/image_background_color/tileset.tsx index 25cae9b..7ab7030 100644 --- a/tests/test_data/tilesets/image_background_color/tileset.tsx +++ b/tests/test_data/tilesets/image_background_color/tileset.tsx @@ -1,4 +1,4 @@ - + diff --git a/tests/test_data/tilesets/image_grid/tileset.json b/tests/test_data/tilesets/image_grid/tileset.json index 7bcbf1e..fdf5118 100644 --- a/tests/test_data/tilesets/image_grid/tileset.json +++ b/tests/test_data/tilesets/image_grid/tileset.json @@ -20,9 +20,9 @@ "name":"tile_set_image", "spacing":1, "tilecount":48, - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilewidth":32, "type":"tileset", - "version":"1.6" + "version":"1.8" } \ No newline at end of file diff --git a/tests/test_data/tilesets/image_grid/tileset.tsx b/tests/test_data/tilesets/image_grid/tileset.tsx index 62ef87e..5e33f6c 100644 --- a/tests/test_data/tilesets/image_grid/tileset.tsx +++ b/tests/test_data/tilesets/image_grid/tileset.tsx @@ -1,5 +1,5 @@ - + diff --git a/tests/test_data/tilesets/image_properties/tileset.json b/tests/test_data/tilesets/image_properties/tileset.json index 3a698fa..b892805 100644 --- a/tests/test_data/tilesets/image_properties/tileset.json +++ b/tests/test_data/tilesets/image_properties/tileset.json @@ -40,9 +40,9 @@ }], "spacing":1, "tilecount":48, - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilewidth":32, "type":"tileset", - "version":"1.6" + "version":"1.8" } \ No newline at end of file diff --git a/tests/test_data/tilesets/image_properties/tileset.tsx b/tests/test_data/tilesets/image_properties/tileset.tsx index 42478ae..863c085 100644 --- a/tests/test_data/tilesets/image_properties/tileset.tsx +++ b/tests/test_data/tilesets/image_properties/tileset.tsx @@ -1,5 +1,5 @@ - + diff --git a/tests/test_data/tilesets/image_tile_offset/tileset.json b/tests/test_data/tilesets/image_tile_offset/tileset.json index 5e0e99a..3be9bef 100644 --- a/tests/test_data/tilesets/image_tile_offset/tileset.json +++ b/tests/test_data/tilesets/image_tile_offset/tileset.json @@ -14,7 +14,7 @@ "name":"tile_set_image", "spacing":1, "tilecount":48, - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tileoffset": { @@ -23,5 +23,5 @@ }, "tilewidth":32, "type":"tileset", - "version":"1.6" + "version":"1.8" } \ No newline at end of file diff --git a/tests/test_data/tilesets/image_tile_offset/tileset.tsx b/tests/test_data/tilesets/image_tile_offset/tileset.tsx index 7c0c1bc..bf97ee9 100644 --- a/tests/test_data/tilesets/image_tile_offset/tileset.tsx +++ b/tests/test_data/tilesets/image_tile_offset/tileset.tsx @@ -1,5 +1,5 @@ - + diff --git a/tests/test_data/tilesets/image_transformations/tileset.json b/tests/test_data/tilesets/image_transformations/tileset.json index 134873c..a1672ea 100644 --- a/tests/test_data/tilesets/image_transformations/tileset.json +++ b/tests/test_data/tilesets/image_transformations/tileset.json @@ -6,7 +6,7 @@ "name":"tile_set_image", "spacing":1, "tilecount":48, - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilewidth":32, "transformations": @@ -17,5 +17,5 @@ "vflip":false }, "type":"tileset", - "version":"1.6" + "version":"1.8" } \ No newline at end of file diff --git a/tests/test_data/tilesets/image_transformations/tileset.tsx b/tests/test_data/tilesets/image_transformations/tileset.tsx index 5b20f69..32bd773 100644 --- a/tests/test_data/tilesets/image_transformations/tileset.tsx +++ b/tests/test_data/tilesets/image_transformations/tileset.tsx @@ -1,5 +1,5 @@ - + diff --git a/tests/test_data/tilesets/image_transparent_color/tileset.json b/tests/test_data/tilesets/image_transparent_color/tileset.json index a6f17d7..b12e884 100644 --- a/tests/test_data/tilesets/image_transparent_color/tileset.json +++ b/tests/test_data/tilesets/image_transparent_color/tileset.json @@ -6,10 +6,10 @@ "name":"tileset", "spacing":1, "tilecount":48, - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilewidth":32, "transparentcolor":"#ff00ff", "type":"tileset", - "version":"1.6" + "version":"1.8" } \ No newline at end of file diff --git a/tests/test_data/tilesets/image_transparent_color/tileset.tsx b/tests/test_data/tilesets/image_transparent_color/tileset.tsx index 5ab0346..308f422 100644 --- a/tests/test_data/tilesets/image_transparent_color/tileset.tsx +++ b/tests/test_data/tilesets/image_transparent_color/tileset.tsx @@ -1,4 +1,4 @@ - + diff --git a/tests/test_data/tilesets/individual_images/expected.py b/tests/test_data/tilesets/individual_images/expected.py index 5f8f6c8..1d19ade 100644 --- a/tests/test_data/tilesets/individual_images/expected.py +++ b/tests/test_data/tilesets/individual_images/expected.py @@ -28,7 +28,7 @@ EXPECTED = tileset.Tileset( image_height=32, image_width=32, properties={"float property": 2.2}, - type="tile", + class_="tile", ), 1: tileset.Tile( id=1, @@ -46,7 +46,7 @@ EXPECTED = tileset.Tileset( name="", size=common_types.Size(14.4766410408043, 13.7196924896511), rotation=0, - type="", + class_="", visible=True, coordinates=common_types.OrderedPair( 13.4358367829687, 13.5304553518628 @@ -57,7 +57,7 @@ EXPECTED = tileset.Tileset( name="", size=common_types.Size(14.287403903016, 11.070372560615), rotation=0, - type="", + class_="", visible=True, coordinates=common_types.OrderedPair( 13.8143110585452, 1.98698994677705 @@ -66,7 +66,7 @@ EXPECTED = tileset.Tileset( ], ), properties={"string property": "testing"}, - type="tile", + class_="tile", ), 2: tileset.Tile( id=2, @@ -74,14 +74,14 @@ EXPECTED = tileset.Tileset( image_height=32, image_width=32, properties={"bool property": True}, - type="tile", + class_="tile", ), 3: tileset.Tile( id=3, image=Path("../../images/tile_04.png"), image_height=32, image_width=32, - type="tile", + class_="tile", ), }, ) diff --git a/tests/test_data/tilesets/individual_images/tileset.json b/tests/test_data/tilesets/individual_images/tileset.json index fdadc85..3d7b412 100644 --- a/tests/test_data/tilesets/individual_images/tileset.json +++ b/tests/test_data/tilesets/individual_images/tileset.json @@ -9,7 +9,7 @@ "name":"tileset", "spacing":0, "tilecount":4, - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tiles":[ { @@ -30,6 +30,7 @@ "duration":100, "tileid":3 }], + "class":"tile", "id":0, "image":"..\/..\/images\/tile_01.png", "imageheight":32, @@ -39,10 +40,10 @@ "name":"float property", "type":"float", "value":2.2 - }], - "type":"tile" + }] }, { + "class":"tile", "id":1, "image":"..\/..\/images\/tile_02.png", "imageheight":32, @@ -53,23 +54,23 @@ "name":"", "objects":[ { + "class":"", "height":13.7196924896511, "id":2, "name":"", "rotation":0, - "type":"", "visible":true, "width":14.4766410408043, "x":13.4358367829687, "y":13.5304553518628 }, { + "class":"", "ellipse":true, "height":11.070372560615, "id":3, "name":"", "rotation":0, - "type":"", "visible":true, "width":14.287403903016, "x":13.8143110585452, @@ -86,10 +87,10 @@ "name":"string property", "type":"string", "value":"testing" - }], - "type":"tile" + }] }, { + "class":"tile", "id":2, "image":"..\/..\/images\/tile_03.png", "imageheight":32, @@ -99,17 +100,16 @@ "name":"bool property", "type":"bool", "value":true - }], - "type":"tile" + }] }, { + "class":"tile", "id":3, "image":"..\/..\/images\/tile_04.png", "imageheight":32, - "imagewidth":32, - "type":"tile" + "imagewidth":32 }], "tilewidth":32, "type":"tileset", - "version":"1.6" + "version":"1.8" } \ No newline at end of file diff --git a/tests/test_data/tilesets/individual_images/tileset.tsx b/tests/test_data/tilesets/individual_images/tileset.tsx index 877cf79..3e8a0f9 100644 --- a/tests/test_data/tilesets/individual_images/tileset.tsx +++ b/tests/test_data/tilesets/individual_images/tileset.tsx @@ -1,7 +1,7 @@ - + - + @@ -13,7 +13,7 @@ - + @@ -25,13 +25,13 @@ - + - + diff --git a/tests/test_data/tilesets/terrain/tileset.json b/tests/test_data/tilesets/terrain/tileset.json index bcb3614..2c48c7f 100644 --- a/tests/test_data/tilesets/terrain/tileset.json +++ b/tests/test_data/tilesets/terrain/tileset.json @@ -6,7 +6,7 @@ "name":"tileset", "spacing":1, "tilecount":48, - "tiledversion":"1.8.5", + "tiledversion":"1.9.0", "tileheight":32, "tilewidth":32, "type":"tileset", diff --git a/tests/test_data/tilesets/terrain/tileset.tsx b/tests/test_data/tilesets/terrain/tileset.tsx index a22e1c5..2a325cc 100644 --- a/tests/test_data/tilesets/terrain/tileset.tsx +++ b/tests/test_data/tilesets/terrain/tileset.tsx @@ -1,5 +1,5 @@ - + diff --git a/tests/test_data/world_tests/both/map_manual_one.json b/tests/test_data/world_tests/both/map_manual_one.json index db2e54a..b48c09d 100644 --- a/tests/test_data/world_tests/both/map_manual_one.json +++ b/tests/test_data/world_tests/both/map_manual_one.json @@ -3,7 +3,11 @@ "infinite":false, "layers":[ { - "data":[30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30], + "data":[30, 30, 30, 30, 30, + 30, 30, 30, 30, 30, + 30, 30, 30, 30, 30, + 30, 30, 30, 30, 30, + 30, 30, 30, 30, 30], "height":5, "id":1, "name":"Tile Layer 1", @@ -18,7 +22,7 @@ "nextobjectid":1, "orientation":"orthogonal", "renderorder":"right-down", - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilesets":[ { @@ -27,6 +31,6 @@ }], "tilewidth":32, "type":"map", - "version":"1.6", + "version":"1.9", "width":5 } \ No newline at end of file diff --git a/tests/test_data/world_tests/both/map_p0-n0.json b/tests/test_data/world_tests/both/map_p0-n0.json index db2e54a..b48c09d 100644 --- a/tests/test_data/world_tests/both/map_p0-n0.json +++ b/tests/test_data/world_tests/both/map_p0-n0.json @@ -3,7 +3,11 @@ "infinite":false, "layers":[ { - "data":[30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30], + "data":[30, 30, 30, 30, 30, + 30, 30, 30, 30, 30, + 30, 30, 30, 30, 30, + 30, 30, 30, 30, 30, + 30, 30, 30, 30, 30], "height":5, "id":1, "name":"Tile Layer 1", @@ -18,7 +22,7 @@ "nextobjectid":1, "orientation":"orthogonal", "renderorder":"right-down", - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilesets":[ { @@ -27,6 +31,6 @@ }], "tilewidth":32, "type":"map", - "version":"1.6", + "version":"1.9", "width":5 } \ No newline at end of file diff --git a/tests/test_data/world_tests/both/map_p0-n1.json b/tests/test_data/world_tests/both/map_p0-n1.json index db2e54a..b48c09d 100644 --- a/tests/test_data/world_tests/both/map_p0-n1.json +++ b/tests/test_data/world_tests/both/map_p0-n1.json @@ -3,7 +3,11 @@ "infinite":false, "layers":[ { - "data":[30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30], + "data":[30, 30, 30, 30, 30, + 30, 30, 30, 30, 30, + 30, 30, 30, 30, 30, + 30, 30, 30, 30, 30, + 30, 30, 30, 30, 30], "height":5, "id":1, "name":"Tile Layer 1", @@ -18,7 +22,7 @@ "nextobjectid":1, "orientation":"orthogonal", "renderorder":"right-down", - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilesets":[ { @@ -27,6 +31,6 @@ }], "tilewidth":32, "type":"map", - "version":"1.6", + "version":"1.9", "width":5 } \ No newline at end of file diff --git a/tests/test_data/world_tests/both/tileset.json b/tests/test_data/world_tests/both/tileset.json index 6f07285..2aff7d4 100644 --- a/tests/test_data/world_tests/both/tileset.json +++ b/tests/test_data/world_tests/both/tileset.json @@ -6,9 +6,9 @@ "name":"tileset", "spacing":1, "tilecount":48, - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilewidth":32, "type":"tileset", - "version":"1.6" + "version":"1.8" } \ No newline at end of file diff --git a/tests/test_data/world_tests/pattern_matched/map_p0-n0.json b/tests/test_data/world_tests/pattern_matched/map_p0-n0.json index db2e54a..b48c09d 100644 --- a/tests/test_data/world_tests/pattern_matched/map_p0-n0.json +++ b/tests/test_data/world_tests/pattern_matched/map_p0-n0.json @@ -3,7 +3,11 @@ "infinite":false, "layers":[ { - "data":[30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30], + "data":[30, 30, 30, 30, 30, + 30, 30, 30, 30, 30, + 30, 30, 30, 30, 30, + 30, 30, 30, 30, 30, + 30, 30, 30, 30, 30], "height":5, "id":1, "name":"Tile Layer 1", @@ -18,7 +22,7 @@ "nextobjectid":1, "orientation":"orthogonal", "renderorder":"right-down", - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilesets":[ { @@ -27,6 +31,6 @@ }], "tilewidth":32, "type":"map", - "version":"1.6", + "version":"1.9", "width":5 } \ No newline at end of file diff --git a/tests/test_data/world_tests/pattern_matched/tileset.json b/tests/test_data/world_tests/pattern_matched/tileset.json index 6f07285..2aff7d4 100644 --- a/tests/test_data/world_tests/pattern_matched/tileset.json +++ b/tests/test_data/world_tests/pattern_matched/tileset.json @@ -6,9 +6,9 @@ "name":"tileset", "spacing":1, "tilecount":48, - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilewidth":32, "type":"tileset", - "version":"1.6" + "version":"1.8" } \ No newline at end of file diff --git a/tests/test_data/world_tests/static_defined/map_01.json b/tests/test_data/world_tests/static_defined/map_01.json index db2e54a..b48c09d 100644 --- a/tests/test_data/world_tests/static_defined/map_01.json +++ b/tests/test_data/world_tests/static_defined/map_01.json @@ -3,7 +3,11 @@ "infinite":false, "layers":[ { - "data":[30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30], + "data":[30, 30, 30, 30, 30, + 30, 30, 30, 30, 30, + 30, 30, 30, 30, 30, + 30, 30, 30, 30, 30, + 30, 30, 30, 30, 30], "height":5, "id":1, "name":"Tile Layer 1", @@ -18,7 +22,7 @@ "nextobjectid":1, "orientation":"orthogonal", "renderorder":"right-down", - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilesets":[ { @@ -27,6 +31,6 @@ }], "tilewidth":32, "type":"map", - "version":"1.6", + "version":"1.9", "width":5 } \ No newline at end of file diff --git a/tests/test_data/world_tests/static_defined/map_02.json b/tests/test_data/world_tests/static_defined/map_02.json index db2e54a..b48c09d 100644 --- a/tests/test_data/world_tests/static_defined/map_02.json +++ b/tests/test_data/world_tests/static_defined/map_02.json @@ -3,7 +3,11 @@ "infinite":false, "layers":[ { - "data":[30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30], + "data":[30, 30, 30, 30, 30, + 30, 30, 30, 30, 30, + 30, 30, 30, 30, 30, + 30, 30, 30, 30, 30, + 30, 30, 30, 30, 30], "height":5, "id":1, "name":"Tile Layer 1", @@ -18,7 +22,7 @@ "nextobjectid":1, "orientation":"orthogonal", "renderorder":"right-down", - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilesets":[ { @@ -27,6 +31,6 @@ }], "tilewidth":32, "type":"map", - "version":"1.6", + "version":"1.9", "width":5 } \ No newline at end of file diff --git a/tests/test_data/world_tests/static_defined/tileset.json b/tests/test_data/world_tests/static_defined/tileset.json index 6f07285..2aff7d4 100644 --- a/tests/test_data/world_tests/static_defined/tileset.json +++ b/tests/test_data/world_tests/static_defined/tileset.json @@ -6,9 +6,9 @@ "name":"tileset", "spacing":1, "tilecount":48, - "tiledversion":"1.6.0", + "tiledversion":"1.9.0", "tileheight":32, "tilewidth":32, "type":"tileset", - "version":"1.6" + "version":"1.8" } \ No newline at end of file diff --git a/tests/test_tiled_object_json.py b/tests/test_tiled_object_json.py index eacbc3e..90daf31 100644 --- a/tests/test_tiled_object_json.py +++ b/tests/test_tiled_object_json.py @@ -38,7 +38,7 @@ ELLIPSES = [ size=common_types.Size(57.4013868364215, 18.5517790155735), name="name: ellipse", rotation=0, - type="ellipse", + class_="ellipse", visible=True, coordinates=common_types.OrderedPair(37.5400704785722, 81.1913152210981), ), @@ -63,7 +63,7 @@ ELLIPSES = [ size=common_types.Size(6.32943048766625, 31.4288962146186), name="name: ellipse - invisible", rotation=0, - type="ellipse", + class_="ellipse", visible=False, coordinates=common_types.OrderedPair(22.6986472661134, 53.9092872570194), ), @@ -88,7 +88,7 @@ ELLIPSES = [ size=common_types.Size(29.6828464249176, 24.2264408321018), name="name: ellipse - rotated", rotation=111, - type="ellipse", + class_="ellipse", visible=True, coordinates=common_types.OrderedPair(35.7940206888712, 120.040923041946), ), @@ -112,7 +112,7 @@ ELLIPSES = [ id=29, name="name: ellipse - no width or height", rotation=0, - type="ellipse", + class_="ellipse", visible=True, coordinates=common_types.OrderedPair(72.4610662725929, 127.679890871888), ), @@ -139,7 +139,7 @@ RECTANGLES = [ size=common_types.Size(45.3972945322269, 41.4686825053996), name="name: rectangle", rotation=0, - type="rectangle", + class_="rectangle", visible=True, coordinates=common_types.OrderedPair(27.7185404115039, 23.571672160964), ), @@ -163,7 +163,7 @@ RECTANGLES = [ size=common_types.Size(30.9923837671934, 32.7384335568944), name="name: rectangle - invisible", rotation=0, - type="rectangle", + class_="rectangle", visible=False, coordinates=common_types.OrderedPair(163.910424008185, 91.0128452881664), ), @@ -187,7 +187,7 @@ RECTANGLES = [ size=common_types.Size(10, 22), name="name: rectangle - rotated", rotation=10, - type="rectangle", + class_="rectangle", visible=True, coordinates=common_types.OrderedPair(183.335227918609, 23.3534159372513), ), @@ -211,7 +211,7 @@ RECTANGLES = [ size=common_types.Size(0, 0), name="name: rectangle - no width or height", rotation=0, - type="rectangle", + class_="rectangle", visible=True, coordinates=common_types.OrderedPair(131.17199045129, 53.4727748095942), ), @@ -266,7 +266,7 @@ RECTANGLES = [ size=common_types.Size(21.170853700125, 13.7501420938956), name="name: rectangle - properties", rotation=0, - type="rectangle", + class_="rectangle", visible=True, coordinates=common_types.OrderedPair(39.0678640445606, 131.826759122428), properties={ @@ -301,7 +301,7 @@ POINTS = [ id=2, name="name: point", rotation=0, - type="point", + class_="point", visible=True, coordinates=common_types.OrderedPair(159.981811981357, 82.9373650107991), ), @@ -325,7 +325,7 @@ POINTS = [ id=3, name="name: point invisible", rotation=0, - type="point", + class_="point", visible=False, coordinates=common_types.OrderedPair(109.346368080027, 95.8144822098443), ), @@ -353,7 +353,7 @@ TILES = [ size=common_types.Size(32, 32), name="name: tile", rotation=0, - type="tile", + class_="tile", visible=True, coordinates=common_types.OrderedPair(111.898147095601, 48.3019211094691), gid=79, @@ -379,7 +379,7 @@ TILES = [ size=common_types.Size(32, 32), name="name: tile - invisible", rotation=0, - type="tile", + class_="tile", visible=False, coordinates=common_types.OrderedPair(41.1831306127089, 168.779356598841), gid=80, @@ -405,7 +405,7 @@ TILES = [ size=common_types.Size(32, 32), name="name: tile - horizontal flipped", rotation=0, - type="tile", + class_="tile", visible=True, coordinates=common_types.OrderedPair(197.236330567239, 59.8695009662385), gid=2147483742, @@ -431,7 +431,7 @@ TILES = [ size=common_types.Size(32, 32), name="name: tile - vertical flipped", rotation=0, - type="tile", + class_="tile", visible=True, coordinates=common_types.OrderedPair(32.4528816642037, 60.742525861089), gid=1073741918, @@ -457,7 +457,7 @@ TILES = [ size=common_types.Size(32, 32), name="name: tile - both flipped", rotation=0, - type="tile", + class_="tile", visible=True, coordinates=common_types.OrderedPair(167.553484142321, 95.6635216551097), gid=3221225558, @@ -483,7 +483,7 @@ TILES = [ size=common_types.Size(32, 32), name="name: tile - rotated", rotation=89, - type="tile", + class_="tile", visible=True, coordinates=common_types.OrderedPair(85.65, 142.62), gid=86, @@ -538,7 +538,7 @@ POLYGONS = [ common_types.OrderedPair(25.317721950665, 16.3692167784472), ], rotation=0, - type="polygon", + class_="polygon", visible=True, coordinates=common_types.OrderedPair(89.485051722178, 38.6313515971354), ), @@ -579,7 +579,7 @@ POLYGONS = [ common_types.OrderedPair(-14.8414232124588, -10.2580425144936), ], rotation=0, - type="polygon", + class_="polygon", visible=False, coordinates=common_types.OrderedPair(133.791065135842, 24.4446970558145), ), @@ -635,7 +635,7 @@ POLYGONS = [ common_types.OrderedPair(-3.71035580311471, 8.29373650107991), ], rotation=123, - type="polygon", + class_="polygon", visible=True, coordinates=common_types.OrderedPair(152.779356598841, 19.8613163578493), ), @@ -679,7 +679,7 @@ POLYLINES = [ common_types.OrderedPair(21.3891099238377, 16.8057292258725), ], rotation=0, - type="polyline", + class_="polyline", visible=True, coordinates=common_types.OrderedPair(124.187791292486, 90.1398203933159), ), @@ -720,7 +720,7 @@ POLYLINES = [ common_types.OrderedPair(5, 23.6666666666667), ], rotation=0, - type="polyline", + class_="polyline", visible=False, coordinates=common_types.OrderedPair(140, 163.333333333333), ), @@ -761,7 +761,7 @@ POLYLINES = [ common_types.OrderedPair(-5.33333333333331, 19.6666666666667), ], rotation=0, - type="polyline", + class_="polyline", visible=True, coordinates=common_types.OrderedPair(192.333333333333, 128.666666666667), ), @@ -792,7 +792,7 @@ TEXTS = [ id=19, name="name: text", text="Hello World", - type="text", + class_="text", wrap=True, rotation=0, visible=True, @@ -824,7 +824,7 @@ TEXTS = [ name="name: text - invisible", text="Hello World", wrap=True, - type="text", + class_="text", rotation=0, visible=False, size=common_types.Size(92.375, 19), @@ -856,7 +856,7 @@ TEXTS = [ text="Hello World", wrap=True, rotation=19, - type="text", + class_="text", visible=True, size=common_types.Size(92.375, 19), coordinates=common_types.OrderedPair(157.882069171308, 78.4572581561896), @@ -893,7 +893,7 @@ TEXTS = [ font_family="DejaVu Sans", font_size=19, rotation=0, - type="text", + class_="text", visible=True, size=common_types.Size(92.375, 19), coordinates=common_types.OrderedPair(2.70189411162896, 101.592417869728), @@ -922,7 +922,7 @@ TEXTS = [ name="name: text - no word wrap", text="Hello World", rotation=0, - type="text", + class_="text", visible=True, size=common_types.Size(92.375, 19), coordinates=common_types.OrderedPair(9.90434949414573, 154.192167784472), @@ -957,7 +957,7 @@ TEXTS = [ horizontal_align="right", vertical_align="bottom", rotation=0, - type="text", + class_="text", visible=True, size=common_types.Size(92.375, 19), coordinates=common_types.OrderedPair(151.989151131067, 1.19455496191883), @@ -991,7 +991,7 @@ TEXTS = [ wrap=True, horizontal_align="center", vertical_align="center", - type="text", + class_="text", visible=True, size=common_types.Size(92.375, 19), coordinates=common_types.OrderedPair(4.22968767761736, 3.81362964647039), @@ -1023,7 +1023,7 @@ TEXTS = [ text="Hello World", wrap=True, horizontal_align="justify", - type="text", + class_="text", visible=True, size=common_types.Size(92.375, 19), coordinates=common_types.OrderedPair(13.8329615209731, 60.7785040354666), @@ -1055,7 +1055,7 @@ TEXTS = [ text="Hello World", wrap=True, color=common_types.Color(170, 0, 0, 255), - type="text", + class_="text", visible=True, size=common_types.Size(92.375, 19), coordinates=common_types.OrderedPair(96.3338140843469, 130.620495623508), @@ -1096,7 +1096,7 @@ TEXTS = [ text="Hello World", underline=True, wrap=True, - type="text", + class_="text", visible=True, size=common_types.Size(92.375, 19), coordinates=common_types.OrderedPair(33, 22), diff --git a/tests/test_tiled_object_tmx.py b/tests/test_tiled_object_tmx.py index 7a1fa40..702ced3 100644 --- a/tests/test_tiled_object_tmx.py +++ b/tests/test_tiled_object_tmx.py @@ -460,7 +460,7 @@ TILES = [ id=13, size=common_types.Size(32, 32), name="tile - invisible", - type="tile", + class_="tile", coordinates=common_types.OrderedPair(111.8981, 48.3019), gid=79, visible=False,