From 4bb474dbed5bc83a1ca8079b8a6d7c1278b56924 Mon Sep 17 00:00:00 2001
From: SyntaX <michael.leithner@gmail.com>
Date: Thu, 21 Nov 2019 14:17:28 +0100
Subject: [PATCH] final pill taking

---
 Characters/Player/Player.tscn | 22 ++++++++--------------
 Things/pills/Pills.tscn       |  2 +-
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/Characters/Player/Player.tscn b/Characters/Player/Player.tscn
index 9d44e89..72d2b04 100644
--- a/Characters/Player/Player.tscn
+++ b/Characters/Player/Player.tscn
@@ -7,6 +7,7 @@
 [ext_resource path="res://Resources/Audio/Step.wav" type="AudioStream" id=5]
 [ext_resource path="res://Characters/Player/UI/UI.tscn" type="PackedScene" id=6]
 [ext_resource path="res://Characters/Player/PillTaker.gd" type="Script" id=7]
+[ext_resource path="res://Things/pills/Pills.tscn" type="PackedScene" id=8]
 
 [sub_resource type="ViewportTexture" id=1]
 viewport_path = NodePath("Body/PillCameras/MaskedView")
@@ -59,7 +60,7 @@ tracks/1/keys = {
 [sub_resource type="Animation" id=9]
 resource_name = "PillTaking"
 tracks/0/type = "value"
-tracks/0/path = NodePath("PillTaker/Pill:visible")
+tracks/0/path = NodePath("PillTaker/Pills:visible")
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
 tracks/0/imported = false
@@ -71,7 +72,7 @@ tracks/0/keys = {
 "values": [ true, false ]
 }
 tracks/1/type = "value"
-tracks/1/path = NodePath("PillTaker/Pill:rotation_degrees")
+tracks/1/path = NodePath("PillTaker/Pills:translation")
 tracks/1/interp = 1
 tracks/1/loop_wrap = true
 tracks/1/imported = false
@@ -80,10 +81,10 @@ tracks/1/keys = {
 "times": PoolRealArray( 0, 1 ),
 "transitions": PoolRealArray( 1, 1 ),
 "update": 0,
-"values": [ Vector3( 0, 0, 0 ), Vector3( 90, 0, 0 ) ]
+"values": [ Vector3( 0, 0, -1 ), Vector3( 0, 0.7, 0 ) ]
 }
 tracks/2/type = "value"
-tracks/2/path = NodePath("PillTaker/Pill:translation")
+tracks/2/path = NodePath("PillTaker/Pills:rotation_degrees")
 tracks/2/interp = 1
 tracks/2/loop_wrap = true
 tracks/2/imported = false
@@ -92,15 +93,13 @@ tracks/2/keys = {
 "times": PoolRealArray( 0, 1 ),
 "transitions": PoolRealArray( 1, 1 ),
 "update": 0,
-"values": [ Vector3( 0, 0, -1 ), Vector3( 0, 0.7, 0 ) ]
+"values": [ Vector3( 180, 0, 0 ), Vector3( -90, 0, 0 ) ]
 }
 
 [sub_resource type="AudioStreamRandomPitch" id=7]
 audio_stream = ExtResource( 5 )
 random_pitch = 1.3
 
-[sub_resource type="CapsuleMesh" id=8]
-
 [node name="Player" type="KinematicBody" groups=[
 "Player",
 ]]
@@ -184,13 +183,8 @@ pitch_scale = 1.5
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0 )
 script = ExtResource( 7 )
 
-[node name="Pill" type="Spatial" parent="PillTaker"]
-transform = Transform( 1, 0, 0, 0, -4.37114e-008, -1, 0, 1, -4.37114e-008, 0, 0.7, 0 )
+[node name="Pills" parent="PillTaker" instance=ExtResource( 8 )]
+transform = Transform( 0.1, 0, 0, 0, -4.37114e-009, 0.1, 0, -0.1, -4.37114e-009, 0, 0.7, 0 )
 visible = false
 
-[node name="MeshInstance" type="MeshInstance" parent="PillTaker/Pill"]
-transform = Transform( 0.1, 0, 0, 0, -4.37114e-009, -0.1, 0, 0.1, -4.37114e-009, 0, 0, 0 )
-mesh = SubResource( 8 )
-material/0 = null
-
 [editable path="HUD"]
diff --git a/Things/pills/Pills.tscn b/Things/pills/Pills.tscn
index 8703791..62382ee 100644
--- a/Things/pills/Pills.tscn
+++ b/Things/pills/Pills.tscn
@@ -34,7 +34,7 @@ surfaces/1 = {
 [node name="Pills" type="Spatial"]
 
 [node name="TrueForm" type="MeshInstance" parent="."]
-layers = 2
+layers = 3
 mesh = SubResource( 1 )
 material/0 = null
 material/1 = null