rough beginning of multiple levels

Author: rosskarchner

autoload/network_events.gd

@@ -1,3 +1,7 @@
 extends Node
 
 signal network_changed
+signal circuit_complete
+
+func _ready() -> void:
+	network_changed.emit()

project.godot

@@ -24,8 +24,8 @@ AppConfig="*res://addons/maaacks_game_template/base/scenes/Autoloads/AppConfig.t
 SceneLoader="*res://addons/maaacks_game_template/base/scenes/Autoloads/SceneLoader.tscn"
 ProjectMusicController="*res://addons/maaacks_game_template/base/scenes/Autoloads/ProjectMusicController.tscn"
 ProjectUISoundController="*res://addons/maaacks_game_template/base/scenes/Autoloads/ProjectUISoundController.tscn"
-NetworkEvents="*res://autoload/network_events.gd"
 Dragging="*res://autoload/dragging.gd"
+NetworkEvents="*res://autoload/network_events.gd"
 
 [display]
 

scenes/GameScene/connection_point.gd

@@ -13,18 +13,12 @@ var connected_to:ConnectionPoint= null:
 	set(new_connection):
 		connected_to = new_connection
 		connection_updated.emit()
-		NetworkEvents.network_changed.emit()
-		print(new_connection)
 
 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
 	pass # Replace with function body.
 
 
-# Called every frame. 'delta' is the elapsed time since the previous frame.
-func _physics_process(delta: float) -> void:
-	pass
-
 
 func query_connections() -> void:
 	if monitoring && has_overlapping_areas():
@@ -41,7 +35,6 @@ func provides_positive_charge()->bool:
 	if disposition == Disposition.PROVIDES_POSITIVE:
 		return true
 	if disposition == Disposition.PAIRED:
-		var partner_connected = partner.connected
 		if partner.connected:
 			return partner.connected_to.provides_positive_charge()
 		else:
@@ -56,9 +49,9 @@ func provides_negative_charge() -> bool:
 		return false
 
 
-func _on_area_entered(area: Area2D) -> void:
+func _on_area_entered(_area: Area2D) -> void:
 	query_connections()
 
 
-func _on_area_exited(area: Area2D) -> void:
+func _on_area_exited(_area: Area2D) -> void:
 	query_connections()

scenes/GameScene/connection_point.tscn

@@ -5,7 +5,6 @@
 [sub_resource type="CircleShape2D" id="CircleShape2D_8ybln"]
 
 [node name="ConnectionPoint" type="Area2D" groups=["connection_points"]]
-monitoring = false
 script = ExtResource("1_43rxn")
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]

scenes/GameScene/game.gd

@@ -6,21 +6,26 @@ var current_level = 0
 var current_level_instance = null
 
 @onready var piece_spawner = $GamepieceSpawner
+@onready var level_container = $LevelContainer
 
 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
+	NetworkEvents.circuit_complete.connect(advance_level)
 	load_current_level()
 
-
-# Called every frame. 'delta' is the elapsed time since the previous frame.
-func _process(delta: float) -> void:
-	pass
-
+func advance_level():
+	current_level_instance.queue_free()
+	current_level +=1
+	load_current_level()
 
 func load_current_level():
-	if not current_level_instance:
-		current_level_instance = levels[current_level].instantiate()
-		add_child(current_level_instance)
-		piece_spawner.add_segments_to_queue(current_level_instance.get_node("PossibleSolution").get_children())
-		piece_spawner.reveal_next_piece()
+	current_level_instance = levels[current_level].instantiate()
+	piece_spawner.prepare()
+	level_container.add_child(current_level_instance)
+	piece_spawner.add_segments_to_queue(current_level_instance.get_node("PossibleSolution").get_children())
+	piece_spawner.reveal_next_piece()
 
+
+
+func _on_undo_button_pressed() -> void:
+	piece_spawner.undo()

scenes/GameScene/game.tscn

