diff --git a/project/Clothes.tscn b/project/Clothes.tscn index 7588add..16506a2 100644 --- a/project/Clothes.tscn +++ b/project/Clothes.tscn @@ -50,7 +50,7 @@ content_margin_right = -1.0 content_margin_top = -1.0 content_margin_bottom = -1.0 -[node name="Clothes" type="Node"] +[node name="Clothes" type="Node" index="0"] script = ExtResource( 1 ) @@ -110,7 +110,6 @@ _sections_unfolded = [ "custom_colors", "custom_styles" ] [node name="Pants" type="Tabs" parent="RefRect/Wordrobe" index="0"] -visible = false anchor_left = 0.0 anchor_top = 0.0 anchor_right = 1.0 @@ -719,6 +718,7 @@ _sections_unfolded = [ "Textures" ] [node name="Accessoires" type="Tabs" parent="RefRect/Wordrobe" index="3"] +visible = false anchor_left = 0.0 anchor_top = 0.0 anchor_right = 1.0 @@ -773,7 +773,7 @@ group = null texture_normal = ExtResource( 24 ) _sections_unfolded = [ "Rect", "Textures" ] -[node name="RemoveAccessoryBtn" type="Button" parent="RefRect/Wordrobe/Accessoires/AccessoiresGrid" index="1"] +[node name="Remove Accessory" type="Button" parent="RefRect/Wordrobe/Accessoires/AccessoiresGrid" index="1"] anchor_left = 0.0 anchor_top = 0.0 @@ -899,6 +899,6 @@ __meta__ = { [connection signal="pressed" from="RefRect/Wordrobe/Accessoires/AccessoiresGrid/Camera" to="." method="_on_Camera_pressed"] -[connection signal="pressed" from="RefRect/Wordrobe/Accessoires/AccessoiresGrid/RemoveAccessoryBtn" to="." method="_on_RemoveAccessoryBtn_pressed"] +[connection signal="pressed" from="RefRect/Wordrobe/Accessoires/AccessoiresGrid/Remove Accessory" to="." method="_on_Remove_Accessory_pressed"] diff --git a/project/src/Clothes.gd b/project/src/Clothes.gd index 43c9a60..605d0e9 100644 --- a/project/src/Clothes.gd +++ b/project/src/Clothes.gd @@ -41,6 +41,15 @@ func change_accessoires(new_accessory): $Body/Accessory.texture = accessory +func _on_Remove_Shirt_pressed(): + change_tops(null) + +func _on_Remove_Pants_pressed(): + change_bottoms(null) + +func _on_Remove_Accessory_pressed(): + change_accessoires(null) + func _on_DJ_Shorts_pressed(): change_bottoms(load("res://assets/dj_shorts.png")) @@ -96,17 +105,8 @@ func _on_Blue_Camo_Jeans_pressed(): func _on_Whats_New_Shirt_pressed(): change_tops(load("res://assets/whatsnew_shirt.png")) -func _on_Remove_Shirt_pressed(): - change_tops(null) - -func _on_Remove_Pants_pressed(): - change_bottoms(null) - func _on_Fundosi_pressed(): change_undies(load("res://assets/fundosi.png")) func _on_Camera_pressed(): change_accessoires(load("res://assets/camera.png")) - -func _on_RemoveAccessoryBtn_pressed(): - change_accessoires(null)