Skip to content

Commit 62202b3

Browse files
committed
Remove unnecessary check for template tileset loading
1 parent 0213a84 commit 62202b3

File tree

1 file changed

+22
-23
lines changed

1 file changed

+22
-23
lines changed

pytiled_parser/parsers/json/tiled_map.py

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -127,31 +127,30 @@ def parse(file: Path) -> TiledMap:
127127
for my_layer in layers:
128128
for tiled_object in my_layer.tiled_objects: # type: ignore
129129
if hasattr(tiled_object, "new_tileset"):
130-
if tiled_object.new_tileset:
131-
already_loaded = None
132-
for val in map_.tilesets.values():
133-
if val.name == tiled_object.new_tileset["name"]:
134-
already_loaded = val
135-
break
136-
137-
if not already_loaded:
138-
highest_firstgid = max(map_.tilesets.keys())
139-
last_tileset_count = map_.tilesets[highest_firstgid].tile_count
140-
new_firstgid = highest_firstgid + last_tileset_count
141-
map_.tilesets[new_firstgid] = parse_json_tileset(
142-
tiled_object.new_tileset,
143-
new_firstgid,
144-
tiled_object.new_tileset_path,
145-
)
146-
tiled_object.gid = tiled_object.gid + (new_firstgid - 1)
130+
already_loaded = None
131+
for val in map_.tilesets.values():
132+
if val.name == tiled_object.new_tileset["name"]:
133+
already_loaded = val
134+
break
135+
136+
if not already_loaded:
137+
highest_firstgid = max(map_.tilesets.keys())
138+
last_tileset_count = map_.tilesets[highest_firstgid].tile_count
139+
new_firstgid = highest_firstgid + last_tileset_count
140+
map_.tilesets[new_firstgid] = parse_json_tileset(
141+
tiled_object.new_tileset,
142+
new_firstgid,
143+
tiled_object.new_tileset_path,
144+
)
145+
tiled_object.gid = tiled_object.gid + (new_firstgid - 1)
147146

148-
else:
149-
tiled_object.gid = tiled_object.gid + (
150-
already_loaded.firstgid - 1
151-
)
147+
else:
148+
tiled_object.gid = tiled_object.gid + (
149+
already_loaded.firstgid - 1
150+
)
152151

153-
tiled_object.new_tileset = None
154-
tiled_object.new_tileset_path = None
152+
tiled_object.new_tileset = None
153+
tiled_object.new_tileset_path = None
155154

156155
if raw_tiled_map.get("backgroundcolor") is not None:
157156
map_.background_color = parse_color(raw_tiled_map["backgroundcolor"])

0 commit comments

Comments
 (0)