1
0
Fork 0

Merge remote-tracking branch 'origin/main'

# Conflicts:
#	project/assets/tilemap/tileset.tres
#	project/main-scenes/island.tscn
Yan Wittmann 2025-01-11 16:15:03 +01:00
commit 9446c10556
4 changed files with 11 additions and 12 deletions

View File

@ -16,20 +16,17 @@ texture = ExtResource("1_ukrsa")
3:0/0/custom_data_0 = true
3:0/0/custom_data_2 = 1
3:0/8 = 8
3:0/8/custom_data_0 = true
1:2/0 = 0
3:2/next_alternative_id = 7
3:2/next_alternative_id = 5
3:2/0 = 0
3:2/0/custom_data_0 = true
3:2/4 = 4
0:0/0 = 0
0:0/0/custom_data_0 = true
0:0/0/custom_data_2 = 4
3:1/next_alternative_id = 4
3:1/next_alternative_id = 3
3:1/0 = 0
3:1/0/custom_data_0 = true
3:1/2 = 2
3:1/2/custom_data_0 = true
4:0/0 = 0
5:3/0 = 0
5:3/0/custom_data_0 = true
@ -89,6 +86,7 @@ texture = ExtResource("3_xap0v")
1:1/0 = 0
0:1/0 = 0
3:1/0 = 0
2:0/0 = 0
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_i41cv"]
texture = ExtResource("4_f38wc")

File diff suppressed because one or more lines are too long

View File

@ -26,8 +26,8 @@ func get_cells_by_type(
func get_cells_by_type_collection(
atlas_coords: Array[Vector2i],
center: Vector2i = Vector2i(-1, -1), max_distance: int = 99999999
atlas_coords: Array[Vector2i],
center: Vector2i = Vector2i(-1, -1), max_distance: int = 99999999
) -> Array[Vector2i]:
var tiles_with_type: Array[Vector2i] = []
for coords in atlas_coords:

View File

@ -10,6 +10,7 @@ const GROUND_WATER_SHALLOW: Vector2i = Vector2i(1, 0)
const GROUND_WATER_DEEP: Vector2i = Vector2i(2, 0)
const GROUND_SAND: Vector2i = Vector2i(3, 0)
const GROUND_DOCK: Vector2i = Vector2i(3, 0)
const GROUND_SNOW: Vector2i = Vector2i(4,0)
#
# objects, sid = 1
# NI = not interactive