organisation

6 files changed, 109 insertions, 102 deletions

diff --git a/UI.gd b/UI.gd
index ecc5aad..a6a8edc 100644
--- a/UI.gd
+++ b/UI.gd
@@ -1,4 +1,4 @@
-extends Control
+extends Node
 
 
 # Called when the node enters the scene tree for the first time.
@@ -7,5 +7,5 @@ func _ready() -> void:
 
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
-func _process(delta: float) -> void:
-	Globals.FUN = $Checkbox.state
+func _process(_delta: float) -> void:
+	Globals.FUN = $UI/Checkbox.state
diff --git a/characters.png b/characters.png
index 1316647..bf4375e 100644
--- a/characters.png
+++ b/characters.png
diff --git a/coin.gd b/coin.gd
index 4d940cb..c9c0c83 100644
--- a/coin.gd
+++ b/coin.gd
@@ -2,7 +2,7 @@ extends Area2D
 
 @export var attraction_range: float = 0.0
 @export var attraction_speed: float = 0.0
-@onready var player: Area2D = get_node("../Player")
+@onready var player: Area2D = get_node("../../Player")
 
 
 func type() -> String: return "coin"
diff --git a/game.tscn b/game.tscn
index 63f1ac4..d7ee8d6 100644
--- a/game.tscn
+++ b/game.tscn
@@ -1,30 +1,16 @@
-[gd_scene load_steps=16 format=3 uid="uid://8ps5533ot84q"]
+[gd_scene load_steps=8 format=3 uid="uid://8ps5533ot84q"]
 
 [ext_resource type="PackedScene" uid="uid://c2g45v321qddb" path="res://player.tscn" id="1_3q46r"]
 [ext_resource type="Script" path="res://ColorRect.gd" id="1_kv47q"]
 [ext_resource type="Texture2D" uid="uid://hqxnw5bd6q2c" path="res://genshinlogo.png" id="1_tfg20"]
+[ext_resource type="PackedScene" uid="uid://4oytwe0gnp18" path="res://ui.tscn" id="2_3layq"]
 [ext_resource type="Script" path="res://Genshinlogo.gd" id="2_8h31p"]
-[ext_resource type="FontFile" uid="uid://dgekwkwx0o0os" path="res://Ginga.ttf" id="2_63wkf"]
-[ext_resource type="Script" path="res://UI.gd" id="2_keird"]
 [ext_resource type="PackedScene" uid="uid://bj48tpvf86kjo" path="res://coin.tscn" id="2_qfcfl"]
-[ext_resource type="Script" path="res://Primogemmes.gd" id="3_06iw8"]
-[ext_resource type="PackedScene" uid="uid://g8m1imvs0g1t" path="res://characters.tscn" id="5_cbcae"]
-[ext_resource type="PackedScene" uid="uid://opbr0q2e2rex" path="res://checkbox.tscn" id="6_mpv26"]
-[ext_resource type="FontFile" uid="uid://dy3o3bbglibkp" path="res://comicsans.ttf" id="8_wylah"]
 [ext_resource type="AudioStream" uid="uid://c7pa506xccdyq" path="res://ost.ogg" id="9_bhhfh"]
-[ext_resource type="Texture2D" uid="uid://wvfljynswg5y" path="res://windaube.png" id="9_tsf5s"]
-
-[sub_resource type="LabelSettings" id="LabelSettings_51tlr"]
-font = ExtResource("2_63wkf")
-font_size = 128
-
-[sub_resource type="LabelSettings" id="LabelSettings_u6313"]
-font = ExtResource("8_wylah")
-font_size = 48
 
 [node name="Game" type="Node2D"]
 
-[node name="ColorRect" type="ColorRect" parent="."]
+[node name="RestrBackground" type="ColorRect" parent="."]
 z_index = -80
 custom_minimum_size = Vector2(2048, 2048)
 anchors_preset = 8
@@ -41,67 +27,7 @@ grow_vertical = 2
 color = Color(0, 0, 0, 1)
 script = ExtResource("1_kv47q")
 