@@ -1,17 +1,30 @@
-[gd_scene load_steps=4 format=3 uid="uid://drwnwutwrrpb0"]
+[gd_scene load_steps=6 format=3 uid="uid://drwnwutwrrpb0"]
 
 [ext_resource type="PackedScene" uid="uid://j34kskfwf7ku" path="res://scenes/Levels/level_1.tscn" id="1_cw4a4"]
 [ext_resource type="Script" path="res://scenes/GameScene/game.gd" id="1_y3mbf"]
 [ext_resource type="Script" path="res://scenes/gamepiece_spawner.gd" id="3_8wmyh"]
+[ext_resource type="PackedScene" uid="uid://bg681tt0cdjvg" path="res://scenes/Levels/level_2.tscn" id="3_ld4mu"]
+[ext_resource type="PackedScene" uid="uid://clsd2khirk0ty" path="res://scenes/Levels/level_3.tscn" id="4_3vlyd"]
 
 [node name="Game" type="Node2D"]
-position = Vector2(254, 124)
 script = ExtResource("1_y3mbf")
-levels = Array[PackedScene]([ExtResource("1_cw4a4")])
+levels = Array[PackedScene]([ExtResource("1_cw4a4"), ExtResource("3_ld4mu"), ExtResource("4_3vlyd")])
 
 [node name="GamepieceSpawner" type="Node2D" parent="."]
 top_level = true
-position = Vector2(54, 30)
+position = Vector2(540, 86)
 script = ExtResource("3_8wmyh")
 
 [node name="LevelContainer" type="Node2D" parent="."]
+position = Vector2(18, 123)
+
+[node name="HUD" type="CanvasLayer" parent="."]
+
+[node name="UndoButton" type="Button" parent="HUD"]
+offset_left = 774.0
+offset_top = 60.0
+offset_right = 824.0
+offset_bottom = 91.0
+text = "Undo"
+
+[connection signal="pressed" from="HUD/UndoButton" to="." method="_on_undo_button_pressed"]

scenes/GameScene/load.gd renamed to scenes/GameScene/light.gd

@@ -1,5 +1,6 @@
 @tool
 extends Node2D
+class_name Light
 
 
 @onready var connection_point1 = $ConnectionPoint1
@@ -10,27 +11,23 @@ var is_on = false:
 		is_on = status
 		update_display()
 
-func _ready() -> void:
-	if not Engine.is_editor_hint():
-		NetworkEvents.network_changed.connect(update_status)
-
-
-func _physics_process(delta: float) -> void:
-	if not Engine.is_editor_hint():
-		#update_status()
-		pass
 
 func update_status()-> void:
+	if Dragging.is_dragging:
+		return
 	var cp1_positive = connection_point1.connected && connection_point1.connected_to.provides_positive_charge()
 	var cp1_negative = connection_point1.connected && connection_point1.connected_to.provides_negative_charge()
 	var cp2_positive = connection_point2.connected && connection_point2.connected_to.provides_positive_charge()
 	var cp2_negative = connection_point2.connected && connection_point2.connected_to.provides_negative_charge()
 	is_on = (cp1_negative && cp2_positive) || (cp1_positive && cp2_negative)
 
 func update_display() -> void:
+	if Engine.is_editor_hint():
+		return
 	if is_on:
 		$OnSprite.show()
 		$OffSprite.hide()
+		NetworkEvents.circuit_complete.emit()
 	else:
 		$OnSprite.hide()
 		$OffSprite.show()

scenes/GameScene/load.tscn

@@ -1,11 +1,11 @@
 [gd_scene load_steps=5 format=3 uid="uid://cy1uuyuh3e44f"]
 
-[ext_resource type="Script" path="res://scenes/GameScene/load.gd" id="1_q7yfn"]
+[ext_resource type="Script" path="res://scenes/GameScene/light.gd" id="1_q7yfn"]
 [ext_resource type="PackedScene" uid="uid://7ycpev6cp8qd" path="res://scenes/GameScene/connection_point.tscn" id="2_qtcvc"]
 [ext_resource type="Texture2D" uid="uid://bp1vld2jiktyq" path="res://assets/images/hex-lamp-off.png" id="3_d4uqo"]
 [ext_resource type="Texture2D" uid="uid://pcuklcrfui8v" path="res://assets/images/hex-lamp-on.png" id="3_oo3ao"]
 
