From 3386bac4ed287e959d2dc0bb71a1f147fc7ff7c0 Mon Sep 17 00:00:00 2001
From: karl <karl.bittner@hexaquo.at>
Date: Wed, 29 Jan 2020 02:40:04 +0100
Subject: [PATCH] Play do_job sound even when work time hasn't begun

Also the Meldewesen gaze light is only visible when sober
---
 Characters/Meldewesen/Meldewesen.gd   | 8 ++++----
 Characters/Meldewesen/Meldewesen.tscn | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Characters/Meldewesen/Meldewesen.gd b/Characters/Meldewesen/Meldewesen.gd
index 5ca7341..acbc5b1 100644
--- a/Characters/Meldewesen/Meldewesen.gd
+++ b/Characters/Meldewesen/Meldewesen.gd
@@ -187,16 +187,16 @@ func _set_behavior ():
 	# take your pills
 	elif Pills.get_level() < _player_follow_pill_level:
 		mood = BEHAVIOR.TAKE_PILLS
+	# do your job
+	elif _playerRef.is_in_workzone():
+		_countCmds = 0 # hard block -> work is always good :D
+		mood = BEHAVIOR.DO_JOB
 	# go to work
 	elif daytime < Daytime.WORK_TIME:
 		mood = BEHAVIOR.GO_WORK
 	# go home
 	elif daytime > Daytime.SLEEP_TIME:
 		mood = BEHAVIOR.GO_HOME
-	# do your job
-	elif _playerRef.is_in_workzone():
-		_countCmds = 0 # hard block -> work is always good :D
-		mood = BEHAVIOR.DO_JOB
 
 	if mood != _curMood:
 		Logger.info("new mood: " + BEHAVIOR.keys()[mood] + " with cntcmd: " + String(_countCmds))
diff --git a/Characters/Meldewesen/Meldewesen.tscn b/Characters/Meldewesen/Meldewesen.tscn
index 9298323..4984e96 100644
--- a/Characters/Meldewesen/Meldewesen.tscn
+++ b/Characters/Meldewesen/Meldewesen.tscn
@@ -203,10 +203,11 @@ material/0 = ExtResource( 7 )
 
 [node name="SpotLight" type="SpotLight" parent="Visibility"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, -1 )
+layers = 2
 light_color = Color( 1, 0, 0, 1 )
 shadow_enabled = true
-spot_range = 11.6162
-spot_angle = 19.7549
+spot_range = 19.691
+spot_angle = 15.9677
 
 [node name="InteractArea" type="Area" parent="." groups=[
 "Enemy",