diff --git a/game/game.gd b/game/game.gd index 8e97e61..3d8565c 100644 --- a/game/game.gd +++ b/game/game.gd @@ -1,6 +1,7 @@ extends Node +@onready var passage : Passage = $Passage @onready var pause_screen : Control = $PauseScreen @onready var game_over_screen : Control = $GameOverScreen @onready var world_generator : WorldGenerator = $WorldGenerator @@ -9,7 +10,8 @@ extends Node func _ready() -> void: pause_screen.hide() game_over_screen.hide() - world_generator.generate(randi()) + var world_data := world_generator.generate(randi()) + passage.data = world_data.areas[0].stages[0].sectors[0].next_passages[0] func _input(event: InputEvent) -> void: diff --git a/game/passage.gd b/game/passage.gd index 4de4444..f12fc57 100644 --- a/game/passage.gd +++ b/game/passage.gd @@ -5,8 +5,33 @@ extends Node2D signal player_died +@export var data : PassageData: + set = _set_data + + +var _current_progress := 0.0 + + @onready var enemy_swamp_controller : EnemySwampController = $EnemySwampController @onready var enemy_timer : Timer = $EnemyTimer +@onready var progress_bar : TextureProgressBar = $ProgressBar + + +func _physics_process(delta: float) -> void: + if data: + _current_progress += delta + _update_progress_indicator() + + +func _set_data(new_data: PassageData) -> void: + data = new_data + if data and progress_bar: + _update_progress_indicator() + + +func _update_progress_indicator() -> void: + progress_bar.value = _current_progress + progress_bar.max_value = data.length func _on_enemy_timer_timeout() -> void: diff --git a/game/passage.tscn b/game/passage.tscn index fd13114..2c3ce74 100644 --- a/game/passage.tscn +++ b/game/passage.tscn @@ -58,7 +58,7 @@ autostart = true [node name="Background" parent="." instance=ExtResource("4_cuj01")] -[node name="TextureProgressBar" type="TextureProgressBar" parent="."] +[node name="ProgressBar" type="TextureProgressBar" parent="."] z_index = 50 anchors_preset = 2 anchor_top = 1.0 @@ -67,6 +67,7 @@ offset_top = 352.0 offset_right = 640.0 offset_bottom = 360.0 grow_vertical = 0 +step = 0.5 texture_under = SubResource("AtlasTexture_u0ams") texture_progress = SubResource("AtlasTexture_heelu") diff --git a/images/main_font.png b/images/main_font.png index 35edea4..9c56f9c 100644 --- a/images/main_font.png +++ b/images/main_font.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6651583fee6a54ed9b339fd3c6f2e7cc6e09a5f6f55b726c8bc12ad67b413322 -size 837 +oid sha256:8f6aed90ec6ce72ee5fd2bc6c82f101b321aff816235e1be4975c118f843a5cc +size 840