diff --git a/godot/Models/buildings/building_1.tscn b/godot/Models/buildings/building_1.tscn index 8b0bb30..bf287b2 100644 --- a/godot/Models/buildings/building_1.tscn +++ b/godot/Models/buildings/building_1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=4 format=3 uid="uid://ce7jbp7f55cro"] +[gd_scene load_steps=5 format=3 uid="uid://ce7jbp7f55cro"] [ext_resource type="PackedScene" uid="uid://cchgdggcbyk6f" path="res://Models/buildings/building_01.1.glb" id="1_8lstr"] [ext_resource type="Texture2D" uid="uid://b4qbyum6h2mhf" path="res://Textures/building_01.png" id="2_w406q"] @@ -6,7 +6,16 @@ [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_i2ykn"] albedo_texture = ExtResource("2_w406q") +[sub_resource type="BoxShape3D" id="BoxShape3D_hr7fu"] +size = Vector3(0.183504, 0.527655, 0.184908) + [node name="building_01_1" instance=ExtResource("1_8lstr")] [node name="node_id4" parent="root" index="0"] surface_material_override/0 = SubResource("StandardMaterial3D_i2ykn") + +[node name="StaticBody3D" type="StaticBody3D" parent="root" index="1"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="root/StaticBody3D" index="0"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.251368) +shape = SubResource("BoxShape3D_hr7fu") diff --git a/godot/Models/buildings/building_2.tscn b/godot/Models/buildings/building_2.tscn index 1b6c872..cd2692a 100644 --- a/godot/Models/buildings/building_2.tscn +++ b/godot/Models/buildings/building_2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=4 format=3 uid="uid://cx44bjuxlhq06"] +[gd_scene load_steps=5 format=3 uid="uid://cx44bjuxlhq06"] [ext_resource type="PackedScene" uid="uid://buxxa2rq7s8eg" path="res://Models/buildings/building_01.2.glb" id="1_sy5sk"] [ext_resource type="Texture2D" uid="uid://vnlqr1ob2tss" path="res://Textures/building_02.png" id="2_ns75r"] @@ -6,7 +6,16 @@ [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ktg7d"] albedo_texture = ExtResource("2_ns75r") +[sub_resource type="BoxShape3D" id="BoxShape3D_wy6bt"] +size = Vector3(0.377897, 0.527655, 0.362437) + [node name="building_01_2" instance=ExtResource("1_sy5sk")] [node name="node_id4" parent="root" index="0"] surface_material_override/0 = SubResource("StandardMaterial3D_ktg7d") + +[node name="StaticBody3D" type="StaticBody3D" parent="." index="1"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D" index="0"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.00178906, 0.251368) +shape = SubResource("BoxShape3D_wy6bt") diff --git a/godot/Models/buildings/building_3.tscn b/godot/Models/buildings/building_3.tscn index 075b3ee..4045a0f 100644 --- a/godot/Models/buildings/building_3.tscn +++ b/godot/Models/buildings/building_3.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=4 format=3 uid="uid://bm65tvb4irjqw"] +[gd_scene load_steps=5 format=3 uid="uid://bm65tvb4irjqw"] [ext_resource type="PackedScene" uid="uid://dgm33vy6bq45y" path="res://Models/buildings/building_01.3.glb" id="1_6oij5"] [ext_resource type="Texture2D" uid="uid://cew7em3xjhrbo" path="res://Textures/building_03.png" id="2_qgmwq"] @@ -6,7 +6,16 @@ [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_h48n6"] albedo_texture = ExtResource("2_qgmwq") +[sub_resource type="BoxShape3D" id="BoxShape3D_t3xdb"] +size = Vector3(0.366655, 0.527655, 0.367689) + [node name="building_01_3" instance=ExtResource("1_6oij5")] [node name="node_id4" parent="root" index="0"] surface_material_override/0 = SubResource("StandardMaterial3D_h48n6") + +[node name="StaticBody3D" type="StaticBody3D" parent="root" index="1"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="root/StaticBody3D" index="0"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.251368) +shape = SubResource("BoxShape3D_t3xdb") diff --git a/godot/Models/buildings/building_4.tscn b/godot/Models/buildings/building_4.tscn index 4c8cebe..b3f0c64 100644 --- a/godot/Models/buildings/building_4.tscn +++ b/godot/Models/buildings/building_4.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=4 format=3 uid="uid://tky3cco2k7v7"] +[gd_scene load_steps=5 format=3 uid="uid://tky3cco2k7v7"] [ext_resource type="PackedScene" uid="uid://ct2lgbtpp3wp" path="res://Models/buildings/building_01.4.glb" id="1_xd1sg"] [ext_resource type="Texture2D" uid="uid://ckmnisf86xgdu" path="res://Textures/building_05.png" id="2_1ortp"] @@ -6,7 +6,16 @@ [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_3mjbs"] albedo_texture = ExtResource("2_1ortp") +[sub_resource type="BoxShape3D" id="BoxShape3D_6nnc6"] +size = Vector3(0.53466, 0.527655, 0.526273) + [node name="building_01_4" instance=ExtResource("1_xd1sg")] [node name="node_id4" parent="root" index="0"] surface_material_override/0 = SubResource("StandardMaterial3D_3mjbs") + +[node name="StaticBody3D" type="StaticBody3D" parent="root" index="1"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="root/StaticBody3D" index="0"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.251368) +shape = SubResource("BoxShape3D_6nnc6") diff --git a/godot/Models/grape_animations/pickup.res b/godot/Models/grape_animations/pickup.res index e98b629..0471c90 100644 Binary files a/godot/Models/grape_animations/pickup.res and b/godot/Models/grape_animations/pickup.res differ diff --git a/godot/Models/grape_animations/upper_body_holding.res b/godot/Models/grape_animations/upper_body_holding.res index 7badc09..4fc0701 100644 Binary files a/godot/Models/grape_animations/upper_body_holding.res and b/godot/Models/grape_animations/upper_body_holding.res differ diff --git a/godot/Models/grape_animations/upper_body_idle.res.res b/godot/Models/grape_animations/upper_body_idle.res.res index 0f2924d..fd30d7a 100644 Binary files a/godot/Models/grape_animations/upper_body_idle.res.res and b/godot/Models/grape_animations/upper_body_idle.res.res differ diff --git a/godot/Models/grape_animations/walk.res b/godot/Models/grape_animations/walk.res index d0c4987..40403e8 100644 Binary files a/godot/Models/grape_animations/walk.res and b/godot/Models/grape_animations/walk.res differ