Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23

godot/Level/Island.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=23 format=3 uid="uid://3d51hjh2st8a"]
+[gd_scene load_steps=22 format=3 uid="uid://3d51hjh2st8a"]
 
 [ext_resource type="PackedScene" uid="uid://d2d4uv7o5gx5p" path="res://Level/World/screen_shader.tscn" id="1_huyen"]
 [ext_resource type="PackedScene" uid="uid://b35w4hlh4n1jt" path="res://Level/World/world_environment.tscn" id="2_lerrn"]
@@ -201,7 +201,7 @@ transform = Transform3D(0.142475, -0.0469124, 0, 0.0469124, 0.142475, 0, 0, 0, 0
 transform = Transform3D(0.130141, 0.074587, 0, -0.074587, 0.130141, 0, 0, 0, 0.15, 3.48612, 0.899973, -0.715843)
 
 [node name="Floatie4" parent="Decorations/beach items" instance=ExtResource("15_2v7p7")]
-transform = Transform3D(0.130141, 0.074587, 0, -0.074587, 0.130141, 0, 0, 0, 0.15, 0.886782, 1.39103, -0.739674)
+transform = Transform3D(0.0101389, 0.149653, -0.00103465, -0.149655, 0.0101343, -0.000689841, -0.000618342, 0.0010789, 0.149995, 0.819336, 1.48238, -0.739674)
 
 [node name="Parsol" parent="Decorations/beach items" instance=ExtResource("21_dlhqg")]
 transform = Transform3D(0.15, 0, 0, 0, 0.15, 0, 0, 0, 0.15, -1.66573, 0.876208, 1.05714)
@@ -245,16 +245,5 @@ transform = Transform3D(-6.55671e-08, 0, -1.5, 0, 1.5, 0, 1.5, 0, -6.55671e-08,
 [node name="fence4" parent="Decorations/slimepen" instance=ExtResource("28_prydb")]
 transform = Transform3D(1.5, 0, 0, 0, 1.5, 0, 0, 0, 1.5, 0, 1.40507, -2.10425)
 
-[node name="villager" parent="." instance=ExtResource("21_hxwg1")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.369429, 2.40957, -0.685529)
-target_location_xz = null
-location_xz = null
-target_direction_xz = null
-direction_xz = null
-walk_chance = null
-spin_chance = null
-walk_speed = null
-dir_correction_rate = null
-
 [node name="Player" parent="." instance=ExtResource("22_cuxj6")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.192051, 2.60275, 0)

godot/Models/edit_slime_material.tscn

@@ -0,0 +1,8 @@
+[gd_scene load_steps=2 format=3 uid="uid://cg2e4bfwkn30e"]
+
+[ext_resource type="Material" uid="uid://b4e8ifjoy4m8i" path="res://Models/slime_pants.material" id="1_evexv"]
+
+[node name="Node3D" type="Node3D"]
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
+material_override = ExtResource("1_evexv")

godot/Models/slime.glb.import

@@ -3628,6 +3628,12 @@ _subresources={
 "slice_99/start_frame": 0,
 "slices/amount": null
 }
+},
+"materials": {
+"Pants": {
+"use_external/enabled": true,
+"use_external/path": "res://Models/slime_pants.material"
+}
 }
 }
 gltf/embedded_image_handling=1

godot/Models/slime.tscn

@@ -29,14 +29,17 @@ transitions = ["Walk", "Idle", SubResource("AnimationNodeStateMachineTransition_
 script = ExtResource("2_xo27e")
 colors = Array[Color]([Color(0, 0.113725, 0.905882, 1), Color(0.592157, 0, 0.243137, 1), Color(0.513726, 0.360784, 0, 1), Color(0, 0.470588, 0.32549, 1), Color(0.423529, 0, 0.54902, 1)])
 
+[node name="Armature" parent="." index="0"]
+transform = Transform3D(0.859505, 0, -0.511128, 0, 1, 0, 0.511128, 0, 0.859505, 0, 0, 0)
+
 [node name="Skeleton3D" parent="Armature" index="0"]
-bones/1/position = Vector3(0, 0.529453, 0)
+bones/1/position = Vector3(0, 0.426907, 0)
 bones/2/rotation = Quaternion(-0.0627444, 0.00212883, -0.213248, 0.974979)
 bones/3/rotation = Quaternion(0.100834, -0.698956, 0.0125015, 0.707911)
-bones/7/rotation = Quaternion(-0.1315, 2.65747e-09, 2.43309e-09, 0.991316)
+bones/7/rotation = Quaternion(-0.258758, 2.37407e-09, 2.7412e-09, 0.965942)
-bones/8/rotation = Quaternion(0.585182, -1.01606e-09, -5.40585e-11, 0.810902)
+bones/8/rotation = Quaternion(0.188737, -8.6127e-10, -4.72466e-10, 0.982028)
-bones/10/rotation = Quaternion(0.0879173, -4.54741e-08, -6.63271e-08, 0.996128)
+bones/10/rotation = Quaternion(0.253668, -5.6372e-08, -4.28241e-09, 0.967291)
-bones/11/rotation = Quaternion(-0.607325, 5.52851e-08, 5.85139e-08, 0.794453)
+bones/11/rotation = Quaternion(-0.191712, 1.11242e-07, 9.37652e-08, 0.981451)
 
 [node name="AnimationTree" type="AnimationTree" parent="." index="2"]
 tree_root = SubResource("AnimationNodeStateMachine_prt7l")

godot/slime_shared.tscn

@@ -10,7 +10,6 @@ radius = 0.05
 script = ExtResource("1_gmj2r")
 
 [node name="slime" parent="." instance=ExtResource("2_6u4ex")]
-transform = Transform3D(0.035, 0, 0, 0, 0.035, 0, 0, 0, 0.035, 0, 0, 0)
 
 [node name="slime_collision" type="CollisionShape3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0408143, 0)