assets/models/characters/umineko/umineko.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://cn6eua2fkf5kq"
-path="res://.godot/imported/umineko.png-6e87d2e61ae380bb905733bba29510bd.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/models/characters/umineko/umineko.png"
-dest_files=["res://.godot/imported/umineko.png-6e87d2e61ae380bb905733bba29510bd.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=true
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=0

assets/sprites/particles/sparkle.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://du3vk5nnksohs"
-path="res://.godot/imported/sparkle.png-707064c32347643bb517651d402ffb9b.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/sprites/particles/sparkle.png"
-dest_files=["res://.godot/imported/sparkle.png-707064c32347643bb517651d402ffb9b.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=true
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=0

assets/textures/sand_trap/sand_trap.png.import

@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://b8rhd8iebf0ep"
-path="res://.godot/imported/sand_trap.png-bf1b8a7d1ddd8397d1443e15395921c0.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/textures/sand_trap/sand_trap.png"
-dest_files=["res://.godot/imported/sand_trap.png-bf1b8a7d1ddd8397d1443e15395921c0.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1

levels/debug_level/debug_level.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=53 format=3 uid="uid://bm2o3mex10v11"]
+[gd_scene load_steps=42 format=3 uid="uid://bm2o3mex10v11"]
 
 [ext_resource type="Terrain3DStorage" uid="uid://bu1gewgsgc5hm" path="res://levels/debug_level/terrain_3d_storage.res" id="1_nlsu2"]
 [ext_resource type="Texture2D" path="res://assets/textures/grass_fairway/grass_fairway_albedo.dds" id="2_e4m27"]
@@ -7,8 +7,6 @@
 [ext_resource type="Texture2D" path="res://assets/textures/grass_fairway/grass_fairway_normal.dds" id="5_o361t"]
 [ext_resource type="Shader" path="res://src/shaders/psx_water.gdshader" id="6_0efu4"]
 [ext_resource type="Texture2D" uid="uid://c47ern0l2d50r" path="res://assets/vista_2.png" id="6_ectru"]
-[ext_resource type="Texture2D" path="res://assets/textures/sand_trap/sand_trap_albedo.dds" id="6_nlea7"]
-[ext_resource type="Texture2D" path="res://assets/textures/sand_trap/sand_trap_normal.dds" id="7_f25dn"]
 [ext_resource type="Texture2D" uid="uid://con5a36t6n6sq" path="res://assets/textures/clear_sea_water_2048x2048.png" id="7_t86h2"]
 [ext_resource type="PackedScene" uid="uid://cy7t2tc4y3b4" path="res://src/player/shot_setup/shot_setup.tscn" id="8_h44v5"]
 [ext_resource type="Script" path="res://src/world/ball_zone/ball_zone.gd" id="9_jwlau"]
@@ -17,10 +15,8 @@
 [ext_resource type="PackedScene" uid="uid://di7aql54lksn7" path="res://src/props/scenery/trees/palm_tree/palm_tree.tscn" id="12_sswxf"]
 [ext_resource type="PackedScene" uid="uid://c7l58wuuahn7w" path="res://src/props/flag/flag.tscn" id="13_6jtao"]
 [ext_resource type="Texture2D" uid="uid://dj60e8ri2fco" path="res://assets/models/scenery/city/concrete_building_1/concrete_building_1.png" id="14_y7s2h"]
-[ext_resource type="Texture2D" uid="uid://du3vk5nnksohs" path="res://assets/sprites/particles/sparkle.png" id="16_2m5yu"]
 [ext_resource type="PackedScene" uid="uid://nqar1qcun8ax" path="res://src/props/scenery/highway/guard_rail.tscn" id="16_xtxyj"]
 [ext_resource type="PackedScene" uid="uid://d0tcr6uijpym5" path="res://src/props/scenery/highway/highway_road.tscn" id="17_amems"]
-[ext_resource type="PackedScene" uid="uid://cblsayfgirexr" path="res://src/characters/umineko/umineko.tscn" id="21_ch6qk"]
 
 [sub_resource type="FastNoiseLite" id="FastNoiseLite_rpgb7"]
 noise_type = 0
@@ -46,7 +42,7 @@ _shader_parameters = {
 "noise_texture": SubResource("NoiseTexture2D_sb318"),
 "vertex_normals_distance": 128.0,
 "world_noise_blend_far": 1.0,
-"world_noise_blend_near": 0.48,
+"world_noise_blend_near": 0.57,
 "world_noise_height": 74.0,
 "world_noise_lod_distance": 16384.0,
 "world_noise_max_octaves": 8,
@@ -83,16 +79,9 @@ albedo_texture = ExtResource("2_e4m27")
 normal_texture = ExtResource("5_o361t")
 uv_scale = 0.01
 
-[sub_resource type="Terrain3DTextureAsset" id="Terrain3DTextureAsset_k6h8c"]
-name = "sand_trap_albedo"
-id = 2
-albedo_texture = ExtResource("6_nlea7")
-normal_texture = ExtResource("7_f25dn")
-uv_scale = 0.01
-
 [sub_resource type="Terrain3DAssets" id="Terrain3DAssets_eq5uw"]
 mesh_list = Array[Terrain3DMeshAsset]([SubResource("Terrain3DMeshAsset_8g62o")])
-texture_list = Array[Terrain3DTextureAsset]([SubResource("Terrain3DTextureAsset_kocfk"), SubResource("Terrain3DTextureAsset_vmhlw"), SubResource("Terrain3DTextureAsset_k6h8c")])
+texture_list = Array[Terrain3DTextureAsset]([SubResource("Terrain3DTextureAsset_kocfk"), SubResource("Terrain3DTextureAsset_vmhlw")])
 
 [sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_h8tes"]
 panorama = ExtResource("6_ectru")
@@ -145,17 +134,17 @@ noise = SubResource("FastNoiseLite_mgjj0")
 render_priority = 0
 shader = ExtResource("6_0efu4")
 shader_parameter/albedo = Color(0.427451, 0.917647, 1, 1)
-shader_parameter/scroll_speed1 = Vector2(0.04, 0)
+shader_parameter/scroll_speed1 = Vector2(0.05, 0)
-shader_parameter/scroll_speed2 = Vector2(-0.02, 0)
+shader_parameter/scroll_speed2 = Vector2(-0.03, 0)
 shader_parameter/blend_factor = 0.5
-shader_parameter/scale1 = Vector2(128, 128)
+shader_parameter/scale1 = Vector2(512, 512)
-shader_parameter/scale2 = Vector2(256, 256)
+shader_parameter/scale2 = Vector2(1024, 1024)
 shader_parameter/wave_strength = 0.4
 shader_parameter/wave_scale = 0.02
 shader_parameter/pixelation_level = 128
-shader_parameter/FoamSize = 3.0
+shader_parameter/FoamSize = 1.0
 shader_parameter/WaterOpacity = 0.9
-shader_parameter/FoamGlowIntensity = 0.6
+shader_parameter/FoamGlowIntensity = 0.5
 shader_parameter/water_texture1 = ExtResource("7_t86h2")
 shader_parameter/water_texture2 = ExtResource("7_t86h2")
 shader_parameter/noise_texture = SubResource("NoiseTexture2D_0xqld")
@@ -169,6 +158,13 @@ subdivide_depth = 1024
 [sub_resource type="BoxShape3D" id="BoxShape3D_x3wvm"]
 size = Vector3(4096, 2, 4096)
 
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_65jc8"]
+albedo_color = Color(0.427451, 0.917647, 1, 1)
+
+[sub_resource type="PlaneMesh" id="PlaneMesh_h0mhn"]
+material = SubResource("StandardMaterial3D_65jc8")
+size = Vector2(65536, 65536)
+
 [sub_resource type="Curve3D" id="Curve3D_3gyu3"]
 _data = {
 "points": PackedVector3Array(-4.50073, 0, 25.6049, 4.501, 0, -18.73, -15.152, 0, 5.61563, -20.4021, 0, 1.25826, 20.4021, 0, -1.25826, 25.991, 0, -27.2219, -9.077, 0, -17.164, 6.41687, 0, 33.4636, 72.1845, 0, 6.57864),
@@ -176,65 +172,13 @@ _data = {
 }
 point_count = 3
 
-[sub_resource type="Curve" id="Curve_5e511"]
-_data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(0.0934256, 1), 0.0, 0.0, 0, 0, Vector2(0.121107, 0.653576), 0.0, 0.0, 0, 0, Vector2(0.141869, 1), 0.0, 0.0, 0, 0, Vector2(0.418685, 1), 0.0, 0.0, 0, 0, Vector2(0.467128, 0.571529), 0.0, 0.0, 0, 0, Vector2(0.525952, 1), 0.0, 0.0, 0, 0, Vector2(0.747405, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
-point_count = 9
-
-[sub_resource type="CurveTexture" id="CurveTexture_pwelt"]
-curve = SubResource("Curve_5e511")
-
-[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_6nt4t"]
-emission_shape = 3
-emission_box_extents = Vector3(256, 1, 256)
-direction = Vector3(0, 1, 0)
-spread = 0.0
-initial_velocity_max = 0.1
-gravity = Vector3(0, 0, 0)
-scale_curve = SubResource("CurveTexture_pwelt")
-
-[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_sp12b"]
-transparency = 1
-shading_mode = 0
-albedo_texture = ExtResource("16_2m5yu")
-texture_filter = 4
-billboard_mode = 3
-billboard_keep_scale = true
-particles_anim_h_frames = 1
-particles_anim_v_frames = 1
-particles_anim_loop = false
-
-[sub_resource type="QuadMesh" id="QuadMesh_l4j8a"]
-material = SubResource("StandardMaterial3D_sp12b")
-size = Vector2(0.2, 0.2)
-
 [sub_resource type="Curve3D" id="Curve3D_u4eo7"]
 _data = {
-"points": PackedVector3Array(0, 0, -7.71536, 0, 0, 7.71536, -27.728, 0, 8.22205, 2.975, 0, -11.175, -2.975, 0, 11.175, -30.3645, 0, 45.9536, -12.075, 0, -20.125, 12.075, 0, 20.125, -21.5332, 0, 96.8633, 0.125, 0, 20.4, -0.125, 0, -20.4, 35.8701, 0, 94.7854, 0.9, 0, 27.9, -0.9, 0, -27.9, 35.9986, 0, 26.4862, 11.7438, 0, 0, -11.7438, 0, 0, 0.948586, 0, -1.88303),
+"points": PackedVector3Array(10.8695, 0, -3.68539, -10.8695, 0, 3.68539, -14.925, 0, 18.9744, 2.975, 0, -11.175, -2.975, 0, 11.175, -30.3645, 0, 45.9536, -12.075, 0, -20.125, 12.075, 0, 20.125, -21.5332, 0, 96.8633, 0.125, 0, 20.4, -0.125, 0, -20.4, 35.8701, 0, 94.7854, 0.9, 0, 27.9, -0.9, 0, -27.9, 35.9986, 0, 26.4862, 11, 0, -4, 0, 0, 0, -15, 0, 19),
 "tilts": PackedFloat32Array(0, 0, 0, 0, 0, 0)
 }
 point_count = 6
 
-[sub_resource type="Curve3D" id="Curve3D_5n8tb"]
-_data = {
-"points": PackedVector3Array(0, 0, 0, 0, 0, 0, 240.456, 0, -225.597, 59.3141, 0, 0, -59.3141, 0, 0, -18.05, 0, -225.653, 7.05249, 0, -37.1185, -7.05249, 0, 37.1185, -109.935, 0, -186.743, -21.8588, 0, -34.8939, 21.8588, 0, 34.8939, -66.1359, 0, -80.2544, 0.442711, 0, -2.30483, -0.442711, 0, 2.30483, -48.737, 0, -15.663, 5.53914, 0, -18.8786, -5.53914, 0, 18.8786, -74.3908, 20, 109.935, 13.4071, 0, 6.63843, -13.4071, 0, -6.63843, -115.009, 20, 126.521, -0.260315, 0, 23.4299, 0.260315, 0, -23.4299, -133.47, 20, 68.4647, 6.79831, 0, 42.3564, -6.79831, 0, -42.3564, -120.971, 20, -39.3107, 11.1252, 0, 10.3163, -11.1252, 0, -10.3163, -159.053, 20, -106.529, 26.7909, 0, 0.0442963, -26.7909, 0, -0.0442963, -215.095, 20, -127.132, 20.4801, 0, -20.654, -20.4801, 0, 20.654, -276.061, 20, -97.3046, 0, 0, 0, 0, 0, 0, -311.461, 20, -42.5658),
-"tilts": PackedFloat32Array(0, 0, 0, 0, 0, -0.008, -0.008, -0.008, -0.008, -0.008, -0.008, -0.008, -0.008)
-}
-point_count = 13
-
-[sub_resource type="Curve3D" id="Curve3D_4iuea"]
-_data = {
-"points": PackedVector3Array(8.60495, 0, -21.6587, -8.60495, 0, 21.6587, 4.31738, 0, -6.92267, 11.7785, 0, -0.0902557, -11.7785, 0, 0.0902557, -33.8488, 0, 18.9507, 9.83423, 0, 24.6441, -9.83423, 0, -24.6441, -72.7077, 0, -7.35956),
-"tilts": PackedFloat32Array(0, 0, 0)
-}
-point_count = 3
-
-[sub_resource type="Curve3D" id="Curve3D_eu1hd"]
-_data = {
-"points": PackedVector3Array(-2.56145, 0, 21.5912, 2.56145, 0, -21.5912, -0.00744629, 0, -7.08258, 13.7421, 0, 29.0431, -13.7421, 0, -29.0431, -10.9398, 0, -86.784, 17.5664, 0, 6.698, -17.5664, 0, -6.698, -69.4132, 0, -142.321, 25.2755, 0, -9.60468, -25.2755, 0, 9.60468, -138.962, 0, -142.928, 5.79678, 0, -12.6036, -5.79678, 0, 12.6036, -196.582, 0, -86.4825),
-"tilts": PackedFloat32Array(0, 0, 0, 0, 0)
-}
-point_count = 5
-
 [node name="TestLevel" type="Node3D"]
 
 [node name="Terrain3D" type="Terrain3D" parent="."]
@@ -251,6 +195,24 @@ transform = Transform3D(0.782608, -0.611691, 0.11558, 0, 0.185667, 0.982613, -0.
 shadow_enabled = true
 shadow_blur = 4.0
 
+[node name="Buildings" type="Node3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 129.404, -9.53674e-07, 309.4)
+
+[node name="ConcreteBuilding1" parent="Buildings" instance=ExtResource("10_lf15j")]
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 0)
+
+[node name="KanaSignboard" parent="Buildings/ConcreteBuilding1" instance=ExtResource("11_evxup")]
+transform = Transform3D(-8.74228e-08, 0, -2, 0, 2, 0, 2, 0, -8.74228e-08, 10.8, 12, 7)
+
+[node name="ConcreteBuilding2" parent="Buildings" instance=ExtResource("10_lf15j")]
+transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 0, 20)
+
+[node name="ConcreteBuilding3" parent="Buildings" instance=ExtResource("10_lf15j")]
+transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 0, 40)
+
+[node name="PalmTree" parent="." instance=ExtResource("12_sswxf")]
+transform = Transform3D(-0.69799, 0, -0.716107, 0, 1, 0, 0.716107, 0, -0.69799, 140.872, -9.53674e-07, 296.932)
+
 [node name="Course" type="Node3D" parent="."]
 
 [node name="Fairway" type="Area3D" parent="Course"]
@@ -285,106 +247,23 @@ water_hazard = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.2, 0)
 shape = SubResource("BoxShape3D_x3wvm")
 
+[node name="MacroWaterTable" type="MeshInstance3D" parent="Course"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -10, 0)
+visible = false
+mesh = SubResource("PlaneMesh_h0mhn")
+skeleton = NodePath("../..")
+
 [node name="Flag" parent="Course" instance=ExtResource("13_6jtao")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 540, 4, 452)
 
 [node name="ShotSetup" parent="Course" instance=ExtResource("8_h44v5")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 212.717, 4, 294.073)
 
-[node name="GuardRail" parent="Course" instance=ExtResource("16_xtxyj")]
+[node name="GuardRail" parent="." instance=ExtResource("16_xtxyj")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 211.416, 4, 288.708)
 curve = SubResource("Curve3D_3gyu3")
 end_cap = true
 
-[node name="WaterSparkle" type="GPUParticles3D" parent="Course"]
+[node name="HighwayRoad" parent="." instance=ExtResource("17_amems")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 419.597, -2, 265.696)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 124.25, 0, 267.5)
-amount = 1024
-lifetime = 12.0
-visibility_aabb = AABB(-128, -4, -128, 256, 8, 256)
-process_material = SubResource("ParticleProcessMaterial_6nt4t")
-draw_pass_1 = SubResource("QuadMesh_l4j8a")
-
-[node name="CityBuildings" type="Node3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 129.404, -9.53674e-07, 309.4)
-
-[node name="ConcreteBuilding1" parent="CityBuildings" instance=ExtResource("10_lf15j")]
-transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 0)
-
-[node name="KanaSignboard" parent="CityBuildings/ConcreteBuilding1" instance=ExtResource("11_evxup")]
-transform = Transform3D(-8.74228e-08, 0, -2, 0, 2, 0, 2, 0, -8.74228e-08, 10.8, 12, 7)
-
-[node name="ConcreteBuilding2" parent="CityBuildings" instance=ExtResource("10_lf15j")]
-transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 0, 20)
-
-[node name="ConcreteBuilding3" parent="CityBuildings" instance=ExtResource("10_lf15j")]
-transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 0, 40)
-
-[node name="PalmTree" parent="CityBuildings" instance=ExtResource("12_sswxf")]
-transform = Transform3D(-0.69799, 0, -0.716107, 0, 1, 0, 0.716107, 0, -0.69799, 11.468, 0, -12.468)
-
-[node name="HighwayRoad" parent="CityBuildings" instance=ExtResource("17_amems")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.15401, 9.53674e-07, -41.9)
 curve = SubResource("Curve3D_u4eo7")
-
-[node name="Umineko" parent="CityBuildings" instance=ExtResource("21_ch6qk")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -57.5273, 19.726, 24.2738)
-
-[node name="MountainCurve" type="Node3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -252.35, 20, 498.52)
-
-[node name="MountainHighway" parent="MountainCurve" instance=ExtResource("17_amems")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 137.181, -20, -7.285)
-curve = SubResource("Curve3D_5n8tb")
-
-[node name="ConcreteBuilding1" parent="MountainCurve" instance=ExtResource("10_lf15j")]
-transform = Transform3D(-0.0979477, 0, 0.995192, 0, 1, 0, -0.995192, 0, -0.0979477, -10.074, 0, -32.347)
-
-[node name="GuardRail" parent="MountainCurve" instance=ExtResource("16_xtxyj")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 70.2122, 0, 116.269)
-curve = SubResource("Curve3D_4iuea")
-end_cap = true
-
-[node name="GuardRail2" parent="MountainCurve" instance=ExtResource("16_xtxyj")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 27.5313, 0, 3.09094)
-curve = SubResource("Curve3D_eu1hd")
-end_cap = true
-
-[node name="PalmTree" parent="MountainCurve" instance=ExtResource("12_sswxf")]
-transform = Transform3D(0.57763, 0, -0.816299, 0, 1, 0, 0.816299, 0, 0.57763, 0.942703, 0, -4.85565)
-
-[node name="PalmTree2" parent="MountainCurve" instance=ExtResource("12_sswxf")]
-transform = Transform3D(0.184826, 0, -0.982771, 0, 1, 0, 0.982771, 0, 0.184826, 1.55019, 0, -15.9243)
-
-[node name="Lakeside" type="Node3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 458.103, 1.52588e-05, 204.202)
-
-[node name="PalmTree" parent="Lakeside" instance=ExtResource("12_sswxf")]
-transform = Transform3D(-0.101178, 0, 0.994868, 0, 1, 0, -0.994868, 0, -0.101178, -1.09882, -1.4275, 6.638)
-
-[node name="PalmTree2" parent="Lakeside" instance=ExtResource("12_sswxf")]
-transform = Transform3D(-0.984291, 0, 0.176552, 0, 1, 0, -0.176552, 0, -0.984291, -9.27121, -0.652365, -3.14384)
-
-[node name="PalmTree3" parent="Lakeside" instance=ExtResource("12_sswxf")]
-transform = Transform3D(-0.652998, 0, 0.75736, 0, 1, 0, -0.75736, 0, -0.652998, -1.89178, -0.327666, -1.44794)
-
-[node name="Umineko4" parent="Lakeside" instance=ExtResource("21_ch6qk")]
-transform = Transform3D(-0.608983, 0, 0.793183, 0, 1, 0, -0.793183, 0, -0.608983, -41.9143, 30, 50.2759)
-
-[node name="Flock1" type="Node3D" parent="Lakeside"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -102.494, 20, 6.50301)
-
-[node name="Umineko" parent="Lakeside/Flock1" instance=ExtResource("21_ch6qk")]
-
-[node name="Umineko2" parent="Lakeside/Flock1" instance=ExtResource("21_ch6qk")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 11.3881, 0.530237, -10.7988)
-
-[node name="Flock2" type="Node3D" parent="Lakeside"]
-transform = Transform3D(-0.914826, 0, -0.403849, 0, 1, 0, 0.403849, 0, -0.914826, 4.524, 30, 52.469)
-
-[node name="Umineko" parent="Lakeside/Flock2" instance=ExtResource("21_ch6qk")]
-
-[node name="Umineko2" parent="Lakeside/Flock2" instance=ExtResource("21_ch6qk")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 14.4011, 0.530239, -13.6932)
-
-[node name="Umineko3" parent="Lakeside/Flock2" instance=ExtResource("21_ch6qk")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.56348, -0.274033, -7.70535)

src/characters/gfolf_girl/gfolf_girl.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=22 format=3 uid="uid://1s3gywmoi20e"]
 
 [ext_resource type="PackedScene" uid="uid://ha6jxf4v5845" path="res://assets/models/characters/gfolf_girl/gfolf_girl.gltf" id="1_j80rr"]
-[ext_resource type="Script" path="res://src/characters/player_characters/character_controller.gd" id="2_7o84v"]
+[ext_resource type="Script" path="res://src/characters/character_controller.gd" id="2_7o84v"]
 [ext_resource type="Script" path="res://src/util/random_timer.gd" id="3_ex68g"]
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_fokhu"]

src/characters/umineko/umineko.gd

@@ -1,17 +0,0 @@
-extends Node3D
-
-@export var speed := 12.0
-@export var unit_rotation := 0.15
-
-@onready var animation: AnimationTree = $AnimationTree
-
-
-func _on_flap_timer_timeout() -> void:
-	animation["parameters/flap_trigger/request"] = AnimationNodeOneShot.ONE_SHOT_REQUEST_FIRE
-
-
-func _process(delta: float) -> void:
-	# Update position (fly in circle)
-
-	global_position += global_basis.z * speed * delta
-	global_rotation.y += unit_rotation * delta

src/characters/umineko/umineko.tscn

@@ -1,77 +0,0 @@
-[gd_scene load_steps=10 format=3 uid="uid://cblsayfgirexr"]
-
-[ext_resource type="PackedScene" uid="uid://ynbeag63q0c5" path="res://assets/models/characters/umineko/umineko.gltf" id="1_05f5o"]
-[ext_resource type="Script" path="res://src/characters/umineko/umineko.gd" id="2_l2m5i"]
-[ext_resource type="Script" path="res://src/util/random_timer.gd" id="3_1csih"]
-
-[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_v712c"]
-animation = &"flap"
-
-[sub_resource type="AnimationNodeOneShot" id="AnimationNodeOneShot_bsmxe"]
-fadein_time = 0.1
-fadeout_time = 0.1
-
-[sub_resource type="AnimationNodeAdd2" id="AnimationNodeAdd2_illtt"]
-
-[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_ami58"]
-animation = &"idle"
-
-[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_342v6"]
-animation = &"wingtip_wind"
-
-[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_8a2qb"]
-graph_offset = Vector2(-850, -26)
-nodes/flap_anim/node = SubResource("AnimationNodeAnimation_v712c")
-nodes/flap_anim/position = Vector2(-160, 300)
-nodes/flap_trigger/node = SubResource("AnimationNodeOneShot_bsmxe")
-nodes/flap_trigger/position = Vector2(120, 140)
-nodes/idle_add/node = SubResource("AnimationNodeAdd2_illtt")
-nodes/idle_add/position = Vector2(-160, 60)
-nodes/idle_anim/node = SubResource("AnimationNodeAnimation_ami58")
-nodes/idle_anim/position = Vector2(-380, 20)
-nodes/output/position = Vector2(340, 160)
-nodes/wingtip_anim/node = SubResource("AnimationNodeAnimation_342v6")
-nodes/wingtip_anim/position = Vector2(-400, 200)
-node_connections = [&"flap_trigger", 0, &"idle_add", &"flap_trigger", 1, &"flap_anim", &"idle_add", 0, &"idle_anim", &"idle_add", 1, &"wingtip_anim", &"output", 0, &"flap_trigger"]
-
-[node name="Umineko" instance=ExtResource("1_05f5o")]
-script = ExtResource("2_l2m5i")
-
-[node name="Armature" parent="." index="0"]
-transform = Transform3D(0.6, 0, 0, 0, 0.6, 0, 0, 0, 0.6, 0, 0, 0)
-
-[node name="Skeleton3D" parent="Armature" index="0"]
-bones/0/rotation = Quaternion(0.707107, -5.33851e-08, -5.33851e-08, 0.707107)
-bones/1/rotation = Quaternion(-1.12526e-07, 3.65963e-15, -0.745227, 0.66681)
-bones/1/scale = Vector3(1, 1, 1)
-bones/2/rotation = Quaternion(-1.21153e-08, 5.90286e-15, -0.0802357, 0.996776)
-bones/3/rotation = Quaternion(-2.30725e-08, -1.76517e-14, -0.152802, 0.988257)
-bones/4/rotation = Quaternion(-2.06306e-08, 9.3445e-15, -0.13663, 0.990622)
-bones/5/position = Vector3(1.46719, 0.319025, -2.26868e-07)
-bones/5/rotation = Quaternion(1.45288e-07, 2.54822e-14, 0.9622, -0.272343)
-bones/5/scale = Vector3(1, 1, 1)
-bones/6/rotation = Quaternion(1.78182e-14, 1.00686e-07, 0.745227, 0.66681)
-bones/6/scale = Vector3(1, 1, 1)
-bones/7/rotation = Quaternion(-1.21153e-08, -4.65491e-15, 0.0802357, 0.996776)
-bones/8/rotation = Quaternion(-2.30725e-08, 2.32662e-14, 0.152802, 0.988257)
-bones/9/rotation = Quaternion(-2.06306e-08, -1.98297e-14, 0.13663, 0.990622)
-bones/10/position = Vector3(-1.46719, 0.319025, 2.16212e-07)
-bones/10/rotation = Quaternion(-3.65961e-14, 4.11227e-08, 0.9622, 0.272343)
-bones/10/scale = Vector3(1, 1, 1)
-
-[node name="AnimationTree" type="AnimationTree" parent="." index="2"]
-tree_root = SubResource("AnimationNodeBlendTree_8a2qb")
-anim_player = NodePath("../AnimationPlayer")
-parameters/flap_trigger/active = false
-parameters/flap_trigger/internal_active = false
-parameters/flap_trigger/request = 0
-parameters/idle_add/add_amount = 0.5
-
-[node name="FlapTimer" type="Timer" parent="." index="3"]
-autostart = true
-script = ExtResource("3_1csih")
-mean_time = 8.0
-st_dev_time = 3.0
-minimum_time = 1.8
-
-[connection signal="timeout" from="FlapTimer" to="." method="_on_flap_timer_timeout"]

src/player/shot_setup/shot_setup.tscn

@@ -3,7 +3,7 @@
 [ext_resource type="Script" path="res://src/player/shot_setup/shot_setup.gd" id="1_r6ei4"]
 [ext_resource type="PackedScene" uid="uid://dfttci386ohip" path="res://src/player/physics_ball/physics_ball.tscn" id="2_1i5j5"]
 [ext_resource type="PackedScene" uid="uid://c2k88ns0h5ie1" path="res://src/ui/arrow/arrow.tscn" id="2_s70wl"]
-[ext_resource type="PackedScene" uid="uid://1s3gywmoi20e" path="res://src/characters/player_characters/gfolf_girl/gfolf_girl.tscn" id="3_e4aur"]
+[ext_resource type="PackedScene" uid="uid://1s3gywmoi20e" path="res://src/characters/gfolf_girl/gfolf_girl.tscn" id="3_e4aur"]
 [ext_resource type="PackedScene" uid="uid://445qd7m4qe2j" path="res://src/player/shot_setup/club_selector/club_selector.tscn" id="4_56ape"]
 [ext_resource type="PackedScene" uid="uid://fht6j87o8ecr" path="res://src/ui/projectile_arc/projectile_arc.tscn" id="4_ry2ho"]
 [ext_resource type="PackedScene" uid="uid://dbdul15c4oblg" path="res://src/ui/projected_target.tscn" id="6_mynqj"]
@@ -484,7 +484,7 @@ _data = {
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_afsun"]
 shader = ExtResource("7_h6c4m")
 shader_parameter/change_color_depth = true
-shader_parameter/target_color_depth = 3
+shader_parameter/target_color_depth = 6
 shader_parameter/dithering = true
 shader_parameter/scale_resolution = true
 shader_parameter/target_resolution_scale = 3

src/props/flag/flag.tscn

@@ -28,8 +28,7 @@ outline_modulate = Color(1, 0, 0.133333, 1)
 text = "Goal!
 0000 m"
 font = ExtResource("2_tmki0")
-font_size = 64
+outline_size = 8
-outline_size = 16
 line_spacing = -16.0
 
 [node name="Skeleton3D" parent="Armature" index="0"]

src/props/scenery/highway/guard_rail.tscn

@@ -21,7 +21,7 @@ size = Vector2(0.5, 1)
 center_offset = Vector3(0, 0.5, 0)
 orientation = 2
 
-[sub_resource type="MultiMesh" id="MultiMesh_ecm13"]
+[sub_resource type="MultiMesh" id="MultiMesh_o7ch8"]
 transform_format = 1
 mesh = SubResource("PlaneMesh_ko4yv")
 
@@ -59,6 +59,6 @@ path_joined = false
 material = ExtResource("2_1s4wy")
 
 [node name="PostMultiMesh" type="MultiMeshInstance3D" parent="."]
-multimesh = SubResource("MultiMesh_ecm13")
+multimesh = SubResource("MultiMesh_o7ch8")
 
 [connection signal="curve_changed" from="." to="." method="_on_curve_changed"]