From a5476d4ddd7deedfbfd6749db5b12d2f4c4b4afb Mon Sep 17 00:00:00 2001
From: Spencer Killen <sjkillen@ualberta.ca>
Date: Sat, 19 Aug 2023 21:21:54 -0600
Subject: [PATCH] Fix rocks colour villagers

---
 godot/Models/rocks/rock1.glb.import | 14 +++++++++++++-
 godot/Models/rocks/rock2.glb.import | 14 +++++++++++++-
 godot/Models/rocks/rock3.glb.import | 14 +++++++++++++-
 godot/Models/slime.gd               |  5 +++++
 godot/Models/slime.tscn             | 11 ++++++-----
 5 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/godot/Models/rocks/rock1.glb.import b/godot/Models/rocks/rock1.glb.import
index 276dfa5..cbabbd0 100644
--- a/godot/Models/rocks/rock1.glb.import
+++ b/godot/Models/rocks/rock1.glb.import
@@ -28,5 +28,17 @@ animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
 import_script/path=""
-_subresources={}
+_subresources={
+"materials": {
+"50": {
+"use_external/enabled": true,
+"use_external/path": "res://Textures/rock.tres"
+}
+},
+"nodes": {
+"PATH:root/node_id4": {
+"generate/physics": true
+}
+}
+}
 gltf/embedded_image_handling=1
diff --git a/godot/Models/rocks/rock2.glb.import b/godot/Models/rocks/rock2.glb.import
index d29cf1b..ec264fa 100644
--- a/godot/Models/rocks/rock2.glb.import
+++ b/godot/Models/rocks/rock2.glb.import
@@ -28,5 +28,17 @@ animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
 import_script/path=""
-_subresources={}
+_subresources={
+"materials": {
+"50": {
+"use_external/enabled": true,
+"use_external/path": "res://Textures/rock.tres"
+}
+},
+"nodes": {
+"PATH:root/node_id4": {
+"generate/physics": true
+}
+}
+}
 gltf/embedded_image_handling=1
diff --git a/godot/Models/rocks/rock3.glb.import b/godot/Models/rocks/rock3.glb.import
index 4f5e8b3..bfd8d70 100644
--- a/godot/Models/rocks/rock3.glb.import
+++ b/godot/Models/rocks/rock3.glb.import
@@ -28,5 +28,17 @@ animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
 import_script/path=""
-_subresources={}
+_subresources={
+"materials": {
+"50": {
+"use_external/enabled": true,
+"use_external/path": "res://Textures/rock.tres"
+}
+},
+"nodes": {
+"PATH:root/node_id4": {
+"generate/physics": true
+}
+}
+}
 gltf/embedded_image_handling=1
diff --git a/godot/Models/slime.gd b/godot/Models/slime.gd
index 9d4c13d..9aaf77b 100644
--- a/godot/Models/slime.gd
+++ b/godot/Models/slime.gd
@@ -1,7 +1,12 @@
 extends Node3D
 
 @onready var animation_state: AnimationNodeStateMachinePlayback = $AnimationTree.get("parameters/playback")
+@export var colors: Array[Color]
 
+func _ready():
+	var color = colors[randi() % colors.size()]
+	$Armature/Skeleton3D/Slime.get_active_material(3).albedo_color = color
+	
 func walk():
 	animation_state.travel("Walk")
 
diff --git a/godot/Models/slime.tscn b/godot/Models/slime.tscn
index cd19e03..a910ab3 100644
--- a/godot/Models/slime.tscn
+++ b/godot/Models/slime.tscn
@@ -27,15 +27,16 @@ transitions = ["Walk", "Idle", SubResource("AnimationNodeStateMachineTransition_
 
 [node name="slime" instance=ExtResource("1_jttw0")]
 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="Skeleton3D" parent="Armature" index="0"]
-bones/1/position = Vector3(0, 0.419783, 0)
+bones/1/position = Vector3(0, 0.529453, 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.259966, 2.31658e-09, 2.75962e-09, 0.965618)
-bones/8/rotation = Quaternion(0.184716, -8.96583e-10, -4.81081e-10, 0.982792)
-bones/10/rotation = Quaternion(0.255235, -5.60434e-08, -5.76742e-08, 0.966879)
-bones/11/rotation = Quaternion(-0.18748, 7.5629e-08, 2.75785e-08, 0.982268)
+bones/7/rotation = Quaternion(-0.1315, 2.65747e-09, 2.43309e-09, 0.991316)
+bones/8/rotation = Quaternion(0.585182, -1.01606e-09, -5.40585e-11, 0.810902)
+bones/10/rotation = Quaternion(0.0879173, -4.54741e-08, -6.63271e-08, 0.996128)
+bones/11/rotation = Quaternion(-0.607325, 5.52851e-08, 5.85139e-08, 0.794453)
 
 [node name="AnimationTree" type="AnimationTree" parent="." index="2"]
 tree_root = SubResource("AnimationNodeStateMachine_prt7l")