diff --git a/project/ClassicInterface.tscn b/project/ClassicInterface.tscn index 1f193ab..0ab44da 100644 --- a/project/ClassicInterface.tscn +++ b/project/ClassicInterface.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=3 format=2] [ext_resource path="res://src/Interface.gd" type="Script" id=1] -[ext_resource path="res://music/song.ogg" type="AudioStream" id=2] -[ext_resource path="res://WinDialogs.tscn" type="PackedScene" id=3] +[ext_resource path="res://WinDialogs.tscn" type="PackedScene" id=2] [node name="Interface" type="Control"] @@ -21,16 +20,7 @@ size_flags_horizontal = 1 size_flags_vertical = 1 script = ExtResource( 1 ) -[node name="Music" type="AudioStreamPlayer" parent="." index="0"] - -stream = ExtResource( 2 ) -volume_db = 0.0 -pitch_scale = 1.0 -autoplay = false -mix_target = 0 -bus = "Master" - -[node name="RefRect" type="ReferenceRect" parent="." index="1"] +[node name="RefRect" type="ReferenceRect" parent="." index="0"] anchor_left = 0.0 anchor_top = 0.0 @@ -65,42 +55,14 @@ size_flags_horizontal = 1 size_flags_vertical = 1 alignment = 0 -[node name="MusicBtn" type="CheckBox" parent="RefRect/VertContainer" index="0"] +[node name="ModernBtn" type="Button" parent="RefRect/VertContainer" index="0"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_right = 147.0 -margin_bottom = 24.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -focus_mode = 2 -mouse_filter = 0 -mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 -size_flags_vertical = 1 -custom_colors/font_color = Color( 0, 0, 0, 1 ) -custom_colors/font_color_hover = Color( 0, 0, 0, 1 ) -custom_colors/font_color_pressed = Color( 0, 0, 0, 1 ) -toggle_mode = true -enabled_focus_mode = 2 -shortcut = null -group = null -text = "KMUS" -flat = false -align = 1 -_sections_unfolded = [ "custom_colors" ] - -[node name="ModernBtn" type="Button" parent="RefRect/VertContainer" index="1"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_top = 28.0 -margin_right = 147.0 -margin_bottom = 48.0 +margin_bottom = 20.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -116,15 +78,39 @@ text = "Modern" flat = false align = 1 +[node name="SettingsBtn" type="Button" parent="RefRect/VertContainer" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 24.0 +margin_right = 147.0 +margin_bottom = 44.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +focus_mode = 2 +mouse_filter = 0 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +toggle_mode = false +enabled_focus_mode = 2 +shortcut = null +group = null +text = "KSET" +flat = false +align = 1 + [node name="AboutBtn" type="Button" parent="RefRect/VertContainer" index="2"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 52.0 +margin_top = 48.0 margin_right = 147.0 -margin_bottom = 72.0 +margin_bottom = 68.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -141,12 +127,12 @@ flat = false align = 1 _sections_unfolded = [ "Margin" ] -[node name="WinDialogs" parent="." index="2" instance=ExtResource( 3 )] - -[connection signal="toggled" from="RefRect/VertContainer/MusicBtn" to="." method="_on_MusicBtn_toggled"] +[node name="WinDialogs" parent="." index="1" instance=ExtResource( 2 )] [connection signal="pressed" from="RefRect/VertContainer/ModernBtn" to="." method="_on_ModernBtn_pressed"] +[connection signal="pressed" from="RefRect/VertContainer/SettingsBtn" to="." method="_on_SettingsBtn_pressed"] + [connection signal="pressed" from="RefRect/VertContainer/AboutBtn" to="." method="_on_AboutBtn_pressed"] diff --git a/project/Clothes.tscn b/project/Clothes.tscn index 8983fb3..1a27344 100644 --- a/project/Clothes.tscn +++ b/project/Clothes.tscn @@ -25,14 +25,14 @@ [ext_resource path="res://assets/bottoms_placeholder.png" type="Texture" id=23] [ext_resource path="res://assets/tops_placeholder.png" type="Texture" id=24] -[sub_resource type="StyleBoxEmpty" id=3] +[sub_resource type="StyleBoxEmpty" id=1] content_margin_left = -1.0 content_margin_right = -1.0 content_margin_top = -1.0 content_margin_bottom = -1.0 -[sub_resource type="StyleBoxEmpty" id=4] +[sub_resource type="StyleBoxEmpty" id=2] resource_local_to_scene = true content_margin_left = 5.0 @@ -41,14 +41,14 @@ content_margin_top = 5.0 content_margin_bottom = 10.0 _sections_unfolded = [ "Content Margin", "Resource" ] -[sub_resource type="StyleBoxEmpty" id=5] +[sub_resource type="StyleBoxEmpty" id=3] content_margin_left = -1.0 content_margin_right = -1.0 content_margin_top = -1.0 content_margin_bottom = -1.0 -[node name="Clothes" type="Node" index="0"] +[node name="Clothes" type="Node"] script = ExtResource( 1 ) @@ -59,11 +59,8 @@ texture = ExtResource( 2 ) [node name="Lights" type="Sprite" parent="." index="1"] -position = Vector2( 485.001, 133 ) +position = Vector2( 485.001, 160 ) texture = ExtResource( 3 ) -__meta__ = { -"_edit_lock_": true -} [node name="RefRect" type="ReferenceRect" parent="." index="2"] @@ -100,9 +97,9 @@ mouse_filter = 0 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 -custom_styles/tab_fg = SubResource( 3 ) -custom_styles/tab_bg = SubResource( 4 ) -custom_styles/panel = SubResource( 5 ) +custom_styles/tab_fg = SubResource( 1 ) +custom_styles/tab_bg = SubResource( 2 ) +custom_styles/panel = SubResource( 3 ) custom_colors/font_color_bg = Color( 1, 1, 1, 1 ) custom_colors/font_color_fg = Color( 0.980392, 0.992157, 0.768627, 1 ) tab_align = 0 diff --git a/project/Interface.tscn b/project/Interface.tscn index c89b015..ab0f34d 100644 --- a/project/Interface.tscn +++ b/project/Interface.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=3 format=2] [ext_resource path="res://src/Interface.gd" type="Script" id=1] -[ext_resource path="res://music/song.ogg" type="AudioStream" id=2] -[ext_resource path="res://WinDialogs.tscn" type="PackedScene" id=3] +[ext_resource path="res://WinDialogs.tscn" type="PackedScene" id=2] [node name="Interface" type="Control" index="0"] @@ -21,16 +20,7 @@ size_flags_horizontal = 1 size_flags_vertical = 1 script = ExtResource( 1 ) -[node name="Music" type="AudioStreamPlayer" parent="." index="0"] - -stream = ExtResource( 2 ) -volume_db = 0.0 -pitch_scale = 1.0 -autoplay = false -mix_target = 0 -bus = "Master" - -[node name="GMRefRect" type="ReferenceRect" parent="." index="1"] +[node name="GMRefRect" type="ReferenceRect" parent="." index="0"] anchor_left = 0.0 anchor_top = 0.0 @@ -65,42 +55,13 @@ size_flags_vertical = 1 alignment = 0 _sections_unfolded = [ "Margin" ] -[node name="SettingsBtn" type="Button" parent="GMRefRect/GMenuHbox" index="0"] +[node name="ClassicBtn" type="Button" parent="GMRefRect/GMenuHbox" index="0"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_right = 41.0 -margin_bottom = 22.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -focus_mode = 2 -mouse_filter = 0 -mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 -size_flags_vertical = 1 -custom_colors/font_color_disabled = Color( 0, 0, 0, 1 ) -custom_colors/font_color = Color( 0, 0, 0, 1 ) -custom_colors/font_color_hover = Color( 0, 0, 0, 1 ) -custom_colors/font_color_pressed = Color( 0, 0, 0, 1 ) -toggle_mode = false -enabled_focus_mode = 2 -shortcut = null -group = null -text = "KSET" -flat = true -align = 1 -_sections_unfolded = [ "custom_colors" ] - -[node name="ClassicBtn" type="Button" parent="GMRefRect/GMenuHbox" index="1"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_left = 45.0 -margin_right = 87.0 +margin_right = 42.0 margin_bottom = 22.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -122,6 +83,35 @@ flat = true align = 1 _sections_unfolded = [ "custom_colors", "custom_constants" ] +[node name="SettingsBtn" type="Button" parent="GMRefRect/GMenuHbox" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 46.0 +margin_right = 87.0 +margin_bottom = 22.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +focus_mode = 2 +mouse_filter = 0 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +custom_colors/font_color_disabled = Color( 0, 0, 0, 1 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_colors/font_color_hover = Color( 0, 0, 0, 1 ) +custom_colors/font_color_pressed = Color( 0, 0, 0, 1 ) +toggle_mode = false +enabled_focus_mode = 2 +shortcut = null +group = null +text = "KSET" +flat = true +align = 1 +_sections_unfolded = [ "custom_colors" ] + [node name="AboutBtn" type="Button" parent="GMRefRect/GMenuHbox" index="2"] anchor_left = 0.0 @@ -151,12 +141,12 @@ flat = true align = 1 _sections_unfolded = [ "Margin", "custom_colors" ] -[node name="WinDialogs" parent="." index="2" instance=ExtResource( 3 )] - -[connection signal="pressed" from="GMRefRect/GMenuHbox/SettingsBtn" to="." method="_on_SettingsBtn_pressed"] +[node name="WinDialogs" parent="." index="1" instance=ExtResource( 2 )] [connection signal="pressed" from="GMRefRect/GMenuHbox/ClassicBtn" to="." method="_on_ClassicBtn_pressed"] +[connection signal="pressed" from="GMRefRect/GMenuHbox/SettingsBtn" to="." method="_on_SettingsBtn_pressed"] + [connection signal="pressed" from="GMRefRect/GMenuHbox/AboutBtn" to="." method="_on_AboutBtn_pressed"] diff --git a/project/WinDialogs.tscn b/project/WinDialogs.tscn index 070c872..6957bc9 100644 --- a/project/WinDialogs.tscn +++ b/project/WinDialogs.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=3 format=2] [ext_resource path="res://src/WinDialogs.gd" type="Script" id=1] +[ext_resource path="res://music/song.ogg" type="AudioStream" id=2] [node name="WinDialogs" type="Control"] @@ -16,7 +17,16 @@ size_flags_horizontal = 1 size_flags_vertical = 1 script = ExtResource( 1 ) -[node name="AboutWin" type="WindowDialog" parent="." index="0"] +[node name="Music" type="AudioStreamPlayer" parent="." index="0"] + +stream = ExtResource( 2 ) +volume_db = 0.0 +pitch_scale = 1.0 +autoplay = false +mix_target = 0 +bus = "Master" + +[node name="AboutWin" type="WindowDialog" parent="." index="1"] visible = false anchor_left = 0.0 @@ -169,7 +179,7 @@ text = "Ok" flat = false align = 1 -[node name="CreditsWin" type="AcceptDialog" parent="." index="1"] +[node name="CreditsWin" type="AcceptDialog" parent="." index="2"] editor/display_folded = true visible = false @@ -246,9 +256,8 @@ selection_enabled = true override_selected_font_color = false _sections_unfolded = [ "BBCode" ] -[node name="SettingsWin" type="AcceptDialog" parent="." index="2"] +[node name="SettingsWin" type="AcceptDialog" parent="." index="3"] -editor/display_folded = true visible = false anchor_left = 0.0 anchor_top = 0.0 @@ -338,7 +347,7 @@ text = "KMUS" flat = false align = 1 -[node name="LicenseWin" type="AcceptDialog" parent="." index="3"] +[node name="LicenseWin" type="AcceptDialog" parent="." index="4"] editor/display_folded = true visible = false @@ -425,4 +434,6 @@ _sections_unfolded = [ "BBCode" ] [connection signal="pressed" from="AboutWin/AboutRefRect/AboutBtnHBox/CloseAbtBtn" to="." method="_on_CloseAbtBtn_pressed"] +[connection signal="toggled" from="SettingsWin/Grid/MusicBtn" to="." method="_on_MusicBtn_toggled"] + diff --git a/project/assets/dressup_wardrobe.png b/project/assets/dressup_wardrobe.png index b654f6a..96779ec 100644 Binary files a/project/assets/dressup_wardrobe.png and b/project/assets/dressup_wardrobe.png differ diff --git a/project/src/Interface.gd b/project/src/Interface.gd index ccc521d..a7bfc94 100644 --- a/project/src/Interface.gd +++ b/project/src/Interface.gd @@ -8,21 +8,8 @@ func _on_AboutBtn_pressed(): func _on_SettingsBtn_pressed(): $WinDialogs/SettingsWin.show() -func _on_MusicBtn_toggled(button_pressed): - if button_pressed == true: - $Music.playing = true - else: - $Music.playing = false - func _on_ClassicBtn_pressed(): - if $Music.playing == true: - $Music.playing = false - get_tree().change_scene("res://ClassicScreen.tscn") - func _on_ModernBtn_pressed(): - if $Music.playing == true: - $Music.playing = false - get_tree().change_scene("res://GameScreen.tscn") diff --git a/project/src/WinDialogs.gd b/project/src/WinDialogs.gd index a5d8fa1..50b81e3 100644 --- a/project/src/WinDialogs.gd +++ b/project/src/WinDialogs.gd @@ -9,4 +9,10 @@ func _on_LicenseBtn_pressed(): $SettingsWin.show() func _on_CloseAbtBtn_pressed(): - $AboutWin.hide() \ No newline at end of file + $AboutWin.hide() + +func _on_MusicBtn_toggled(button_pressed): + if button_pressed == true: + $Music.playing = true + else: + $Music.playing = false \ No newline at end of file