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 0000000..475849d Binary files /dev/null and b/Resources/Textures/pillLevel_danger.png differ 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 7078d3d..b60afdc 100644 Binary files a/Resources/Textures/pillLevel_fill.png and b/Resources/Textures/pillLevel_fill.png differ 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]