From d98ad5fd2397fffdf76ee93f94026c7bc513065e Mon Sep 17 00:00:00 2001 From: Fabien Freling Date: Tue, 26 Nov 2019 13:57:50 +0100 Subject: [PATCH] connect 'solved' signal --- game/src/Main.gd | 17 +++++++++++++++++ game/src/Main.tscn | 9 ++++++--- game/src/Taquin.gd | 8 ++++++-- 3 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 game/src/Main.gd diff --git a/game/src/Main.gd b/game/src/Main.gd new file mode 100644 index 0000000..3ae1b6a --- /dev/null +++ b/game/src/Main.gd @@ -0,0 +1,17 @@ +extends Control + +# Declare member variables here. Examples: +# var a = 2 +# var b = "text" + +# Called when the node enters the scene tree for the first time. +func _ready(): + pass # Replace with function body. + +# Called every frame. 'delta' is the elapsed time since the previous frame. +#func _process(delta): +# pass + + +func _on_Taquin_solved(): + print("Solved!") diff --git a/game/src/Main.tscn b/game/src/Main.tscn index 37e5f52..4c9656c 100644 --- a/game/src/Main.tscn +++ b/game/src/Main.tscn @@ -1,9 +1,12 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=3 format=2] -[ext_resource path="res://src/Taquin.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/Main.gd" type="Script" id=1] +[ext_resource path="res://src/Taquin.tscn" type="PackedScene" id=2] [node name="Main" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 +script = ExtResource( 1 ) -[node name="Taquin" parent="." instance=ExtResource( 1 )] +[node name="Taquin" parent="." instance=ExtResource( 2 )] +[connection signal="solved" from="Taquin" to="." method="_on_Taquin_solved"] diff --git a/game/src/Taquin.gd b/game/src/Taquin.gd index 9c6ffce..031a2ed 100644 --- a/game/src/Taquin.gd +++ b/game/src/Taquin.gd @@ -2,12 +2,16 @@ extends Node2D class_name Taquin tool +signal solved + var Piece = preload("res://src/Piece.tscn") export var rows: int = 4 export var columns: int = 4 export var width: int = 512 export var height: int = 512 +export var difficulty: int = 10 + var interpiece: int = 5 var padding = 10 @@ -47,7 +51,7 @@ func _ready() -> void: pieces.append(pieces_row) - shuffle(10) + shuffle(difficulty) func compute_piece_size() -> int: var w_size: int = (width - (2 * padding) - ((columns - 1) * interpiece)) / columns @@ -93,7 +97,7 @@ func move_piece(direction) -> bool: update() if check_solved(): - print("solved") + emit_signal("solved") return true