diff --git a/Button.gd b/map_select/Button.gd similarity index 84% rename from Button.gd rename to map_select/Button.gd index e79627f..41d2f66 100644 --- a/Button.gd +++ b/map_select/Button.gd @@ -11,7 +11,7 @@ func _on_pressed(): return var sim = load("res://sim.tscn").instantiate() - var map = load(map_path).instantiate() - sim.add_child(map) + var map = load(map_path).new() + map.create_map(sim) get_tree().root.add_child(sim) get_node("/root/MapSelect").queue_free() diff --git a/map_select.gd b/map_select/map_select.gd similarity index 92% rename from map_select.gd rename to map_select/map_select.gd index dc643ab..9e58d78 100644 --- a/map_select.gd +++ b/map_select/map_select.gd @@ -7,6 +7,6 @@ func _ready(): # Called every frame. 'delta' is the elapsed time since the previous frame. -func _process(delta): +func _process(_delta): if Input.is_action_just_pressed("escape"): get_tree().quit() # default behavior diff --git a/map_select.tscn b/map_select/map_select.tscn similarity index 74% rename from map_select.tscn rename to map_select/map_select.tscn index fc014af..8e1889f 100644 --- a/map_select.tscn +++ b/map_select/map_select.tscn @@ -1,13 +1,13 @@ [gd_scene load_steps=4 format=3 uid="uid://iskh4m3ltqul"] -[ext_resource type="Script" path="res://map_select.gd" id="1_f0hdc"] -[ext_resource type="Script" path="res://Button.gd" id="1_rygkg"] +[ext_resource type="Script" path="res://map_select/map_select.gd" id="1_w7uu4"] +[ext_resource type="Script" path="res://map_select/Button.gd" id="2_ykkpr"] [sub_resource type="LabelSettings" id="LabelSettings_kd1xo"] font_size = 32 [node name="MapSelect" type="Node2D"] -script = ExtResource("1_f0hdc") +script = ExtResource("1_w7uu4") [node name="Title" type="Label" parent="."] offset_left = 29.0 @@ -23,7 +23,7 @@ offset_top = 261.0 offset_right = 199.0 offset_bottom = 324.0 text = "RGB" -script = ExtResource("1_rygkg") +script = ExtResource("2_ykkpr") map_path = "res://maps/rgb.tscn" [node name="Button2" type="Button" parent="."] @@ -32,7 +32,7 @@ offset_top = 186.0 offset_right = 204.0 offset_bottom = 249.0 text = "Source" -script = ExtResource("1_rygkg") +script = ExtResource("2_ykkpr") map_path = "res://maps/source.tscn" [node name="Button3" type="Button" parent="."] @@ -41,7 +41,7 @@ offset_top = 332.0 offset_right = 200.0 offset_bottom = 395.0 text = "CMY" -script = ExtResource("1_rygkg") +script = ExtResource("2_ykkpr") map_path = "res://maps/cmy.tscn" [node name="Button4" type="Button" parent="."] @@ -50,7 +50,7 @@ offset_top = 188.0 offset_right = 572.0 offset_bottom = 251.0 text = "Rare" -script = ExtResource("1_rygkg") +script = ExtResource("2_ykkpr") map_path = "res://maps/rare.tscn" [node name="Button5" type="Button" parent="."] @@ -59,7 +59,7 @@ offset_top = 185.0 offset_right = 388.0 offset_bottom = 248.0 text = "Seperated" -script = ExtResource("1_rygkg") +script = ExtResource("2_ykkpr") map_path = "res://maps/seperated.tscn" [node name="Button6" type="Button" parent="."] @@ -68,25 +68,26 @@ offset_top = 260.0 offset_right = 383.0 offset_bottom = 323.0 text = "RGB Sections" -script = ExtResource("1_rygkg") +script = ExtResource("2_ykkpr") map_path = "res://maps/rgb_sections.tscn" -[node name="Title2" type="Label" parent="."] -offset_left = 17.0 -offset_top = 133.0 -offset_right = 186.0 -offset_bottom = 181.0 -text = "Archived" -label_settings = SubResource("LabelSettings_kd1xo") - [node name="Button7" type="Button" parent="."] offset_left = 35.0 offset_top = 71.0 offset_right = 210.0 offset_bottom = 134.0 text = "Sections" -script = ExtResource("1_rygkg") -map_path = "res://maps/sections.tscn" +script = ExtResource("2_ykkpr") +map_path = "res://maps/sections.gd" + +[node name="Button8" type="Button" parent="."] +offset_left = 227.0 +offset_top = 70.0 +offset_right = 402.0 +offset_bottom = 133.0 +text = "Small" +script = ExtResource("2_ykkpr") +map_path = "res://maps/small.gd" [connection signal="pressed" from="Button" to="Button" method="_on_pressed"] [connection signal="pressed" from="Button2" to="Button2" method="_on_pressed"] @@ -95,3 +96,4 @@ map_path = "res://maps/sections.tscn" [connection signal="pressed" from="Button5" to="Button5" method="_on_pressed"] [connection signal="pressed" from="Button6" to="Button6" method="_on_pressed"] [connection signal="pressed" from="Button7" to="Button7" method="_on_pressed"] +[connection signal="pressed" from="Button8" to="Button8" method="_on_pressed"] diff --git a/maps/cmy.tscn b/maps/cmy.tscn deleted file mode 100644 index 5e8cb3a..0000000 --- a/maps/cmy.tscn +++ /dev/null @@ -1,29 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://ce4ed87hyb1o3"] - -[ext_resource type="PackedScene" uid="uid://bpd3l1iyb13h2" path="res://pool.tscn" id="2_u62jc"] - -[node name="Map" type="Node2D"] - -[node name="M" parent="." instance=ExtResource("2_u62jc")] -modulate = Color(1, 0, 1, 1) -position = Vector2(260, 209) -scale = Vector2(0.447214, 0.447214) -mana_r = 100 -mana_g = 0 -mana_b = 100 - -[node name="C" parent="." instance=ExtResource("2_u62jc")] -modulate = Color(0, 1, 1, 1) -position = Vector2(886, 210) -scale = Vector2(0.447214, 0.447214) -mana_r = 0 -mana_g = 100 -mana_b = 100 - -[node name="Y" parent="." instance=ExtResource("2_u62jc")] -modulate = Color(1, 1, 0, 1) -position = Vector2(583, 502) -scale = Vector2(0.447214, 0.447214) -mana_r = 100 -mana_g = 100 -mana_b = 0 diff --git a/maps/map_tools.gd b/maps/map_tools.gd deleted file mode 100644 index 58577cf..0000000 --- a/maps/map_tools.gd +++ /dev/null @@ -1,11 +0,0 @@ -extends Node2D - - -# 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 diff --git a/maps/rare.tscn b/maps/rare.tscn deleted file mode 100644 index 014bfa0..0000000 --- a/maps/rare.tscn +++ /dev/null @@ -1,29 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://bts7n21b8v8os"] - -[ext_resource type="PackedScene" uid="uid://bpd3l1iyb13h2" path="res://pool.tscn" id="1_ivbwl"] - -[node name="Map" type="Node2D"] - -[node name="Red" parent="." instance=ExtResource("1_ivbwl")] -modulate = Color(1, 0, 0, 1) -position = Vector2(260, 209) -scale = Vector2(0.1, 0.1) -mana_r = 10 -mana_g = 0 -mana_b = 0 - -[node name="Green" parent="." instance=ExtResource("1_ivbwl")] -modulate = Color(0, 1, 0, 1) -position = Vector2(886, 210) -scale = Vector2(1, 1) -mana_r = 0 -mana_g = 1000 -mana_b = 0 - -[node name="Blue" parent="." instance=ExtResource("1_ivbwl")] -modulate = Color(0, 0, 1, 1) -position = Vector2(583, 502) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 0 -mana_b = 100 diff --git a/maps/rgb.tscn b/maps/rgb.tscn deleted file mode 100644 index 2574fcc..0000000 --- a/maps/rgb.tscn +++ /dev/null @@ -1,29 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://de5ghicw2skkg"] - -[ext_resource type="PackedScene" uid="uid://bpd3l1iyb13h2" path="res://pool.tscn" id="1_icig8"] - -[node name="Map" type="Node2D"] - -[node name="Red" parent="." instance=ExtResource("1_icig8")] -modulate = Color(1, 0, 0, 1) -position = Vector2(260, 209) -scale = Vector2(0.316228, 0.316228) -mana_r = 100 -mana_g = 0 -mana_b = 0 - -[node name="Green" parent="." instance=ExtResource("1_icig8")] -modulate = Color(0, 1, 0, 1) -position = Vector2(886, 210) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 100 -mana_b = 0 - -[node name="Blue" parent="." instance=ExtResource("1_icig8")] -modulate = Color(0, 0, 1, 1) -position = Vector2(583, 502) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 0 -mana_b = 100 diff --git a/maps/rgb_sections.tscn b/maps/rgb_sections.tscn deleted file mode 100644 index c5c4f69..0000000 --- a/maps/rgb_sections.tscn +++ /dev/null @@ -1,541 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://65vslfrgjtly"] - -[ext_resource type="PackedScene" uid="uid://bpd3l1iyb13h2" path="res://pool.tscn" id="2_caufp"] - -[node name="Map" type="Node2D"] - -[node name="Red" parent="." instance=ExtResource("2_caufp")] -modulate = Color(1, 0, 0, 1) -position = Vector2(540, 177) -scale = Vector2(0.316228, 0.316228) -mana_r = 100 -mana_g = 0 -mana_b = 0 - -[node name="Green" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 1, 0, 1) -position = Vector2(779, 119) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 100 -mana_b = 0 - -[node name="Blue" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 0, 1, 1) -position = Vector2(722, 502) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 0 -mana_b = 100 - -[node name="Red2" parent="." instance=ExtResource("2_caufp")] -modulate = Color(1, 0, 0, 1) -position = Vector2(513, 210) -scale = Vector2(0.316228, 0.316228) -mana_r = 100 -mana_g = 0 -mana_b = 0 - -[node name="Red3" parent="." instance=ExtResource("2_caufp")] -modulate = Color(1, 0, 0, 1) -position = Vector2(449, 250) -scale = Vector2(0.316228, 0.316228) -mana_r = 100 -mana_g = 0 -mana_b = 0 - -[node name="Red4" parent="." instance=ExtResource("2_caufp")] -modulate = Color(1, 0, 0, 1) -position = Vector2(196, 312) -scale = Vector2(0.316228, 0.316228) -mana_r = 100 -mana_g = 0 -mana_b = 0 - -[node name="Red5" parent="." instance=ExtResource("2_caufp")] -modulate = Color(1, 0, 0, 1) -position = Vector2(332, 287) -scale = Vector2(0.316228, 0.316228) -mana_r = 100 -mana_g = 0 -mana_b = 0 - -[node name="Red6" parent="." instance=ExtResource("2_caufp")] -modulate = Color(1, 0, 0, 1) -position = Vector2(597, 85) -scale = Vector2(0.316228, 0.316228) -mana_r = 100 -mana_g = 0 -mana_b = 0 - -[node name="Red7" parent="." instance=ExtResource("2_caufp")] -modulate = Color(1, 0, 0, 1) -position = Vector2(483, 229) -scale = Vector2(0.316228, 0.316228) -mana_r = 100 -mana_g = 0 -mana_b = 0 - -[node name="Red8" parent="." instance=ExtResource("2_caufp")] -modulate = Color(1, 0, 0, 1) -position = Vector2(259, 310) -scale = Vector2(0.316228, 0.316228) -mana_r = 100 -mana_g = 0 -mana_b = 0 - -[node name="Red9" parent="." instance=ExtResource("2_caufp")] -modulate = Color(1, 0, 0, 1) -position = Vector2(628, 13) -scale = Vector2(0.316228, 0.316228) -mana_r = 100 -mana_g = 0 -mana_b = 0 - -[node name="Red10" parent="." instance=ExtResource("2_caufp")] -modulate = Color(1, 0, 0, 1) -position = Vector2(561, 154) -scale = Vector2(0.316228, 0.316228) -mana_r = 100 -mana_g = 0 -mana_b = 0 - -[node name="Red11" parent="." instance=ExtResource("2_caufp")] -modulate = Color(1, 0, 0, 1) -position = Vector2(600, 47) -scale = Vector2(0.316228, 0.316228) -mana_r = 100 -mana_g = 0 -mana_b = 0 - -[node name="Red12" parent="." instance=ExtResource("2_caufp")] -modulate = Color(1, 0, 0, 1) -position = Vector2(164, 309) -scale = Vector2(0.316228, 0.316228) -mana_r = 100 -mana_g = 0 -mana_b = 0 - -[node name="Red13" parent="." instance=ExtResource("2_caufp")] -modulate = Color(1, 0, 0, 1) -position = Vector2(289, 288) -scale = Vector2(0.316228, 0.316228) -mana_r = 100 -mana_g = 0 -mana_b = 0 - -[node name="Red14" parent="." instance=ExtResource("2_caufp")] -modulate = Color(1, 0, 0, 1) -position = Vector2(410, 263) -scale = Vector2(0.316228, 0.316228) -mana_r = 100 -mana_g = 0 -mana_b = 0 - -[node name="Red15" parent="." instance=ExtResource("2_caufp")] -modulate = Color(1, 0, 0, 1) -position = Vector2(366, 273) -scale = Vector2(0.316228, 0.316228) -mana_r = 100 -mana_g = 0 -mana_b = 0 - -[node name="Red16" parent="." instance=ExtResource("2_caufp")] -modulate = Color(1, 0, 0, 1) -position = Vector2(581, 118) -scale = Vector2(0.316228, 0.316228) -mana_r = 100 -mana_g = 0 -mana_b = 0 - -[node name="Green2" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 1, 0, 1) -position = Vector2(775, 85) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 100 -mana_b = 0 - -[node name="Green3" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 1, 0, 1) -position = Vector2(790, 161) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 100 -mana_b = 0 - -[node name="Green4" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 1, 0, 1) -position = Vector2(823, 219) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 100 -mana_b = 0 - -[node name="Green5" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 1, 0, 1) -position = Vector2(1145, 410) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 100 -mana_b = 0 - -[node name="Green6" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 1, 0, 1) -position = Vector2(860, 273) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 100 -mana_b = 0 - -[node name="Green7" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 1, 0, 1) -position = Vector2(1019, 374) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 100 -mana_b = 0 - -[node name="Green8" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 1, 0, 1) -position = Vector2(1082, 396) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 100 -mana_b = 0 - -[node name="Green9" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 1, 0, 1) -position = Vector2(1121, 403) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 100 -mana_b = 0 - -[node name="Green10" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 1, 0, 1) -position = Vector2(773, 50) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 100 -mana_b = 0 - -[node name="Green11" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 1, 0, 1) -position = Vector2(963, 342) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 100 -mana_b = 0 - -[node name="Green12" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 1, 0, 1) -position = Vector2(842, 250) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 100 -mana_b = 0 - -[node name="Green13" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 1, 0, 1) -position = Vector2(811, 185) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 100 -mana_b = 0 - -[node name="Green14" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 1, 0, 1) -position = Vector2(770, 15) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 100 -mana_b = 0 - -[node name="Green15" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 1, 0, 1) -position = Vector2(983, 363) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 100 -mana_b = 0 - -[node name="Green16" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 1, 0, 1) -position = Vector2(1051, 384) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 100 -mana_b = 0 - -[node name="Green17" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 1, 0, 1) -position = Vector2(941, 336) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 100 -mana_b = 0 - -[node name="Blue2" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 0, 1, 1) -position = Vector2(763, 511) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 0 -mana_b = 100 - -[node name="Blue3" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 0, 1, 1) -position = Vector2(803, 525) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 0 -mana_b = 100 - -[node name="Blue4" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 0, 1, 1) -position = Vector2(829, 534) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 0 -mana_b = 100 - -[node name="Blue5" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 0, 1, 1) -position = Vector2(933, 650) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 0 -mana_b = 100 - -[node name="Blue6" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 0, 1, 1) -position = Vector2(916, 631) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 0 -mana_b = 100 - -[node name="Blue7" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 0, 1, 1) -position = Vector2(362, 512) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 0 -mana_b = 100 - -[node name="Blue8" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 0, 1, 1) -position = Vector2(293, 588) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 0 -mana_b = 100 - -[node name="Blue9" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 0, 1, 1) -position = Vector2(698, 498) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 0 -mana_b = 100 - -[node name="Blue10" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 0, 1, 1) -position = Vector2(392, 494) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 0 -mana_b = 100 - -[node name="Blue11" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 0, 1, 1) -position = Vector2(336, 537) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 0 -mana_b = 100 - -[node name="Blue12" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 0, 1, 1) -position = Vector2(253, 646) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 0 -mana_b = 100 - -[node name="Blue13" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 0, 1, 1) -position = Vector2(662, 485) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 0 -mana_b = 100 - -[node name="Blue14" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 0, 1, 1) -position = Vector2(269, 616) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 0 -mana_b = 100 - -[node name="Blue15" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 0, 1, 1) -position = Vector2(878, 578) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 0 -mana_b = 100 - -[node name="Blue16" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 0, 1, 1) -position = Vector2(317, 561) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 0 -mana_b = 100 - -[node name="Blue17" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 0, 1, 1) -position = Vector2(626, 482) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 0 -mana_b = 100 - -[node name="Blue18" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 0, 1, 1) -position = Vector2(898, 606) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 0 -mana_b = 100 - -[node name="Blue19" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 0, 1, 1) -position = Vector2(853, 552) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 0 -mana_b = 100 - -[node name="Green18" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 1, 0, 1) -position = Vector2(885, 295) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 100 -mana_b = 0 - -[node name="Green19" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 1, 0, 1) -position = Vector2(914, 320) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 100 -mana_b = 0 - -[node name="Red17" parent="." instance=ExtResource("2_caufp")] -modulate = Color(1, 0, 0, 1) -position = Vector2(259, 310) -scale = Vector2(0.316228, 0.316228) -mana_r = 100 -mana_g = 0 -mana_b = 0 - -[node name="Red18" parent="." instance=ExtResource("2_caufp")] -modulate = Color(1, 0, 0, 1) -position = Vector2(227, 310) -scale = Vector2(0.316228, 0.316228) -mana_r = 100 -mana_g = 0 -mana_b = 0 - -[node name="Red19" parent="." instance=ExtResource("2_caufp")] -modulate = Color(1, 0, 0, 1) -position = Vector2(3, 323) -scale = Vector2(0.316228, 0.316228) -mana_r = 100 -mana_g = 0 -mana_b = 0 - -[node name="Red20" parent="." instance=ExtResource("2_caufp")] -modulate = Color(1, 0, 0, 1) -position = Vector2(29, 325) -scale = Vector2(0.316228, 0.316228) -mana_r = 100 -mana_g = 0 -mana_b = 0 - -[node name="Red21" parent="." instance=ExtResource("2_caufp")] -modulate = Color(1, 0, 0, 1) -position = Vector2(56, 320) -scale = Vector2(0.316228, 0.316228) -mana_r = 100 -mana_g = 0 -mana_b = 0 - -[node name="Red22" parent="." instance=ExtResource("2_caufp")] -modulate = Color(1, 0, 0, 1) -position = Vector2(93, 318) -scale = Vector2(0.316228, 0.316228) -mana_r = 100 -mana_g = 0 -mana_b = 0 - -[node name="Red23" parent="." instance=ExtResource("2_caufp")] -modulate = Color(1, 0, 0, 1) -position = Vector2(131, 317) -scale = Vector2(0.316228, 0.316228) -mana_r = 100 -mana_g = 0 -mana_b = 0 - -[node name="Blue20" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 0, 1, 1) -position = Vector2(598, 476) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 0 -mana_b = 100 - -[node name="Blue21" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 0, 1, 1) -position = Vector2(564, 471) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 0 -mana_b = 100 - -[node name="Blue22" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 0, 1, 1) -position = Vector2(530, 466) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 0 -mana_b = 100 - -[node name="Blue23" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 0, 1, 1) -position = Vector2(491, 462) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 0 -mana_b = 100 - -[node name="Blue24" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 0, 1, 1) -position = Vector2(458, 468) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 0 -mana_b = 100 - -[node name="Blue25" parent="." instance=ExtResource("2_caufp")] -modulate = Color(0, 0, 1, 1) -position = Vector2(428, 478) -scale = Vector2(0.316228, 0.316228) -mana_r = 0 -mana_g = 0 -mana_b = 100 diff --git a/maps/sections.gd b/maps/sections.gd index bd59f89..59e3c20 100644 --- a/maps/sections.gd +++ b/maps/sections.gd @@ -1,8 +1,7 @@ -extends Node2D +var root - -# Called when the node enters the scene tree for the first time. -func _ready(): +func create_map(root): + self.root=root pass # Replace with function body. poolcircle(Vector2(0,0),200,32,100,0,0) poolcircle(Vector2(600,0),200,32,0,100,0) @@ -19,7 +18,6 @@ func _process(delta): pass func poolcircle(pos: Vector2, radius, count, r,g,b): - for n in range(1,count+1): var new_pool: Pool = load("res://pool.tscn").instantiate() var t=(float(n)/count)*3.141*2 @@ -29,4 +27,4 @@ func poolcircle(pos: Vector2, radius, count, r,g,b): new_pool.mana_g=g new_pool.mana_b=b new_pool.get_node("StaticBody2D/CollisionShape2D2").disabled=true; - get_tree().root.get_node("Sim").call_deferred("add_child",new_pool) + root.call_deferred("add_child",new_pool) diff --git a/maps/sections.tscn b/maps/sections.tscn deleted file mode 100644 index 7f86a36..0000000 --- a/maps/sections.tscn +++ /dev/null @@ -1,6 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://bkapistmqmur8"] - -[ext_resource type="Script" path="res://maps/sections.gd" id="1_ihwvy"] - -[node name="Map" type="Node2D"] -script = ExtResource("1_ihwvy") diff --git a/maps/seperated.tscn b/maps/seperated.tscn deleted file mode 100644 index 60e158d..0000000 --- a/maps/seperated.tscn +++ /dev/null @@ -1,53 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://bc64eh8p22erv"] - -[ext_resource type="PackedScene" uid="uid://bpd3l1iyb13h2" path="res://pool.tscn" id="1_uxair"] - -[node name="Map" type="Node2D"] - -[node name="Pool" parent="." instance=ExtResource("1_uxair")] -modulate = Color(1, 1, 1, 1) -position = Vector2(576, 106) -scale = Vector2(1.73205, 1.73205) -mana_r = 1000 -mana_g = 1000 -mana_b = 1000 - -[node name="Pool2" parent="." instance=ExtResource("1_uxair")] -modulate = Color(1, 1, 1, 1) -position = Vector2(568, 249) -scale = Vector2(1.73205, 1.73205) -mana_r = 1000 -mana_g = 1000 -mana_b = 1000 - -[node name="Pool3" parent="." instance=ExtResource("1_uxair")] -modulate = Color(1, 1, 1, 1) -position = Vector2(573, 390) -scale = Vector2(1.73205, 1.73205) -mana_r = 1000 -mana_g = 1000 -mana_b = 1000 - -[node name="Pool4" parent="." instance=ExtResource("1_uxair")] -modulate = Color(1, 1, 1, 1) -position = Vector2(573, 557) -scale = Vector2(1.73205, 1.73205) -mana_r = 1000 -mana_g = 1000 -mana_b = 1000 - -[node name="Pool5" parent="." instance=ExtResource("1_uxair")] -modulate = Color(1, 0, 0, 1) -position = Vector2(217, 331) -scale = Vector2(1, 1) -mana_r = 1000 -mana_g = 0 -mana_b = 0 - -[node name="Pool6" parent="." instance=ExtResource("1_uxair")] -modulate = Color(0, 1, 0, 1) -position = Vector2(927, 324) -scale = Vector2(1, 1) -mana_r = 0 -mana_g = 1000 -mana_b = 0 diff --git a/maps/small.gd b/maps/small.gd new file mode 100644 index 0000000..99513e3 --- /dev/null +++ b/maps/small.gd @@ -0,0 +1,18 @@ +var root + +# Called when the node enters the scene tree for the first time. +func create_map(_root): + root=_root + poolcircle(Vector2(0,0),2000,100,1000,1000,1000) + +func poolcircle(pos: Vector2, radius, count, r,g,b): + for n in range(1,count+1): + var new_pool: Pool = load("res://pool.tscn").instantiate() + var t=(float(n)/count)*3.141*2 + print(t) + new_pool.position = pos + (Vector2(sin(t),cos(t))*radius) + new_pool.mana_r=r + new_pool.mana_g=g + new_pool.mana_b=b + new_pool.get_node("StaticBody2D/CollisionShape2D2").disabled=true; + root.call_deferred("add_child",new_pool) diff --git a/maps/source.tscn b/maps/source.tscn deleted file mode 100644 index 2d221cf..0000000 --- a/maps/source.tscn +++ /dev/null @@ -1,13 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://dh05x28usoabl"] - -[ext_resource type="PackedScene" uid="uid://bpd3l1iyb13h2" path="res://pool.tscn" id="2_3xoru"] - -[node name="Map" type="Node2D"] - -[node name="Pool" parent="." instance=ExtResource("2_3xoru")] -modulate = Color(1, 1, 1, 1) -position = Vector2(596, 330) -scale = Vector2(1.73205, 1.73205) -mana_r = 1000 -mana_g = 1000 -mana_b = 1000 diff --git a/project.godot b/project.godot index 7976fc7..d446b22 100644 --- a/project.godot +++ b/project.godot @@ -11,7 +11,7 @@ config_version=5 [application] config/name="RGB Physics Life" -run/main_scene="res://map_select.tscn" +run/main_scene="res://map_select/map_select.tscn" config/features=PackedStringArray("4.2", "Mobile") config/icon="res://images/icon.svg" diff --git a/test.tscn b/test.tscn deleted file mode 100644 index 1a71f89..0000000 --- a/test.tscn +++ /dev/null @@ -1,71 +0,0 @@ -[gd_scene load_steps=10 format=3 uid="uid://bkjmlky5ihri0"] - -[ext_resource type="Script" path="res://sim.gd" id="1_gqc3c"] -[ext_resource type="Script" path="res://Debug.gd" id="2_gfcm0"] -[ext_resource type="Script" path="res://TimerSS.gd" id="3_gvywt"] -[ext_resource type="Script" path="res://Camera2D.gd" id="4_1cl5t"] -[ext_resource type="PackedScene" uid="uid://65vslfrgjtly" path="res://maps/rgb_sections.tscn" id="5_6ne8u"] - -[sub_resource type="RectangleShape2D" id="RectangleShape2D_jlloy"] -size = Vector2(1152, 20) - -[sub_resource type="RectangleShape2D" id="RectangleShape2D_kvylm"] -size = Vector2(1152, 20) - -[sub_resource type="RectangleShape2D" id="RectangleShape2D_ygq31"] -size = Vector2(20, 648) - -[sub_resource type="RectangleShape2D" id="RectangleShape2D_piktq"] -size = Vector2(20, 648) - -[node name="Sim" type="Node2D"] -script = ExtResource("1_gqc3c") - -[node name="Debug" type="Label" parent="."] -offset_right = 67.0 -offset_bottom = 26.0 -text = "00:00:22 60 fps" -script = ExtResource("2_gfcm0") - -[node name="Timer" type="Timer" parent="."] -wait_time = 0.3 - -[node name="TimerSS" type="Timer" parent="."] -wait_time = 60.0 -script = ExtResource("3_gvywt") - -[node name="Camera2D" type="Camera2D" parent="."] -script = ExtResource("4_1cl5t") - -[node name="Map" parent="." instance=ExtResource("5_6ne8u")] - -[node name="_StaticBody2D_2" type="StaticBody2D" parent="."] -position = Vector2(576, 0) -collision_layer = 4 - -[node name="_CollisionShape2D_3" type="CollisionShape2D" parent="_StaticBody2D_2"] -shape = SubResource("RectangleShape2D_jlloy") - -[node name="_StaticBody2D_4" type="StaticBody2D" parent="."] -position = Vector2(576, 648) -collision_layer = 4 - -[node name="_CollisionShape2D_5" type="CollisionShape2D" parent="_StaticBody2D_4"] -shape = SubResource("RectangleShape2D_kvylm") - -[node name="_StaticBody2D_6" type="StaticBody2D" parent="."] -position = Vector2(0, 324) -collision_layer = 4 - -[node name="_CollisionShape2D_7" type="CollisionShape2D" parent="_StaticBody2D_6"] -shape = SubResource("RectangleShape2D_ygq31") - -[node name="_StaticBody2D_8" type="StaticBody2D" parent="."] -position = Vector2(1152, 324) -collision_layer = 4 - -[node name="_CollisionShape2D_9" type="CollisionShape2D" parent="_StaticBody2D_8"] -shape = SubResource("RectangleShape2D_piktq") - -[connection signal="timeout" from="Timer" to="." method="_on_timer_timeout"] -[connection signal="timeout" from="TimerSS" to="TimerSS" method="_on_timeout"]