Skip to content

Commit b82499e

Browse files
manuqmanuq
authored
Merge pull request #1339 from endlessm/wjt/move-template-tiles-out-of-no-edit-storyquest
Move template tiles out of NO_EDIT StoryQuest
2 parents 885533b + ca4336e commit b82499e

10 files changed

Lines changed: 124 additions & 105 deletions

File tree

‎REUSE.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ path = [
2323
"scenes/*.tscn",
2424
"scenes/**/*.tscn",
2525
"scenes/**/*.tres",
26+
"tiles/**/*.tscn",
27+
"tiles/**/*.tres",
2628
# .import files are largely machine-generated but developers can tweak their contents
2729
"**/*.import",
2830
"default_bus_layout.tres",

scenes/quests/story_quests/NO_EDIT/NO_EDIT_tileset/NO_EDIT_elevation_tiles.aseprite renamed to assets/first_party/tiles/template/elevation_tiles.aseprite

File renamed without changes.

scenes/quests/story_quests/NO_EDIT/NO_EDIT_tileset/NO_EDIT_elevation_tiles.png renamed to assets/first_party/tiles/template/elevation_tiles.png

File renamed without changes.

scenes/quests/story_quests/NO_EDIT/NO_EDIT_tileset/NO_EDIT_elevation_tiles.png.import renamed to assets/first_party/tiles/template/elevation_tiles.png.import

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
importer="texture"
44
type="CompressedTexture2D"
55
uid="uid://dn1xlyoch27n4"
6-
path="res://.godot/imported/NO_EDIT_elevation_tiles.png-c4b3579e35378c5663f6b11f0b2bc1d2.ctex"
6+
path="res://.godot/imported/elevation_tiles.png-373999a35024653d46c9fa9eeff2eb18.ctex"
77
metadata={
88
"vram_texture": false
99
}
1010

1111
[deps]
1212

13-
source_file="res://scenes/quests/story_quests/NO_EDIT/NO_EDIT_tileset/NO_EDIT_elevation_tiles.png"
14-
dest_files=["res://.godot/imported/NO_EDIT_elevation_tiles.png-c4b3579e35378c5663f6b11f0b2bc1d2.ctex"]
13+
source_file="res://assets/first_party/tiles/template/elevation_tiles.png"
14+
dest_files=["res://.godot/imported/elevation_tiles.png-373999a35024653d46c9fa9eeff2eb18.ctex"]
1515

1616
[params]
1717

scenes/quests/story_quests/NO_EDIT/NO_EDIT_tileset/NO_EDIT_floor_tiles.aseprite renamed to assets/first_party/tiles/template/floor_tiles.aseprite

File renamed without changes.

scenes/quests/story_quests/NO_EDIT/NO_EDIT_tileset/NO_EDIT_floor_tiles.png renamed to assets/first_party/tiles/template/floor_tiles.png

File renamed without changes.

scenes/quests/story_quests/NO_EDIT/NO_EDIT_tileset/NO_EDIT_floor_tiles.png.import renamed to assets/first_party/tiles/template/floor_tiles.png.import

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
importer="texture"
44
type="CompressedTexture2D"
55
uid="uid://bvron1ojmm2ua"
6-
path="res://.godot/imported/NO_EDIT_floor_tiles.png-59d6eed2c867c11f572e8930dc8395a0.ctex"
6+
path="res://.godot/imported/floor_tiles.png-ef65024e7ad9bfdccdc9e161a1065999.ctex"
77
metadata={
88
"vram_texture": false
99
}
1010

1111
[deps]
1212

13-
source_file="res://scenes/quests/story_quests/NO_EDIT/NO_EDIT_tileset/NO_EDIT_floor_tiles.png"
14-
dest_files=["res://.godot/imported/NO_EDIT_floor_tiles.png-59d6eed2c867c11f572e8930dc8395a0.ctex"]
13+
source_file="res://assets/first_party/tiles/template/floor_tiles.png"
14+
dest_files=["res://.godot/imported/floor_tiles.png-ef65024e7ad9bfdccdc9e161a1065999.ctex"]
1515

1616
[params]
1717

scenes/quests/story_quests/NO_EDIT/NO_EDIT_tileset/NO_EDIT_tileset.tres renamed to tiles/template/elevation.tres

Lines changed: 4 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,9 @@
1-
[gd_resource type="TileSet" load_steps=5 format=3 uid="uid://bqpxe17ayso7c"]
1+
[gd_resource type="TileSet" load_steps=3 format=3 uid="uid://p048y06b6mj7"]
22

3-
[ext_resource type="Texture2D" uid="uid://bvron1ojmm2ua" path="res://scenes/quests/story_quests/NO_EDIT/NO_EDIT_tileset/NO_EDIT_floor_tiles.png" id="1_gxacc"]
4-
[ext_resource type="Texture2D" uid="uid://dn1xlyoch27n4" path="res://scenes/quests/story_quests/NO_EDIT/NO_EDIT_tileset/NO_EDIT_elevation_tiles.png" id="2_htnuy"]
5-
6-
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_0e48y"]
7-
texture = ExtResource("1_gxacc")
8-
texture_region_size = Vector2i(64, 64)
9-
0:0/0 = 0
10-
0:0/0/terrain_set = 0
11-
0:0/0/terrain = 0
12-
0:0/0/terrains_peering_bit/right_side = 0
13-
0:0/0/terrains_peering_bit/bottom_side = 0
14-
1:0/0 = 0
15-
1:0/0/terrain_set = 0
16-
1:0/0/terrain = 0
17-
1:0/0/terrains_peering_bit/right_side = 0
18-
1:0/0/terrains_peering_bit/bottom_side = 0
19-
1:0/0/terrains_peering_bit/left_side = 0
20-
2:0/0 = 0
21-
2:0/0/terrain_set = 0
22-
2:0/0/terrain = 0
23-
2:0/0/terrains_peering_bit/bottom_side = 0
24-
2:0/0/terrains_peering_bit/left_side = 0
25-
3:0/0 = 0
26-
3:0/0/terrain_set = 0
27-
3:0/0/terrain = 0
28-
3:0/0/terrains_peering_bit/bottom_side = 0
29-
0:1/0 = 0
30-
0:1/0/terrain_set = 0
31-
0:1/0/terrain = 0
32-
0:1/0/terrains_peering_bit/right_side = 0
33-
0:1/0/terrains_peering_bit/bottom_side = 0
34-
0:1/0/terrains_peering_bit/top_side = 0
35-
1:1/0 = 0
36-
1:1/0/terrain_set = 0
37-
1:1/0/terrain = 0
38-
1:1/0/terrains_peering_bit/right_side = 0
39-
1:1/0/terrains_peering_bit/bottom_side = 0
40-
1:1/0/terrains_peering_bit/left_side = 0
41-
1:1/0/terrains_peering_bit/top_side = 0
42-
2:1/0 = 0
43-
2:1/0/terrain_set = 0
44-
2:1/0/terrain = 0
45-
2:1/0/terrains_peering_bit/bottom_side = 0
46-
2:1/0/terrains_peering_bit/left_side = 0
47-
2:1/0/terrains_peering_bit/top_side = 0
48-
3:1/0 = 0
49-
3:1/0/terrain_set = 0
50-
3:1/0/terrain = 0
51-
3:1/0/terrains_peering_bit/bottom_side = 0
52-
3:1/0/terrains_peering_bit/top_side = 0
53-
0:2/0 = 0
54-
0:2/0/terrain_set = 0
55-
0:2/0/terrain = 0
56-
0:2/0/terrains_peering_bit/right_side = 0
57-
0:2/0/terrains_peering_bit/top_side = 0
58-
1:2/0 = 0
59-
1:2/0/terrain_set = 0
60-
1:2/0/terrain = 0
61-
1:2/0/terrains_peering_bit/right_side = 0
62-
1:2/0/terrains_peering_bit/left_side = 0
63-
1:2/0/terrains_peering_bit/top_side = 0
64-
2:2/0 = 0
65-
2:2/0/terrain_set = 0
66-
2:2/0/terrain = 0
67-
2:2/0/terrains_peering_bit/left_side = 0
68-
2:2/0/terrains_peering_bit/top_side = 0
69-
3:2/0 = 0
70-
3:2/0/terrain_set = 0
71-
3:2/0/terrain = 0
72-
3:2/0/terrains_peering_bit/top_side = 0
73-
0:3/0 = 0
74-
0:3/0/terrain_set = 0
75-
0:3/0/terrain = 0
76-
0:3/0/terrains_peering_bit/right_side = 0
77-
1:3/0 = 0
78-
1:3/0/terrain_set = 0
79-
1:3/0/terrain = 0
80-
1:3/0/terrains_peering_bit/right_side = 0
81-
1:3/0/terrains_peering_bit/left_side = 0
82-
2:3/0 = 0
83-
2:3/0/terrain_set = 0
84-
2:3/0/terrain = 0
85-
2:3/0/terrains_peering_bit/left_side = 0
86-
3:3/0 = 0
87-
3:3/0/terrain_set = 0
88-
3:3/0/terrain = 0
3+
[ext_resource type="Texture2D" uid="uid://dn1xlyoch27n4" path="res://assets/first_party/tiles/template/elevation_tiles.png" id="1_4ta6j"]
894

905
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_6ehk7"]
91-
texture = ExtResource("2_htnuy")
6+
texture = ExtResource("1_4ta6j")
927
texture_region_size = Vector2i(64, 64)
938
0:0/0 = 0
949
0:0/0/terrain_set = 0
@@ -264,5 +179,4 @@ terrain_set_0/terrain_1/name = "Elevation Floor"
264179
terrain_set_0/terrain_1/color = Color(0.88344, 0.719793, 0.29437, 1)
265180
terrain_set_0/terrain_2/name = "Elevation Walls"
266181
terrain_set_0/terrain_2/color = Color(0.879182, 0.518392, 3.85046e-07, 1)
267-
sources/0 = SubResource("TileSetAtlasSource_0e48y")
268-
sources/1 = SubResource("TileSetAtlasSource_6ehk7")
182+
sources/0 = SubResource("TileSetAtlasSource_6ehk7")

‎tiles/template/floor.tres‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
[gd_resource type="TileSet" load_steps=3 format=3 uid="uid://bqpxe17ayso7c"]
2+
3+
[ext_resource type="Texture2D" uid="uid://bvron1ojmm2ua" path="res://assets/first_party/tiles/template/floor_tiles.png" id="1_4dogh"]
4+
5+
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_0e48y"]
6+
texture = ExtResource("1_4dogh")
7+
texture_region_size = Vector2i(64, 64)
8+
0:0/0 = 0
9+
0:0/0/terrain_set = 0
10+
0:0/0/terrain = 0
11+
0:0/0/terrains_peering_bit/right_side = 0
12+
0:0/0/terrains_peering_bit/bottom_side = 0
13+
1:0/0 = 0
14+
1:0/0/terrain_set = 0
15+
1:0/0/terrain = 0
16+
1:0/0/terrains_peering_bit/right_side = 0
17+
1:0/0/terrains_peering_bit/bottom_side = 0
18+
1:0/0/terrains_peering_bit/left_side = 0
19+
2:0/0 = 0
20+
2:0/0/terrain_set = 0
21+
2:0/0/terrain = 0
22+
2:0/0/terrains_peering_bit/bottom_side = 0
23+
2:0/0/terrains_peering_bit/left_side = 0
24+
3:0/0 = 0
25+
3:0/0/terrain_set = 0
26+
3:0/0/terrain = 0
27+
3:0/0/terrains_peering_bit/bottom_side = 0
28+
0:1/0 = 0
29+
0:1/0/terrain_set = 0
30+
0:1/0/terrain = 0
31+
0:1/0/terrains_peering_bit/right_side = 0
32+
0:1/0/terrains_peering_bit/bottom_side = 0
33+
0:1/0/terrains_peering_bit/top_side = 0
34+
1:1/0 = 0
35+
1:1/0/terrain_set = 0
36+
1:1/0/terrain = 0
37+
1:1/0/terrains_peering_bit/right_side = 0
38+
1:1/0/terrains_peering_bit/bottom_side = 0
39+
1:1/0/terrains_peering_bit/left_side = 0
40+
1:1/0/terrains_peering_bit/top_side = 0
41+
2:1/0 = 0
42+
2:1/0/terrain_set = 0
43+
2:1/0/terrain = 0
44+
2:1/0/terrains_peering_bit/bottom_side = 0
45+
2:1/0/terrains_peering_bit/left_side = 0
46+
2:1/0/terrains_peering_bit/top_side = 0
47+
3:1/0 = 0
48+
3:1/0/terrain_set = 0
49+
3:1/0/terrain = 0
50+
3:1/0/terrains_peering_bit/bottom_side = 0
51+
3:1/0/terrains_peering_bit/top_side = 0
52+
0:2/0 = 0
53+
0:2/0/terrain_set = 0
54+
0:2/0/terrain = 0
55+
0:2/0/terrains_peering_bit/right_side = 0
56+
0:2/0/terrains_peering_bit/top_side = 0
57+
1:2/0 = 0
58+
1:2/0/terrain_set = 0
59+
1:2/0/terrain = 0
60+
1:2/0/terrains_peering_bit/right_side = 0
61+
1:2/0/terrains_peering_bit/left_side = 0
62+
1:2/0/terrains_peering_bit/top_side = 0
63+
2:2/0 = 0
64+
2:2/0/terrain_set = 0
65+
2:2/0/terrain = 0
66+
2:2/0/terrains_peering_bit/left_side = 0
67+
2:2/0/terrains_peering_bit/top_side = 0
68+
3:2/0 = 0
69+
3:2/0/terrain_set = 0
70+
3:2/0/terrain = 0
71+
3:2/0/terrains_peering_bit/top_side = 0
72+
0:3/0 = 0
73+
0:3/0/terrain_set = 0
74+
0:3/0/terrain = 0
75+
0:3/0/terrains_peering_bit/right_side = 0
76+
1:3/0 = 0
77+
1:3/0/terrain_set = 0
78+
1:3/0/terrain = 0
79+
1:3/0/terrains_peering_bit/right_side = 0
80+
1:3/0/terrains_peering_bit/left_side = 0
81+
2:3/0 = 0
82+
2:3/0/terrain_set = 0
83+
2:3/0/terrain = 0
84+
2:3/0/terrains_peering_bit/left_side = 0
85+
3:3/0 = 0
86+
3:3/0/terrain_set = 0
87+
3:3/0/terrain = 0
88+
89+
[resource]
90+
tile_size = Vector2i(64, 64)
91+
physics_layer_0/collision_layer = 16
92+
physics_layer_0/collision_mask = 0
93+
physics_layer_1/collision_layer = 8
94+
physics_layer_1/collision_mask = 0
95+
terrain_set_0/mode = 2
96+
terrain_set_0/terrain_0/name = "Floor"
97+
terrain_set_0/terrain_0/color = Color(0.40951, 0.365954, 1, 1)
98+
terrain_set_0/terrain_1/name = "Elevation Floor"
99+
terrain_set_0/terrain_1/color = Color(0.88344, 0.719793, 0.29437, 1)
100+
terrain_set_0/terrain_2/name = "Elevation Walls"
101+
terrain_set_0/terrain_2/color = Color(0.879182, 0.518392, 3.85046e-07, 1)
102+
sources/0 = SubResource("TileSetAtlasSource_0e48y")

0 commit comments

Comments
 (0)