-[node name="Load" type="Node2D"]
+[node name="Load" type="Node2D" groups=["lights"]]
 script = ExtResource("1_q7yfn")
 
 [node name="OnSprite" type="Sprite2D" parent="."]
@@ -20,10 +20,14 @@ centered = false
 
 [node name="ConnectionPoint1" parent="." node_paths=PackedStringArray("partner") instance=ExtResource("2_qtcvc")]
 position = Vector2(-25, -34)
-monitoring = true
 partner = NodePath("../ConnectionPoint2")
 
 [node name="ConnectionPoint2" parent="." node_paths=PackedStringArray("partner") instance=ExtResource("2_qtcvc")]
 position = Vector2(-25, 33)
-monitoring = true
 partner = NodePath("../ConnectionPoint1")
+
+[node name="StatusCheckTimer" type="Timer" parent="."]
+wait_time = 0.5
+autostart = true
+
+[connection signal="timeout" from="StatusCheckTimer" to="." method="update_status"]

scenes/GameScene/segment.gd

@@ -2,7 +2,7 @@
 extends Node2D
 class_name Segment
 
-signal dropped
+signal dropped(segment:Segment)
 
 var draggable = true
 var is_inside_dropable = false
@@ -12,11 +12,11 @@ var dragging = false
 var drop_target:Area2D
 
 var connection_point_scene=preload("res://scenes/GameScene/connection_point.tscn")
+var connection_points = []
 
 @export var connection_pairs:Array[Vector2i]:
 	set(newpairs):
 		connection_pairs = newpairs
