export_presets.cfg

@@ -8,7 +8,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter=""
 exclude_filter=""
-export_path="../../../../../../../run/user/1016/gvfs/smb-share:server=canaima.casa.vm,share=turpial/00_casavm/12_pDasher/builds/pDash_v0.1.x86_64"
+export_path="./pDash.x86_64"
 encryption_include_filters=""
 encryption_exclude_filters=""
 encrypt_pck=false

project.godot

@@ -10,7 +10,7 @@ config_version=5
 
 [application]
 
-config/name="pDash_v0.1"
+config/name="pDash"
 config/version=".1"
 run/main_scene="res://scenes/UI/Splash.tscn"
 config/features=PackedStringArray("4.2", "Forward Plus")

scenes/UI/Start.tscn

@@ -31,7 +31,7 @@ focus_neighbor_right = NodePath("../Button02")
 focus_neighbor_bottom = NodePath("../Button02")
 focus_next = NodePath("../Button02")
 focus_previous = NodePath("../Button05")
-text = "Play Level 1"
+text = "New Game"
 
 [node name="Button02" type="Button" parent="CenterContainer/VBoxContainer"]
 layout_mode = 2
@@ -41,7 +41,8 @@ focus_neighbor_right = NodePath("../Button03")
 focus_neighbor_bottom = NodePath("../Button03")
 focus_next = NodePath("../Button03")
 focus_previous = NodePath("../Button01")
-text = "Play Level 2"
+disabled = true
+text = "Continue"
 
 [node name="Button03" type="Button" parent="CenterContainer/VBoxContainer"]
 layout_mode = 2
@@ -76,6 +77,5 @@ focus_previous = NodePath("../Button04")
 text = "Quit
 "
 
-[connection signal="button_up" from="CenterContainer/VBoxContainer/Button01" to="." method="_on_play_lv0"]
+[connection signal="button_up" from="CenterContainer/VBoxContainer/Button01" to="." method="_on_play"]
-[connection signal="button_up" from="CenterContainer/VBoxContainer/Button02" to="." method="_on_play_lv1"]
 [connection signal="button_up" from="CenterContainer/VBoxContainer/Button05" to="." method="_on_quit"]

scenes/UI/Win.tscn

@@ -1,9 +1,9 @@
 [gd_scene load_steps=2 format=3 uid="uid://8euefl26umu1"]
 
-[ext_resource type="Script" path="res://scripts/Win.gd" id="1_wgn5v"]
+[ext_resource type="Script" path="res://scripts/End.gd" id="1_oljih"]
 
 [node name="End" type="CanvasLayer"]
-script = ExtResource("1_wgn5v")
+script = ExtResource("1_oljih")
 metadata/_edit_use_anchors_ = true
 
 [node name="CenterContainer" type="CenterContainer" parent="."]
@@ -27,4 +27,4 @@ horizontal_alignment = 1
 layout_mode = 2
 text = "Play Again?"
 
-[connection signal="button_up" from="CenterContainer/VBoxContainer/Label2" to="." method="_on_label_2_button_up"]
+[connection signal="button_up" from="CenterContainer/VBoxContainer/Label2" to="." method="_on_play"]

scenes/main.tscn

@@ -1,8 +1,7 @@
-[gd_scene load_steps=4 format=3 uid="uid://dsqm17w8hg428"]
+[gd_scene load_steps=3 format=3 uid="uid://dsqm17w8hg428"]
 
 [ext_resource type="Script" path="res://scripts/World.gd" id="1_131aq"]
 [ext_resource type="PackedScene" uid="uid://cnp8h65468543" path="res://scenes/overlays/crt_overlay.tscn" id="2_xf15f"]
-[ext_resource type="PackedScene" uid="uid://bhoqj8b4oxyks" path="res://scenes/levels/level_0.tscn" id="3_wx6ne"]
 
 [node name="World" type="Node2D"]
 script = ExtResource("1_131aq")
@@ -12,8 +11,6 @@ one_shot = true
 
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
 
-[node name="Level" parent="." instance=ExtResource("3_wx6ne")]
-
 [node name="CRT_Overlay" parent="." instance=ExtResource("2_xf15f")]
 
 [connection signal="timeout" from="Timer" to="." method="_on_timeout"]

scenes/main1.tscn

