From b5689a5511e082f889ecbe692b4d2b0316d579ab Mon Sep 17 00:00:00 2001
From: SyntaX <michael.leithner@gmail.com>
Date: Tue, 28 Jan 2020 15:52:57 +0100
Subject: [PATCH] pillometer texture change depending on pill level

---
 Characters/Meldewesen/Meldewesen.gd           |   2 +-
 Characters/Player/UI/UI.gd                    |  20 ++++++++---
 Resources/Textures/pillLevel_danger.png       | Bin 0 -> 345 bytes
 .../Textures/pillLevel_danger.png.import      |  34 ++++++++++++++++++
 Resources/Textures/pillLevel_fill.png         | Bin 378 -> 360 bytes
 project.godot                                 |   2 +-
 6 files changed, 51 insertions(+), 7 deletions(-)
 create mode 100644 Resources/Textures/pillLevel_danger.png
 create mode 100644 Resources/Textures/pillLevel_danger.png.import

diff --git a/Characters/Meldewesen/Meldewesen.gd b/Characters/Meldewesen/Meldewesen.gd
index 20be35e..756c6d8 100644
--- a/Characters/Meldewesen/Meldewesen.gd
+++ b/Characters/Meldewesen/Meldewesen.gd
@@ -1,7 +1,7 @@
 extends NPC
 
 
-export(int) var _player_follow_pill_level = 3
+export(int) var _player_follow_pill_level = Pills.LEVELS.MEDIUM
 
 onready var visibility_cone_mesh = get_node("Visibility/VisibilityCone")
 
diff --git a/Characters/Player/UI/UI.gd b/Characters/Player/UI/UI.gd
index eb34a5a..1aa1232 100644
--- a/Characters/Player/UI/UI.gd
+++ b/Characters/Player/UI/UI.gd
@@ -7,12 +7,15 @@ var _labelDayTime: Label
 var _dayTime: ProgressBar
 var _dayTimeVisual: TextureRect
 
-onready var _keyTexture = load("res://Resources/Models/key/key.png")
+onready var _keyTexture = preload("res://Resources/Models/key/key.png")
 var _cardTexture = {
 	1: preload("res://Resources/Models/keycard/lvl1_keycard.png"),
 	2: preload("res://Resources/Models/keycard/lvl2_keycard.png")
 }
 
+onready var _pillFill = preload("res://Resources/Textures/pillLevel_fill.png")
+onready var _pillDanger = preload("res://Resources/Textures/pillLevel_danger.png")
+
 # Called when the node enters the scene tree for the first time.
 func _ready():
 	_container = get_node("InventoryContainer")
@@ -50,11 +53,18 @@ func add_item (object):
 	_container.add_child(rect)
 
 func _process(_delta):
-	_labelPillLevel.text = "curLevel: " + String(Pills.get_level())
-	_pillLevel.value = Pills.get_level()
-	var val = int(Daytime.get_time())
+	# pill level
+	var val = Pills.get_level()
+	_labelPillLevel.text = "curLevel: " + String(val)
+	_pillLevel.value = val
+	if val < Pills.LEVELS.MEDIUM:
+		_pillLevel.set_progress_texture(_pillDanger)
+	elif _pillLevel.get_progress_texture() != _pillFill:
+		_pillLevel.set_progress_texture(_pillFill)
+	
+	# day time
+	val = int(Daytime.get_time())
 	#_labelDayTime.text = "dayTime: " + String(val) + " - %02d:%02d" % [val/60%24, val%60]
 	_dayTime.value = val
-	
 	_dayTimeVisual.rect_rotation = ((val/_dayTime.max_value) * 180) - 90
 	
