lvl

4 files changed, 61 insertions, 4 deletions

diff --git a/components/button.tscn b/components/button.tscn
index 3a8029e..883bda7 100644
--- a/components/button.tscn
+++ b/components/button.tscn
@@ -9,17 +9,17 @@
 script = ExtResource( 5 )
 
 [node name="Left" type="Sprite" parent="."]
-position = Vector2( -100, 0 )
+position = Vector2( -24, 0 )
 scale = Vector2( 4, 4 )
 texture = ExtResource( 4 )
 
 [node name="Right" type="Sprite" parent="."]
-position = Vector2( 99, 0 )
+position = Vector2( 24, 0 )
 scale = Vector2( 4, 4 )
 texture = ExtResource( 2 )
 
 [node name="Middle" type="Sprite" parent="."]
-scale = Vector2( 29, 4 )
+scale = Vector2( 4, 4 )
 texture = ExtResource( 1 )
 
 [node name="Hitbox" type="CollisionShape2D" parent="."]
diff --git a/project.godot b/project.godot
index 80d51c1..f0076c6 100644
--- a/project.godot
+++ b/project.godot
@@ -69,6 +69,7 @@ Settings="*res://components/Settings.gd"
 
 window/size/width=1280
 window/size/height=720
+window/size/fullscreen=true
 mouse_cursor/custom_image="res://textures/icons/cursor.png"
 window/stretch/mode="2d"
 window/stretch/aspect="keep"
@@ -111,5 +112,5 @@ quality/intended_usage/framebuffer_allocation=0
 quality/intended_usage/framebuffer_allocation.mobile=0
 vram_compression/import_etc=true
 vram_compression/import_etc2=false
-environment/default_clear_color=Color( 0.00392157, 0.0862745, 0.160784, 1 )
 environment/default_environment="res://default_env.tres"
+<<<<<<<Updatedupstreamenvironment/default_clear_color=Color( 0.00392157, 0.0862745, 0.160784, 1 )
diff --git a/scenes/levels/level1.gd b/scenes/levels/level1.gd
new file mode 100644
index 0000000..3386590
--- /dev/null
+++ b/scenes/levels/level1.gd
@@ -0,0 +1,19 @@
+extends Level
+
+onready var buttons = $ButtonHolder.get_children()
+
+var order = [
+	9, 8, 7, 6, 5, 4, 3, 2, 1, 0
+]
+var sequence_index = 0
+
+func _ready():
+	for i in range(buttons.size()):
+		buttons[i].connect("on_click", self, "_on_AnyButton_click", [i])
+
+func _on_Any_button_click(btn_idx):
+	if btn_idx == order[sequence_index]:
+		sequence_index += 1
+		print("Correct button: ", btn_idx)
+	else:
+		print("Incorrect button: ", btn_idx)
diff --git a/scenes/levels/level1.tscn b/scenes/levels/level1.tscn
new file mode 100644
index 0000000..fa40852
--- /dev/null
+++ b/scenes/levels/level1.tscn
@@ -0,0 +1,37 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://scenes/levels/level1.gd" type="Script" id=1]
+[ext_resource path="res://components/button.tscn" type="PackedScene" id=2]
+
+[node name="Level2" type="Node2D"]
+position = Vector2( 640, 320 )
+script = ExtResource( 1 )
+
+[node name="ButtonHolder" type="Node2D" parent="."]
+
+[node name="Button" parent="ButtonHolder" instance=ExtResource( 2 )]
+position = Vector2( -317.028, -134.015 )
+
+[node name="Button2" parent="ButtonHolder" instance=ExtResource( 2 )]
+position = Vector2( 366.41, -3.20047 )
+
+[node name="Button3" parent="ButtonHolder" instance=ExtResource( 2 )]
+position = Vector2( 115.46, -187.408 )
+
+[node name="Button4" parent="ButtonHolder" instance=ExtResource( 2 )]
+position = Vector2( 19.3514, 4.8085 )
+
+[node name="Button5" parent="ButtonHolder" instance=ExtResource( 2 )]
+position = Vector2( -258.295, 82.2293 )
+
+[node name="Button6" parent="ButtonHolder" instance=ExtResource( 2 )]
+position = Vector2( 142.157, 67.5461 )
+
+[node name="Button7" parent="ButtonHolder" instance=ExtResource( 2 )]
+position = Vector2( -123.476, 198.36 )
+
+[node name="Button8" parent="ButtonHolder" instance=ExtResource( 2 )]
+position = Vector2( 50.0527, 262.433 )
+
+[node name="Button9" parent="ButtonHolder" instance=ExtResource( 2 )]
+position = Vector2( -147.504, -76.6167 )