diff --git a/project.godot b/project.godot index d3ad639..1a1a26c 100644 --- a/project.godot +++ b/project.godot @@ -149,6 +149,11 @@ click={ "events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null) ] } +interact={ +"deadzone": 0.5, +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":0,"physical_scancode":69,"unicode":0,"echo":false,"script":null) + ] +} [layer_names] diff --git a/src/Actors/BlobbyCam.gd b/src/Actors/BlobbyCam.gd index cc4c79e..6512646 100644 --- a/src/Actors/BlobbyCam.gd +++ b/src/Actors/BlobbyCam.gd @@ -39,9 +39,13 @@ func _ready(): print(screen_rect) self.position = blobby.global_position image.create(128, 2, false, Image.FORMAT_RGBAH) + # TODO Test Performance _update_lighting_shader() # TODO Trigger when needed - # get_node("LightAnimationPlayer").play("Pulsing") + signalManager.connect("terminal_activated", self, "_on_SignalManager_terminal_activated") + +func _on_SignalManager_terminal_activated(): + get_node("LightAnimationPlayer").play("Pulsing") func _physics_process(delta: float) -> void: if(!levelState.is_dead): diff --git a/src/Actors/BlobbyCam.tscn b/src/Actors/BlobbyCam.tscn index bcf9b50..9a1d5e4 100644 --- a/src/Actors/BlobbyCam.tscn +++ b/src/Actors/BlobbyCam.tscn @@ -679,10 +679,10 @@ texture = ExtResource( 8 ) [node name="AnimatedSprite" type="AnimatedSprite" parent="ParallaxBackground/ParallaxLayer5"] visible = false frames = SubResource( 7 ) -frame = 13 +frame = 10 playing = true [node name="AnimatedSprite2" type="AnimatedSprite" parent="ParallaxBackground/ParallaxLayer5"] frames = SubResource( 8 ) -frame = 4 +frame = 1 playing = true diff --git a/src/Contraptions/Triggers/ElevatorButton.gd b/src/Contraptions/Triggers/ElevatorButton.gd index 253c3c7..8aaaffe 100644 --- a/src/Contraptions/Triggers/ElevatorButton.gd +++ b/src/Contraptions/Triggers/ElevatorButton.gd @@ -5,6 +5,14 @@ onready var activatorArea = $"%ActivatorArea" onready var indicatorPlayer = $"%IndicatorPlayer" onready var elevator = get_node("./Portal") onready var signalManager := get_tree().root.get_child(1).get_node("%SignalManager") +onready var unactivatable_timer := $Timer + +var activatable = true + +func _process(delta): + if activatable && Input.is_action_just_released("interact"): + selfActivate() + signalManager.emit_signal("terminal_activated") func selfActivate(): @@ -16,8 +24,13 @@ func selfActivate(): activatorArea.set_deferred("monitoring", false) -func _on_ActivatorArea_area_entered(_area:Area2D) -> void: - selfActivate() - signalManager.emit_signal("terminal_activated") +func _on_ActivatorArea_area_entered(area:Area2D) -> void: + if area.is_in_group("player"): + activatable = true +func _on_ActivatorArea_area_exited(area:Area2D) -> void: + if area.is_in_group("player"): + unactivatable_timer.start() +func _on_Timer_timeout(): + activatable = false diff --git a/src/Contraptions/Triggers/ElevatorButton.tscn b/src/Contraptions/Triggers/ElevatorButton.tscn index 7d63132..b79d3f5 100644 --- a/src/Contraptions/Triggers/ElevatorButton.tscn +++ b/src/Contraptions/Triggers/ElevatorButton.tscn @@ -1,8 +1,8 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://src/Contraptions/Triggers/ElevatorButton.gd" type="Script" id=1] - -[sub_resource type="StreamTexture" id=1] +[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" @@ -20,8 +20,6 @@ tracks/0/keys = { "values": [ 0.0, 1.0, 2.0 ] } -[sub_resource type="StreamTexture" id=17] - [sub_resource type="Animation" id=10] length = 0.1 tracks/0/type = "value" @@ -53,18 +51,15 @@ tracks/0/keys = { "values": [ 7.0, 8.0, 6.0, 4.0 ] } -[sub_resource type="RectangleShape2D" id=4] -extents = Vector2( 4, 1 ) - -[sub_resource type="RectangleShape2D" id=3] -extents = Vector2( 6, 1 ) +[sub_resource type="CircleShape2D" id=18] +radius = 18.0 [node name="Terminal" type="Node2D"] script = ExtResource( 1 ) [node name="Button" type="Sprite" parent="."] position = Vector2( 0, -6 ) -texture = SubResource( 1 ) +texture = ExtResource( 2 ) hframes = 2 vframes = 2 __meta__ = { @@ -78,7 +73,7 @@ anims/pushing = SubResource( 2 ) [node name="Indicator" type="Sprite" parent="."] position = Vector2( 0, -1 ) z_index = 1 -texture = SubResource( 17 ) +texture = ExtResource( 3 ) hframes = 3 vframes = 3 __meta__ = { @@ -98,15 +93,11 @@ collision_layer = 24 [node name="ActivatorAreaShape" type="CollisionShape2D" parent="ActivatorArea"] unique_name_in_owner = true position = Vector2( 0, 3 ) -shape = SubResource( 4 ) +shape = SubResource( 18 ) -[node name="ButtonBody" type="StaticBody2D" parent="."] -unique_name_in_owner = true -position = Vector2( 0, -6 ) -collision_layer = 64 - -[node name="CollisionShape2D" type="CollisionShape2D" parent="ButtonBody"] -position = Vector2( 0, 5 ) -shape = SubResource( 3 ) +[node name="Timer" type="Timer" parent="."] +wait_time = 0.1 +one_shot = true [connection signal="area_entered" from="ActivatorArea" to="." method="_on_ActivatorArea_area_entered"] +[connection signal="timeout" from="Timer" to="." method="_on_Timer_timeout"] diff --git a/src/Levels/01 Level.tscn b/src/Levels/01 Level.tscn index 304d32e..b00c0c2 100644 --- a/src/Levels/01 Level.tscn +++ b/src/Levels/01 Level.tscn @@ -1,16 +1,15 @@ -[gd_scene load_steps=13 format=2] +[gd_scene load_steps=12 format=2] [ext_resource path="res://src/Environment/AlienShipTileSet.tres" type="TileSet" id=1] [ext_resource path="res://src/Actors/Blobby/Blobby.tscn" type="PackedScene" id=2] [ext_resource path="res://src/ObstacleObjects/Spikes.tscn" type="PackedScene" id=3] [ext_resource path="res://src/Levels/02 Level.tscn" type="PackedScene" id=4] [ext_resource path="res://src/Contraptions/Portal/Portal.tscn" type="PackedScene" id=5] -[ext_resource path="res://src/NeutralObjects/Coin.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/Contraptions/Triggers/ElevatorButton.tscn" type="PackedScene" id=6] [ext_resource path="res://src/UserInterface/UserInterface.tscn" type="PackedScene" id=7] [ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=8] [ext_resource path="res://src/Utilities/LevelState.tscn" type="PackedScene" id=9] [ext_resource path="res://src/Actors/BlobbyCam.tscn" type="PackedScene" id=12] -[ext_resource path="res://src/Environment/ShaderGrass.tscn" type="PackedScene" id=13] [sub_resource type="AnimationNodeStateMachinePlayback" id=4] @@ -27,6 +26,18 @@ unique_name_in_owner = true [node name="UserInterface" parent="." instance=ExtResource( 7 )] +[node name="HUDOverlay" parent="UserInterface/HUD" index="0"] +margin_right = 640.0 +margin_bottom = 360.0 + +[node name="GetBackTimer" parent="UserInterface/HUD/HUDOverlay" index="3"] +anchor_left = 0.0 +anchor_right = 0.0 +margin_left = 322.0 +margin_top = 1.0 +margin_right = 340.0 +margin_bottom = 14.0 + [node name="Timer" parent="UserInterface/HUD/HUDOverlay/GetBackTimer" index="0"] wait_time = 20.0 @@ -34,10 +45,10 @@ wait_time = 20.0 drag_margin_bottom = 0.3 [node name="AnimatedSprite" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="4"] -frame = 10 +frame = 9 [node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"] -frame = 0 +frame = 6 [node name="Blobby" parent="." instance=ExtResource( 2 )] unique_name_in_owner = true @@ -47,56 +58,6 @@ scale = Vector2( 0.878906, 0.936025 ) [node name="AnimationTree" parent="Blobby/BlobbySprite" index="0"] parameters/playback = SubResource( 4 ) -[node name="Decor" type="Node2D" parent="."] -visible = false - -[node name="ShaderGrass" parent="Decor" instance=ExtResource( 13 )] -position = Vector2( 118, -35 ) - -[node name="ShaderGrass3" parent="Decor" instance=ExtResource( 13 )] -position = Vector2( 129, -35 ) - -[node name="ShaderGrass2" parent="Decor" instance=ExtResource( 13 )] -position = Vector2( 124, -36 ) -z_index = -1 - -[node name="ShaderGrass4" parent="Decor" instance=ExtResource( 13 )] -position = Vector2( 325, -11 ) - -[node name="ShaderGrass5" parent="Decor" instance=ExtResource( 13 )] -position = Vector2( 339, -11 ) - -[node name="ShaderGrass6" parent="Decor" instance=ExtResource( 13 )] -position = Vector2( 332, -12 ) -z_index = -1 - -[node name="Collectibles" type="Node2D" parent="."] -z_index = -1 - -[node name="Coin" parent="Collectibles" instance=ExtResource( 6 )] -position = Vector2( 336, -96 ) -scale = Vector2( 0.133, 0.133 ) - -[node name="Coin2" parent="Collectibles" instance=ExtResource( 6 )] -position = Vector2( 336, -7 ) -scale = Vector2( 0.133, 0.133 ) - -[node name="Coin3" parent="Collectibles" instance=ExtResource( 6 )] -position = Vector2( 1188, -84 ) -scale = Vector2( 0.133, 0.133 ) - -[node name="Coin4" parent="Collectibles" instance=ExtResource( 6 )] -position = Vector2( 1236, -108 ) -scale = Vector2( 0.133, 0.133 ) - -[node name="Coin5" parent="Collectibles" instance=ExtResource( 6 )] -position = Vector2( 1140, -108 ) -scale = Vector2( 0.133, 0.133 ) - -[node name="Coin6" parent="Collectibles" instance=ExtResource( 6 )] -position = Vector2( 696, -48 ) -scale = Vector2( 0.133, 0.133 ) - [node name="TileMap" type="TileMap" parent="."] unique_name_in_owner = true tile_set = ExtResource( 1 ) @@ -107,7 +68,7 @@ collision_layer = 8 collision_mask = 8 bake_navigation = true format = 1 -tile_data = PoolIntArray( -851975, 1610612751, 0, -851974, 1610612746, 0, -851973, 1610612746, 0, -851972, 1610612746, 0, -851971, 1610612746, 0, -851970, 1610612746, 0, -851969, 1610612746, 0, -917504, 1610612746, 0, -917503, 1610612746, 0, -917502, 1610612746, 0, -917501, 1610612746, 0, -917500, 1610612746, 0, -917499, 1610612746, 0, -917498, 1610612746, 0, -917497, 1610612746, 0, -917496, 1610612746, 0, -917495, 1610612746, 0, -917494, 1610612746, 0, -917493, 1610612746, 0, -917492, 1610612746, 0, -917491, 1610612746, 0, -917490, 1610612746, 0, -917489, 1610612746, 0, -917488, 1610612746, 0, -917487, 1610612746, 0, -917486, 1610612746, 0, -917485, 1610612746, 0, -917484, 1610612746, 0, -917483, 1610612746, 0, -917482, 1610612746, 0, -917481, 1610612746, 0, -917480, 1610612746, 0, -917479, 1610612746, 0, -917478, 1610612746, 0, -917477, 1610612746, 0, -917476, 1610612746, 0, -917475, 1610612746, 0, -917474, 1610612746, 0, -917473, 1610612746, 0, -917472, 1610612746, 0, -917471, 1610612746, 0, -917470, 1610612746, 0, -917469, 1610612746, 0, -917468, 1610612746, 0, -917467, 1610612746, 0, -917466, 1610612746, 0, -917465, 1610612746, 0, -917464, 1610612746, 0, -917463, 1610612746, 0, -917462, 1610612746, 0, -917461, 1610612746, 0, -917460, 1610612746, 0, -917459, 1610612746, 0, -917458, 1610612746, 0, -917457, 1610612746, 0, -917456, 1610612746, 0, -917455, 1610612746, 0, -917454, 1610612746, 0, -917453, 1610612746, 0, -917452, 1610612746, 0, -917451, 1610612746, 0, -917450, 1610612746, 0, -917449, 1610612746, 0, -917448, 1610612746, 0, -917447, 1610612746, 0, -917446, 1610612746, 0, -917445, 1610612746, 0, -917444, 1610612746, 0, -917443, 1610612746, 0, -917442, 1610612746, 0, -917441, 1610612746, 0, -917440, -1073741809, 0, -786439, -1610612726, 0, -786438, 1610612739, 0, -786437, 1610612738, 0, -786436, 1610612738, 0, -786435, 1610612736, 0, -786434, 1610612738, 0, -786433, 1610612738, 0, -851968, 1610612738, 0, -851967, 1610612738, 0, -851966, 1610612738, 0, -851965, 1610612736, 0, -851964, 1610612738, 0, -851963, 1610612738, 0, -851962, 1610612738, 0, -851961, 1610612738, 0, -851960, 1610612738, 0, -851959, 1610612736, 0, -851958, 1610612738, 0, -851957, 1610612738, 0, -851956, 1610612738, 0, -851955, 1610612738, 0, -851954, 1610612738, 0, -851953, 1610612736, 0, -851952, 1610612738, 0, -851951, 1610612738, 0, -851950, 1610612738, 0, -851949, 1610612738, 0, -851948, 1610612738, 0, -851947, 1610612736, 0, -851946, 1610612738, 0, -851945, 1610612738, 0, -851944, 1610612738, 0, -851943, 1610612738, 0, -851942, 1610612738, 0, -851941, 1610612736, 0, -851940, 1610612738, 0, -851939, 1610612738, 0, -851938, 1610612738, 0, -851937, 1610612738, 0, -851936, 1610612738, 0, -851935, 1610612738, 0, -851934, 1610612738, 0, -851933, 1610612738, 0, -851932, 1610612736, 0, -851931, 1610612738, 0, -851930, 1610612738, 0, -851929, 1610612738, 0, -851928, 1610612738, 0, -851927, 1610612738, 0, -851926, 1610612736, 0, -851925, 1610612738, 0, -851924, 1610612738, 0, -851923, 1610612738, 0, -851922, 1610612738, 0, -851921, 1610612738, 0, -851920, 1610612736, 0, -851919, 1610612738, 0, -851918, 1610612738, 0, -851917, 1610612738, 0, -851916, 1610612738, 0, -851915, 1610612738, 0, -851914, 1610612736, 0, -851913, 1610612738, 0, -851912, 1610612738, 0, -851911, 1610612738, 0, -851910, 1610612738, 0, -851909, 1610612738, 0, -851908, 1610612736, 0, -851907, 3, 0, -851906, 3, 0, -851905, 1073741827, 0, -851904, -1073741814, 0, -720903, -1610612726, 0, -720902, -1610612734, 0, -786371, -1073741822, 0, -786370, -2147483645, 0, -786369, -536870909, 0, -786368, -1073741814, 0, -655367, -1610612726, 0, -655366, -1610612734, 0, -720835, -1073741822, 0, -720834, -2147483645, 0, -720833, -536870909, 0, -720832, -1073741814, 0, -589831, -1610612726, 0, -589830, -1610612734, 0, -655299, -1073741822, 0, -655298, -2147483645, 0, -655297, -536870909, 0, -655296, -1073741814, 0, -524295, -1610612726, 0, -524294, -1610612734, 0, -589763, -1073741822, 0, -589762, -2147483645, 0, -589761, -536870909, 0, -589760, -1073741814, 0, -458759, -1610612726, 0, -458758, -1610612734, 0, -524227, -1073741822, 0, -524226, -2147483645, 0, -524225, -536870909, 0, -524224, -1073741814, 0, -393223, -1610612726, 0, -393222, -1610612734, 0, -458691, 1073741831, 0, -458690, 1073741826, 0, -458689, 1073741826, 0, -458688, -1073741814, 0, -327687, -1610612726, 0, -327686, -1610612734, 0, -393152, -1073741814, 0, -262151, -1610612726, 0, -262150, -1610612734, 0, -327616, -1073741814, 0, -196615, -1610612726, 0, -196614, -1610612734, 0, -262088, 8, 0, -262087, 2, 0, -262086, 2, 0, -262085, 2, 0, -262084, 2, 0, -262083, 2, 0, -262082, 536870914, 0, -262081, 536870914, 0, -262080, -1073741814, 0, -131079, -1610612726, 0, -131078, -1610612734, 0, -196595, 7, 0, -196594, 1610612743, 0, -196568, 8, 0, -196567, 2, 0, -196566, 2, 0, -196565, 2, 0, -196564, 2, 0, -196563, 2, 0, -196562, 536870920, 0, -196559, 2, 0, -196556, 7, 0, -196555, 2, 0, -196554, 2, 0, -196553, 2, 0, -196552, 1610612739, 0, -196551, 3, 0, -196550, 3, 0, -196549, 3, 0, -196548, 3, 0, -196547, 3, 0, -196546, 1, 0, -196545, 3, 0, -196544, -1073741814, 0, -65543, -1610612726, 0, -65542, -1610612734, 0, -131064, 8, 0, -131063, -1610612729, 0, -131054, 7, 0, -131053, 2, 0, -131052, 0, 0, -131051, 536870919, 0, -131034, 7, 0, -131033, 2, 0, -131032, 3, 0, -131031, 3, 0, -131030, 3, 0, -131029, 3, 0, -131028, 3, 0, -131027, 3, 0, -131026, 1610612739, 0, -131020, 1610612739, 0, -131019, 3, 0, -131018, 3, 0, -131017, 3, 0, -131016, 1, 0, -131015, 3, 0, -131014, 3, 0, -131013, 3, 0, -131012, 3, 0, -131011, 3, 0, -131010, 3, 0, -131009, 3, 0, -131008, -1073741814, 0, -7, -1610612726, 0, -6, -1610612734, 0, -65532, 7, 0, -65531, 2, 0, -65530, 2, 0, -65529, 2, 0, -65528, 1610612739, 0, -65527, 1610612739, 0, -65526, -1610612729, 0, -65519, 7, 0, -65518, 3, 0, -65517, 3, 0, -65516, 3, 0, -65515, -1610612734, 0, -65514, 4, 0, -65500, 7, 0, -65499, 2, 0, -65498, 3, 0, -65497, 3, 0, -65496, 3, 0, -65495, 3, 0, -65494, 3, 0, -65493, 3, 0, -65492, 3, 0, -65491, 3, 0, -65490, 3, 0, -65489, 2, 0, -65488, 2, 0, -65487, 2, 0, -65486, 2, 0, -65485, 2, 0, -65484, 3, 0, -65483, 3, 0, -65482, 3, 0, -65481, 3, 0, -65480, 3, 0, -65479, 3, 0, -65478, 3, 0, -65477, 3, 0, -65476, 3, 0, -65475, 3, 0, -65474, 3, 0, -65473, 3, 0, -65472, -1073741814, 0, 65529, -1610612726, 0, 65530, 3, 0, 65531, 2, 0, 65532, 0, 0, 65533, 2, 0, 65534, 2, 0, 65535, 2, 0, 0, 2, 0, 1, 2, 0, 2, 0, 0, 3, 2, 0, 4, 3, 0, 5, 3, 0, 6, 3, 0, 7, 3, 0, 8, 3, 0, 9, 3, 0, 10, 1610612739, 0, 11, 2, 0, 12, 2, 0, 13, 2, 0, 14, 0, 0, 15, 2, 0, 16, 2, 0, 17, 3, 0, 18, 3, 0, 19, 3, 0, 20, 3, 0, 21, 3, 0, 22, 2, 0, 23, 2, 0, 24, 2, 0, 25, 2, 0, 26, 0, 0, 27, 536870919, 0, 30, 7, 0, 31, 2, 0, 32, 2, 0, 33, 2, 0, 34, 0, 0, 35, 2, 0, 36, 1610612739, 0, 37, 3, 0, 38, 3, 0, 39, 3, 0, 40, 3, 0, 41, 3, 0, 42, 3, 0, 43, 3, 0, 44, 3, 0, 45, 3, 0, 46, 3, 0, 47, 3, 0, 48, 3, 0, 49, 3, 0, 50, 3, 0, 51, 3, 0, 52, 3, 0, 53, 3, 0, 54, 3, 0, 55, 3, 0, 56, 1, 0, 57, 3, 0, 58, 3, 0, 59, 3, 0, 60, 3, 0, 61, 3, 0, 62, 1, 0, 63, 3, 0, 64, -1073741814, 0, 131065, -1610612721, 0, 131066, 10, 0, 131067, 10, 0, 131068, 10, 0, 131069, 10, 0, 131070, 10, 0, 131071, 10, 0, 65536, 10, 0, 65537, 10, 0, 65538, 10, 0, 65539, 10, 0, 65540, 10, 0, 65541, 10, 0, 65542, 10, 0, 65543, 10, 0, 65544, 12, 0, 65545, 10, 0, 65546, 10, 0, 65547, 10, 0, 65548, 10, 0, 65549, 10, 0, 65550, 10, 0, 65551, 10, 0, 65552, 10, 0, 65553, 10, 0, 65554, 10, 0, 65555, 10, 0, 65556, 12, 0, 65557, 10, 0, 65558, 10, 0, 65559, 10, 0, 65560, 10, 0, 65561, 10, 0, 65562, 10, 0, 65563, 10, 0, 65564, 10, 0, 65565, 10, 0, 65566, 10, 0, 65567, 10, 0, 65568, 10, 0, 65569, 10, 0, 65570, 10, 0, 65571, 10, 0, 65572, 10, 0, 65573, 10, 0, 65574, 10, 0, 65575, 10, 0, 65576, 12, 0, 65577, 10, 0, 65578, 10, 0, 65579, 10, 0, 65580, 10, 0, 65581, 10, 0, 65582, 12, 0, 65583, 10, 0, 65584, 10, 0, 65585, 10, 0, 65586, 10, 0, 65587, 10, 0, 65588, 10, 0, 65589, 10, 0, 65590, 10, 0, 65591, 10, 0, 65592, 10, 0, 65593, 10, 0, 65594, 10, 0, 65595, 10, 0, 65596, 10, 0, 65597, 10, 0, 65598, 10, 0, 65599, 10, 0, 65600, 15, 0 ) +tile_data = PoolIntArray( -851975, 1610612751, 0, -851974, 1610612746, 0, -851973, 1610612746, 0, -851972, 1610612746, 0, -851971, 1610612746, 0, -851970, 1610612746, 0, -851969, 1610612746, 0, -917504, 1610612746, 0, -917503, 1610612746, 0, -917502, 1610612746, 0, -917501, 1610612746, 0, -917500, 1610612746, 0, -917499, 1610612746, 0, -917498, 1610612746, 0, -917497, 1610612746, 0, -917496, 1610612746, 0, -917495, 1610612746, 0, -917494, 1610612746, 0, -917493, 1610612746, 0, -917492, 1610612746, 0, -917491, 1610612746, 0, -917490, 1610612746, 0, -917489, 1610612746, 0, -917488, 1610612746, 0, -917487, 1610612746, 0, -917486, 1610612746, 0, -917485, 1610612746, 0, -917484, 1610612746, 0, -917483, 1610612746, 0, -917482, 1610612746, 0, -917481, 1610612746, 0, -917480, 1610612746, 0, -917479, 1610612746, 0, -917478, 1610612746, 0, -917477, 1610612746, 0, -917476, 1610612746, 0, -917475, 1610612746, 0, -917474, 1610612746, 0, -917473, 1610612746, 0, -917472, 1610612746, 0, -917471, 1610612746, 0, -917470, 1610612746, 0, -917469, 1610612746, 0, -917468, 1610612746, 0, -917467, 1610612746, 0, -917466, 1610612746, 0, -917465, 1610612746, 0, -917464, 1610612746, 0, -917463, 1610612746, 0, -917462, 1610612746, 0, -917461, 1610612746, 0, -917460, 1610612746, 0, -917459, 1610612746, 0, -917458, 1610612746, 0, -917457, 1610612746, 0, -917456, 1610612746, 0, -917455, 1610612746, 0, -917454, 1610612746, 0, -917453, 1610612746, 0, -917452, 1610612746, 0, -917451, 1610612746, 0, -917450, 1610612746, 0, -917449, 1610612746, 0, -917448, 1610612746, 0, -917447, 1610612746, 0, -917446, 1610612746, 0, -917445, 1610612746, 0, -917444, 1610612746, 0, -917443, 1610612746, 0, -917442, 1610612746, 0, -917441, 1610612746, 0, -917440, -1073741809, 0, -786439, -1610612726, 0, -786438, 1610612739, 0, -786437, 1610612738, 0, -786436, 1610612738, 0, -786435, 1610612736, 0, -786434, 1610612738, 0, -786433, 1610612738, 0, -851968, 1610612738, 0, -851967, 1610612738, 0, -851966, 1610612738, 0, -851965, 1610612736, 0, -851964, 1610612738, 0, -851963, 1610612738, 0, -851962, 1610612738, 0, -851961, 1610612738, 0, -851960, 1610612738, 0, -851959, 1610612736, 0, -851958, 1610612738, 0, -851957, 1610612738, 0, -851956, 1610612738, 0, -851955, 1610612738, 0, -851954, 1610612738, 0, -851953, 1610612736, 0, -851952, 1610612738, 0, -851951, 1610612738, 0, -851950, 1610612738, 0, -851949, 1610612738, 0, -851948, 1610612738, 0, -851947, 1610612736, 0, -851946, 1610612738, 0, -851945, 1610612738, 0, -851944, 1610612738, 0, -851943, 1610612738, 0, -851942, 1610612738, 0, -851941, 1610612736, 0, -851940, 1610612738, 0, -851939, 1610612738, 0, -851938, 1610612738, 0, -851937, 1610612738, 0, -851936, 1610612738, 0, -851935, 1610612738, 0, -851934, 1610612738, 0, -851933, 1610612738, 0, -851932, 1610612736, 0, -851931, 1610612738, 0, -851930, 1610612738, 0, -851929, 1610612738, 0, -851928, 1610612738, 0, -851927, 1610612738, 0, -851926, 1610612736, 0, -851925, 1610612738, 0, -851924, 1610612738, 0, -851923, 1610612738, 0, -851922, 1610612738, 0, -851921, 1610612738, 0, -851920, 1610612736, 0, -851919, 1610612738, 0, -851918, 1610612738, 0, -851917, 1610612738, 0, -851916, 1610612738, 0, -851915, 1610612738, 0, -851914, 1610612736, 0, -851913, 1610612738, 0, -851912, 1610612738, 0, -851911, 1610612738, 0, -851910, 1610612738, 0, -851909, 1610612738, 0, -851908, 1610612736, 0, -851907, 3, 0, -851906, 3, 0, -851905, 1073741827, 0, -851904, -1073741814, 0, -720903, -1610612726, 0, -720902, -1610612734, 0, -786371, -1073741822, 0, -786370, -2147483645, 0, -786369, -536870909, 0, -786368, -1073741814, 0, -655367, -1610612726, 0, -655366, -1610612734, 0, -720835, -1073741822, 0, -720834, -2147483645, 0, -720833, -536870909, 0, -720832, -1073741814, 0, -589831, -1610612726, 0, -589830, -1610612734, 0, -655299, -1073741822, 0, -655298, -2147483645, 0, -655297, -536870909, 0, -655296, -1073741814, 0, -524295, -1610612726, 0, -524294, -1610612734, 0, -589763, -1073741822, 0, -589762, -2147483645, 0, -589761, -536870909, 0, -589760, -1073741814, 0, -458759, -1610612726, 0, -458758, -1610612734, 0, -524227, -1073741822, 0, -524226, -2147483645, 0, -524225, -536870909, 0, -524224, -1073741814, 0, -393223, -1610612726, 0, -393222, -1610612734, 0, -458691, 1073741831, 0, -458690, 1073741826, 0, -458689, -1073741821, 0, -458688, -1073741814, 0, -327687, -1610612726, 0, -327686, -1610612734, 0, -393153, -1073741822, 0, -393152, -1073741814, 0, -262151, -1610612726, 0, -262150, -1610612734, 0, -327617, -1073741822, 0, -327616, -1073741814, 0, -196615, -1610612726, 0, -196614, -1610612734, 0, -262088, 8, 0, -262087, 2, 0, -262086, 2, 0, -262085, 2, 0, -262084, 2, 0, -262083, 2, 0, -262082, 536870914, 0, -262081, -1073741821, 0, -262080, -1073741814, 0, -131079, -1610612726, 0, -131078, -1610612734, 0, -196595, 7, 0, -196594, 1610612743, 0, -196568, 8, 0, -196567, 2, 0, -196566, 2, 0, -196565, 2, 0, -196564, 2, 0, -196563, 2, 0, -196562, 536870920, 0, -196559, 2, 0, -196556, 7, 0, -196555, 2, 0, -196554, 2, 0, -196553, 2, 0, -196552, 1610612739, 0, -196551, 3, 0, -196550, 3, 0, -196549, 3, 0, -196548, 3, 0, -196547, 3, 0, -196546, 1, 0, -196545, 3, 0, -196544, -1073741814, 0, -65543, -1610612726, 0, -65542, -1610612734, 0, -131064, 8, 0, -131063, -1610612729, 0, -131054, 7, 0, -131053, 2, 0, -131052, 0, 0, -131051, 536870919, 0, -131034, 7, 0, -131033, 2, 0, -131032, 3, 0, -131031, 3, 0, -131030, 3, 0, -131029, 3, 0, -131028, 3, 0, -131027, 3, 0, -131026, 1610612739, 0, -131020, 1610612739, 0, -131019, 3, 0, -131018, 3, 0, -131017, 3, 0, -131016, 1, 0, -131015, 3, 0, -131014, 3, 0, -131013, 3, 0, -131012, 3, 0, -131011, 3, 0, -131010, 3, 0, -131009, 3, 0, -131008, -1073741814, 0, -7, -1610612726, 0, -6, -1610612734, 0, -65532, 7, 0, -65531, 2, 0, -65530, 2, 0, -65529, 2, 0, -65528, 1610612739, 0, -65527, 1610612739, 0, -65526, -1610612729, 0, -65519, 7, 0, -65518, 3, 0, -65517, 3, 0, -65516, 3, 0, -65515, -1610612734, 0, -65514, 4, 0, -65500, 7, 0, -65499, 2, 0, -65498, 3, 0, -65497, 3, 0, -65496, 3, 0, -65495, 3, 0, -65494, 3, 0, -65493, 3, 0, -65492, 3, 0, -65491, 3, 0, -65490, 3, 0, -65489, 2, 0, -65488, 2, 0, -65487, 2, 0, -65486, 2, 0, -65485, 2, 0, -65484, 3, 0, -65483, 3, 0, -65482, 3, 0, -65481, 3, 0, -65480, 3, 0, -65479, 3, 0, -65478, 3, 0, -65477, 3, 0, -65476, 3, 0, -65475, 3, 0, -65474, 3, 0, -65473, 3, 0, -65472, -1073741814, 0, 65529, -1610612726, 0, 65530, 3, 0, 65531, 2, 0, 65532, 0, 0, 65533, 2, 0, 65534, 2, 0, 65535, 2, 0, 0, 2, 0, 1, 2, 0, 2, 0, 0, 3, 2, 0, 4, 3, 0, 5, 3, 0, 6, 3, 0, 7, 3, 0, 8, 3, 0, 9, 3, 0, 10, 1610612739, 0, 11, 2, 0, 12, 2, 0, 13, 2, 0, 14, 0, 0, 15, 2, 0, 16, 2, 0, 17, 3, 0, 18, 3, 0, 19, 3, 0, 20, 3, 0, 21, 3, 0, 22, 2, 0, 23, 2, 0, 24, 2, 0, 25, 2, 0, 26, 0, 0, 27, 536870919, 0, 30, 7, 0, 31, 2, 0, 32, 2, 0, 33, 2, 0, 34, 0, 0, 35, 2, 0, 36, 1610612739, 0, 37, 3, 0, 38, 3, 0, 39, 3, 0, 40, 3, 0, 41, 3, 0, 42, 3, 0, 43, 3, 0, 44, 3, 0, 45, 3, 0, 46, 3, 0, 47, 3, 0, 48, 3, 0, 49, 3, 0, 50, 3, 0, 51, 3, 0, 52, 3, 0, 53, 3, 0, 54, 3, 0, 55, 3, 0, 56, 1, 0, 57, 3, 0, 58, 3, 0, 59, 3, 0, 60, 3, 0, 61, 3, 0, 62, 1, 0, 63, 3, 0, 64, -1073741814, 0, 131065, -1610612721, 0, 131066, 10, 0, 131067, 10, 0, 131068, 10, 0, 131069, 10, 0, 131070, 10, 0, 131071, 10, 0, 65536, 10, 0, 65537, 10, 0, 65538, 10, 0, 65539, 10, 0, 65540, 10, 0, 65541, 10, 0, 65542, 10, 0, 65543, 10, 0, 65544, 12, 0, 65545, 10, 0, 65546, 10, 0, 65547, 10, 0, 65548, 10, 0, 65549, 10, 0, 65550, 10, 0, 65551, 10, 0, 65552, 10, 0, 65553, 10, 0, 65554, 10, 0, 65555, 10, 0, 65556, 12, 0, 65557, 10, 0, 65558, 10, 0, 65559, 10, 0, 65560, 10, 0, 65561, 10, 0, 65562, 10, 0, 65563, 10, 0, 65564, 10, 0, 65565, 10, 0, 65566, 10, 0, 65567, 10, 0, 65568, 10, 0, 65569, 10, 0, 65570, 10, 0, 65571, 10, 0, 65572, 10, 0, 65573, 10, 0, 65574, 10, 0, 65575, 10, 0, 65576, 12, 0, 65577, 10, 0, 65578, 10, 0, 65579, 10, 0, 65580, 10, 0, 65581, 10, 0, 65582, 12, 0, 65583, 10, 0, 65584, 10, 0, 65585, 10, 0, 65586, 10, 0, 65587, 10, 0, 65588, 10, 0, 65589, 10, 0, 65590, 10, 0, 65591, 10, 0, 65592, 10, 0, 65593, 10, 0, 65594, 10, 0, 65595, 10, 0, 65596, 10, 0, 65597, 10, 0, 65598, 10, 0, 65599, 10, 0, 65600, 15, 0 ) [node name="Spikes" parent="TileMap" instance=ExtResource( 3 )] position = Vector2( 708, 12 ) @@ -137,10 +98,16 @@ rotation = 1.57079 position = Vector2( 684, 12 ) rotation = 1.57079 -[node name="Portal" parent="." instance=ExtResource( 5 )] -position = Vector2( 1488, -120 ) +[node name="Terminal" parent="." instance=ExtResource( 6 )] +position = Vector2( 109, -24 ) + +[node name="Portal" parent="Terminal" instance=ExtResource( 5 )] +visible = false +position = Vector2( 1379, -96 ) +monitoring = false next_scene = ExtResource( 4 ) +[connection signal="timeout" from="UserInterface/HUD/HUDOverlay/GetBackTimer/Timer" to="UserInterface/HUD" method="_on_Timer_timeout"] [connection signal="body_exited" from="Blobby/BlobbySkin" to="Blobby" method="_on_BlobbySkin_body_exited"] [editable path="UserInterface"] diff --git a/src/Levels/02 Level.tscn b/src/Levels/02 Level.tscn index e397e5d..709ba98 100644 --- a/src/Levels/02 Level.tscn +++ b/src/Levels/02 Level.tscn @@ -87,10 +87,10 @@ wait_time = 20.0 [node name="BlobbyCam" parent="." instance=ExtResource( 12 )] [node name="AnimatedSprite" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="4"] -frame = 8 +frame = 12 [node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"] -frame = 13 +frame = 3 [node name="Blobby" parent="." instance=ExtResource( 2 )] unique_name_in_owner = true diff --git a/src/UserInterface/Screens/HUD.gd b/src/UserInterface/Screens/HUD.gd index e72736c..d6f6dca 100644 --- a/src/UserInterface/Screens/HUD.gd +++ b/src/UserInterface/Screens/HUD.gd @@ -27,6 +27,7 @@ func start_timer(): timer.visible = true $HUDOverlay/GetBackTimer/Timer.start() $HUDOverlay/GetBackTimer/AnimationPlayer.play("Redlight") + _zoom_timer() @@ -52,3 +53,7 @@ func update_interface() -> void: func _on_SignalManager_terminal_activated() -> void: start_timer() + + +func _on_Timer_timeout(): + pass # Replace with function body. diff --git a/src/UserInterface/Screens/HUD.tscn b/src/UserInterface/Screens/HUD.tscn index b8464b8..c4fc1d7 100644 --- a/src/UserInterface/Screens/HUD.tscn +++ b/src/UserInterface/Screens/HUD.tscn @@ -20,7 +20,7 @@ tracks/0/keys = { [sub_resource type="Animation" id=2] resource_name = "Redlight" -length = 2.0 +length = 3.33 loop = true tracks/0/type = "value" tracks/0/path = NodePath("..:color") @@ -29,10 +29,10 @@ tracks/0/loop_wrap = true tracks/0/imported = false tracks/0/enabled = true tracks/0/keys = { -"times": PoolRealArray( 0, 1 ), +"times": PoolRealArray( 0, 1.65 ), "transitions": PoolRealArray( 1, 1 ), "update": 0, -"values": [ Color( 0.423529, 0, 0, 0.160784 ), Color( 0, 0, 0, 0 ) ] +"values": [ Color( 0, 0, 0, 0 ), Color( 0.423529, 0, 0, 0.160784 ) ] } [node name="HUD" type="Control"]