From d72597053946ad07ded2649ec2315bb87a8e5fb0 Mon Sep 17 00:00:00 2001 From: Jakob Feldmann Date: Tue, 14 Mar 2023 15:14:10 +0100 Subject: [PATCH] Small fixes --- src/Actors/Enemies/Beings/Flyer.tscn | 1 - src/Contraptions/Triggers/ElevatorButton.gd | 2 +- src/Contraptions/Triggers/WhyButton.tscn | 28 ++++++++------------- src/UserInterface/Buttons/RetryButton.gd | 2 +- src/UserInterface/Screens/HUD.gd | 2 +- 5 files changed, 14 insertions(+), 21 deletions(-) diff --git a/src/Actors/Enemies/Beings/Flyer.tscn b/src/Actors/Enemies/Beings/Flyer.tscn index 3a85557..37a8b4d 100644 --- a/src/Actors/Enemies/Beings/Flyer.tscn +++ b/src/Actors/Enemies/Beings/Flyer.tscn @@ -311,4 +311,3 @@ collision_mask = 9 collide_with_areas = true [connection signal="body_entered" from="StompDetector" to="." method="_on_StompDetector_body_entered"] -[connection signal="area_entered" from="EnemySkin" to="." method="_on_EnemySkin_area_entered"] diff --git a/src/Contraptions/Triggers/ElevatorButton.gd b/src/Contraptions/Triggers/ElevatorButton.gd index 4e957e3..253c3c7 100644 --- a/src/Contraptions/Triggers/ElevatorButton.gd +++ b/src/Contraptions/Triggers/ElevatorButton.gd @@ -4,7 +4,7 @@ onready var buttonPlayer = $"%ButtonPlayer" onready var activatorArea = $"%ActivatorArea" onready var indicatorPlayer = $"%IndicatorPlayer" onready var elevator = get_node("./Portal") -onready var signalManager = $"%SignalManager" +onready var signalManager := get_tree().root.get_child(1).get_node("%SignalManager") func selfActivate(): diff --git a/src/Contraptions/Triggers/WhyButton.tscn b/src/Contraptions/Triggers/WhyButton.tscn index 9c6248a..9c16982 100644 --- a/src/Contraptions/Triggers/WhyButton.tscn +++ b/src/Contraptions/Triggers/WhyButton.tscn @@ -1,9 +1,8 @@ -[gd_scene load_steps=15 format=2] +[gd_scene load_steps=13 format=2] [ext_resource path="res://src/Contraptions/Triggers/WhyButton.gd" type="Script" id=1] - -[sub_resource type="StreamTexture" id=1] -load_path = "res://.import/button.png-6b06252879983e2da39a6ce37483d567.stex" +[ext_resource path="res://assets/contraption/button.png" type="Texture" id=2] +[ext_resource path="res://assets/contraption/buttonStateIndicator.png" type="Texture" id=3] [sub_resource type="Animation" id=2] resource_name = "pushing" @@ -21,9 +20,6 @@ tracks/0/keys = { "values": [ 0.0, 1.0, 2.0 ] } -[sub_resource type="StreamTexture" id=5] -load_path = "res://.import/buttonStateIndicator.png-4ad4dfff1d6add183d62f1b602452b7a.stex" - [sub_resource type="Animation" id=6] length = 0.1 tracks/0/type = "value" @@ -55,9 +51,6 @@ tracks/0/keys = { "values": [ 5.0, 2.0, 6.0, 4.0 ] } -[sub_resource type="StreamTexture" id=17] -load_path = "res://.import/buttonStateIndicator.png-4ad4dfff1d6add183d62f1b602452b7a.stex" - [sub_resource type="Animation" id=10] length = 0.1 tracks/0/type = "value" @@ -89,9 +82,6 @@ tracks/0/keys = { "values": [ 7.0, 8.0, 6.0, 4.0 ] } -[sub_resource type="StreamTexture" id=18] -load_path = "res://.import/buttonStateIndicator.png-4ad4dfff1d6add183d62f1b602452b7a.stex" - [sub_resource type="Animation" id=14] length = 0.1 tracks/0/type = "value" @@ -134,9 +124,10 @@ script = ExtResource( 1 ) [node name="Button" type="Sprite" parent="."] position = Vector2( 0, -6 ) -texture = SubResource( 1 ) +texture = ExtResource( 2 ) hframes = 2 vframes = 2 +frame = 2 __meta__ = { "_editor_description_": "YXNlcHJpdGVfd2l6YXJkX2NvbmZpZwpwbGF5ZXJ8PVNwcml0ZS9BbmltYXRpb25QbGF5ZXIKc291cmNlfD1yZXM6Ly9hc3NldHMvbmV1dHJhbCBvYmplY3QvYnV0dG9uLmFzZXByaXRlCmxheWVyfD0Kb3BfZXhwfD1GYWxzZQpvX2ZvbGRlcnw9Cm9fbmFtZXw9Cm9ubHlfdmlzaWJsZXw9RmFsc2UKb19leF9wfD0K" } @@ -148,9 +139,10 @@ anims/pushing = SubResource( 2 ) [node name="Indicator1" type="Sprite" parent="."] position = Vector2( -3, -1 ) z_index = 1 -texture = SubResource( 5 ) +texture = ExtResource( 3 ) hframes = 3 vframes = 3 +frame = 4 __meta__ = { "_editor_description_": "YXNlcHJpdGVfd2l6YXJkX2NvbmZpZwpwbGF5ZXJ8PUluZGljYXRvcjEvQW5pbWF0aW9uUGxheWVyCnNvdXJjZXw9cmVzOi8vYXNzZXRzL25ldXRyYWwgb2JqZWN0L2J1dHRvblN0YXRlSW5kaWNhdG9yLmFzZXByaXRlCmxheWVyfD0Kb3BfZXhwfD1GYWxzZQpvX2ZvbGRlcnw9Cm9fbmFtZXw9Cm9ubHlfdmlzaWJsZXw9RmFsc2UKb19leF9wfD0K" } @@ -163,9 +155,10 @@ anims/onning = SubResource( 8 ) [node name="Indicator2" type="Sprite" parent="."] position = Vector2( 0, -1 ) z_index = 1 -texture = SubResource( 17 ) +texture = ExtResource( 3 ) hframes = 3 vframes = 3 +frame = 4 __meta__ = { "_editor_description_": "YXNlcHJpdGVfd2l6YXJkX2NvbmZpZwpwbGF5ZXJ8PUluZGljYXRvcjIvQW5pbWF0aW9uUGxheWVyCnNvdXJjZXw9cmVzOi8vYXNzZXRzL25ldXRyYWwgb2JqZWN0L2J1dHRvblN0YXRlSW5kaWNhdG9yLmFzZXByaXRlCmxheWVyfD0Kb3BfZXhwfD1GYWxzZQpvX2ZvbGRlcnw9Cm9fbmFtZXw9Cm9ubHlfdmlzaWJsZXw9RmFsc2UKb19leF9wfD0K" } @@ -178,9 +171,10 @@ anims/onning = SubResource( 13 ) [node name="Indicator3" type="Sprite" parent="."] position = Vector2( 3, -1 ) z_index = 1 -texture = SubResource( 18 ) +texture = ExtResource( 3 ) hframes = 3 vframes = 3 +frame = 1 __meta__ = { "_editor_description_": "YXNlcHJpdGVfd2l6YXJkX2NvbmZpZwpwbGF5ZXJ8PUluZGljYXRvcjMvQW5pbWF0aW9uUGxheWVyCnNvdXJjZXw9cmVzOi8vYXNzZXRzL25ldXRyYWwgb2JqZWN0L2J1dHRvblN0YXRlSW5kaWNhdG9yLmFzZXByaXRlCmxheWVyfD0Kb3BfZXhwfD1GYWxzZQpvX2ZvbGRlcnw9Cm9fbmFtZXw9Cm9ubHlfdmlzaWJsZXw9RmFsc2UKb19leF9wfD0K" } diff --git a/src/UserInterface/Buttons/RetryButton.gd b/src/UserInterface/Buttons/RetryButton.gd index 5abfa84..c428132 100644 --- a/src/UserInterface/Buttons/RetryButton.gd +++ b/src/UserInterface/Buttons/RetryButton.gd @@ -1,6 +1,6 @@ extends Button -onready var levelState := $"../%LevelState" +onready var levelState := get_tree().root.get_child(1).get_node("%LevelState") func _on_button_up() -> void: levelState.kills = 0 diff --git a/src/UserInterface/Screens/HUD.gd b/src/UserInterface/Screens/HUD.gd index e560312..e72736c 100644 --- a/src/UserInterface/Screens/HUD.gd +++ b/src/UserInterface/Screens/HUD.gd @@ -16,7 +16,7 @@ func _ready(): signalManager.connect("currency_updated", self, "update_interface") signalManager.connect("kills_updated", self, "update_interface") signalManager.connect("frees_updated", self, "update_interface") - signalManager.connect("termial_activated", self, "_on_SignalManager_terminal_activated") + signalManager.connect("terminal_activated", self, "_on_SignalManager_terminal_activated") update_interface() func _process(delta):