resetting level and loading next level

1 files changed, 4 insertions, 34 deletions

diff --git a/Scripts/game.gd b/Scripts/game.gd
index bacb709..3c4326f 100644
--- a/Scripts/game.gd
+++ b/Scripts/game.gd
@@ -10,7 +10,8 @@ var post_game = false
 var scenes = [
 #	preload("res://Nodes/levels/level1/level1.tscn"), 
 #	preload("res://Nodes/levels/level2/level2.tscn")
-	preload("res://Nodes/Level_test.tscn")
+	preload("res://Nodes/Level_test.tscn"),
+	preload("res://Nodes/Level_test_2.tscn")
 	]
 
 # Called when the node enters the scene tree for the first time.
@@ -22,7 +23,6 @@ func _ready():
 # Called every frame. 'delta' is the elapsed time since the previous frame.
 func _process(delta):
 	if Input.is_action_just_pressed("ui_cancel"):
-		close_scoreboard()
 		get_tree().paused = true
 		$PausePopup.show()
 		Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
@@ -33,7 +33,6 @@ func _on_QuitButton_pressed():
 
 
 func _on_ResumeButton_pressed():
-	print('aaaa')
 	$PausePopup.hide()
 	get_tree().paused = false
 	Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
@@ -45,31 +44,13 @@ func _on_MainMenuButton_pressed():
 
 
 func end_level():
-	open_scoreboard()
 #	evaluate_player(current_strokes, PAR[current_level_id])
 	$BGMPLayer.stream_paused = true
 	$JinglePlayer.play()
 	post_game = true
 
 
-func open_scoreboard():
-#	strokes_per_level[current_level_id] = current_strokes
-#	$Scoreboard.update_values(strokes_per_level, PAR)
-#	$Scoreboard.show()
-	pass
-
-
-func close_scoreboard():
-#	$Scoreboard.hide()
-	pass
-
-
-func is_post_game():
-	return post_game
-
-
 func next_level():
-	post_game = false
 	current_level_id += 1
 	
 	if current_level_id >= NUM_LEVELS:
@@ -77,20 +58,9 @@ func next_level():
 		return 
 	
 	load_scene_by_index(current_level_id)
-	close_scoreboard()
-	$Evaluation.hide()
 	
-	$BGMPLayer.stream_paused = false
-	$JinglePlayer.stop()
-
-
-func evaluate_player(strokes, par):
-	$Evaluation/EvaluationLabel.text = "%d Seconds" % 42
-	$Evaluation.show()
-
-
-func _on_JinglePlayer_finished():
-	$BGMPLayer.stream_paused = false
+	# $BGMPLayer.stream_paused = false
+	# $JinglePlayer.stop()
 
 
 func load_scene_by_index(index):