From fc0eb63dc8db117d29ea1932f60cbcc97170a4e0 Mon Sep 17 00:00:00 2001
From: karl <karl.bittner@hexaquo.at>
Date: Wed, 8 Jan 2020 11:37:26 +0100
Subject: [PATCH] Fix issues with pill levels and collision

---
 Characters/Player/Player.tscn       | 4 ++--
 Characters/Player/UI/UI.gd          | 2 +-
 Characters/Player/UI/UI.tscn        | 2 +-
 Global/Pills.gd                     | 2 +-
 Level/Buildings/MeldewesenHome.tscn | 8 ++++----
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Characters/Player/Player.tscn b/Characters/Player/Player.tscn
index acb345d..92c2b10 100644
--- a/Characters/Player/Player.tscn
+++ b/Characters/Player/Player.tscn
@@ -176,7 +176,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0461721, 1.84617, 0 )
 script = ExtResource( 2 )
 
 [node name="LookingAt" type="RayCast" parent="Body/PillCameras"]
-transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 0, 0, 0 )
+transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0 )
 enabled = true
 cast_to = Vector3( 0, 0, 2 )
 
@@ -268,7 +268,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0 )
 script = ExtResource( 11 )
 
 [node name="Pills" parent="PillTaker" instance=ExtResource( 12 )]
-transform = Transform( 0.1, 0, 0, 0, -4.37114e-009, 0.1, 0, -0.1, -4.37114e-009, 0, 0.7, 0 )
+transform = Transform( 0.1, 0, 0, 0, -4.37114e-09, 0.1, 0, -0.1, -4.37114e-09, 0, 0.7, 0 )
 visible = false
 
 [node name="InteractArea" type="Area" parent="."]
diff --git a/Characters/Player/UI/UI.gd b/Characters/Player/UI/UI.gd
index 035381d..037266a 100644
--- a/Characters/Player/UI/UI.gd
+++ b/Characters/Player/UI/UI.gd
@@ -34,4 +34,4 @@ func add_item (name):
 
 func _process(_delta):
 	_labelPillLevel.text = "curLevel: " + String(Pills._level)
-	_pillLevel.value = Pills._level - 1
\ No newline at end of file
+	_pillLevel.value = Pills._level
\ No newline at end of file
diff --git a/Characters/Player/UI/UI.tscn b/Characters/Player/UI/UI.tscn
index 6f6af13..bc0e2af 100644
--- a/Characters/Player/UI/UI.tscn
+++ b/Characters/Player/UI/UI.tscn
@@ -33,7 +33,7 @@ margin_left = -0.571533
 margin_top = 24.7845
 margin_right = 247.428
 margin_bottom = 64.7845
-max_value = 6.0
+max_value = 7.0
 step = 0.1
 value = 6.0
 texture_progress = ExtResource( 2 )
diff --git a/Global/Pills.gd b/Global/Pills.gd
index f368849..05c844e 100644
--- a/Global/Pills.gd
+++ b/Global/Pills.gd
@@ -2,7 +2,7 @@ extends Node
 
 
 var _level: float setget _set_level, get_level
-var _min: float = 1.0
+var _min: float = 0.0
 var _max: float = 7.0
 var _decrease_per_second: float = 0.2
 var _pill_add_amount: float = 2.0
diff --git a/Level/Buildings/MeldewesenHome.tscn b/Level/Buildings/MeldewesenHome.tscn
index ac8f500..f3569e1 100644
--- a/Level/Buildings/MeldewesenHome.tscn
+++ b/Level/Buildings/MeldewesenHome.tscn
@@ -1,10 +1,10 @@
 [gd_scene load_steps=3 format=2]
 
-[sub_resource type="SpatialMaterial" id=10]
+[sub_resource type="SpatialMaterial" id=1]
 albedo_color = Color( 1, 0.466667, 0.466667, 1 )
 
-[sub_resource type="CubeMesh" id=11]
-material = SubResource( 10 )
+[sub_resource type="CubeMesh" id=2]
+material = SubResource( 1 )
 size = Vector3( 26, 26, 20 )
 
 [node name="MeldewesenHome" type="Spatial"]
@@ -12,5 +12,5 @@ transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -57, 0,
 
 [node name="MeshInstance" type="MeshInstance" parent="."]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 6, 0 )
-mesh = SubResource( 11 )
+mesh = SubResource( 2 )
 material/0 = null