-[node name="CanvasUI" type="CanvasLayer" parent="."]
-
-[node name="UI" type="Control" parent="CanvasUI"]
-visibility_layer = 2
-z_index = 69
-custom_minimum_size = Vector2(1280, 960)
-layout_mode = 3
-anchors_preset = 0
-offset_right = 1280.0
-offset_bottom = 960.0
-script = ExtResource("2_keird")
-
-[node name="Primogemmes" type="Label" parent="CanvasUI/UI"]
-layout_mode = 1
-anchors_preset = 1
-anchor_left = 1.0
-anchor_right = 1.0
-offset_left = -813.0
-offset_right = -40.0
-offset_bottom = 150.0
-grow_horizontal = 0
-text = "PRIMOGMEES:  "
-label_settings = SubResource("LabelSettings_51tlr")
-horizontal_alignment = 2
-script = ExtResource("3_06iw8")
-
-[node name="Windaube" type="Sprite2D" parent="CanvasUI/UI"]
-position = Vector2(1056, 877)
-scale = Vector2(1.5, 1.5)
-texture = ExtResource("9_tsf5s")
-
-[node name="Characters" parent="CanvasUI/UI" instance=ExtResource("5_cbcae")]
-position = Vector2(1280, 320)
-key = "1"
-
-[node name="Characters2" parent="CanvasUI/UI" instance=ExtResource("5_cbcae")]
-position = Vector2(1280, 400)
-label = "luigi"
-key = "2"
-
-[node name="Characters3" parent="CanvasUI/UI" instance=ExtResource("5_cbcae")]
-position = Vector2(1280, 480)
-label = ""
-key = "3"
-
-[node name="Characters4" parent="CanvasUI/UI" instance=ExtResource("5_cbcae")]
-position = Vector2(1281, 559)
-label = ""
-key = "4"
-
-[node name="Checkbox" parent="CanvasUI/UI" instance=ExtResource("6_mpv26")]
-position = Vector2(64, 897)
-scale = Vector2(4, 4)
-
-[node name="Label" type="Label" parent="CanvasUI/UI"]
-offset_left = 111.0
-offset_top = 855.0
-offset_right = 318.0
-offset_bottom = 881.0
-text = "epilepsy warning: fun toggle"
-label_settings = SubResource("LabelSettings_u6313")
+[node name="CanvasUI" parent="." instance=ExtResource("2_3layq")]
 
 [node name="Genshinlogo" type="Sprite2D" parent="."]
 texture = ExtResource("1_tfg20")
@@ -112,7 +38,7 @@ script = ExtResource("2_8h31p")
 [node name="Camera2D" type="Camera2D" parent="Player"]
 editor_draw_screen = false
 
-[node name="ColorRect" type="ColorRect" parent="Player/Camera2D"]
+[node name="LargeBackground" type="ColorRect" parent="Player/Camera2D"]
 z_index = -100
 custom_minimum_size = Vector2(1600, 1200)
 anchors_preset = 8
@@ -129,55 +55,57 @@ grow_vertical = 2
 color = Color(0, 0, 0, 1)
 script = ExtResource("1_kv47q")
 
-[node name="s" type="AudioStreamPlayer2D" parent="Player"]
+[node name="Soundtrack" type="AudioStreamPlayer2D" parent="Player"]
 stream = ExtResource("9_bhhfh")
 volume_db = -6.597
 autoplay = true
 
-[node name="Coin" parent="." instance=ExtResource("2_qfcfl")]
+[node name="Coins" type="Node" parent="."]
+
+[node name="Coin" parent="Coins" instance=ExtResource("2_qfcfl")]
 position = Vector2(-132, -375)
 
-[node name="Coin2" parent="." instance=ExtResource("2_qfcfl")]
+[node name="Coin2" parent="Coins" instance=ExtResource("2_qfcfl")]
 position = Vector2(-155, -224)
 
-[node name="Coin3" parent="." instance=ExtResource("2_qfcfl")]
+[node name="Coin3" parent="Coins" instance=ExtResource("2_qfcfl")]
 position = Vector2(-397, -423)
 
-[node name="Coin4" parent="." instance=ExtResource("2_qfcfl")]
+[node name="Coin4" parent="Coins" instance=ExtResource("2_qfcfl")]
 position = Vector2(-405, -163)
 
-[node name="Coin5" parent="." instance=ExtResource("2_qfcfl")]
+[node name="Coin5" parent="Coins" instance=ExtResource("2_qfcfl")]
 position = Vector2(-389, -9)
 
-[node name="Coin6" parent="." instance=ExtResource("2_qfcfl")]
+[node name="Coin6" parent="Coins" instance=ExtResource("2_qfcfl")]
 position = Vector2(-92, 17)
 
-[node name="Coin16" parent="." instance=ExtResource("2_qfcfl")]
+[node name="Coin16" parent="Coins" instance=ExtResource("2_qfcfl")]
 position = Vector2(334, -205)
 
-[node name="Coin15" parent="." instance=ExtResource("2_qfcfl")]
+[node name="Coin15" parent="Coins" instance=ExtResource("2_qfcfl")]
 position = Vector2(167, -106)
 
-[node name="Coin14" parent="." instance=ExtResource("2_qfcfl")]
+[node name="Coin14" parent="Coins" instance=ExtResource("2_qfcfl")]
 position = Vector2(256, 78)
 
-[node name="Coin13" parent="." instance=ExtResource("2_qfcfl")]
+[node name="Coin13" parent="Coins" instance=ExtResource("2_qfcfl")]
 position = Vector2(313, 239)
 
-[node name="Coin12" parent="." instance=ExtResource("2_qfcfl")]
+[node name="Coin12" parent="Coins" instance=ExtResource("2_qfcfl")]
 position = Vector2(-467, 356)
 
-[node name="Coin11" parent="." instance=ExtResource("2_qfcfl")]
+[node name="Coin11" parent="Coins" instance=ExtResource("2_qfcfl")]
 position = Vector2(115, 385)
 
