add level transitions. add popups

Author: Digit16

Code/GameManager.gd

@@ -46,8 +46,8 @@ func _check_all_platforms_occupied(platform):
 			all_occupied = false
 			break
 
-	if all_occupied:
-		_load_next_level()
+	#if all_occupied:
+		#_load_next_level()
 
 func _load_next_level():
 	print("All platforms are occupied! Loading next level...")

Code/characters/player_robot.gd

@@ -44,19 +44,19 @@ func _process(_delta):
 		if commands.size() > 0:
 			var c = commands.pop_front()
 			match c:
-				'd':
+				'moveSouth()':
 					_on_node_down()
-				'u':
+				'moveNorth()':
 					_on_node_up()
-				'l':
+				'moveWest()':
 					_on_node_left()
-				'r':
+				'moveEast()':
 					_on_node_right()
-				'p':
+				'push()':
 					_on_pick_up()
-				'rc':
+				'rotateLeft()':
 					_on_node_rotate_clockwise()
-				'rcc':
+				'rotateRight()':
 					_on_node_rotate_c_clockwise()
 				'cp':
 					_on_check_if_can_push()

Code/characters/player_robot.tscn

@@ -187,9 +187,6 @@ libraries = {
 
 [node name="AnimationTree" type="AnimationTree" parent="."]
 root_node = NodePath("../Character")
-libraries = {
-"": SubResource("AnimationLibrary_el0e8")
-}
 tree_root = SubResource("AnimationNodeStateMachine_0odwy")
 anim_player = NodePath("../AnimationPlayer")
 parameters/Walk/blend_position = Vector2(-0.00384617, -0.982379)

Code/default.tres

@@ -333,6 +333,7 @@ sources/2 = SubResource("TileSetAtlasSource_y6uth")
 sources/5 = SubResource("TileSetAtlasSource_p6k03")
 
 [node name="level_0" type="Node2D"]
+position = Vector2(-112, -232)
 scale = Vector2(3, 3)
 
 [node name="TileMap" type="TileMap" parent="." groups=["walls"]]

Code/levels/level_0.tscn

@@ -350,12 +350,6 @@ script = ExtResource("4_y45qn")
 [node name="PlayerRobot" parent="." instance=ExtResource("5_45nlo")]
 position = Vector2(56, 56)
 
-[node name="Box" parent="." instance=ExtResource("6_jjywg")]
-position = Vector2(87, 71)
-
-[node name="Box2" parent="." instance=ExtResource("6_jjywg")]
-position = Vector2(87, 88)
-
 [node name="EndZone" parent="." groups=["platforms"] instance=ExtResource("7_you6s")]
 z_index = 1
 position = Vector2(104, 72)
@@ -364,6 +358,12 @@ position = Vector2(104, 72)
 z_index = 1
 position = Vector2(72, 88)
 
+[node name="Box" parent="." instance=ExtResource("6_jjywg")]
+position = Vector2(87, 71)
+
+[node name="Box2" parent="." instance=ExtResource("6_jjywg")]
+position = Vector2(87, 88)
+
 [node name="InteractionManager" parent="." groups=["interaction_manager"] instance=ExtResource("8_5uy7b")]
 
 [node name="GameManager" parent="." groups=["game_manager"] instance=ExtResource("9_0kenn")]

Code/levels/level_1.tscn

@@ -0,0 +1,10 @@
+extends Button
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready():
+	var button_run_node = get_parent().get_node("ButtonRun")
+	button_run_node.reset_level()
+
+
+

Code/ui_scenes/ButtonReset.gd

@@ -146,20 +146,19 @@ metadata/_edit_lock_ = true
 custom_minimum_size = Vector2(40, 0)
 layout_mode = 2
 theme = ExtResource("2_cdpth")
-text = ">>"
+text = " Run >> "
 script = ExtResource("10_jquk4")
 metadata/_edit_lock_ = true
 
-[node name="ButtonStep" type="Button" parent="ControlRoot/DraggablePanel/MarginContainer/VBoxContainer/Footer"]
+[node name="ButtonReset" type="Button" parent="ControlRoot/DraggablePanel/MarginContainer/VBoxContainer/Footer"]
 custom_minimum_size = Vector2(40, 0)
 layout_mode = 2
 theme = ExtResource("2_cdpth")
-disabled = true
 shortcut = SubResource("Shortcut_g6ykv")
-text = ">"
-metadata/_edit_lock_ = true
+text = " Reset <- "
 
 [node name="ButtonStop" type="Button" parent="ControlRoot/DraggablePanel/MarginContainer/VBoxContainer/Footer"]
+visible = false
 custom_minimum_size = Vector2(40, 0)
 layout_mode = 2
 theme = ExtResource("2_cdpth")
@@ -196,6 +195,6 @@ resized_component_path = NodePath("../..")
 [connection signal="gui_input" from="ControlRoot/DraggablePanel/MarginContainer/VBoxContainer/MainCodeEditor" to="ControlRoot/DraggablePanel/MarginContainer/VBoxContainer/MainCodeEditor" method="_on_gui_input"]
 [connection signal="text_changed" from="ControlRoot/DraggablePanel/MarginContainer/VBoxContainer/MainCodeEditor" to="ControlRoot/DraggablePanel/MarginContainer/VBoxContainer/MainCodeEditor" method="_on_text_changed"]
 [connection signal="pressed" from="ControlRoot/DraggablePanel/MarginContainer/VBoxContainer/Footer/ButtonRun" to="ControlRoot/DraggablePanel/MarginContainer/VBoxContainer/Footer/ButtonRun" method="_on_pressed"]
-[connection signal="pressed" from="ControlRoot/DraggablePanel/MarginContainer/VBoxContainer/Footer/ButtonStep" to="ControlRoot/DraggablePanel/MarginContainer/VBoxContainer/MainCodeEditor" method="_on_button_step_pressed"]
+[connection signal="pressed" from="ControlRoot/DraggablePanel/MarginContainer/VBoxContainer/Footer/ButtonReset" to="ControlRoot/DraggablePanel/MarginContainer/VBoxContainer/Footer/ButtonRun" method="_on_button_reset_pressed"]
 [connection signal="mouse_entered" from="ControlRoot/DraggablePanel/ResizeCorner" to="ControlRoot/DraggablePanel/ResizeCorner" method="mouse_entered"]
 [connection signal="mouse_exited" from="ControlRoot/DraggablePanel/ResizeCorner" to="ControlRoot/DraggablePanel/ResizeCorner" method="mouse_exited"]

Code/ui_scenes/DragableCodeEditor.tscn

@@ -1,9 +1,11 @@
-[gd_scene load_steps=7 format=3 uid="uid://cj2sexcpt1q4q"]
+[gd_scene load_steps=9 format=3 uid="uid://cj2sexcpt1q4q"]
 
 [ext_resource type="PackedScene" uid="uid://dgm4e3dj1l320" path="res://levels/level_0.tscn" id="1_4kjc0"]
 [ext_resource type="PackedScene" uid="uid://3tvr6ayegv2x" path="res://ui_scenes/DragableCodeEditor.tscn" id="2_muupc"]
+[ext_resource type="PackedScene" uid="uid://byk6y86f2duot" path="res://ui_scenes/Popup.tscn" id="3_4n7vu"]
 [ext_resource type="Theme" uid="uid://b5uuv0ae6k3gt" path="res://default.tres" id="3_piwo1"]
 [ext_resource type="Texture2D" uid="uid://cgje3lmsmwll0" path="res://ui_assets/ui_buttons_settings.tres" id="4_b1mge"]
+[ext_resource type="PackedScene" uid="uid://ccsq3p8k80rn0" path="res://ui_scenes/PopupLevel.tscn" id="4_gast1"]
 [ext_resource type="Script" path="res://ui_scripts/SettingsOverlayButton.gd" id="5_a14h4"]
 [ext_resource type="PackedScene" uid="uid://by03ax1tx0l0j" path="res://ui_scenes/CRTFilter.tscn" id="6_8clgr"]
 
@@ -12,11 +14,6 @@
 [node name="CanvasLayer" type="CanvasLayer" parent="."]
 layer = -2
 
-[node name="Windows" type="Node" parent="CanvasLayer"]
-
-[node name="Control" parent="CanvasLayer/Windows" instance=ExtResource("2_muupc")]
-position = Vector2(280, 178)
-
 [node name="Levels" type="CenterContainer" parent="CanvasLayer" groups=["levels"]]
 unique_name_in_owner = true
 anchors_preset = 8
@@ -32,7 +29,36 @@ size_flags_vertical = 4
 [node name="level_0" parent="CanvasLayer/Levels" instance=ExtResource("1_4kjc0")]
 position = Vector2(-122, -234)
 
-[node name="ControlUI" type="Control" parent="."]
+[node name="Windows" type="Node" parent="CanvasLayer"]
+
+[node name="Control" parent="CanvasLayer/Windows" instance=ExtResource("2_muupc")]
+position = Vector2(280, 178)
+
+[node name="Popup" parent="CanvasLayer" instance=ExtResource("3_4n7vu")]
+visible = false
+z_index = 8
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="PopupLevel" parent="CanvasLayer" instance=ExtResource("4_gast1")]
+visible = false
+z_index = 9
+anchors_preset = -1
+anchor_left = 0.5
+anchor_right = 0.5
+anchor_bottom = 1.0
+offset_top = 150.0
+offset_bottom = -550.0
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="ControlUI" type="Control" parent="CanvasLayer"]
+z_index = 12
 z_as_relative = false
 y_sort_enabled = true
 layout_mode = 3