-		configure_control_points()
 		queue_redraw()
 
 const positions = [
@@ -43,17 +43,19 @@ func configure_control_points():
 
 
 
+
+
 func create_connection_pair(position1, position2):
 		var connector1:ConnectionPoint = connection_point_scene.instantiate()
 		var connector2:ConnectionPoint = connection_point_scene.instantiate()
+		connection_points.append(connector1)
+		connection_points.append(connector2)
 		connector1.disposition = ConnectionPoint.Disposition.PAIRED
 		connector2.disposition = ConnectionPoint.Disposition.PAIRED
 		connector1.partner = connector2
 		connector2.partner = connector1
 		connector1.position = position1 - Vector2i(46,46)
 		connector2.position = position2 - Vector2i(46,46)
-		connector1.monitoring = true
-		connector2.monitoring = true
 		add_child(connector1)
 		add_child(connector2)
 
@@ -63,13 +65,12 @@ func _draw() -> void:
 		var position2 = positions[pair[1]]
 		draw_line(position1 - Vector2i(46,46),Vector2.ZERO,Color.BLACK,2.0)
 		draw_line(position2 - Vector2i(46,46),Vector2.ZERO,Color.BLACK,2.0)
-		print("drawing!")
 
 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
 	pass # Replace with function body.
 
-func _process(delta: float) -> void:
+func _process(_delta: float) -> void:
 	if not Engine.is_editor_hint():
 		if dragging:
 			global_position = get_global_mouse_position()
@@ -87,7 +88,7 @@ func _on_click_area_mouse_exited() -> void:
 			#scale = Vector2(1.0,1.0)
 
 
-func _on_click_area_input_event(viewport: Node, event: InputEvent, shape_idx: int) -> void:
+func _on_click_area_input_event(_viewport: Node, event: InputEvent, _shape_idx: int) -> void:
 	if Engine.is_editor_hint():
 		return
 	if event.is_action_pressed("click") and draggable:
@@ -101,18 +102,21 @@ func _on_click_area_input_event(viewport: Node, event: InputEvent, shape_idx: in
 		if drop_target:
 			drop_target.monitorable = false
 			global_position = drop_target.global_position
-			dropped.emit()
-			$ClickArea.queue_free()
-			drop_target = null
+			dropped.emit(self)
+			configure_control_points()
+			NetworkEvents.network_changed.emit()
+			$ClickArea.hide()
 		else:
 			global_position = dragStartPosition
 
 
+func restore_playable():
+	drop_target.monitorable = true
+	$ClickArea.show()
+
 func _on_drop_target_detector_area_entered(area: Area2D) -> void:
-	print("entered target")
 	drop_target = area
 
 
-func _on_drop_target_detector_area_exited(area: Area2D) -> void:
-	print("exit target")
+func _on_drop_target_detector_area_exited(_area: Area2D) -> void:
 	drop_target = null

scenes/Levels/level_1.tscn

@@ -19,37 +19,58 @@ sources/0 = SubResource("TileSetScenesCollectionSource_ie45y")
 [node name="Level1" type="Node2D"]
 
 [node name="Tiles" type="TileMapLayer" parent="."]
-position = Vector2(-26, -18)
+position = Vector2(619, 3)
 tile_map_data = PackedByteArray("AAD//wMAAAAAAAAAAQAAAAMAAAAAAAAAAQAAAAIAAAAAAAAAAQD//wIAAAAAAAAAAQD//wEAAAAAAAAAAQD+/wEAAAAAAAAAAQD+/wIAAAAAAAAAAgABAAIAAAAAAAAAAwD+/wMAAAAAAAAAAQD//wQAAAAAAAAAAQAAAAQAAAAAAAAAAQABAAQAAAAAAAAAAQABAAMAAAAAAAAAAQAAAAEAAAAAAAAAAQA=")
 tile_set = SubResource("TileSet_f5i1a")
 
 [node name="PossibleSolution" type="Node2D" parent="."]
 visible = false
+position = Vector2(581, 178)
 
 [node name="Segment" parent="PossibleSolution" instance=ExtResource("4_c6ir0")]
-position = Vector2(-133, -53)
+position = Vector2(-316, 142)
 connection_pairs = Array[Vector2i]([Vector2i(2, -2)])
 
 [node name="Segment2" parent="PossibleSolution" instance=ExtResource("4_c6ir0")]
-position = Vector2(-82, 20)
+position = Vector2(-260, 28)
+connection_pairs = Array[Vector2i]([Vector2i(5, 2)])
+
+[node name="Segment11" parent="PossibleSolution" instance=ExtResource("4_c6ir0")]
+position = Vector2(-188, 159)
+connection_pairs = Array[Vector2i]([Vector2i(5, 2)])
+
+[node name="Segment12" parent="PossibleSolution" instance=ExtResource("4_c6ir0")]
+position = Vector2(-88, 334)
 connection_pairs = Array[Vector2i]([Vector2i(5, 2)])
 
 [node name="Segment3" parent="PossibleSolution" instance=ExtResource("4_c6ir0")]
-position = Vector2(63, -54)
+position = Vector2(192, 11)
 connection_pairs = Array[Vector2i]([Vector2i(5, 3)])
 
 [node name="Segment4" parent="PossibleSolution" instance=ExtResource("4_c6ir0")]
-position = Vector2(-179, 27)
+position = Vector2(-247, 297)
+connection_pairs = Array[Vector2i]([Vector2i(0, 1)])
+
+[node name="Segment10" parent="PossibleSolution" instance=ExtResource("4_c6ir0")]
+position = Vector2(291, 206)
 connection_pairs = Array[Vector2i]([Vector2i(0, 1)])
 
 [node name="Segment5" parent="PossibleSolution" instance=ExtResource("4_c6ir0")]
-position = Vector2(114, 20)
+position = Vector2(55, -24)
 connection_pairs = Array[Vector2i]([Vector2i(4, 2)])
 
+[node name="Segment8" parent="PossibleSolution" instance=ExtResource("4_c6ir0")]
+position = Vector2(340, 106)
+connection_pairs = Array[Vector2i]([Vector2i(4, 3)])
+
+[node name="Segment9" parent="PossibleSolution" instance=ExtResource("4_c6ir0")]
+position = Vector2(298, 334)
+connection_pairs = Array[Vector2i]([Vector2i(4, 3)])
+
 [node name="Segment6" parent="PossibleSolution" instance=ExtResource("4_c6ir0")]
-position = Vector2(-34, -55)
+position = Vector2(-91, -27)
 connection_pairs = Array[Vector2i]([Vector2i(5, 3)])
 
 [node name="Segment7" parent="PossibleSolution" instance=ExtResource("4_c6ir0")]
-position = Vector2(17, 19)
+position = Vector2(-370, 253)
 connection_pairs = Array[Vector2i]([Vector2i(1, 0)])