Seagulls

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

@@ -0,0 +1,34 @@
+[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

levels/debug_level/debug_level.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=52 format=3 uid="uid://bm2o3mex10v11"]
+[gd_scene load_steps=53 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"]
@@ -20,6 +20,7 @@
 [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
@@ -325,6 +326,9 @@ transform = Transform3D(-0.69799, 0, -0.716107, 0, 1, 0, 0.716107, 0, -0.69799,
 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)
 
@@ -362,3 +366,25 @@ transform = Transform3D(-0.984291, 0, 0.176552, 0, 1, 0, -0.176552, 0, -0.984291
 
 [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/player_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/character_controller.gd" id="2_7o84v"]
+[ext_resource type="Script" path="res://src/characters/player_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

@@ -0,0 +1,17 @@
+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

@@ -0,0 +1,77 @@
+[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/gfolf_girl/gfolf_girl.tscn" id="3_e4aur"]
+[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://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"]