@@ -43,15 +69,15 @@ grow_horizontal = 2
 grow_vertical = 2
 mouse_filter = 2
 
-[node name="SettingsOverlayButton" type="Button" parent="ControlUI"]
+[node name="SettingsOverlayButton" type="Button" parent="CanvasLayer/ControlUI"]
 layout_mode = 1
 anchors_preset = 1
 anchor_left = 1.0
 anchor_right = 1.0
-offset_left = -88.0
-offset_top = 32.0
-offset_right = -32.0
-offset_bottom = 88.0
+offset_left = -152.0
+offset_top = 96.0
+offset_right = -96.0
+offset_bottom = 152.0
 grow_horizontal = 0
 theme = ExtResource("3_piwo1")
 icon = ExtResource("4_b1mge")
@@ -62,5 +88,14 @@ script = ExtResource("5_a14h4")
 [node name="crt_filter" parent="." instance=ExtResource("6_8clgr")]
 layer = -1
 
-[editable path="CanvasLayer/Windows/Control"]
+[connection signal="mouse_entered" from="CanvasLayer/Windows/Control/ControlRoot/DraggablePanel" to="CanvasLayer/Windows/Control" method="mouse_entered"]
+[connection signal="mouse_exited" from="CanvasLayer/Windows/Control/ControlRoot/DraggablePanel" to="CanvasLayer/Windows/Control" method="mouse_exited"]
+[connection signal="mouse_entered" from="CanvasLayer/Windows/Control/ControlRoot/DraggablePanel/ResizeCorner" to="CanvasLayer/Windows/Control/ControlRoot/DraggablePanel/ResizeCorner" method="mouse_entered"]
+[connection signal="mouse_exited" from="CanvasLayer/Windows/Control/ControlRoot/DraggablePanel/ResizeCorner" to="CanvasLayer/Windows/Control/ControlRoot/DraggablePanel/ResizeCorner" method="mouse_exited"]
+[connection signal="pressed" from="CanvasLayer/PopupLevel/DraggablePanel/MarginContainer/VBoxContainer/Footer/OkButton" to="CanvasLayer/Windows/Control/ControlRoot/DraggablePanel/MarginContainer/VBoxContainer/Footer/ButtonRun" method="_on_level_ok_button_pressed"]
+[connection signal="mouse_entered" from="CanvasLayer/PopupLevel/DraggablePanel/ResizeCorner" to="CanvasLayer/PopupLevel/DraggablePanel/ResizeCorner" method="mouse_entered"]
+[connection signal="mouse_exited" from="CanvasLayer/PopupLevel/DraggablePanel/ResizeCorner" to="CanvasLayer/PopupLevel/DraggablePanel/ResizeCorner" method="mouse_exited"]
+
 [editable path="CanvasLayer/Levels/level_0"]
+[editable path="CanvasLayer/Windows/Control"]
+[editable path="CanvasLayer/PopupLevel"]

Code/ui_scenes/Main.tscn

@@ -0,0 +1,11 @@
+extends Popup
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready():
+	popup()
+
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+func _process(delta):
+	pass