\ No newline at end of file
diff --git a/Resources/Textures/pillLevel_danger.png b/Resources/Textures/pillLevel_danger.png
new file mode 100644
index 0000000000000000000000000000000000000000..475849d6e92a9984a5bafa5c6400eb5651207306
GIT binary patch
literal 345
zcmeAS@N?(olHy`uVBq!ia0vp^KY&<+gAGVtes8V<q!^2X+?^QKos)S9<glbW`Z_W&
zZ0zU$lgJ9>a~60+7Bet#3xY6XeM<a9px`@C7srr_xVLvUavpM!XnPpXeuC}Vx29I+
zmttXg3z?S+yjgqq0PCU?TMvmg{rYI*yF>fZ-Y0yA>}M}q+2Hf}8w(SsOcN&h`uD}A
zNWE2UwP)KxZ!_*o-4(y;UAxr!?b|+wr9XK6_;c&+ZA|;}EUs4E+j=y**1aS??}zSO
z-(Ahl292bl4f_tn8!u>>fAQv$h20<W?d(bfe|W!pAmD=yt$xK=lB8v;zkd58pwAgR
MUHx3vIVCg!09KcV8vp<R

literal 0
HcmV?d00001

diff --git a/Resources/Textures/pillLevel_danger.png.import b/Resources/Textures/pillLevel_danger.png.import
new file mode 100644
index 0000000..39215b0
--- /dev/null
+++ b/Resources/Textures/pillLevel_danger.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/pillLevel_danger.png-3f16593e6f8ad54ee32d61800bfb0c9f.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Resources/Textures/pillLevel_danger.png"
+dest_files=[ "res://.import/pillLevel_danger.png-3f16593e6f8ad54ee32d61800bfb0c9f.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Resources/Textures/pillLevel_fill.png b/Resources/Textures/pillLevel_fill.png
index 7078d3dd094dd7c23b5320cfd7871aa81561f9b8..b60afdcae798f36e8e655f522bf90febb3ec7f19 100644
GIT binary patch
literal 360
zcmeAS@N?(olHy`uVBq!ia0vp^KY&<+gAGVtes8V<q!^2X+?^QKos)S9<glbW`Z_W&
zZ0zU$lgJ9>a~60+7Bet#3xY6XeM<a9px|Fm7srr_xVLvU<}w*Fv;{izvww+fvfboR
zwaIl=4r8s@2{|1{|006}tsZ$3V-yO%zux=ooZh<MDbZGyW<1V}MrU6ObEp(>s9~UM
zUlyOvp1D`&*Vp5ZHr=|W`M`7C>HCkj{{Hz#@9;{$yH`biMDM?O-)_fh=LaYAxZgco
zZN2~c!&u+w5^eJy@9fFv9til5h}LL+_;0=7m9_!XTHjqIf@;qmPS<0){Dg<^APW|>
c(d#F(qP(f?$CmjsfdRqb>FVdQ&MBb@0EJMA-v9sr

literal 378
zcmeAS@N?(olHy`uVBq!ia0vp^KY&<+gAGVtes8V<q!f}pf_xbms#F;m8k!jxe*Op2
zFBuq04Hy_+B``2p&0t^<&z}^3)D5VXv%n*=n1O*?2!t6g-L3lr6qG1&jVKAuPb(=;
zEJ|f4NX*PD(aTFMQ83Xn)HD0*$N2)N=8mU}V@O5Z+dGDQO%4n$f&7PJd&D1>#hp1)
zyhgxk=AkB*IeQ+prgSa+b>VGp595?B<qL{^4(%39vX3}QI#4*tCH4N@k`{MGq<J6h
z*ev&>!gl&|2ET1ve*`}%ymND()X&rdlFx3unr`uqLuQ@Zg8&~=(3=YfVsEm97yg*)
zyZY;axBh%{UO(^_Z`?29zQ9?gk*|=&>WJVA0VGa_L7u#&X5k0vjRC1Ze=>Nw`njxg
HN@xNAQrM69

diff --git a/project.godot b/project.godot
index 7533e1c..b7ad24a 100644
--- a/project.godot
+++ b/project.godot
@@ -75,7 +75,7 @@ _global_script_class_icons={
 [application]
 
 config/name="retrace"
-run/main_scene="res://Level/World.tscn"
+run/main_scene="res://Level/OutsideWorld.tscn"
 config/icon="res://icon.png"
 
 [autoload]