diff --git a/.godot/editor/BP.tscn-editstate-cc4ae2e0d275770b6e043005d50db181.cfg b/.godot/editor/BP.tscn-editstate-cc4ae2e0d275770b6e043005d50db181.cfg index 71ac4b8..f0d7131 100644 --- a/.godot/editor/BP.tscn-editstate-cc4ae2e0d275770b6e043005d50db181.cfg +++ b/.godot/editor/BP.tscn-editstate-cc4ae2e0d275770b6e043005d50db181.cfg @@ -8,7 +8,7 @@ Anim={ "grid_snap_active": false, "grid_step": Vector2(8, 8), "grid_visibility": 1, -"ofs": Vector2(-55.2972, 1.30959), +"ofs": Vector2(-360.005, -103.269), "primary_grid_steps": 8, "show_edit_locks": true, "show_guides": true, @@ -32,7 +32,7 @@ Anim={ "snap_rotation_step": 0.261799, "snap_scale": false, "snap_scale_step": 0.1, -"zoom": 2.37841 +"zoom": 0.840896 } 3D={ "fov": 70.01, diff --git a/.godot/editor/BP.tscn-folding-cc4ae2e0d275770b6e043005d50db181.cfg b/.godot/editor/BP.tscn-folding-cc4ae2e0d275770b6e043005d50db181.cfg index bf2e6ef..4fd7179 100644 --- a/.godot/editor/BP.tscn-folding-cc4ae2e0d275770b6e043005d50db181.cfg +++ b/.godot/editor/BP.tscn-folding-cc4ae2e0d275770b6e043005d50db181.cfg @@ -1,5 +1,5 @@ [folding] -node_unfolds=[NodePath("Girl/Sprite2D/Area2D"), PackedStringArray("Transform"), NodePath("Bow"), PackedStringArray("Texture", "theme_override_styles/panel", "Theme Overrides", "Theme Overrides/styles", "Layout", "Layout/Transform"), NodePath("Bow2"), PackedStringArray("Theme Overrides", "Theme Overrides/styles", "theme_override_styles/panel")] -resource_unfolds=["res://BP.tscn::CircleShape2D_y5fdt", PackedStringArray(), "res://BP.tscn::StyleBoxTexture_jwptn", PackedStringArray(), "res://BP.tscn::RectangleShape2D_fyrsd", PackedStringArray(), "res://BP.tscn::StyleBoxTexture_n1olx", PackedStringArray()] -nodes_folded=[] +node_unfolds=[NodePath("Paperdoll/Hair_Accessory"), PackedStringArray("Transform"), NodePath("Paperdoll/Hat/CollisionShape2D"), PackedStringArray("shape"), NodePath("Paperdoll/Bottoms/CollisionShape2D"), PackedStringArray("Transform"), NodePath("Paperdoll/Shoes/CollisionShape2D"), PackedStringArray("Transform"), NodePath("Bow"), PackedStringArray("Texture", "theme_override_styles/panel", "Theme Overrides", "Theme Overrides/styles", "Layout", "Layout/Transform"), NodePath("GodotHead"), PackedStringArray("Theme Overrides", "Theme Overrides/styles", "theme_override_styles/panel")] +resource_unfolds=["res://BP.tscn::CircleShape2D_y5fdt", PackedStringArray(), "res://BP.tscn::CircleShape2D_76h34", PackedStringArray(), "res://BP.tscn::CircleShape2D_it84w", PackedStringArray(), "res://BP.tscn::CircleShape2D_731wn", PackedStringArray(), "res://BP.tscn::CircleShape2D_cvwod", PackedStringArray(), "res://BP.tscn::RectangleShape2D_8wmnj", PackedStringArray(), "res://BP.tscn::StyleBoxTexture_jwptn", PackedStringArray(), "res://BP.tscn::RectangleShape2D_fyrsd", PackedStringArray(), "res://BP.tscn::StyleBoxTexture_n1olx", PackedStringArray()] +nodes_folded=[NodePath("Paperdoll/Hair_Accessory"), NodePath("Paperdoll/Hat"), NodePath("Paperdoll/Necklace"), NodePath("Paperdoll/Bracelet"), NodePath("Paperdoll/Bracelet2"), NodePath("Paperdoll/Dress"), NodePath("Paperdoll/Top"), NodePath("Paperdoll/Bottoms"), NodePath("Paperdoll/Shoes")] diff --git a/.godot/editor/script_editor_cache.cfg b/.godot/editor/script_editor_cache.cfg index 8349c26..a682811 100644 --- a/.godot/editor/script_editor_cache.cfg +++ b/.godot/editor/script_editor_cache.cfg @@ -6,7 +6,7 @@ state={ "column": 0, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 11, +"row": 1, "scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" @@ -17,10 +17,10 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 7, +"column": 0, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 13, +"row": 1, "scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" @@ -31,10 +31,10 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 0, +"column": 17, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 0, +"row": 2, "scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" diff --git a/BP.tscn b/BP.tscn index ec04a56..c004f38 100644 --- a/BP.tscn +++ b/BP.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=3 uid="uid://ciru6mxnwvvu1"] +[gd_scene load_steps=16 format=3 uid="uid://ciru6mxnwvvu1"] [ext_resource type="Script" path="res://BP.gd" id="1_y7bav"] [ext_resource type="Texture2D" uid="uid://c23xw3kwtxvyd" path="res://res/girl.png" id="2_2k77g"] @@ -10,6 +10,21 @@ [sub_resource type="CircleShape2D" id="CircleShape2D_y5fdt"] radius = 107.197 +[sub_resource type="CircleShape2D" id="CircleShape2D_76h34"] +radius = 168.321 + +[sub_resource type="CircleShape2D" id="CircleShape2D_it84w"] +radius = 113.481 + +[sub_resource type="CircleShape2D" id="CircleShape2D_731wn"] +radius = 269.804 + +[sub_resource type="CircleShape2D" id="CircleShape2D_cvwod"] +radius = 245.356 + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_8wmnj"] +size = Vector2(676.203, 329.845) + [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_jwptn"] texture = ExtResource("3_tw0uh") @@ -22,19 +37,110 @@ texture = ExtResource("4_iap7x") [node name="BP" type="Node"] script = ExtResource("1_y7bav") -[node name="Girl" type="Node" parent="."] +[node name="Paperdoll" type="Node" parent="."] -[node name="Sprite2D" type="Sprite2D" parent="Girl"] +[node name="Sprite2D" type="Sprite2D" parent="Paperdoll"] position = Vector2(216, 328) scale = Vector2(0.285417, 0.284982) texture = ExtResource("2_2k77g") -[node name="Area2D" type="Area2D" parent="Girl/Sprite2D"] -position = Vector2(28.0292, -1017.61) +[node name="Hair_Accessory" type="Area2D" parent="Paperdoll"] +position = Vector2(224, 38) +scale = Vector2(0.285417, 0.284982) script = ExtResource("3_bptr4") +target = "hair_accessory" +metadata/_edit_lock_ = true -[node name="CollisionShape2D" type="CollisionShape2D" parent="Girl/Sprite2D/Area2D"] +[node name="CollisionShape2D" type="CollisionShape2D" parent="Paperdoll/Hair_Accessory"] shape = SubResource("CircleShape2D_y5fdt") +metadata/_edit_lock_ = true + +[node name="Hat" type="Area2D" parent="Paperdoll"] +position = Vector2(199, 41.9999) +scale = Vector2(0.285417, 0.284982) +script = ExtResource("3_bptr4") +target = "hat" +metadata/_edit_lock_ = true + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Paperdoll/Hat"] +shape = SubResource("CircleShape2D_76h34") +metadata/_edit_lock_ = true + +[node name="Necklace" type="Area2D" parent="Paperdoll"] +position = Vector2(193, 142) +scale = Vector2(0.285417, 0.284982) +script = ExtResource("3_bptr4") +target = "necklace" +metadata/_edit_lock_ = true + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Paperdoll/Necklace"] +position = Vector2(3.5036, -14.0362) +shape = SubResource("CircleShape2D_it84w") +metadata/_edit_lock_ = true + +[node name="Bracelet" type="Area2D" parent="Paperdoll"] +position = Vector2(320, 321) +scale = Vector2(0.285417, 0.284982) +script = ExtResource("3_bptr4") +target = "bracelet" + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Paperdoll/Bracelet"] +position = Vector2(3.5036, -14.0362) +shape = SubResource("CircleShape2D_it84w") + +[node name="Bracelet2" type="Area2D" parent="Paperdoll"] +position = Vector2(98, 320) +scale = Vector2(0.285417, 0.284982) +script = ExtResource("3_bptr4") +target = "bracelet" + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Paperdoll/Bracelet2"] +position = Vector2(3.5036, -14.0362) +shape = SubResource("CircleShape2D_it84w") + +[node name="Dress" type="Area2D" parent="Paperdoll"] +position = Vector2(194, 199) +scale = Vector2(0.285417, 0.284982) +script = ExtResource("3_bptr4") +target = "dress" +metadata/_edit_lock_ = true + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Paperdoll/Dress"] +position = Vector2(3.5036, -14.0362) +shape = SubResource("CircleShape2D_731wn") +metadata/_edit_lock_ = true + +[node name="Top" type="Area2D" parent="Paperdoll"] +position = Vector2(194, 199) +scale = Vector2(0.285417, 0.284982) +script = ExtResource("3_bptr4") +target = "top" +metadata/_edit_lock_ = true + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Paperdoll/Top"] +position = Vector2(3.5036, -14.0362) +shape = SubResource("CircleShape2D_731wn") +metadata/_edit_lock_ = true + +[node name="Bottoms" type="Area2D" parent="Paperdoll"] +position = Vector2(192, 300) +scale = Vector2(0.285417, 0.284982) +script = ExtResource("3_bptr4") +target = "bottom" +metadata/_edit_lock_ = true + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Paperdoll/Bottoms"] +position = Vector2(3.5036, -14.0362) +shape = SubResource("CircleShape2D_cvwod") + +[node name="Shoes" type="Area2D" parent="Paperdoll"] +position = Vector2(213, 591) +scale = Vector2(0.285417, 0.284982) +script = ExtResource("3_bptr4") +target = "shoes" + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Paperdoll/Shoes"] +shape = SubResource("RectangleShape2D_8wmnj") [node name="Bow" type="PanelContainer" parent="." groups=["apparel", "hair_accessory"]] offset_left = 398.0 @@ -50,20 +156,28 @@ script = ExtResource("3_wgl4m") position = Vector2(22.5, 38.5) shape = SubResource("RectangleShape2D_fyrsd") -[node name="Bow2" type="PanelContainer" parent="." groups=["apparel"]] -offset_left = 398.0 -offset_top = 62.0 -offset_right = 444.0 -offset_bottom = 138.0 +[node name="GodotHead" type="PanelContainer" parent="." groups=["apparel", "bracelet"]] +offset_left = 457.0 +offset_top = 13.0 +offset_right = 503.0 +offset_bottom = 89.0 theme_override_styles/panel = SubResource("StyleBoxTexture_n1olx") script = ExtResource("3_wgl4m") -[node name="Area2D" type="Area2D" parent="Bow2"] +[node name="Area2D" type="Area2D" parent="GodotHead"] -[node name="CollisionShape2D" type="CollisionShape2D" parent="Bow2/Area2D"] +[node name="CollisionShape2D" type="CollisionShape2D" parent="GodotHead/Area2D"] position = Vector2(22.5, 38.5) shape = SubResource("RectangleShape2D_fyrsd") -[connection signal="area_entered" from="Girl/Sprite2D/Area2D" to="Girl/Sprite2D/Area2D" method="_on_area_entered"] +[connection signal="area_entered" from="Paperdoll/Hair_Accessory" to="Paperdoll/Hair_Accessory" method="_on_area_entered"] +[connection signal="area_entered" from="Paperdoll/Hat" to="Paperdoll/Hat" method="_on_area_entered"] +[connection signal="area_entered" from="Paperdoll/Necklace" to="Paperdoll/Necklace" method="_on_area_entered"] +[connection signal="area_entered" from="Paperdoll/Bracelet" to="Paperdoll/Bracelet" method="_on_area_entered"] +[connection signal="area_entered" from="Paperdoll/Bracelet2" to="Paperdoll/Bracelet2" method="_on_area_entered"] +[connection signal="area_entered" from="Paperdoll/Dress" to="Paperdoll/Dress" method="_on_area_entered"] +[connection signal="area_entered" from="Paperdoll/Top" to="Paperdoll/Top" method="_on_area_entered"] +[connection signal="area_entered" from="Paperdoll/Bottoms" to="Paperdoll/Bottoms" method="_on_area_entered"] +[connection signal="area_entered" from="Paperdoll/Shoes" to="Paperdoll/Shoes" method="_on_area_entered"] [connection signal="gui_input" from="Bow" to="Bow" method="_on_gui_input"] -[connection signal="gui_input" from="Bow2" to="Bow2" method="_on_gui_input"] +[connection signal="gui_input" from="GodotHead" to="GodotHead" method="_on_gui_input"] diff --git a/Snaps.gd b/Snaps.gd index 0029e0c..37ad108 100644 --- a/Snaps.gd +++ b/Snaps.gd @@ -1,8 +1,10 @@ extends Area2D +@export var target: String = "apparel" + func _on_area_entered(area): var apparel = area.get_parent() - if !apparel.is_in_group("hair_accessory"): + if !apparel.is_in_group(target): return apparel.track = false apparel.global_position = global_position