From c1a0d5672dc142c270925d0fc31762c53dc08718 Mon Sep 17 00:00:00 2001 From: incredibleLeitman Date: Fri, 27 Dec 2019 19:09:11 +0100 Subject: [PATCH] Meldewesen stops following in pill level is high enough adjusted pill level --- Characters/Meldewesen/Meldewesen.gd | 9 +++++++++ Characters/Player/Player.gd | 4 ++++ Characters/Player/UI/UI.gd | 2 +- Global/Pills.gd | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Characters/Meldewesen/Meldewesen.gd b/Characters/Meldewesen/Meldewesen.gd index 7ad341f..15bd0d0 100644 --- a/Characters/Meldewesen/Meldewesen.gd +++ b/Characters/Meldewesen/Meldewesen.gd @@ -16,12 +16,21 @@ func _ready(): _visibility.connect("body_exited", self, "_on_body_exited_visibility") +func _process(_delta): + # stop following player if pill level is high enough + if current_target and Pills.get_round_level() > _player_follow_pill_level: + current_target = null + + func _on_body_entered_visibility(body: PhysicsBody): #Logger.trace("Meldewesen seeing %s" % [body]) if body.is_in_group("Player"): Logger.info("Seeing player!") + # TODO: check if player is in illegal area + #var player = get_node("") + # If the player didn't take enough pills lately, they're suspicious -> Run towards them! if Pills.get_round_level() <= _player_follow_pill_level: Logger.info("The player's pill level is too low - following!") diff --git a/Characters/Player/Player.gd b/Characters/Player/Player.gd index 01731d4..d4ee0ac 100644 --- a/Characters/Player/Player.gd +++ b/Characters/Player/Player.gd @@ -211,3 +211,7 @@ func _reset_scene (): _animationFadeOut.seek(0, true) get_tree().reload_current_scene() Pills._set_level(Pills.get_max()) + + +func Is_in_Illegal_Area (): + return _is_in_illegal_area diff --git a/Characters/Player/UI/UI.gd b/Characters/Player/UI/UI.gd index 037266a..035381d 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 \ No newline at end of file + _pillLevel.value = Pills._level - 1 \ No newline at end of file diff --git a/Global/Pills.gd b/Global/Pills.gd index fb5c13c..9ed47e1 100644 --- a/Global/Pills.gd +++ b/Global/Pills.gd @@ -3,7 +3,7 @@ extends Node var _level: float setget _set_level, get_level var _min: float = 1.0 -var _max: float = 10.0 +var _max: float = 7.0 var _decrease_per_second: float = 0.2 var _pill_add_amount: float = 2.0