Tituya
/
Adoranda
mirror of https://github.com/bgiraudr/Adoranda.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Compare commits

base: Tituya:1513502e0bff04d997ecfe621acd7dcb9f2569fa
Branches Tags
Tituya:master
...
compare: Tituya:eff11d79085cf3c22758374b0a5e826223e9c074
Branches Tags
Tituya:master

2 Commits
1513502e0b ... eff11d7908

Author SHA1 Message Date
bgiraudr eff11d7908
Merge pull request #2 from lephe/master 
fix JSON map dependencies and support Tiled 1.9
 2022-07-24 23:05:06 +02:00
Lephenixnoir 686548cfbc
fix JSON map dependencies and support Tiled 1.9 2022-07-24 21:53:29 +01:00
2 changed files with 3 additions and 1 deletions
Show Stats Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -13,6 +13,8 @@ fxconv_declare_converters(assets-cg/converters.py)
add_custom_command(
OUTPUT "${CMAKE_CURRENT_LIST_DIR}/assets-cg/maps/testCarte.json"
"${CMAKE_CURRENT_LIST_DIR}/assets-cg/maps/1.json"
"${CMAKE_CURRENT_LIST_DIR}/assets-cg/maps/2.json"
"${CMAKE_CURRENT_LIST_DIR}/assets-cg/maps/inside/1.json"
"${CMAKE_CURRENT_LIST_DIR}/assets-cg/maps/inside/2.json"
COMMENT "Convert tmx map to json"

2
assets-cg/converters.py
View File

@ -73,7 +73,7 @@ def convert_map(input, output, params, target):
#create a dictionnary {tile id:type}
for i in data_tileset["tiles"]:
id = i["id"]+1
type = i["type"]
type = i["class"] if "class" in i else i["type"]
value = tile_type.get(type) if type in tile_type else TILE_AIR
tile_value[id] = value