From ee5feb73c13a6bf77e946870b930a0cc924b8097 Mon Sep 17 00:00:00 2001 From: Jakob Feldmann Date: Tue, 1 Aug 2023 11:31:07 +0200 Subject: [PATCH] fix: better timer label anim, alarm light shader activation --- src/Actors/BlobbyCam.gd | 38 +++++++++++++--------- src/Actors/BlobbyCam.tscn | 10 +++--- src/Actors/Enemies/Beings/WhatAreFrog.tscn | 13 +++++++- src/Contraptions/Portal/Portal.gd | 22 ++++++------- src/Levels/1 Tutorial Level.tscn | 4 +-- src/Levels/3 Tutorial Level.tscn | 16 +++++---- src/Platforms/FlyingPlatform.tscn | 1 - src/UserInterface/Screens/HUD.gd | 3 +- src/UserInterface/Screens/HUD.tscn | 10 ++++-- 9 files changed, 71 insertions(+), 46 deletions(-) diff --git a/src/Actors/BlobbyCam.gd b/src/Actors/BlobbyCam.gd index a5213cd..b1ac57c 100644 --- a/src/Actors/BlobbyCam.gd +++ b/src/Actors/BlobbyCam.gd @@ -1,5 +1,22 @@ extends Camera2D +export var camera_horizontal_shift = 60 +export var offset_reset_seconds := 1 +export var offset_adapt_seconds := 1 +export var offset_input_seconds := 0.618 * 2 +export var alarm_light_shader: Material + +onready var levelState := $"%LevelState" +onready var signalManager := $"%SignalManager" +onready var shiftLeft = $CameraAnimationPlayer.get_animation("shiftingLeft") +onready var shiftRight = $CameraAnimationPlayer.get_animation("shiftingRight") +onready var shiftCenter = $CameraAnimationPlayer.get_animation("shiftingCenter") +onready var anim_player := $CameraAnimationPlayer +onready var horizontal_tween := $HorizontalShiftTween +onready var original_x_zoom := zoom.x +onready var original_y_zoom := zoom.y +onready var blobby := get_node("%Blobby") + var horizontal_facing = 0 var vertical_facing = 0 var camera_vertical_shift = 0 @@ -14,22 +31,7 @@ var original_limit_top: int var camera_is_panning: bool = false var target_offset: Vector2 = Vector2(0,0) -export var camera_horizontal_shift = 60 -export var offset_reset_seconds := 1 -export var offset_adapt_seconds := 1 -export var offset_input_seconds := 0.618 * 2 - -onready var levelState := $"%LevelState" -onready var signalManager := $"%SignalManager" -onready var shiftLeft = $CameraAnimationPlayer.get_animation("shiftingLeft") -onready var shiftRight = $CameraAnimationPlayer.get_animation("shiftingRight") -onready var shiftCenter = $CameraAnimationPlayer.get_animation("shiftingCenter") -onready var anim_player := $CameraAnimationPlayer -onready var horizontal_tween := $HorizontalShiftTween -onready var original_x_zoom := zoom.x -onready var original_y_zoom := zoom.y -onready var blobby := get_node("%Blobby") - +var terminal_activated: bool = false var image = Image.new() var texture = ImageTexture.new() var prev_pos: Vector2 @@ -51,12 +53,14 @@ func _ready(): self.position = blobby.global_position image.create(128, 2, false, Image.FORMAT_RGBAH) # TODO Test Performance + material.set_shader_param("light_data", null) _update_lighting_shader() # TODO Trigger when needed signalManager.connect("terminal_activated", self, "_on_SignalManager_terminal_activated") signalManager.connect("player_died", self, "_death_cam") func _on_SignalManager_terminal_activated(animation_number: int = 0): + terminal_activated = true get_node("LightAnimationPlayer").play("Pulsing") #func _draw(): @@ -230,7 +234,9 @@ func _death_cam(animation_number: int = 0) -> void: if(animation_number == 1): $CameraAnimationPlayer.play("deathCamLateRotation") +# TODO Rename to alarm lights specially func _update_lighting_shader() -> void: + if !terminal_activated: return # Props to gameendaevour # TODO get this into a central world update management system var lights = get_tree().get_nodes_in_group("light") diff --git a/src/Actors/BlobbyCam.tscn b/src/Actors/BlobbyCam.tscn index f7a6046..a35ae0d 100644 --- a/src/Actors/BlobbyCam.tscn +++ b/src/Actors/BlobbyCam.tscn @@ -925,21 +925,21 @@ material = ExtResource( 38 ) z_index = -1 texture = ExtResource( 5 ) -[node name="Emitter3" type="Sprite" parent="ParallaxBackground/ParallaxLayer4"] +[node name="Emitter3" type="Sprite" parent="ParallaxBackground/ParallaxLayer4" groups=["light"]] visible = false position = Vector2( -154, 14 ) texture = ExtResource( 40 ) script = ExtResource( 39 ) color = Color( 1, 0, 0, 0.615686 ) -[node name="Emitter4" type="Sprite" parent="ParallaxBackground/ParallaxLayer4"] +[node name="Emitter4" type="Sprite" parent="ParallaxBackground/ParallaxLayer4" groups=["light"]] visible = false position = Vector2( 1, 14 ) texture = ExtResource( 40 ) script = ExtResource( 39 ) color = Color( 1, 0, 0, 0.615686 ) -[node name="Emitter5" type="Sprite" parent="ParallaxBackground/ParallaxLayer4"] +[node name="Emitter5" type="Sprite" parent="ParallaxBackground/ParallaxLayer4" groups=["light"]] visible = false position = Vector2( 154, 14 ) texture = ExtResource( 40 ) @@ -972,10 +972,10 @@ texture = ExtResource( 8 ) [node name="AnimatedSprite" type="AnimatedSprite" parent="ParallaxBackground/ParallaxLayer5"] frames = SubResource( 7 ) -frame = 4 +frame = 13 playing = true [node name="AnimatedSprite2" type="AnimatedSprite" parent="ParallaxBackground/ParallaxLayer5"] frames = SubResource( 8 ) -frame = 9 +frame = 4 playing = true diff --git a/src/Actors/Enemies/Beings/WhatAreFrog.tscn b/src/Actors/Enemies/Beings/WhatAreFrog.tscn index 7d3ad5e..d8df69f 100644 --- a/src/Actors/Enemies/Beings/WhatAreFrog.tscn +++ b/src/Actors/Enemies/Beings/WhatAreFrog.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=48 format=2] +[gd_scene load_steps=49 format=2] [ext_resource path="res://assets/enemy/froshler.png" type="Texture" id=1] [ext_resource path="res://src/Actors/Enemies/Beings/WhatAreFrog.gd" type="Script" id=2] @@ -432,6 +432,9 @@ extents = Vector2( 12, 0.5 ) [sub_resource type="RectangleShape2D" id=3] extents = Vector2( 18.2143, 13.5955 ) +[sub_resource type="RectangleShape2D" id=59] +extents = Vector2( 10, 15 ) + [node name="WhatAreFrog" type="KinematicBody2D"] collision_layer = 2 collision_mask = 185 @@ -585,6 +588,14 @@ shape = SubResource( 3 ) wait_time = 3.236 one_shot = true +[node name="JumpCollisionBody" type="KinematicBody2D" parent="."] +collision_layer = 2 +collision_mask = 8 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="JumpCollisionBody"] +position = Vector2( 0, -6 ) +shape = SubResource( 59 ) + [connection signal="body_entered" from="StompDetector" to="." method="_on_StompDetector_body_entered"] [connection signal="body_exited" from="StompDetector" to="." method="_on_StompDetector_body_exited"] [connection signal="area_entered" from="EnemySkin" to="." method="_on_EnemySkin_area_entered"] diff --git a/src/Contraptions/Portal/Portal.gd b/src/Contraptions/Portal/Portal.gd index c034f0d..049b3f4 100644 --- a/src/Contraptions/Portal/Portal.gd +++ b/src/Contraptions/Portal/Portal.gd @@ -10,21 +10,21 @@ export(String, FILE, "*.tscn") var next_scene func _get_configuration_warning() -> String: - return "The next scene property can't be empty" if not next_scene else "" + return "The next scene property can't be empty" if not next_scene else "" func level_completion() -> void: - signalManager.emit_signal("level_completed") - + signalManager.emit_signal("level_completed") + func teleport() -> void: - get_tree().paused = true - anim_player.play("fade_in") - # TODO This doesn't pause the game but should - yield(anim_player, "animation_finished") - if ResourceLoader.exists(next_scene): - get_tree().change_scene(next_scene) + get_tree().paused = true + anim_player.play("fade_in") + # TODO This doesn't pause the game but should + yield(anim_player, "animation_finished") + if ResourceLoader.exists(next_scene): + get_tree().change_scene(next_scene) func _on_body_entered(_body: Node) -> void: - level_completion() - teleport() + level_completion() + teleport() diff --git a/src/Levels/1 Tutorial Level.tscn b/src/Levels/1 Tutorial Level.tscn index e4a62d6..7ab71c2 100644 --- a/src/Levels/1 Tutorial Level.tscn +++ b/src/Levels/1 Tutorial Level.tscn @@ -42,10 +42,10 @@ unique_name_in_owner = true process_mode = 1 [node name="AnimatedSprite" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="4"] -frame = 8 +frame = 0 [node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"] -frame = 7 +frame = 13 [node name="Blobby" parent="." instance=ExtResource( 7 )] unique_name_in_owner = true diff --git a/src/Levels/3 Tutorial Level.tscn b/src/Levels/3 Tutorial Level.tscn index af5578b..9b884ef 100644 --- a/src/Levels/3 Tutorial Level.tscn +++ b/src/Levels/3 Tutorial Level.tscn @@ -80,10 +80,10 @@ wait_time = 20.0 unique_name_in_owner = true [node name="AnimatedSprite" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="4"] -frame = 1 +frame = 3 [node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"] -frame = 0 +frame = 2 [node name="Blobby" parent="." instance=ExtResource( 10 )] unique_name_in_owner = true @@ -97,10 +97,13 @@ parameters/playback = SubResource( 4 ) position = Vector2( 416, 170 ) [node name="Caterpillar" parent="." instance=ExtResource( 15 )] -position = Vector2( 254, -134 ) +position = Vector2( 254, -135 ) + +[node name="Caterpillar3" parent="." instance=ExtResource( 15 )] +position = Vector2( 112, -295 ) [node name="Caterpillar2" parent="." instance=ExtResource( 15 )] -position = Vector2( 104, -88 ) +position = Vector2( 113, -233 ) rotation = 3.14159 scale = Vector2( 0.743861, 0.536024 ) @@ -114,7 +117,7 @@ collision_layer = 8 collision_mask = 8 bake_navigation = true format = 1 -tile_data = PoolIntArray( -1638414, 5, 65540, -1638413, 5, 10, -1638412, 5, 10, -1638411, 5, 10, -1638410, 5, 10, -1638409, 5, 10, -1638408, 5, 10, -1638407, 5, 10, -1638406, 5, 10, -1638405, 5, 10, -1638404, 5, 10, -1638403, 5, 10, -1638402, 5, 10, -1638401, 5, 10, -1703936, 5, 10, -1703935, 5, 10, -1703934, 5, 10, -1703933, 5, 10, -1703932, 5, 10, -1703931, 5, 10, -1703930, 5, 10, -1703929, 5, 10, -1703928, 5, 10, -1703927, 5, 10, -1703926, 5, 10, -1703925, 5, 10, -1703924, 5, 10, -1703923, 5, 10, -1703922, 5, 10, -1703921, 5, 10, -1703920, 5, 10, -1703919, 5, 10, -1703918, 5, 10, -1703917, 5, 10, -1703916, 5, 10, -1703915, 5, 10, -1703914, 5, 10, -1703913, 5, 10, -1703912, 5, 10, -1703911, 5, 10, -1703910, 5, 10, -1703909, 5, 10, -1703908, 5, 10, -1703907, 5, 10, -1703906, 5, 10, -1703905, 5, 10, -1703904, 5, 10, -1703903, 5, 10, -1703902, 5, 10, -1703901, 5, 10, -1703900, 5, 10, -1703899, 5, 10, -1703898, 5, 10, -1703897, 5, 10, -1703896, 5, 10, -1703895, 5, 10, -1703894, 5, 10, -1703893, 5, 10, -1703892, 5, 10, -1703891, 5, 10, -1703890, 5, 65541, -1572878, 5, 7, -1638354, 5, 6, -1507342, 5, 7, -1572818, 5, 6, -1441806, 5, 7, -1507282, 5, 6, -1376270, 5, 7, -1441746, 5, 6, -1310734, 5, 7, -1376210, 5, 6, -1245198, 5, 7, -1310674, 5, 6, -1179662, 5, 7, -1245138, 5, 6, -1114126, 5, 7, -1179648, 5, 1, -1179647, 5, 2, -1179646, 5, 2, -1179645, 5, 2, -1179644, 5, 2, -1179643, 5, 2, -1179642, 5, 2, -1179641, 5, 2, -1179640, 5, 2, -1179639, 5, 2, -1179638, 5, 5, -1179629, 5, 1, -1179628, 5, 3, -1179627, 5, 3, -1179626, 5, 3, -1179625, 5, 3, -1179624, 5, 3, -1179623, 5, 3, -1179622, 5, 4, -1179602, 5, 6, -1048590, 5, 7, -1114112, 5, 6, -1114111, 5, 524298, -1114110, 5, 589824, -1114109, 5, 589824, -1114108, 5, 589824, -1114107, 5, 589824, -1114106, 5, 589824, -1114105, 5, 589824, -1114104, 5, 589824, -1114103, 5, 524297, -1114102, 5, 8, -1114093, 5, 9, -1114092, 5, 10, -1114091, 5, 10, -1114090, 5, 10, -1114089, 5, 10, -1114088, 5, 10, -1114087, 5, 10, -1114086, 5, 65536, -1114066, 5, 6, -983054, 5, 7, -983047, 5, 65542, -983046, 5, 65543, -983045, 5, 65543, -983044, 5, 65544, -1048576, 5, 6, -1048575, 5, 589828, -1048567, 5, 589829, -1048566, 5, 8, -1048530, 5, 6, -917518, 5, 7, -983040, 5, 6, -983039, 5, 589830, -983038, 5, 589831, -983037, 5, 589831, -983036, 5, 589831, -983035, 5, 589831, -983034, 5, 589831, -983033, 5, 589831, -983032, 5, 589831, -983031, 5, 589832, -983030, 5, 8, -982994, 5, 6, -851982, 5, 7, -917504, 5, 9, -917503, 5, 10, -917502, 5, 10, -917501, 5, 10, -917500, 5, 10, -917499, 5, 10, -917498, 5, 10, -917497, 5, 10, -917496, 5, 10, -917495, 5, 10, -917494, 5, 65536, -917458, 5, 6, -786446, 5, 65538, -786445, 5, 3, -786444, 5, 3, -786443, 5, 4, -851922, 5, 6, -720910, 5, 65540, -720909, 5, 10, -720908, 5, 10, -720907, 5, 65536, -786386, 5, 6, -655376, 5, 524293, -655374, 5, 7, -720850, 5, 6, -589840, 5, 524293, -589838, 5, 7, -655314, 5, 6, -524304, 5, 524293, -524302, 5, 7, -589798, 5, 1, -589797, 5, 3, -589796, 5, 3, -589795, 5, 3, -589794, 5, 3, -589793, 5, 3, -589792, 5, 3, -589791, 5, 3, -589790, 5, 3, -589789, 5, 3, -589788, 5, 3, -589787, 5, 3, -589786, 5, 5, -589778, 5, 6, -458768, 5, 524293, -458766, 5, 7, -524285, 5, 1, -524284, 5, 3, -524283, 5, 3, -524282, 5, 3, -524281, 5, 3, -524280, 5, 3, -524279, 5, 3, -524278, 5, 3, -524277, 5, 3, -524276, 5, 3, -524275, 5, 3, -524274, 5, 3, -524273, 5, 3, -524272, 5, 5, -524262, 5, 9, -524261, 5, 10, -524260, 5, 10, -524259, 5, 10, -524258, 5, 10, -524257, 5, 10, -524256, 5, 10, -524255, 5, 10, -524254, 5, 10, -524253, 5, 10, -524252, 5, 10, -524251, 5, 10, -524250, 5, 65536, -524242, 5, 6, -393232, 5, 524293, -393230, 5, 7, -458749, 5, 9, -458748, 5, 10, -458747, 5, 10, -458746, 5, 10, -458745, 5, 10, -458744, 5, 10, -458743, 5, 10, -458742, 5, 10, -458741, 5, 10, -458740, 5, 10, -458739, 5, 10, -458738, 5, 10, -458737, 5, 10, -458736, 5, 65536, -458706, 5, 6, -327696, 5, 524293, -327694, 5, 7, -393170, 5, 6, -262160, 5, 524293, -262158, 5, 7, -327634, 5, 6, -196624, 5, 524293, -196622, 5, 7, -262098, 5, 6, -131088, 5, 524293, -131086, 5, 7, -196562, 5, 6, -65552, 5, 524293, -65550, 5, 7, -131026, 5, 6, -16, 5, 524293, -14, 5, 7, -65490, 5, 6, 65520, 5, 524293, 65522, 5, 7, 46, 5, 6, 131056, 5, 524293, 131058, 5, 7, 65565, 5, 1, 65566, 5, 3, 65567, 5, 3, 65568, 5, 3, 65569, 5, 3, 65570, 5, 3, 65571, 5, 3, 65572, 5, 3, 65573, 5, 3, 65574, 5, 3, 65575, 5, 5, 65582, 5, 6, 196592, 5, 524293, 196594, 5, 7, 131101, 5, 6, 131102, 5, 196616, 131103, 5, 196616, 131104, 5, 196616, 131105, 5, 196616, 131106, 5, 196616, 131107, 5, 196616, 131108, 5, 196616, 131109, 5, 196616, 131110, 5, 196616, 131111, 5, 8, 131118, 5, 6, 262128, 5, 524293, 262130, 5, 7, 196617, 5, 1, 196618, 5, 3, 196619, 5, 3, 196620, 5, 3, 196621, 5, 3, 196622, 5, 3, 196623, 5, 3, 196624, 5, 3, 196625, 5, 3, 196626, 5, 3, 196627, 5, 3, 196628, 5, 5, 196637, 5, 9, 196638, 5, 10, 196639, 5, 10, 196640, 5, 10, 196641, 5, 10, 196642, 5, 10, 196643, 5, 10, 196644, 5, 10, 196645, 5, 10, 196646, 5, 10, 196647, 5, 65536, 196654, 5, 6, 327664, 5, 524293, 327666, 5, 7, 262153, 5, 9, 262154, 5, 10, 262155, 5, 10, 262156, 5, 10, 262157, 5, 10, 262158, 5, 10, 262159, 5, 10, 262160, 5, 10, 262161, 5, 10, 262162, 5, 10, 262163, 5, 10, 262164, 5, 65536, 262187, 5, 1, 262188, 5, 3, 262189, 5, 3, 262190, 5, 65539, 393200, 5, 524293, 393202, 5, 7, 327723, 5, 6, 458736, 5, 524293, 458738, 5, 7, 393259, 5, 6, 524272, 5, 524293, 524274, 5, 65538, 524275, 5, 2, 524276, 5, 2, 524277, 5, 2, 524278, 5, 2, 524279, 536870917, 2, 524280, 536870917, 2, 524281, 536870917, 2, 524282, 536870917, 2, 524283, 536870917, 2, 524284, 536870917, 2, 524285, 536870917, 2, 524286, 536870917, 2, 524287, 536870917, 2, 458752, 536870917, 2, 458753, 5, 3, 458754, 5, 3, 458755, 5, 3, 458756, 5, 3, 458757, 5, 3, 458758, 5, 3, 458759, 5, 3, 458760, 5, 3, 458761, 5, 3, 458762, 5, 3, 458763, 5, 3, 458764, 5, 3, 458765, 5, 3, 458766, 5, 3, 458767, 5, 3, 458768, 5, 3, 458769, 5, 3, 458770, 5, 3, 458771, 5, 3, 458772, 5, 3, 458773, 5, 3, 458774, 5, 3, 458775, 5, 3, 458776, 5, 3, 458777, 5, 3, 458778, 5, 3, 458779, 5, 3, 458780, 5, 3, 458781, 5, 3, 458782, 5, 3, 458783, 5, 3, 458784, 5, 3, 458785, 5, 3, 458786, 5, 3, 458787, 5, 3, 458788, 5, 3, 458789, 5, 3, 458790, 5, 3, 458791, 5, 3, 458792, 5, 3, 458793, 5, 3, 458794, 5, 3, 458795, 5, 65539, 589808, 5, 524293, 655344, 5, 524293, 655345, 5, 524293, 655346, 5, 524293, 655347, 5, 524293, 655348, 5, 524293, 655349, 5, 524293, 655350, 5, 524293, 655351, 5, 524293, 655352, 5, 524293, 655353, 5, 524293, 655354, 5, 524293, 655355, 5, 524293, 655356, 5, 524293, 655357, 5, 524293, 655358, 5, 524293, 655359, 5, 524293, 589824, 5, 524293, 589825, 5, 524293, 589826, 5, 524293, 589827, 5, 524293, 589828, 5, 524293, 589829, 5, 524293 ) +tile_data = PoolIntArray( -1638414, 5, 65540, -1638413, 5, 10, -1638412, 5, 10, -1638411, 5, 10, -1638410, 5, 10, -1638409, 5, 10, -1638408, 5, 10, -1638407, 5, 10, -1638406, 5, 10, -1638405, 5, 10, -1638404, 5, 10, -1638403, 5, 10, -1638402, 5, 10, -1638401, 5, 10, -1703936, 5, 10, -1703935, 5, 10, -1703934, 5, 10, -1703933, 5, 10, -1703932, 5, 10, -1703931, 5, 10, -1703930, 5, 10, -1703929, 5, 10, -1703928, 5, 10, -1703927, 5, 10, -1703926, 5, 10, -1703925, 5, 10, -1703924, 5, 10, -1703923, 5, 10, -1703922, 5, 10, -1703921, 5, 10, -1703920, 5, 10, -1703919, 5, 10, -1703918, 5, 10, -1703917, 5, 10, -1703916, 5, 10, -1703915, 5, 10, -1703914, 5, 10, -1703913, 5, 10, -1703912, 5, 10, -1703911, 5, 10, -1703910, 5, 10, -1703909, 5, 10, -1703908, 5, 10, -1703907, 5, 10, -1703906, 5, 10, -1703905, 5, 10, -1703904, 5, 10, -1703903, 5, 10, -1703902, 5, 10, -1703901, 5, 10, -1703900, 5, 10, -1703899, 5, 10, -1703898, 5, 10, -1703897, 5, 10, -1703896, 5, 10, -1703895, 5, 10, -1703894, 5, 10, -1703893, 5, 10, -1703892, 5, 10, -1703891, 5, 10, -1703890, 5, 65541, -1572878, 5, 7, -1638354, 5, 6, -1507342, 5, 7, -1572818, 5, 6, -1441806, 5, 7, -1507282, 5, 6, -1376270, 5, 7, -1441746, 5, 6, -1310734, 5, 7, -1376210, 5, 6, -1245198, 5, 7, -1310674, 5, 6, -1179662, 5, 7, -1245138, 5, 6, -1114126, 5, 7, -1179645, 5, 1, -1179644, 5, 2, -1179643, 5, 2, -1179642, 5, 2, -1179641, 5, 2, -1179640, 5, 2, -1179639, 5, 2, -1179638, 5, 5, -1179629, 5, 1, -1179628, 5, 3, -1179627, 5, 3, -1179626, 5, 3, -1179625, 5, 3, -1179624, 5, 3, -1179623, 5, 3, -1179622, 5, 4, -1179602, 5, 6, -1048590, 5, 7, -1114109, 5, 6, -1114108, 5, 196616, -1114107, 5, 262151, -1114106, 5, 196616, -1114105, 5, 196616, -1114104, 5, 327688, -1114103, 5, 196616, -1114102, 5, 7, -1114093, 5, 9, -1114092, 5, 10, -1114091, 5, 10, -1114090, 5, 10, -1114089, 5, 10, -1114088, 5, 10, -1114087, 5, 10, -1114086, 5, 65536, -1114066, 5, 6, -983054, 5, 7, -983047, 5, 65542, -983046, 5, 65543, -983045, 5, 65543, -983044, 5, 65544, -1048573, 5, 9, -1048572, 5, 10, -1048571, 5, 10, -1048570, 5, 10, -1048569, 5, 10, -1048568, 5, 10, -1048567, 5, 10, -1048566, 5, 65536, -1048530, 5, 6, -917518, 5, 7, -982994, 5, 6, -851982, 5, 7, -917458, 5, 6, -786446, 5, 65538, -786445, 5, 3, -786444, 5, 3, -786443, 5, 4, -851922, 5, 6, -720910, 5, 65540, -720909, 5, 10, -720908, 5, 10, -720907, 5, 65536, -786386, 5, 6, -655376, 5, 524293, -655374, 5, 7, -720850, 5, 6, -589840, 5, 524293, -589838, 5, 7, -655314, 5, 6, -524304, 5, 524293, -524302, 5, 7, -589798, 5, 1, -589797, 5, 3, -589796, 5, 3, -589795, 5, 3, -589794, 5, 3, -589793, 5, 3, -589792, 5, 3, -589791, 5, 3, -589790, 5, 3, -589789, 5, 3, -589788, 5, 3, -589787, 5, 3, -589786, 5, 5, -589778, 5, 6, -458768, 5, 524293, -458766, 5, 7, -524285, 5, 1, -524284, 5, 3, -524283, 5, 3, -524282, 5, 3, -524281, 5, 3, -524280, 5, 3, -524279, 5, 3, -524278, 5, 3, -524277, 5, 3, -524276, 5, 3, -524275, 5, 3, -524274, 5, 3, -524273, 5, 3, -524272, 5, 5, -524262, 5, 9, -524261, 5, 10, -524260, 5, 10, -524259, 5, 10, -524258, 5, 10, -524257, 5, 10, -524256, 5, 10, -524255, 5, 10, -524254, 5, 10, -524253, 5, 10, -524252, 5, 10, -524251, 5, 10, -524250, 5, 65536, -524242, 5, 6, -393232, 5, 524293, -393230, 5, 7, -458749, 5, 9, -458748, 5, 10, -458747, 5, 10, -458746, 5, 10, -458745, 5, 10, -458744, 5, 10, -458743, 5, 10, -458742, 5, 10, -458741, 5, 10, -458740, 5, 10, -458739, 5, 10, -458738, 5, 10, -458737, 5, 10, -458736, 5, 65536, -458706, 5, 6, -327696, 5, 524293, -327694, 5, 7, -393170, 5, 6, -262160, 5, 524293, -262158, 5, 7, -327634, 5, 6, -196624, 5, 524293, -196622, 5, 7, -262098, 5, 6, -131088, 5, 524293, -131086, 5, 7, -196562, 5, 6, -65552, 5, 524293, -65550, 5, 7, -131026, 5, 6, -16, 5, 524293, -14, 5, 7, -65490, 5, 6, 65520, 5, 524293, 65522, 5, 7, 46, 5, 6, 131056, 5, 524293, 131058, 5, 7, 65565, 5, 1, 65566, 5, 3, 65567, 5, 3, 65568, 5, 3, 65569, 5, 3, 65570, 5, 3, 65571, 5, 3, 65572, 5, 3, 65573, 5, 3, 65574, 5, 3, 65575, 5, 5, 65582, 5, 6, 196592, 5, 524293, 196594, 5, 7, 131101, 5, 6, 131102, 5, 196616, 131103, 5, 196616, 131104, 5, 196616, 131105, 5, 196616, 131106, 5, 196616, 131107, 5, 196616, 131108, 5, 196616, 131109, 5, 196616, 131110, 5, 196616, 131111, 5, 8, 131118, 5, 6, 262128, 5, 524293, 262130, 5, 7, 196617, 5, 1, 196618, 5, 3, 196619, 5, 3, 196620, 5, 3, 196621, 5, 3, 196622, 5, 3, 196623, 5, 3, 196624, 5, 3, 196625, 5, 3, 196626, 5, 3, 196627, 5, 3, 196628, 5, 5, 196637, 5, 9, 196638, 5, 10, 196639, 5, 10, 196640, 5, 10, 196641, 5, 10, 196642, 5, 10, 196643, 5, 10, 196644, 5, 10, 196645, 5, 10, 196646, 5, 10, 196647, 5, 65536, 196654, 5, 6, 327664, 5, 524293, 327666, 5, 7, 262153, 5, 9, 262154, 5, 10, 262155, 5, 10, 262156, 5, 10, 262157, 5, 10, 262158, 5, 10, 262159, 5, 10, 262160, 5, 10, 262161, 5, 10, 262162, 5, 10, 262163, 5, 10, 262164, 5, 65536, 262187, 5, 1, 262188, 5, 3, 262189, 5, 3, 262190, 5, 65539, 393200, 5, 524293, 393202, 5, 7, 327723, 5, 6, 458736, 5, 524293, 458738, 5, 7, 393259, 5, 6, 524272, 5, 524293, 524274, 5, 65538, 524275, 5, 2, 524276, 5, 2, 524277, 5, 2, 524278, 5, 2, 524279, 536870917, 2, 524280, 536870917, 2, 524281, 536870917, 2, 524282, 536870917, 2, 524283, 536870917, 2, 524284, 536870917, 2, 524285, 536870917, 2, 524286, 536870917, 2, 524287, 536870917, 2, 458752, 536870917, 2, 458753, 5, 3, 458754, 5, 3, 458755, 5, 3, 458756, 5, 3, 458757, 5, 3, 458758, 5, 3, 458759, 5, 3, 458760, 5, 3, 458761, 5, 3, 458762, 5, 3, 458763, 5, 3, 458764, 5, 3, 458765, 5, 3, 458766, 5, 3, 458767, 5, 3, 458768, 5, 3, 458769, 5, 3, 458770, 5, 3, 458771, 5, 3, 458772, 5, 3, 458773, 5, 3, 458774, 5, 3, 458775, 5, 3, 458776, 5, 3, 458777, 5, 3, 458778, 5, 3, 458779, 5, 3, 458780, 5, 3, 458781, 5, 3, 458782, 5, 3, 458783, 5, 3, 458784, 5, 3, 458785, 5, 3, 458786, 5, 3, 458787, 5, 3, 458788, 5, 3, 458789, 5, 3, 458790, 5, 3, 458791, 5, 3, 458792, 5, 3, 458793, 5, 3, 458794, 5, 3, 458795, 5, 65539, 589808, 5, 524293, 655344, 5, 524293, 655345, 5, 524293, 655346, 5, 524293, 655347, 5, 524293, 655348, 5, 524293, 655349, 5, 524293, 655350, 5, 524293, 655351, 5, 524293, 655352, 5, 524293, 655353, 5, 524293, 655354, 5, 524293, 655355, 5, 524293, 655356, 5, 524293, 655357, 5, 524293, 655358, 5, 524293, 655359, 5, 524293, 589824, 5, 524293, 589825, 5, 524293, 589826, 5, 524293, 589827, 5, 524293, 589828, 5, 524293, 589829, 5, 524293 ) [node name="DropThroughPlatforms" type="TileMap" parent="."] tile_set = ExtResource( 13 ) @@ -128,9 +131,10 @@ format = 1 [node name="ElevatorButton" parent="." instance=ExtResource( 2 )] position = Vector2( 366, -288 ) +elevator_time = 10 [node name="Portal" parent="ElevatorButton" instance=ExtResource( 4 )] -position = Vector2( 113, 64 ) +position = Vector2( 175, 168 ) scale = Vector2( 0.5, 0.5 ) next_scene = "res://src/Levels/Actual Level 1.tscn" diff --git a/src/Platforms/FlyingPlatform.tscn b/src/Platforms/FlyingPlatform.tscn index c39900e..006a586 100644 --- a/src/Platforms/FlyingPlatform.tscn +++ b/src/Platforms/FlyingPlatform.tscn @@ -39,7 +39,6 @@ tracks/0/keys = { script = ExtResource( 1 ) [node name="anim" type="AnimationPlayer" parent="."] -pause_mode = 2 playback_process_mode = 0 anims/Path = SubResource( 3 ) anims/RESET = SubResource( 4 ) diff --git a/src/UserInterface/Screens/HUD.gd b/src/UserInterface/Screens/HUD.gd index 6d2f9b6..4093282 100644 --- a/src/UserInterface/Screens/HUD.gd +++ b/src/UserInterface/Screens/HUD.gd @@ -33,7 +33,8 @@ func start_timer(time): func _zoom_timer() -> void: var tween := create_tween() - tween.tween_property(timer, "rect_scale", Vector2(1,1), 1.0) + tween.parallel().tween_property(timer, "rect_position", Vector2(295, 0), 1.0) + tween.parallel().tween_property(timer, "rect_scale", Vector2(1,1), 1.0) func update_interface() -> void: diff --git a/src/UserInterface/Screens/HUD.tscn b/src/UserInterface/Screens/HUD.tscn index e8bc497..1f5b0d3 100644 --- a/src/UserInterface/Screens/HUD.tscn +++ b/src/UserInterface/Screens/HUD.tscn @@ -88,12 +88,16 @@ unique_name_in_owner = true visible = false anchor_left = 0.5 anchor_right = 0.5 -margin_left = 45.0 -margin_right = 73.0 +margin_left = -140.0 +margin_right = -90.0 margin_bottom = 21.0 +grow_horizontal = 2 +grow_vertical = 2 rect_scale = Vector2( 5, 5 ) +size_flags_horizontal = 0 +size_flags_vertical = 0 text = "100" -align = 2 +align = 1 [node name="Timer" type="Timer" parent="HUDOverlay/GetBackTimer"] wait_time = 100.0