Skip to content

Commit

Permalink
Isometric tileset changes for 3d vision (#2036)
Browse files Browse the repository at this point in the history
* unassign t_open_air

* tr_ledge use empty

* add zlevel_height

* fix empty png

old png causes compiling to fail

* fix value

* fix other value

* lint json

* Revert "fix empty png"

This reverts commit 9b9c535.

* Revert "unassign t_open_air"

This reverts commit 40ff3e2.

* Update 687_t_open_air_0.png
  • Loading branch information
Rewryte authored Jun 23, 2023
1 parent 47e9134 commit 6cf0a5a
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 1 deletion.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"id": ["lighting_hidden", "t_hole", "tr_ledge"], "bg": ["2_lighting_hidden_0"], "fg": []}
{"id": ["lighting_hidden", "t_hole", "tr_ledge"], "bg": ["empty_16x20"], "fg": []}
1 change: 1 addition & 0 deletions gfx/HitButton_iso/tile_info.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"height": 20,
"iso": true,
"width": 16,
"zlevel_height": 10,
"pixelscale": 2
},
{
Expand Down
4 changes: 4 additions & 0 deletions gfx/Ultica_iso/pngs_normal_32x32/tr_ledge.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"id": "tr_ledge",
"fg": "empty_32x32"
}
1 change: 1 addition & 0 deletions gfx/Ultica_iso/tile_info.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"pixelscale": 1,
"width": 48,
"height": 24,
"zlevel_height": 96,
"retract_dist_min": 2.5,
"retract_dist_max": 6.0,
"//": "We assume a base area of 90cm x 90cm."
Expand Down
4 changes: 4 additions & 0 deletions tools/compose.py
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ def __init__(
info_path = self.source_dir.joinpath('tile_info.json')
self.sprite_width = 16
self.sprite_height = 16
self.zlevel_height = 0
self.pixelscale = 1
self.iso = False
self.retract_dist_min = -1.0
Expand All @@ -272,6 +273,8 @@ def __init__(
self.info = json.load(file)
self.sprite_width = self.info[0].get('width', self.sprite_width)
self.sprite_height = self.info[0].get('height', self.sprite_height)
self.zlevel_height = self.info[0].get('zlevel_height',
self.zlevel_height)
self.pixelscale = self.info[0].get('pixelscale', self.pixelscale)
self.retract_dist_min = self.info[0].get('retract_dist_min',
self.retract_dist_min)
Expand Down Expand Up @@ -471,6 +474,7 @@ def create_tile_entries_for_unused(
'pixelscale': self.pixelscale,
'width': self.sprite_width,
'height': self.sprite_height,
'zlevel_height': self.zlevel_height,
'iso': self.iso,
'retract_dist_min': self.retract_dist_min,
'retract_dist_max': self.retract_dist_max
Expand Down

0 comments on commit 6cf0a5a

Please sign in to comment.