diff --git a/scenes/active_scene.tscn b/scenes/active_scene.tscn index d2de485..5188682 100644 --- a/scenes/active_scene.tscn +++ b/scenes/active_scene.tscn @@ -104,7 +104,6 @@ total_visitors = 1 [node name="Timer" type="Timer" parent="Guildhall/VisitorSpawner"] [node name="UI" type="CanvasLayer" parent="."] -visible = false [node name="VBoxContainer" type="VBoxContainer" parent="UI"] offset_left = 1485.0 diff --git a/scripts/quest_view.gd b/scripts/quest_view.gd index 1907eb8..397d430 100644 --- a/scripts/quest_view.gd +++ b/scripts/quest_view.gd @@ -5,7 +5,7 @@ const questor_template = preload("res://templates/questor_sprite.tscn") @onready var questorSprite : QuestorSprite @onready var setting = $Setting var quest : Quest - +@export var base_speed : float func setup(qst : Quest) -> void: quest = qst @@ -14,6 +14,9 @@ func setup(qst : Quest) -> void: questorSprite.setup(quest.questor) add_child(questorSprite) questorSprite.global_position = $QuestorPosition.global_position + for child in %Layers.get_children(): + if child is Parallax2D: + child.autoscroll.x = -base_speed * child.scroll_scale.x func set_questor_animation(anim_name : String) -> void: diff --git a/scripts/questor_sprite.gd b/scripts/questor_sprite.gd index f8ae506..a49da3c 100644 --- a/scripts/questor_sprite.gd +++ b/scripts/questor_sprite.gd @@ -54,3 +54,6 @@ func check_levelup() -> void: func _on_level_up() -> void: show_levelup_banner() + +func _on_questor_changed() -> void: + pass diff --git a/templates/enemies/goo.tscn b/templates/enemies/goo.tscn index 2e68719..7e1e9cd 100644 --- a/templates/enemies/goo.tscn +++ b/templates/enemies/goo.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=5 format=3 uid="uid://c31w28fcqw4ra"] +[gd_scene load_steps=9 format=3 uid="uid://c31w28fcqw4ra"] [ext_resource type="Script" uid="uid://fxixa11vqdrn" path="res://scripts/enemy.gd" id="1_82j8k"] [ext_resource type="Texture2D" uid="uid://1mkagt2y0jah" path="res://graphics/questview/goo.png" id="2_87tms"] @@ -8,6 +8,22 @@ script = ExtResource("2_fehp8") metadata/_custom_type_script = "uid://727tgvtmq4nb" +[sub_resource type="Gradient" id="Gradient_nqdtq"] +offsets = PackedFloat32Array(0) +colors = PackedColorArray(0, 0, 0, 1) + +[sub_resource type="GradientTexture1D" id="GradientTexture1D_fehp8"] +gradient = SubResource("Gradient_nqdtq") +width = 1 + +[sub_resource type="Gradient" id="Gradient_yy18h"] +offsets = PackedFloat32Array(1) +colors = PackedColorArray(1, 1, 1, 1) + +[sub_resource type="GradientTexture1D" id="GradientTexture1D_bfuvr"] +gradient = SubResource("Gradient_yy18h") +width = 1 + [node name="Goo" type="Control"] layout_mode = 3 anchors_preset = 0 @@ -15,7 +31,19 @@ script = ExtResource("1_82j8k") stats = SubResource("Resource_bfuvr") [node name="Sprite2D" type="Sprite2D" parent="."] -position = Vector2(5, -47) +position = Vector2(0, -48) texture = ExtResource("2_87tms") [node name="AnimationPlayer" type="AnimationPlayer" parent="."] + +[node name="LifeBar" type="TextureProgressBar" parent="."] +layout_mode = 0 +offset_left = -37.0 +offset_top = 16.0 +offset_right = 38.0 +offset_bottom = 26.0 +nine_patch_stretch = true +texture_under = SubResource("GradientTexture1D_fehp8") +texture_progress = SubResource("GradientTexture1D_bfuvr") +tint_over = Color(1, 0, 0, 1) +tint_progress = Color(1, 0, 0, 1) diff --git a/templates/quest_view.tscn b/templates/quest_view.tscn index 982fd62..84b0d41 100644 --- a/templates/quest_view.tscn +++ b/templates/quest_view.tscn @@ -11,6 +11,7 @@ custom_minimum_size = Vector2(375, 325) offset_right = 375.0 offset_bottom = 325.0 script = ExtResource("1_gmxj1") +base_speed = 45.0 [node name="Setting" type="Control" parent="."] clip_contents = true @@ -19,51 +20,50 @@ anchors_preset = 0 offset_right = 375.0 offset_bottom = 325.0 -[node name="Control" type="Control" parent="Setting"] +[node name="Layers" type="Control" parent="Setting"] +unique_name_in_owner = true anchors_preset = 0 offset_right = 40.0 offset_bottom = 40.0 -[node name="StageParallax" type="Parallax2D" parent="Setting/Control"] +[node name="StageParallax" type="Parallax2D" parent="Setting/Layers"] +scroll_scale = Vector2(0.667, 1) repeat_size = Vector2(750, 0) -autoscroll = Vector2(-30, 0) ignore_camera_scroll = true -[node name="Background" type="TextureRect" parent="Setting/Control/StageParallax"] +[node name="Background" type="TextureRect" parent="Setting/Layers/StageParallax"] offset_top = -50.0 offset_right = 750.0 offset_bottom = 375.0 texture = ExtResource("2_0cnce") -[node name="StageParallax3" type="Parallax2D" parent="Setting/Control"] +[node name="StageParallax3" type="Parallax2D" parent="Setting/Layers"] scale = Vector2(0.8, 0.8) +scroll_scale = Vector2(0.778, 1) repeat_size = Vector2(750, 0) -autoscroll = Vector2(-35, 0) ignore_camera_scroll = true -[node name="Background" type="TextureRect" parent="Setting/Control/StageParallax3"] +[node name="Background" type="TextureRect" parent="Setting/Layers/StageParallax3"] modulate = Color(1.179842, 1.179842, 1.179842, 1) offset_right = 750.0 offset_bottom = 425.0 texture = ExtResource("3_dvgqk") -[node name="BackgroundParallax" type="Parallax2D" parent="Setting/Control"] +[node name="BackgroundParallax" type="Parallax2D" parent="Setting/Layers"] repeat_size = Vector2(475, 0) -autoscroll = Vector2(-45, 0) ignore_camera_scroll = true -[node name="TextureRect" type="TextureRect" parent="Setting/Control/BackgroundParallax"] +[node name="TextureRect" type="TextureRect" parent="Setting/Layers/BackgroundParallax"] offset_top = -50.0 offset_right = 475.0 offset_bottom = 375.0 texture = ExtResource("4_0yhlr") -[node name="StageParallax2" type="Parallax2D" parent="Setting/Control"] +[node name="StageParallax2" type="Parallax2D" parent="Setting/Layers"] repeat_size = Vector2(750, 0) -autoscroll = Vector2(-45, 0) ignore_camera_scroll = true -[node name="Foreground" type="TextureRect" parent="Setting/Control/StageParallax2"] +[node name="Foreground" type="TextureRect" parent="Setting/Layers/StageParallax2"] offset_top = -50.0 offset_right = 750.0 offset_bottom = 375.0