@@ -1,19 +0,0 @@
-[gd_scene load_steps=4 format=3 uid="uid://cokjt1a3cdywh"]
-
-[ext_resource type="Script" path="res://scripts/World.gd" id="1_3g8ek"]
-[ext_resource type="PackedScene" uid="uid://cnp8h65468543" path="res://scenes/overlays/crt_overlay.tscn" id="2_onw3m"]
-[ext_resource type="PackedScene" uid="uid://duai0nkslx7o8" path="res://scenes/levels/level_1.tscn" id="2_xjpi1"]
-
-[node name="World" type="Node2D"]
-script = ExtResource("1_3g8ek")
-
-[node name="Timer" type="Timer" parent="."]
-one_shot = true
-
-[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
-
-[node name="Level" parent="." instance=ExtResource("2_xjpi1")]
-
-[node name="CRT_Overlay" parent="." instance=ExtResource("2_onw3m")]
-
-[connection signal="timeout" from="Timer" to="." method="_on_timeout"]

scripts/End.gd

@@ -15,17 +15,14 @@ func _process(delta):
 func _on_quit():
 	get_tree().quit()
 	
-func _on_play_lv0():
+func _on_play():
-	get_tree().change_scene_to_file( "res://scenes/main.tscn" )
+	$".".hide()
-func _on_play_lv1():
+	var w = get_node("/root/World");
-	get_tree().change_scene_to_file( "res://scenes/main1.tscn" )
+	
-	#$".".hide()
+	if !w:
-	#var w = get_node("/root/World");
+		get_tree().change_scene_to_file( "res://scenes/main.tscn" )
-	#
+	else:
-	#if !w:
+		w.load_level()
-		#get_tree().change_scene_to_file( "res://scenes/main.tscn" )
+		w.player_spawn()  
-	#else:
+		w.show()
-		#w.load_level()
-		#w.player_spawn()  
-		#w.show()
 

scripts/Menu.gd

@@ -1,31 +0,0 @@
-extends CanvasLayer
-var mainScene
-
-# Called when the node enters the scene tree for the first time.
-func _ready():
-	#$CenterContainer/VBoxContainer/Button05.button_up.connect( _on_quit )
-	#$CenterContainer/VBoxContainer/Button01.button_up.connect( _on_play )
-	pass # Replace with function body.
-
-
-# Called every frame. 'delta' is the elapsed time since the previous frame.
-func _process(delta):
-	pass
-
-func _on_quit():
-	get_tree().quit()
-	
-func _on_play_lv0():
-	get_tree().change_scene_to_file( "res://scenes/main.tscn" )
-func _on_play_lv1():
-	get_tree().change_scene_to_file( "res://scenes/main1.tscn" )
-	#$".".hide()
-	#var w = get_node("/root/World");
-	#
-	#if !w:
-		#get_tree().change_scene_to_file( "res://scenes/main.tscn" )
-	#else:
-		#w.load_level()
-		#w.player_spawn()  
-		#w.show()
-

scripts/Splash.gd

@@ -16,7 +16,7 @@ func _on_quit():
 	get_tree().quit()
 	
 func load_start_menu():
-	#$".".hide()
+	$".".hide()
-	#get_tree().get_root().add_child( start )
+	get_tree().get_root().add_child( start )
-	get_tree().change_scene_to_file("res://scenes/UI/Start.tscn")
+	#get_tree().change_scene_to_file("res://scenes/UI/Start.tscn")
 

scripts/Win.gd

@@ -16,16 +16,12 @@ func _on_quit():
 	get_tree().quit()
 	
 func _on_play():
-	#$".".hide()
+	$".".hide()
-	#var w = get_node("/root/World");
+	var w = get_node("/root/World");
-	#
+	
-	#if !w:
+	if !w:
-	get_tree().change_scene_to_file( "res://scenes/Start.tscn" )
+		get_tree().change_scene_to_file( "res://scenes/main.tscn" )
-	#else:
+	else:
-		#w.player_spawn()  
+		w.player_spawn()  
-		#w.show()
+		w.show()
-
-
 
-func _on_label_2_button_up():
-	get_tree().change_scene_to_file("res://scenes/UI/Start.tscn")

scripts/World.gd

@@ -3,14 +3,15 @@ extends Node2D
 var gravity = ProjectSettings.get_setting("physics/2d/default_gravity")
 var gravity_vector = ProjectSettings.get_setting("physics/2d/default_gravity_vector")
 var player = load("res://scenes/pDasher.tscn")
-#var level
+var level
 var direction: int = 1
 var paused: bool = false
 var asp: AudioStreamPlayer
 var switch_gravity_sound = preload("res://audio/switch_gravity.wav")
 var win = preload("res://scenes/UI/Win.tscn").instantiate()
 var end = preload("res://scenes/UI/End.tscn").instantiate()
-#var level_n: int = 1
+@export var Levels: Array[Resource] = [ preload("res://scenes/levels/level_0.tscn"), preload("res://scenes/levels/level_1.tscn") ]
+var level_n: int = 0
 var pDasher
  
 
@@ -24,32 +25,41 @@ func switch_direction():
 
 ## NAVIGATION
 func player_fail():
-	get_tree().change_scene_to_file("res://scenes/UI/Start.tscn")
+	$".".hide()
+	#$pDasher.queue_free()
+	
+	#ONLY IF NOT THERE ALREADY
+	
+	if !$"."/End :
+		get_tree().get_root().add_child( end )
+	else:
+		$"."/End.show()
+	#get_tree().change_scene_to_file("res://scenes/UI/End.tscn")
 	
 func player_win():
-	#level_n += 1
+	level_n += 1
-	#load_level()
+	load_level()
-	#$"." .hide()
+	$"." .hide()
-	#get_tree().get_root().add_child( win )
+	get_tree().get_root().add_child( win )
-	get_tree().change_scene_to_file("res://scenes/UI/Win.tscn")
+	#get_tree().change_scene_to_file("res://scenes/UI/Win.tscn")
 
 func player_spawn():
 	pDasher.position = Vector2(0,0  )
 
-#func load_level():
+func load_level():
-	##if level_n == null:
+	if level_n == null:
-		##level_n = 0
+		level_n = 0
-	#level = Levels[level_n]
+	level = Levels[level_n]
 	
 func _ready():
 	
-	#load_level()
+	load_level()
 		
 	asp = $AudioStreamPlayer
 	
 	#load player and level
 	get_node("/root/World").add_child( player.instantiate() )
-	#get_node("/root/World").add_child( level.instantiate() ) #relative way meaning <ME> or whatever node this script is attached to.
+	get_node("/root/World").add_child( level.instantiate() ) #relative way meaning <ME> or whatever node this script is attached to.
 	
 	# manage signals connections
 	var abysses = $Level/Abysses.get_children()