From 30e87cccf07fbb85ba80453ca55fe254257eae5a Mon Sep 17 00:00:00 2001 From: incredibleLeitman Date: Sun, 26 Jan 2020 16:09:13 +0100 Subject: [PATCH] #42 --- Characters/Meldewesen/Meldewesen.gd | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Characters/Meldewesen/Meldewesen.gd b/Characters/Meldewesen/Meldewesen.gd index b5ab9ae..781a8fa 100644 --- a/Characters/Meldewesen/Meldewesen.gd +++ b/Characters/Meldewesen/Meldewesen.gd @@ -29,7 +29,7 @@ var _lastSound = 0 # timestamp of last played message var _countCmds = 0 # count of spoken commands -> after MAX_CMDS Meldewesen gets pissy func _ready(): - Logger.set_logger_level(Logger.LOG_LEVEL_FINE) + #Logger.set_logger_level(Logger.LOG_LEVEL_FINE) _audioPlayer = get_node("AudioStreamPlayer3D") as AudioStreamPlayer3D assert(null != _audioPlayer) @@ -107,17 +107,19 @@ func _load_sound (): func _set_behavior (): if _huntingPlayer == false: var reason = null + var daytime = Daytime.get_time() if _playerRef.IsHunted: # player is already marked by another Meldewesen reason = "player is haunted" elif _playerRef.is_in_illegalzone(): # player is in illegal area reason = "player is haunted in illegal area" elif Pills.get_round_level() == 0: # player has taken no pills in a while reason = "player's pill level is zero" - get_tree().change_scene("res://Level/PathTestWorld.tscn") - # TODO: outside after WORK_TIME - #elif daytime < Daytime.WORK_TIME: - # TODO: at work after SLEEP_TIME - #elif daytime > Daytime.SLEEP_TIME: + elif _playerRef.IsOutside and daytime > Daytime.WORK_TIME and daytime < Daytime.SLEEP_TIME: # outside during WORK_TIME + reason = "player outside during worktime" + #elif _playerRef.IsInFactory and daytime < Daytime.WORK_TIME and daytime > Daytime.SLEEP_TIME: # at work after out of WORK_TIME + # EDIT: too early at work is not an angry reason :p + elif _playerRef.IsInFactory and daytime > Daytime.SLEEP_TIME: # at work after out of WORK_TIME + reason = "player in factory out of worktime" elif _countCmds > MAX_CMDS: # after MAX_CMDS repeats of the same command reason = "player is seemingly not coorperativ"