diff --git a/tests/generated_world_runtime_validation.gd b/tests/generated_world_runtime_validation.gd index adec70b..f487ae7 100644 --- a/tests/generated_world_runtime_validation.gd +++ b/tests/generated_world_runtime_validation.gd @@ -872,7 +872,7 @@ func _validate_elevated_cliff_feature( var overlay_mesh := TerrainChunkAnalyzer.find_primary_mesh( overlay, ( - &"chunk_0015" + &"chunk_0010" if stable_id in [ &"chunk_9999", &"chunk_9998", diff --git a/tests/terrain_chunk_generator_validation.gd b/tests/terrain_chunk_generator_validation.gd index a46d1d7..ec736d9 100644 --- a/tests/terrain_chunk_generator_validation.gd +++ b/tests/terrain_chunk_generator_validation.gd @@ -629,13 +629,14 @@ func _validate_catalog() -> void: ]: _check( transition.overlay_only + and transition.primary_mesh_name == &"chunk_0010" and transition.base_layer_scene != null and transition.base_layer_mesh_name == &"chunk_0007" and not transition.must_be_interior and transition.prefers_map_boundary and "transition" in transition.tags, ( - "Each raised-coast endpoint must layer the deep corner " + "Each raised-coast endpoint must layer the inland corner " + "over an authored level-one coastline." ), ) @@ -657,6 +658,7 @@ func _validate_catalog() -> void: ]: _check( transition.overlay_only + and transition.primary_mesh_name == &"chunk_0010" and transition.base_layer_scene != null and transition.base_layer_mesh_name == &"chunk_0008" and not transition.must_be_interior diff --git a/world/generation/chunks/assets/chunk_0003.glb b/world/generation/chunks/assets/chunk_0003.glb index 815aa8f..bb67914 100644 Binary files a/world/generation/chunks/assets/chunk_0003.glb and b/world/generation/chunks/assets/chunk_0003.glb differ diff --git a/world/generation/chunks/assets/chunk_0004.glb b/world/generation/chunks/assets/chunk_0004.glb index 4756e0f..fa093c0 100644 Binary files a/world/generation/chunks/assets/chunk_0004.glb and b/world/generation/chunks/assets/chunk_0004.glb differ diff --git a/world/generation/chunks/assets/chunk_0016.glb b/world/generation/chunks/assets/chunk_0016.glb index 7953824..dbf51a3 100644 Binary files a/world/generation/chunks/assets/chunk_0016.glb and b/world/generation/chunks/assets/chunk_0016.glb differ diff --git a/world/generation/chunks/assets/chunk_0018.glb b/world/generation/chunks/assets/chunk_0018.glb index cc8a4cb..16d6bf9 100644 Binary files a/world/generation/chunks/assets/chunk_0018.glb and b/world/generation/chunks/assets/chunk_0018.glb differ diff --git a/world/generation/chunks/assets/chunk_0020.glb b/world/generation/chunks/assets/chunk_0020.glb index 831fa49..3a1894f 100644 Binary files a/world/generation/chunks/assets/chunk_0020.glb and b/world/generation/chunks/assets/chunk_0020.glb differ diff --git a/world/generation/chunks/assets/chunk_0021.glb b/world/generation/chunks/assets/chunk_0021.glb index c7042ec..09562af 100644 Binary files a/world/generation/chunks/assets/chunk_0021.glb and b/world/generation/chunks/assets/chunk_0021.glb differ diff --git a/world/generation/chunks/assets/chunk_0022.glb b/world/generation/chunks/assets/chunk_0022.glb index 84ff40e..ea430c0 100644 Binary files a/world/generation/chunks/assets/chunk_0022.glb and b/world/generation/chunks/assets/chunk_0022.glb differ diff --git a/world/generation/chunks/assets/chunk_0024.glb b/world/generation/chunks/assets/chunk_0024.glb index 66a73dd..3266df4 100644 Binary files a/world/generation/chunks/assets/chunk_0024.glb and b/world/generation/chunks/assets/chunk_0024.glb differ diff --git a/world/generation/chunks/assets/chunk_0025.glb b/world/generation/chunks/assets/chunk_0025.glb index a0a0447..0ff38e9 100644 Binary files a/world/generation/chunks/assets/chunk_0025.glb and b/world/generation/chunks/assets/chunk_0025.glb differ diff --git a/world/generation/chunks/assets/chunk_0029.glb b/world/generation/chunks/assets/chunk_0029.glb index 78d4301..d3a6208 100644 Binary files a/world/generation/chunks/assets/chunk_0029.glb and b/world/generation/chunks/assets/chunk_0029.glb differ diff --git a/world/generation/chunks/assets/chunk_0030.glb b/world/generation/chunks/assets/chunk_0030.glb index c02801b..9cd6c4d 100644 Binary files a/world/generation/chunks/assets/chunk_0030.glb and b/world/generation/chunks/assets/chunk_0030.glb differ diff --git a/world/generation/chunks/assets/chunk_0031.glb b/world/generation/chunks/assets/chunk_0031.glb index 4815347..1293a19 100644 Binary files a/world/generation/chunks/assets/chunk_0031.glb and b/world/generation/chunks/assets/chunk_0031.glb differ diff --git a/world/generation/chunks/assets/chunk_0032.glb b/world/generation/chunks/assets/chunk_0032.glb index 7712aac..28fec93 100644 Binary files a/world/generation/chunks/assets/chunk_0032.glb and b/world/generation/chunks/assets/chunk_0032.glb differ diff --git a/world/generation/chunks/assets/chunk_0033.glb b/world/generation/chunks/assets/chunk_0033.glb index 648a089..03413af 100644 Binary files a/world/generation/chunks/assets/chunk_0033.glb and b/world/generation/chunks/assets/chunk_0033.glb differ diff --git a/world/generation/chunks/assets/chunk_0034.glb b/world/generation/chunks/assets/chunk_0034.glb index eaea7d1..7fc32e4 100644 Binary files a/world/generation/chunks/assets/chunk_0034.glb and b/world/generation/chunks/assets/chunk_0034.glb differ diff --git a/world/generation/chunks/assets/chunk_0035.glb b/world/generation/chunks/assets/chunk_0035.glb index 2eae4e7..a05d016 100644 Binary files a/world/generation/chunks/assets/chunk_0035.glb and b/world/generation/chunks/assets/chunk_0035.glb differ diff --git a/world/generation/chunks/assets/chunk_0036.glb b/world/generation/chunks/assets/chunk_0036.glb index e063e0c..52561b2 100644 Binary files a/world/generation/chunks/assets/chunk_0036.glb and b/world/generation/chunks/assets/chunk_0036.glb differ diff --git a/world/generation/chunks/assets/chunk_0037.glb b/world/generation/chunks/assets/chunk_0037.glb index ea79505..2d9a236 100644 Binary files a/world/generation/chunks/assets/chunk_0037.glb and b/world/generation/chunks/assets/chunk_0037.glb differ diff --git a/world/generation/chunks/assets/chunk_0038.glb b/world/generation/chunks/assets/chunk_0038.glb index 5fa83e3..2807d4e 100644 Binary files a/world/generation/chunks/assets/chunk_0038.glb and b/world/generation/chunks/assets/chunk_0038.glb differ diff --git a/world/generation/chunks/definitions/chunk_9996.tres b/world/generation/chunks/definitions/chunk_9996.tres index 5613d89..30f08d3 100644 --- a/world/generation/chunks/definitions/chunk_9996.tres +++ b/world/generation/chunks/definitions/chunk_9996.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="TerrainChunkDefinition" load_steps=4 format=3] [ext_resource type="Script" path="res://world/generation/terrain_chunk_definition.gd" id="1_definition"] -[ext_resource type="PackedScene" path="res://world/generation/chunks/assets/chunk_0015.glb" id="2_scene"] +[ext_resource type="PackedScene" path="res://world/generation/chunks/assets/chunk_0010.glb" id="2_scene"] [ext_resource type="PackedScene" path="res://world/generation/chunks/assets/chunk_0008.glb" id="3_base_coast"] [resource] @@ -9,7 +9,7 @@ script = ExtResource("1_definition") stable_id = &"chunk_9996" label = "second-tier beach sea transition left" packed_scene = ExtResource("2_scene") -primary_mesh_name = &"chunk_0015" +primary_mesh_name = &"chunk_0010" base_layer_scene = ExtResource("3_base_coast") base_layer_mesh_name = &"chunk_0008" base_layer_quarter_turns = 1 diff --git a/world/generation/chunks/definitions/chunk_9997.tres b/world/generation/chunks/definitions/chunk_9997.tres index 429db52..bf6b4e5 100644 --- a/world/generation/chunks/definitions/chunk_9997.tres +++ b/world/generation/chunks/definitions/chunk_9997.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="TerrainChunkDefinition" load_steps=4 format=3] [ext_resource type="Script" path="res://world/generation/terrain_chunk_definition.gd" id="1_definition"] -[ext_resource type="PackedScene" path="res://world/generation/chunks/assets/chunk_0015.glb" id="2_scene"] +[ext_resource type="PackedScene" path="res://world/generation/chunks/assets/chunk_0010.glb" id="2_scene"] [ext_resource type="PackedScene" path="res://world/generation/chunks/assets/chunk_0008.glb" id="3_base_coast"] [resource] @@ -9,7 +9,7 @@ script = ExtResource("1_definition") stable_id = &"chunk_9997" label = "second-tier beach sea transition right" packed_scene = ExtResource("2_scene") -primary_mesh_name = &"chunk_0015" +primary_mesh_name = &"chunk_0010" base_layer_scene = ExtResource("3_base_coast") base_layer_mesh_name = &"chunk_0008" base_layer_quarter_turns = 3 diff --git a/world/generation/chunks/definitions/chunk_9998.tres b/world/generation/chunks/definitions/chunk_9998.tres index a2e1dbf..fb12e20 100644 --- a/world/generation/chunks/definitions/chunk_9998.tres +++ b/world/generation/chunks/definitions/chunk_9998.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="TerrainChunkDefinition" load_steps=4 format=3] [ext_resource type="Script" path="res://world/generation/terrain_chunk_definition.gd" id="1_definition"] -[ext_resource type="PackedScene" path="res://world/generation/chunks/assets/chunk_0015.glb" id="2_scene"] +[ext_resource type="PackedScene" path="res://world/generation/chunks/assets/chunk_0010.glb" id="2_scene"] [ext_resource type="PackedScene" path="res://world/generation/chunks/assets/chunk_0007.glb" id="3_base_coast"] [resource] @@ -9,7 +9,7 @@ script = ExtResource("1_definition") stable_id = &"chunk_9998" label = "second-tier grass sea transition left" packed_scene = ExtResource("2_scene") -primary_mesh_name = &"chunk_0015" +primary_mesh_name = &"chunk_0010" base_layer_scene = ExtResource("3_base_coast") base_layer_mesh_name = &"chunk_0007" base_layer_quarter_turns = 1 diff --git a/world/generation/chunks/definitions/chunk_9999.tres b/world/generation/chunks/definitions/chunk_9999.tres index 8b4f99e..130d65d 100644 --- a/world/generation/chunks/definitions/chunk_9999.tres +++ b/world/generation/chunks/definitions/chunk_9999.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="TerrainChunkDefinition" load_steps=4 format=3] [ext_resource type="Script" path="res://world/generation/terrain_chunk_definition.gd" id="1_definition"] -[ext_resource type="PackedScene" path="res://world/generation/chunks/assets/chunk_0015.glb" id="2_scene"] +[ext_resource type="PackedScene" path="res://world/generation/chunks/assets/chunk_0010.glb" id="2_scene"] [ext_resource type="PackedScene" path="res://world/generation/chunks/assets/chunk_0007.glb" id="3_base_coast"] [resource] @@ -9,7 +9,7 @@ script = ExtResource("1_definition") stable_id = &"chunk_9999" label = "second-tier grass sea transition right" packed_scene = ExtResource("2_scene") -primary_mesh_name = &"chunk_0015" +primary_mesh_name = &"chunk_0010" base_layer_scene = ExtResource("3_base_coast") base_layer_mesh_name = &"chunk_0007" base_layer_quarter_turns = 3