diff --git a/basement.json b/basement.json
index ca8b5f3..bf3cfa1 100644
--- a/basement.json
+++ b/basement.json
@@ -469,11 +469,11 @@
{
"columns":18,
"firstgid":321,
- "image":"imgs\/cija_32x32_expansion for Pipoya_CC0.png",
- "imageheight":4256,
+ "image":"imgs\/cija_32x32_expansion for Pipoya_CC0_0000.png",
+ "imageheight":4096,
"imagewidth":576,
"margin":0,
- "name":"cija_32x32_expansion for Pipoya_CC0",
+ "name":"cija_32x32_expansion for Pipoya_CC0 (0, 0)",
"properties":[
{
"name":"tilesetCopyright",
@@ -481,7 +481,26 @@
"value":"CC0"
}],
"spacing":0,
- "tilecount":2394,
+ "tilecount":2304,
+ "tileheight":32,
+ "tilewidth":32
+ },
+ {
+ "columns":18,
+ "firstgid":2625,
+ "image":"imgs\/cija_32x32_expansion for Pipoya_CC0_0001.png",
+ "imageheight":160,
+ "imagewidth":576,
+ "margin":0,
+ "name":"cija_32x32_expansion for Pipoya_CC0 (0, 1)",
+ "properties":[
+ {
+ "name":"tilesetCopyright",
+ "type":"string",
+ "value":"CC0"
+ }],
+ "spacing":0,
+ "tilecount":90,
"tileheight":32,
"tilewidth":32
},
diff --git a/first-floor.json b/first-floor.json
index 2679063..230b853 100644
--- a/first-floor.json
+++ b/first-floor.json
@@ -455,11 +455,11 @@
{
"columns":18,
"firstgid":321,
- "image":"imgs\/cija_32x32_expansion for Pipoya_CC0.png",
- "imageheight":4256,
+ "image":"imgs\/cija_32x32_expansion for Pipoya_CC0_0000.png",
+ "imageheight":4096,
"imagewidth":576,
"margin":0,
- "name":"cija_32x32_expansion for Pipoya_CC0",
+ "name":"cija_32x32_expansion for Pipoya_CC0 (0, 0)",
"properties":[
{
"name":"tilesetCopyright",
@@ -467,7 +467,26 @@
"value":"CC0"
}],
"spacing":0,
- "tilecount":2394,
+ "tilecount":2304,
+ "tileheight":32,
+ "tilewidth":32
+ },
+ {
+ "columns":18,
+ "firstgid":2625,
+ "image":"imgs\/cija_32x32_expansion for Pipoya_CC0_0001.png",
+ "imageheight":160,
+ "imagewidth":576,
+ "margin":0,
+ "name":"cija_32x32_expansion for Pipoya_CC0 (0, 1)",
+ "properties":[
+ {
+ "name":"tilesetCopyright",
+ "type":"string",
+ "value":"CC0"
+ }],
+ "spacing":0,
+ "tilecount":90,
"tileheight":32,
"tilewidth":32
},
diff --git a/heizhaus-basement.tmx b/heizhaus-basement.tmx
index fadfd9e..d50a2a8 100644
--- a/heizhaus-basement.tmx
+++ b/heizhaus-basement.tmx
@@ -18,11 +18,17 @@
-
+
-
+
+
+
+
+
+
+
diff --git a/heizhaus-first-floor.tmx b/heizhaus-first-floor.tmx
index ed15c2b..59cfb81 100644
--- a/heizhaus-first-floor.tmx
+++ b/heizhaus-first-floor.tmx
@@ -18,11 +18,17 @@
-
+
-
+
+
+
+
+
+
+
diff --git a/heizhaus.tmx b/heizhaus.tmx
index caf6579..011eeed 100644
--- a/heizhaus.tmx
+++ b/heizhaus.tmx
@@ -18,11 +18,17 @@
-
+
-
+
+
+
+
+
+
+
diff --git a/imgs/cija_32x32_expansion for Pipoya_CC0.png b/imgs/cija_32x32_expansion for Pipoya_CC0.png
deleted file mode 100644
index 655c555..0000000
Binary files a/imgs/cija_32x32_expansion for Pipoya_CC0.png and /dev/null differ
diff --git a/imgs/cija_32x32_expansion for Pipoya_CC0_0000.png b/imgs/cija_32x32_expansion for Pipoya_CC0_0000.png
new file mode 100644
index 0000000..b715ed9
Binary files /dev/null and b/imgs/cija_32x32_expansion for Pipoya_CC0_0000.png differ
diff --git a/imgs/cija_32x32_expansion for Pipoya_CC0_0001.png b/imgs/cija_32x32_expansion for Pipoya_CC0_0001.png
new file mode 100644
index 0000000..3022958
Binary files /dev/null and b/imgs/cija_32x32_expansion for Pipoya_CC0_0001.png differ
diff --git a/main.json b/main.json
index 5e3541d..b21a811 100644
--- a/main.json
+++ b/main.json
@@ -802,11 +802,11 @@
{
"columns":18,
"firstgid":321,
- "image":"imgs\/cija_32x32_expansion for Pipoya_CC0.png",
- "imageheight":4256,
+ "image":"imgs\/cija_32x32_expansion for Pipoya_CC0_0000.png",
+ "imageheight":4096,
"imagewidth":576,
"margin":0,
- "name":"cija_32x32_expansion for Pipoya_CC0",
+ "name":"cija_32x32_expansion for Pipoya_CC0 (0, 0)",
"properties":[
{
"name":"tilesetCopyright",
@@ -814,7 +814,26 @@
"value":"CC0"
}],
"spacing":0,
- "tilecount":2394,
+ "tilecount":2304,
+ "tileheight":32,
+ "tilewidth":32
+ },
+ {
+ "columns":18,
+ "firstgid":2625,
+ "image":"imgs\/cija_32x32_expansion for Pipoya_CC0_0001.png",
+ "imageheight":160,
+ "imagewidth":576,
+ "margin":0,
+ "name":"cija_32x32_expansion for Pipoya_CC0 (0, 1)",
+ "properties":[
+ {
+ "name":"tilesetCopyright",
+ "type":"string",
+ "value":"CC0"
+ }],
+ "spacing":0,
+ "tilecount":90,
"tileheight":32,
"tilewidth":32
},
diff --git a/mapcleanup.py b/mapcleanup.py
index 7672820..e8fe06c 100755
--- a/mapcleanup.py
+++ b/mapcleanup.py
@@ -1,6 +1,7 @@
#!/usr/bin/env python3
from argparse import ArgumentParser
+from copy import copy
from lxml import etree
from pathlib import Path
from PIL import Image
@@ -164,13 +165,13 @@ def separate_collisions(map):
def split_tilesets(map):
- # we need the offset of the tileset inside the map element to insert new tilesets correctly
- for offset, tileset in enumerate(map):
- if tileset.tag != "tileset":
- continue
+ for tileset in map.findall("tileset"):
image = tileset.find("image")
if int(image.attrib["width"]) <= 4096 and int(image.attrib["height"]) <= 4096:
continue
+ if int(image.attrib["width"]) > 4096:
+ print("Can't split tileset '%s'. Spliting of width > 4096 not implemented." % tileset.attrib["name"])
+ continue
dosplit = input("Split tileset '%s'? [yN] " % tileset.attrib["name"])
if dosplit.lower() != "y":
continue
@@ -201,10 +202,10 @@ def split_tilesets(map):
tilecount=str(tilecount),
columns=str(columns),
)
- map.insert(offset + i + j, tileset_croped)
+ tileset.addprevious(tileset_croped)
firstgid += tilecount
if properties is not None:
- tileset_croped.append(properties)
+ tileset_croped.append(copy(properties))
etree.SubElement(
tileset_croped,
"image",