Skip to content

Commit da8f5c8

Browse files
manuqmanuq
authored
Merge pull request #922 from endlessm/tileset-z_index
tileset: Remove z_index -1 from water & foam
2 parents 01f71fc + be88209 commit da8f5c8

6 files changed

Lines changed: 16 additions & 26 deletions

File tree

‎scenes/quests/lore_quests/quest_001/2_ink_combat/ink_combat_round_1.tscn‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ script = ExtResource("5_lmnu5")
141141
next_scene = "uid://cgemeabsewy1f"
142142
enter_transition = 3
143143
exit_transition = 3
144-
spawn_point_path = NodePath("")
145144
metadata/_custom_type_script = "uid://hqdquinbimce"
146145

147146
[node name="CollisionShape2D" type="CollisionShape2D" parent="OnTheGround/LevelExit/Teleporter"]

‎scenes/quests/lore_quests/quest_001/2_ink_combat/ink_combat_round_2.tscn‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ tile_map_data = PackedByteArray("AAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAIAAAAAAAA
6969
tile_set = ExtResource("4_0kd4s")
7070

7171
[node name="Foam" type="TileMapLayer" parent="TileMapLayers"]
72-
tile_map_data = PackedByteArray("AAAJAAIAAgACAAEAAAAJAAMAAgACAAEAAAAJAAQAAgACAAEAAAAJAAUAAgACAAEAAAAJAAYAAgACAAEAAAAJAAcAAgACAAEAAAALAAIAAgAAAAEAAAALAAMAAgAAAAEAAAALAAQAAgAAAAEAAAALAAUAAgAAAAEAAAALAAYAAgAAAAEAAAALAAcAAgAAAAEAAAA=")
72+
tile_map_data = PackedByteArray("AAAJAAIAAgACAAEAAAAJAAMAAgACAAEAAAAJAAQAAgACAAEAAAAJAAUAAgACAAEAAAAJAAYAAgACAAEAAAAJAAcAAgACAAEAAAALAAIAAgAAAAEAAAALAAMAAgAAAAEAAAALAAQAAgAAAAEAAAALAAUAAgAAAAEAAAALAAYAAgAAAAEAAAALAAcAAgAAAAEAAAAIAAIAAgABAAEAAAAIAAMAAgABAAEAAAAIAAQAAgABAAEAAAAIAAUAAgABAAEAAAAIAAYAAgABAAEAAAAIAAcAAgABAAEAAAAMAAIAAgABAAEAAAAMAAMAAgABAAEAAAAMAAQAAgABAAEAAAAMAAUAAgABAAEAAAAMAAcAAgABAAEAAAAMAAYAAgABAAEAAAANAAYAAgABAAEAAAAMAAEAAgABAAEAAAAIAAEAAgABAAEAAAACAAIAAgABAAEAAAACAAMAAgABAAEAAAACAAQAAgABAAEAAAACAAUAAgABAAEAAAACAAYAAgABAAEAAAACAAcAAgABAAEAAAABAAIAAgAAAAEAAAABAAMAAgAAAAEAAAABAAQAAgAAAAEAAAABAAUAAgAAAAEAAAABAAYAAgAAAAEAAAABAAcAAgAAAAEAAAA=")
7373
tile_set = ExtResource("4_0kd4s")
7474

7575
[node name="Foam Level 2" type="TileMapLayer" parent="TileMapLayers"]
76-
tile_map_data = PackedByteArray("AAAJAAIAAgABAAIAAAAKAAIAAgABAAIAAAALAAIAAgABAAIAAAANAAYAAgABAAIAAAAMAAYAAgABAAIAAAA=")
76+
tile_map_data = PackedByteArray("AAAJAAIAAgABAAIAAAAKAAIAAgABAAIAAAALAAIAAgABAAIAAAAAAAEAAgABAAEAAAAAAAIAAgABAAIAAAABAAEAAgABAAEAAAABAAIAAgABAAIAAAAJAAEAAgABAAEAAAAKAAEAAgABAAEAAAALAAEAAgABAAEAAAA=")
7777
tile_set = ExtResource("4_0kd4s")
7878

7979
[node name="Grass" type="TileMapLayer" parent="TileMapLayers"]
@@ -120,7 +120,6 @@ script = ExtResource("11_0kd4s")
120120
next_scene = "uid://bo6qfusag3fae"
121121
enter_transition = 3
122122
exit_transition = 3
123-
spawn_point_path = NodePath("")
124123
metadata/_custom_type_script = "uid://hqdquinbimce"
125124

126125
[node name="CollisionShape2D" type="CollisionShape2D" parent="OnTheGround/LevelExit/Teleporter"]

‎scenes/quests/lore_quests/quest_001/2_ink_combat/ink_combat_round_3.tscn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ tile_map_data = PackedByteArray("AAANAAIAAgAAAAEAAAAGAAMAAgACAAEAAAAHAAMAAgAAAAE
8181
tile_set = ExtResource("4_je2ou")
8282

8383
[node name="Foam3" type="TileMapLayer" parent="TileMapLayers"]
84-
tile_map_data = PackedByteArray("AAANAAEAAgABAAEAAAAOAAEAAgACAAEAAAANAAIAAgABAAAAAAAMAAEAAgABAAEAAAANAAAAAgABAAAAAAAMAAIAAgABAAAAAAAMAAAAAgABAAAAAAALAAEAAgABAAEAAAALAAAAAgABAAAAAAAAAAgAAgABAAEAAAABAAgAAgABAAEAAAAAAAkAAgABAAIAAAD//wgAAgABAAEAAAAAAAcAAgABAAAAAAD//wkAAgABAAIAAAD//wcAAgABAAAAAAD+/wgAAgAAAAEAAAARAAgAAgABAAEAAAASAAgAAgABAAEAAAARAAkAAgABAAIAAAAQAAgAAgAAAAEAAAARAAcAAgABAAAAAAASAAkAAgABAAIAAAASAAcAAgABAAAAAAATAAgAAgACAAEAAAAAAAQAAgABAAEAAAABAAQAAgABAAEAAAAAAAUAAgABAAIAAAD//wQAAgABAAEAAAAAAAMAAgABAAAAAAD//wUAAgABAAIAAAD//wMAAgABAAAAAAD+/wQAAgAAAAEAAAARAAQAAgABAAEAAAASAAQAAgABAAEAAAARAAUAAgABAAIAAAAQAAQAAgAAAAEAAAARAAMAAgABAAAAAAASAAUAAgABAAIAAAASAAMAAgABAAAAAAATAAQAAgACAAEAAAAKAAEAAgAAAAEAAAACAAQAAgACAAEAAAABAAUAAgABAAIAAAABAAMAAgABAAAAAAACAAgAAgABAAAAAAABAAkAAgABAAIAAAABAAcAAgABAAAAAAAHAAQAAgABAAAAAAAHAAUAAgABAAIAAAANAAMAAgABAAIAAAAMAAMAAgABAAIAAAAGAAMAAgABAAAAAAAGAAQAAgABAAIAAAACAAkAAgABAAIAAAA=")
84+
tile_map_data = PackedByteArray("AAANAAEAAgABAAEAAAAOAAEAAgACAAEAAAANAAIAAgABAAAAAAAMAAEAAgABAAEAAAANAAAAAgABAAAAAAAMAAIAAgABAAAAAAAMAAAAAgABAAAAAAALAAEAAgABAAEAAAALAAAAAgABAAAAAAAAAAgAAgABAAEAAAABAAgAAgABAAEAAAAAAAkAAgABAAIAAAD//wgAAgABAAEAAAD//wkAAgABAAIAAAD//wcAAgABAAEAAAD+/wgAAgAAAAEAAAARAAgAAgABAAEAAAASAAgAAgABAAEAAAARAAkAAgABAAIAAAAQAAgAAgAAAAEAAAARAAcAAgABAAAAAAASAAkAAgABAAIAAAASAAcAAgABAAAAAAATAAgAAgACAAEAAAAAAAQAAgABAAEAAAABAAQAAgABAAEAAAAAAAUAAgABAAIAAAD//wQAAgABAAEAAAAAAAMAAgABAAAAAAD//wUAAgABAAIAAAD//wMAAgABAAAAAAD+/wQAAgAAAAEAAAARAAQAAgABAAEAAAASAAQAAgABAAEAAAARAAUAAgABAAIAAAAQAAQAAgAAAAEAAAARAAMAAgABAAAAAAASAAUAAgABAAIAAAASAAMAAgABAAAAAAATAAQAAgACAAEAAAAKAAEAAgAAAAEAAAACAAQAAgACAAEAAAABAAUAAgABAAIAAAABAAMAAgABAAAAAAACAAgAAgABAAAAAAABAAkAAgABAAIAAAABAAcAAgABAAEAAAAHAAQAAgABAAAAAAAHAAUAAgABAAIAAAANAAMAAgABAAIAAAAMAAMAAgABAAIAAAAGAAMAAgABAAAAAAAGAAQAAgABAAIAAAACAAkAAgABAAIAAAACAAcAAgACAAEAAAD+/wcAAgAAAAEAAAA=")
8585
tile_set = ExtResource("4_je2ou")
8686

8787
[node name="Grass" type="TileMapLayer" parent="TileMapLayers"]

‎scenes/quests/lore_quests/quest_001/4_closing_transition/closing_transition.tscn‎

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

‎scenes/quests/story_quests/stella/2_stella_combat/stella_combat.tscn‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,16 @@ tile_map_data = PackedByteArray("AAADAAsABAABAAcAAAAEAAsABAACAAcAAAAEAAwABAACAAc
8585
tile_set = ExtResource("3_oj7ex")
8686
collision_enabled = false
8787

88+
[node name="Foam_Horizontal" type="TileMapLayer" parent="TileMapLayers"]
89+
modulate = Color(0.298039, 0.298039, 0.298039, 1)
90+
tile_map_data = PackedByteArray("AAAPAAQAAgABAAIAAAAVAAUAAgABAAIAAAAEAAUAAgABAAIAAAADAAUAAgABAAIAAAAGAAQAAgABAAIAAAAHAAQAAgABAAIAAAAIAAQAAgABAAIAAAALAAcAAgABAAIAAAAMAAcAAgABAAIAAAANAAcAAgABAAIAAAARAAQAAgABAAIAAAATAAYAAgABAAIAAAAUAAYAAgABAAIAAAAWAAUAAgABAAIAAAAXAAUAAgABAAIAAAACAAUAAgABAAIAAAAFAAQAAgABAAIAAAAKAAUAAgABAAIAAAAJAAQAAgABAAIAAAAOAAYAAgABAAIAAAAQAAQAAgABAAIAAAASAAUAAgABAAIAAAAEAAwAAgABAAIAAAANAAgAAgABAAIAAAA=")
91+
tile_set = ExtResource("3_oj7ex")
92+
93+
[node name="Foam_Vertical" type="TileMapLayer" parent="TileMapLayers"]
94+
modulate = Color(0.298039, 0.298039, 0.298039, 1)
95+
tile_map_data = PackedByteArray("AAAIAAQAAgABAAIAAAACAAUAAgACAAEAAAACAAYAAgACAAEAAAACAAcAAgACAAEAAAACAAgAAgACAAEAAAAOAAYAAgACAAEAAAAPAAUAAgACAAEAAAAPAAQAAgACAAEAAAAVAAUAAgACAAEAAAAFAAQAAgACAAEAAAAJAAQAAgAAAAEAAAAKAAUAAgAAAAEAAAAKAAYAAgAAAAEAAAARAAQAAgAAAAEAAAASAAUAAgAAAAEAAAAFAAsAAgACAAEAAAAFAAoAAgACAAEAAAAEAA0AAgACAAEAAAAEAAwAAgACAAEAAAAOAAcAAgACAAEAAAAMAAcAAgAAAAEAAAA=")
96+
tile_set = ExtResource("3_oj7ex")
97+
8898
[node name="Sand" type="TileMapLayer" parent="TileMapLayers"]
8999
modulate = Color(0.266667, 0.266667, 0.266667, 1)
90100
tile_map_data = PackedByteArray("AAAEAAEAAQAGAAAAAAAFAAEAAQAGAAAAAAAGAAEAAQAGAAAAAAAHAAEAAQAGAAAAAAABAAEAAQAFAAAAAAACAAEAAQAGAAAAAAADAAEAAQAGAAAAAAADAAIAAQAGAAEAAAACAAIAAQAGAAEAAAABAAIAAQAFAAEAAAABAAMAAQAFAAEAAAACAAMAAQAGAAEAAAADAAMAAQAGAAEAAAAEAAMAAQAGAAEAAAAEAAIAAQAGAAEAAAAFAAIAAQAGAAEAAAAGAAIAAQAGAAEAAAAGAAMAAQAGAAIAAAAFAAMAAQAGAAIAAAAHAAMAAQAGAAIAAAAIAAMAAQAGAAIAAAAIAAIAAQAGAAEAAAAHAAIAAQAGAAEAAAAIAAEAAQAGAAAAAAAJAAEAAQAGAAAAAAAJAAIAAQAGAAEAAAAJAAMAAQAGAAIAAAAKAAMAAQAGAAEAAAALAAMAAQAGAAEAAAALAAIAAQAGAAEAAAAKAAIAAQAGAAEAAAAKAAEAAQAGAAAAAAALAAEAAQAGAAAAAAAMAAEAAQAGAAAAAAAMAAIAAQAGAAEAAAAMAAMAAQAGAAEAAAANAAMAAQAGAAEAAAANAAIAAQAGAAEAAAANAAEAAQAGAAAAAAAOAAEAAQAGAAAAAAAOAAIAAQAGAAEAAAAOAAMAAQAGAAEAAAAPAAMAAQAGAAIAAAAPAAIAAQAGAAEAAAAPAAEAAQAGAAAAAAAQAAEAAQAGAAAAAAAQAAIAAQAGAAEAAAAQAAMAAQAGAAIAAAARAAMAAQAGAAIAAAARAAIAAQAGAAEAAAARAAEAAQAGAAAAAAASAAEAAQAGAAAAAAASAAIAAQAGAAEAAAASAAMAAQAGAAEAAAATAAMAAQAGAAEAAAATAAIAAQAGAAEAAAATAAEAAQAGAAAAAAAUAAEAAQAGAAAAAAAUAAIAAQAGAAEAAAAUAAMAAQAGAAEAAAAVAAMAAQAGAAEAAAAVAAIAAQAGAAEAAAAVAAEAAQAGAAAAAAAWAAEAAQAGAAAAAAAWAAIAAQAGAAEAAAAWAAMAAQAGAAEAAAABAAQAAQAFAAEAAAACAAQAAQAGAAIAAAADAAQAAQAGAAIAAAAEAAQAAQAHAAIAAAALAAQAAQAGAAEAAAALAAUAAQAFAAEAAAALAAYAAQAFAAIAAAAMAAYAAQAGAAIAAAANAAYAAQAHAAEAAAANAAUAAQAGAAEAAAANAAQAAQAGAAEAAAAMAAQAAQAGAAEAAAAMAAUAAQAGAAEAAAASAAQAAQAFAAIAAAATAAQAAQAGAAEAAAAUAAQAAQAGAAEAAAAVAAQAAQAGAAIAAAAWAAQAAQAGAAIAAAABAAUAAQAIAAEAAAABAAYAAQAIAAEAAAABAAcAAQAIAAEAAAABAAgAAQAIAAIAAAATAAUAAQAFAAIAAAAUAAUAAQAHAAIAAAAOAAUAAQAHAAIAAAAOAAQAAQAHAAEAAAAKAAQAAQAFAAIAAAANAAcAAQAIAAIAAAA=")
@@ -100,16 +110,6 @@ modulate = Color(0.266667, 0.266667, 0.266667, 1)
100110
tile_map_data = PackedByteArray("AAARAAMAAwAAAAEAAAARAAQAAwAAAAIAAAARAAUAAwAAAAIAAAARAAYAAwAAAAIAAAARAAcAAwAAAAIAAAARAAgAAwAAAAIAAAARAAkAAwAAAAIAAAAIAAMAAwAAAAEAAAAIAAQAAwAAAAIAAAAIAAUAAwAAAAIAAAAIAAYAAwAAAAIAAAAIAAcAAwAAAAIAAAARAAoAAwAAAAMAAAAIAAgAAwAAAAMAAAA=")
101111
tile_set = ExtResource("3_oj7ex")
102112

103-
[node name="Foam_Horitzontal" type="TileMapLayer" parent="TileMapLayers"]
104-
modulate = Color(0.298039, 0.298039, 0.298039, 1)
105-
tile_map_data = PackedByteArray("AAAPAAQAAgABAAIAAAAVAAUAAgABAAIAAAAEAAUAAgABAAIAAAADAAUAAgABAAIAAAAGAAQAAgABAAIAAAAHAAQAAgABAAIAAAAIAAQAAgABAAIAAAALAAcAAgABAAIAAAAMAAcAAgABAAIAAAANAAcAAgABAAIAAAARAAQAAgABAAIAAAATAAYAAgABAAIAAAAUAAYAAgABAAIAAAAWAAUAAgABAAIAAAAXAAUAAgABAAIAAAACAAUAAgABAAIAAAAFAAQAAgABAAIAAAAKAAUAAgABAAIAAAAJAAQAAgABAAIAAAAOAAYAAgABAAIAAAAQAAQAAgABAAIAAAASAAUAAgABAAIAAAAEAAwAAgABAAIAAAANAAgAAgABAAIAAAA=")
106-
tile_set = ExtResource("3_oj7ex")
107-
108-
[node name="Foam_Vertical" type="TileMapLayer" parent="TileMapLayers"]
109-
modulate = Color(0.298039, 0.298039, 0.298039, 1)
110-
tile_map_data = PackedByteArray("AAAIAAQAAgABAAIAAAACAAUAAgACAAEAAAACAAYAAgACAAEAAAACAAcAAgACAAEAAAACAAgAAgACAAEAAAAOAAYAAgACAAEAAAAPAAUAAgACAAEAAAAPAAQAAgACAAEAAAAVAAUAAgACAAEAAAAFAAQAAgACAAEAAAAJAAQAAgAAAAEAAAAKAAUAAgAAAAEAAAAKAAYAAgAAAAEAAAARAAQAAgAAAAEAAAASAAUAAgAAAAEAAAAFAAsAAgACAAEAAAAFAAoAAgACAAEAAAAEAA0AAgACAAEAAAAEAAwAAgACAAEAAAAOAAcAAgACAAEAAAAMAAcAAgAAAAEAAAA=")
111-
tile_set = ExtResource("3_oj7ex")
112-
113113
[node name="OnTheGround" type="Node2D" parent="."]
114114
y_sort_enabled = true
115115

‎scenes/tileset.tres‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,10 @@ texture = ExtResource("1_glnwb")
4040
texture_region_size = Vector2i(64, 64)
4141
0:0/next_alternative_id = 3
4242
0:0/0 = 0
43-
0:0/0/z_index = -1
4443
0:0/0/physics_layer_2/polygon_0/points = PackedVector2Array(-32, -32, 32, -32, 32, 32, -32, 32)
4544
0:0/2 = 2
46-
0:0/2/z_index = -1
4745
0:0/2/physics_layer_2/polygon_0/points = PackedVector2Array(-32, 3.85675, 32, 4.40771, 32, 32, -32, 32)
4846
0:0/1 = 1
49-
0:0/1/z_index = -1
5047

5148
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_0wfyh"]
5249
texture = ExtResource("2_jmclm")
@@ -535,7 +532,6 @@ texture_region_size = Vector2i(64, 64)
535532
1:0/animation_frame_6/duration = 1.0
536533
1:0/animation_frame_7/duration = 1.0
537534
1:0/0 = 0
538-
1:0/0/z_index = -1
539535
1:0/0/terrain_set = 0
540536
1:0/0/terrains_peering_bit/bottom_side = 3
541537
0:1/animation_separation = Vector2i(2, 0)
@@ -549,7 +545,6 @@ texture_region_size = Vector2i(64, 64)
549545
0:1/animation_frame_6/duration = 1.0
550546
0:1/animation_frame_7/duration = 1.0
551547
0:1/0 = 0
552-
0:1/0/z_index = -1
553548
0:1/0/terrain_set = 0
554549
0:1/0/terrains_peering_bit/right_side = 3
555550
2:1/animation_columns = 8
@@ -564,7 +559,6 @@ texture_region_size = Vector2i(64, 64)
564559
2:1/animation_frame_6/duration = 1.0
565560
2:1/animation_frame_7/duration = 1.0
566561
2:1/0 = 0
567-
2:1/0/z_index = -1
568562
2:1/0/terrain_set = 0
569563
2:1/0/terrains_peering_bit/left_side = 3
570564
1:2/animation_columns = 8
@@ -579,7 +573,6 @@ texture_region_size = Vector2i(64, 64)
579573
1:2/animation_frame_6/duration = 1.0
580574
1:2/animation_frame_7/duration = 1.0
581575
1:2/0 = 0
582-
1:2/0/z_index = -1
583576
1:2/0/terrain_set = 0
584577
1:2/0/terrains_peering_bit/top_side = 3
585578
1:1/animation_columns = 8
@@ -594,7 +587,6 @@ texture_region_size = Vector2i(64, 64)
594587
1:1/animation_frame_6/duration = 1.0
595588
1:1/animation_frame_7/duration = 1.0
596589
1:1/0 = 0
597-
1:1/0/z_index = -1
598590
1:1/0/terrain_set = 0
599591
1:1/0/terrain = 3
600592
1:1/0/terrains_peering_bit/right_side = 3

0 commit comments

Comments
 (0)