-[node name="Coin10" parent="." instance=ExtResource("2_qfcfl")]
+[node name="Coin10" parent="Coins" instance=ExtResource("2_qfcfl")]
 position = Vector2(-161, 392)
 
-[node name="Coin9" parent="." instance=ExtResource("2_qfcfl")]
+[node name="Coin9" parent="Coins" instance=ExtResource("2_qfcfl")]
 position = Vector2(78, 208)
 
-[node name="Coin8" parent="." instance=ExtResource("2_qfcfl")]
+[node name="Coin8" parent="Coins" instance=ExtResource("2_qfcfl")]
 position = Vector2(-341, 201)
 
-[node name="Coin7" parent="." instance=ExtResource("2_qfcfl")]
+[node name="Coin7" parent="Coins" instance=ExtResource("2_qfcfl")]
 position = Vector2(39, -55)
diff --git a/player.gd b/player.gd
index fc3e842..9743b4c 100644
--- a/player.gd
+++ b/player.gd
@@ -26,8 +26,7 @@ func get_input() -> Vector2:
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
 func _physics_process(_delta2: float) -> void:
-	if get_local_mouse_position().length() >= speed * 1.5:
-		position += get_local_mouse_position().normalized() * speed
+	position += get_local_mouse_position().normalized() * speed
 	position = position.clamp(Globals.LIMITS_MIN, Globals.LIMITS_MAX)
 	#var color := Color()
 	#color.r = randi() % 2
diff --git a/ui.tscn b/ui.tscn
new file mode 100644
index 0000000..24ab908
--- /dev/null
+++ b/ui.tscn
@@ -0,0 +1,80 @@
+[gd_scene load_steps=10 format=3 uid="uid://4oytwe0gnp18"]
+
+[ext_resource type="Script" path="res://UI.gd" id="1_6yqol"]
+[ext_resource type="FontFile" uid="uid://dgekwkwx0o0os" path="res://Ginga.ttf" id="2_l84eu"]
+[ext_resource type="Script" path="res://Primogemmes.gd" id="3_5ruo1"]
+[ext_resource type="Texture2D" uid="uid://wvfljynswg5y" path="res://windaube.png" id="4_lkyt6"]
+[ext_resource type="PackedScene" uid="uid://g8m1imvs0g1t" path="res://characters.tscn" id="5_3wm4j"]
+[ext_resource type="PackedScene" uid="uid://opbr0q2e2rex" path="res://checkbox.tscn" id="6_jwgl3"]
+[ext_resource type="FontFile" uid="uid://dy3o3bbglibkp" path="res://comicsans.ttf" id="7_rtagq"]
+
+[sub_resource type="LabelSettings" id="LabelSettings_51tlr"]
+font = ExtResource("2_l84eu")
+font_size = 128
+
+[sub_resource type="LabelSettings" id="LabelSettings_u6313"]
+font = ExtResource("7_rtagq")
+font_size = 48
+
+[node name="CanvasUI" type="CanvasLayer"]
+script = ExtResource("1_6yqol")
+
+[node name="UI" type="Control" parent="."]
+visibility_layer = 2
+z_index = 69
+custom_minimum_size = Vector2(1280, 960)
+layout_mode = 3
+anchors_preset = 0
+offset_right = 1280.0
+offset_bottom = 960.0
+
+[node name="Primogemmes" type="Label" parent="UI"]
+layout_mode = 1
+anchors_preset = 1
+anchor_left = 1.0
+anchor_right = 1.0
+offset_left = -813.0
+offset_right = -40.0
+offset_bottom = 150.0
+grow_horizontal = 0
+text = "PRIMOGMEES:  "
+label_settings = SubResource("LabelSettings_51tlr")
+horizontal_alignment = 2
+script = ExtResource("3_5ruo1")
+
+[node name="Windaube" type="Sprite2D" parent="UI"]
+position = Vector2(1056, 877)
+scale = Vector2(1.5, 1.5)
+texture = ExtResource("4_lkyt6")
+
+[node name="Characters" parent="UI" instance=ExtResource("5_3wm4j")]
+position = Vector2(1280, 320)
+key = "1"
+
+[node name="Characters2" parent="UI" instance=ExtResource("5_3wm4j")]
+position = Vector2(1280, 400)
+label = "luigi"
+key = "2"
+
+[node name="Characters3" parent="UI" instance=ExtResource("5_3wm4j")]
+position = Vector2(1280, 480)
+label = ""
+key = "3"
+
+[node name="Characters4" parent="UI" instance=ExtResource("5_3wm4j")]
+position = Vector2(1281, 559)
+label = ""
+key = "4"
+
+[node name="Checkbox" parent="UI" instance=ExtResource("6_jwgl3")]
+position = Vector2(64, 897)
+scale = Vector2(4, 4)
+
+[node name="Label" type="Label" parent="UI"]
+layout_mode = 0
+offset_left = 111.0
+offset_top = 855.0
+offset_right = 318.0
+offset_bottom = 881.0
+text = "epilepsy warning: fun toggle"
+label_settings = SubResource("LabelSettings_u6313")