diff --git a/core/ai/agents/human/Farmer1.fbx b/core/ai/agents/human/Farmer1.fbx index 7bfa65b..aab21d4 100644 Binary files a/core/ai/agents/human/Farmer1.fbx and b/core/ai/agents/human/Farmer1.fbx differ diff --git a/core/ai/agents/human/ai_farmer.tscn b/core/ai/agents/human/ai_farmer.tscn index 60210ee..85be1ba 100644 --- a/core/ai/agents/human/ai_farmer.tscn +++ b/core/ai/agents/human/ai_farmer.tscn @@ -4,9 +4,7 @@ [ext_resource type="Script" uid="uid://bngfthvt04ivv" path="res://core/ai/framework/patrol_state.gd" id="3_2oda6"] [ext_resource type="Script" uid="uid://d3hy70ec8vqo5" path="res://core/ai/framework/run_animation_state.gd" id="4_2oda6"] [ext_resource type="Shader" uid="uid://d0ch5ofrgf7y6" path="res://core/daynight/trunk_shader.gdshader" id="6_ejkex"] -[ext_resource type="Material" uid="uid://biaudrjlfoflm" path="res://tgcc/chunk/prop/house/house.tres" id="6_yh1vp"] [ext_resource type="Texture2D" uid="uid://jn4seoee6vtw" path="res://tgcc/chunk/prop/house/main_texture.png" id="7_ax7ee"] -[ext_resource type="Material" uid="uid://wkegx4a21x7u" path="res://tgcc/chunk/prop/fence/fences.tres" id="8_ax7ee"] [ext_resource type="Material" uid="uid://b2lg2y1k7grmo" path="res://tgcc/chunk/prop/tree/trunk.tres" id="9_gownw"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_gownw"] @@ -98,22 +96,17 @@ bones/53/rotation = Quaternion(-0.25056988, -0.06629382, 0.018621337, 0.96564656 bones/54/rotation = Quaternion(0.549743, -0.041815143, -0.046032935, 0.83301574) bones/55/rotation = Quaternion(0.3627838, -0.05369254, 0.01255593, 0.9302406) -[node name="hat_001" parent="Farmer1/BaseMesh/Skeleton3D" parent_id_path=PackedInt32Array(925374995, 170090470) index="0" unique_id=1870022852] +[node name="hat_001" parent="Farmer1/BaseMesh/Skeleton3D" parent_id_path=PackedInt32Array(925374995, 224377346) index="1" unique_id=1950307793] surface_material_override/0 = SubResource("ShaderMaterial_gownw") -surface_material_override/1 = ExtResource("8_ax7ee") -[node name="pants" parent="Farmer1/BaseMesh/Skeleton3D" parent_id_path=PackedInt32Array(925374995, 170090470) index="1" unique_id=786344672] +[node name="pants" parent="Farmer1/BaseMesh/Skeleton3D" parent_id_path=PackedInt32Array(925374995, 224377346) index="2" unique_id=1080342530] surface_material_override/0 = ExtResource("9_gownw") -[node name="shirt2" parent="Farmer1/BaseMesh/Skeleton3D" parent_id_path=PackedInt32Array(925374995, 170090470) index="2" unique_id=1681371541] +[node name="shirt2" parent="Farmer1/BaseMesh/Skeleton3D" parent_id_path=PackedInt32Array(925374995, 224377346) index="3" unique_id=1846653994] surface_material_override/0 = ExtResource("9_gownw") surface_material_override/1 = ExtResource("9_gownw") surface_material_override/2 = ExtResource("9_gownw") -[node name="hat_001" parent="Farmer2/BaseMesh/Skeleton3D" parent_id_path=PackedInt32Array(1239853450, 1824387143) index="0" unique_id=1838787788] -surface_material_override/0 = ExtResource("6_yh1vp") -surface_material_override/1 = ExtResource("8_ax7ee") - [node name="pants" parent="Farmer2/BaseMesh/Skeleton3D" parent_id_path=PackedInt32Array(1239853450, 1824387143) index="1" unique_id=1777820543] surface_material_override/0 = ExtResource("9_gownw") diff --git a/core/ai/agents/human/ai_human.tscn b/core/ai/agents/human/ai_human.tscn index c5b9d7a..e9bd64b 100644 --- a/core/ai/agents/human/ai_human.tscn +++ b/core/ai/agents/human/ai_human.tscn @@ -7,8 +7,12 @@ [ext_resource type="Animation" uid="uid://oq22ilhxjejj" path="res://core/ai/agents/human/idle.res" id="4_cuxdk"] [ext_resource type="Animation" uid="uid://6xnsf8x7nmsl" path="res://core/ai/agents/human/walking.res" id="6_cuxdk"] [ext_resource type="PackedScene" uid="uid://b3j2dbcqwodx1" path="res://core/ai/agents/human/Farmer1.fbx" id="7_hguxe"] +[ext_resource type="Material" uid="uid://blqelpjvdv23j" path="res://tgcc/chunk/material/grassflat_chunk.tres" id="8_362f3"] [ext_resource type="PackedScene" uid="uid://c5x3ycaxixpxy" path="res://core/ai/agents/human/Farmer2.fbx" id="8_ke7sb"] [ext_resource type="Script" uid="uid://dauqq8cqmwrqh" path="res://core/ai/agents/human/dress_human.gd" id="9_2tpdi"] +[ext_resource type="Material" uid="uid://b4luvp3fi0p43" path="res://tgcc/chunk/material/railway_chunk.tres" id="9_12auf"] +[ext_resource type="Material" uid="uid://biaudrjlfoflm" path="res://tgcc/chunk/prop/house/house.tres" id="10_hokl2"] +[ext_resource type="Material" uid="uid://wkegx4a21x7u" path="res://tgcc/chunk/prop/fence/fences.tres" id="11_v2pkc"] [sub_resource type="AnimationLibrary" id="AnimationLibrary_8kg0q"] _data = { @@ -40,7 +44,7 @@ anim_player = NodePath("BaseMesh/AnimationPlayer") [node name="BaseMesh" parent="." index="3" unique_id=1846171523 instance=ExtResource("3_ef4cu")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.9, 0) -[node name="Skeleton3D" parent="BaseMesh/BaseMesh" parent_id_path=PackedInt32Array(1846171523, 2032005240) index="0" unique_id=1876883359] +[node name="Skeleton3D" parent="BaseMesh/BaseMesh" parent_id_path=PackedInt32Array(1846171523, 1363988051) index="0" unique_id=1848874512] bones/0/position = Vector3(-0.0024333135, 0.9952637, 6.9276895e-05) bones/0/rotation = Quaternion(-0.0049152793, -0.050206795, -0.026513178, 0.99837476) bones/1/rotation = Quaternion(-0.025209453, 0.006135946, 0.009180705, 0.9996213) @@ -83,14 +87,14 @@ bones/53/rotation = Quaternion(-0.10502596, -0.00032293255, 0.008123855, 0.99443 bones/54/rotation = Quaternion(0.51151097, 0.066536464, -0.07767137, 0.8531686) bones/55/rotation = Quaternion(0.3453064, -0.067497015, 0.02391528, 0.93575406) -[node name="AnimationPlayer" parent="BaseMesh" index="1" unique_id=226905852] +[node name="AnimationPlayer" parent="BaseMesh" index="1" unique_id=930749540] libraries/custom = SubResource("AnimationLibrary_8kg0q") [node name="Farmer1" parent="." index="4" unique_id=925374995 instance=ExtResource("7_hguxe")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.9, 0) visible = false -[node name="Skeleton3D" parent="Farmer1/BaseMesh" parent_id_path=PackedInt32Array(925374995, 35893719) index="0" unique_id=264693097] +[node name="Skeleton3D" parent="Farmer1/BaseMesh" parent_id_path=PackedInt32Array(925374995, 1608049295) index="0" unique_id=224377346] bones/0/position = Vector3(0.00060560287, 0.9719096, 0.007789615) bones/0/rotation = Quaternion(-0.03158553, -0.024531638, -0.086598895, 0.9954402) bones/1/rotation = Quaternion(-0.068302006, -0.011589706, 0.088431515, 0.99367017) @@ -133,14 +137,30 @@ bones/53/rotation = Quaternion(-0.20515193, 0.049833227, 0.0071537, 0.9774345) bones/54/rotation = Quaternion(0.55275166, -0.049315806, -0.007871797, 0.8318483) bones/55/rotation = Quaternion(0.326561, -0.058840513, 0.019667907, 0.9431378) -[node name="AnimationPlayer" parent="Farmer1" index="1" unique_id=1795570086] +[node name="Cesto" parent="Farmer1/BaseMesh/Skeleton3D" index="0" unique_id=1473592366] +surface_material_override/0 = ExtResource("8_362f3") +surface_material_override/1 = ExtResource("9_12auf") +surface_material_override/2 = ExtResource("9_12auf") + +[node name="hat_001" parent="Farmer1/BaseMesh/Skeleton3D" index="1" unique_id=1950307793] +surface_material_override/0 = ExtResource("10_hokl2") +surface_material_override/1 = ExtResource("11_v2pkc") + +[node name="pants" parent="Farmer1/BaseMesh/Skeleton3D" index="2" unique_id=1080342530] +surface_material_override/0 = ExtResource("11_v2pkc") + +[node name="shirt2" parent="Farmer1/BaseMesh/Skeleton3D" index="3" unique_id=1846653994] +surface_material_override/0 = ExtResource("11_v2pkc") +surface_material_override/1 = ExtResource("11_v2pkc") +surface_material_override/2 = ExtResource("11_v2pkc") + +[node name="AnimationPlayer" parent="Farmer1" index="1" unique_id=2137081705] libraries/custom = SubResource("AnimationLibrary_ke7sb") [node name="Farmer2" parent="." index="5" unique_id=1239853450 instance=ExtResource("8_ke7sb")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.9, 0) -visible = false -[node name="Skeleton3D" parent="Farmer2/BaseMesh" parent_id_path=PackedInt32Array(1239853450, 2123768022) index="0" unique_id=1560566445] +[node name="Skeleton3D" parent="Farmer2/BaseMesh" parent_id_path=PackedInt32Array(1239853450, 2068119799) index="0" unique_id=1824387143] bones/0/position = Vector3(0.00060560287, 0.9719096, 0.007789615) bones/0/rotation = Quaternion(-0.03158553, -0.024531638, -0.086598895, 0.9954402) bones/1/rotation = Quaternion(-0.068302006, -0.011589706, 0.088431515, 0.99367017) @@ -183,13 +203,24 @@ bones/53/rotation = Quaternion(-0.20515193, 0.049833227, 0.0071537, 0.9774345) bones/54/rotation = Quaternion(0.55275166, -0.049315806, -0.007871797, 0.8318483) bones/55/rotation = Quaternion(0.326561, -0.058840513, 0.019667907, 0.9431378) -[node name="AnimationPlayer" parent="Farmer2" index="1" unique_id=916643412] +[node name="hat_001" parent="Farmer2/BaseMesh/Skeleton3D" index="0" unique_id=1838787788] +surface_material_override/0 = ExtResource("10_hokl2") +surface_material_override/1 = ExtResource("11_v2pkc") + +[node name="pants" parent="Farmer2/BaseMesh/Skeleton3D" index="1" unique_id=1777820543] +surface_material_override/0 = ExtResource("11_v2pkc") + +[node name="shirt1" parent="Farmer2/BaseMesh/Skeleton3D" index="2" unique_id=1243989703] +surface_material_override/0 = ExtResource("11_v2pkc") +surface_material_override/1 = ExtResource("11_v2pkc") + +[node name="AnimationPlayer" parent="Farmer2" index="1" unique_id=995025267] libraries/custom = SubResource("AnimationLibrary_2tpdi") [node name="DressHuman" type="Node3D" parent="." index="6" unique_id=107727715 node_paths=PackedStringArray("farmers", "main_anim_player")] script = ExtResource("9_2tpdi") farmers = [NodePath("../Farmer1"), NodePath("../Farmer2")] -colors = Array[Color]([Color(0, 0, 0, 1), Color(1, 1, 1, 1), Color(1, 0, 0, 1), Color(0, 1, 0, 1), Color(0, 0, 1, 1)]) +colors = Array[Color]([Color(0.4089676, 0.23789883, 0.083061926, 1), Color(0.4862745, 0.60784316, 0.6901961, 1), Color(0.3529412, 0.41960785, 0.32941177, 1), Color(0.31533447, 0.3330399, 0.29725653, 1)]) main_anim_player = NodePath("../BaseMesh/AnimationPlayer") [editable path="BaseMesh"]