diff --git a/.gitignore b/.gitignore index a36f313..e3803f3 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ .import/ export.cfg export_presets.cfg +*.log # Mono-specific ignores .mono/ diff --git a/project/ClassicInterface.tscn b/project/ClassicGUI.tscn similarity index 73% rename from project/ClassicInterface.tscn rename to project/ClassicGUI.tscn index 0ab44da..caacf43 100644 --- a/project/ClassicInterface.tscn +++ b/project/ClassicGUI.tscn @@ -55,7 +55,7 @@ size_flags_horizontal = 1 size_flags_vertical = 1 alignment = 0 -[node name="ModernBtn" type="Button" parent="RefRect/VertContainer" index="0"] +[node name="ExitBtn" type="Button" parent="RefRect/VertContainer" index="0"] anchor_left = 0.0 anchor_top = 0.0 @@ -74,7 +74,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -text = "Modern" +text = "KEXT" flat = false align = 1 @@ -102,37 +102,10 @@ 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 = 48.0 -margin_right = 147.0 -margin_bottom = 68.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 = "KABO" -flat = false -align = 1 -_sections_unfolded = [ "Margin" ] - [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/ExitBtn" to="." method="_on_ExitBtn_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/ClassicScreen.tscn b/project/ClassicScn.tscn similarity index 86% rename from project/ClassicScreen.tscn rename to project/ClassicScn.tscn index ca6bb23..1fb1302 100644 --- a/project/ClassicScreen.tscn +++ b/project/ClassicScn.tscn @@ -1,11 +1,13 @@ [gd_scene load_steps=7 format=2] [ext_resource path="res://src/GameScreen.gd" type="Script" id=1] -[ext_resource path="res://assets/dress_up_bg.png" type="Texture" id=2] +[ext_resource path="res://assets/classic_dress_up_bg.png" type="Texture" id=2] [ext_resource path="res://assets/lights.png" type="Texture" id=3] [ext_resource path="res://Zack.tscn" type="PackedScene" id=4] [ext_resource path="res://ClassicClothes.tscn" type="PackedScene" id=5] -[ext_resource path="res://ClassicInterface.tscn" type="PackedScene" id=6] +[ext_resource path="res://ClassicGUI.tscn" type="PackedScene" id=6] + + [node name="GameScreen" type="Node"] diff --git a/project/Interface.tscn b/project/GUI.tscn similarity index 71% rename from project/Interface.tscn rename to project/GUI.tscn index ab0f34d..8bb4b22 100644 --- a/project/Interface.tscn +++ b/project/GUI.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://src/Interface.gd" type="Script" id=1] [ext_resource path="res://WinDialogs.tscn" type="PackedScene" id=2] -[node name="Interface" type="Control" index="0"] +[node name="Interface" type="Control"] anchor_left = 0.0 anchor_top = 0.0 @@ -44,7 +44,9 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 1.0 anchor_bottom = 1.0 -margin_right = -20.0 +margin_left = 10.0 +margin_top = 2.0 +margin_right = -10.0 margin_bottom = -6.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -55,14 +57,14 @@ size_flags_vertical = 1 alignment = 0 _sections_unfolded = [ "Margin" ] -[node name="ClassicBtn" type="Button" parent="GMRefRect/GMenuHbox" index="0"] +[node name="ExitBtn" 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 = 42.0 -margin_bottom = 22.0 +margin_bottom = 20.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -78,7 +80,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -text = "KCLS" +text = "KEXT" flat = true align = 1 _sections_unfolded = [ "custom_colors", "custom_constants" ] @@ -91,7 +93,7 @@ anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 46.0 margin_right = 87.0 -margin_bottom = 22.0 +margin_bottom = 20.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -112,41 +114,10 @@ flat = true align = 1 _sections_unfolded = [ "custom_colors" ] -[node name="AboutBtn" type="Button" parent="GMRefRect/GMenuHbox" index="2"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_left = 91.0 -margin_right = 140.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 = "KABO" -flat = true -align = 1 -_sections_unfolded = [ "Margin", "custom_colors" ] - [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/ExitBtn" to="." method="_on_ExitBtn_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/GameScreen.tscn b/project/GameScn.tscn similarity index 81% rename from project/GameScreen.tscn rename to project/GameScn.tscn index ac93505..6678c8c 100644 --- a/project/GameScreen.tscn +++ b/project/GameScn.tscn @@ -1,13 +1,13 @@ [gd_scene load_steps=7 format=2] [ext_resource path="res://src/GameScreen.gd" type="Script" id=1] -[ext_resource path="res://assets/15_dress_up_bg.png" type="Texture" id=2] +[ext_resource path="res://assets/modern_dress_up_bg.png" type="Texture" id=2] [ext_resource path="res://assets/icrazy_frame.png" type="Texture" id=3] [ext_resource path="res://Zack.tscn" type="PackedScene" id=4] [ext_resource path="res://Clothes.tscn" type="PackedScene" id=5] -[ext_resource path="res://Interface.tscn" type="PackedScene" id=6] +[ext_resource path="res://GUI.tscn" type="PackedScene" id=6] -[node name="GameScreen" type="Node" index="0"] +[node name="GameScreen" type="Node"] script = ExtResource( 1 ) diff --git a/project/StartScn.tscn b/project/StartScn.tscn new file mode 100644 index 0000000..648980d --- /dev/null +++ b/project/StartScn.tscn @@ -0,0 +1,286 @@ +[gd_scene load_steps=7 format=2] + +[ext_resource path="res://src/StartScn.gd" type="Script" id=1] +[ext_resource path="res://assets/modern_dress_up_blurred_bg.png" type="Texture" id=2] +[ext_resource path="res://assets/dressup_blurred_wardrobe.png" type="Texture" id=3] +[ext_resource path="res://assets/classic_dress_up_blurred_bg.png" type="Texture" id=4] +[ext_resource path="res://assets/dressup_title.svg" type="Texture" id=5] +[ext_resource path="res://WinDialogs.tscn" type="PackedScene" id=6] + +[node name="Start" type="Node" index="0"] + +script = ExtResource( 1 ) + +[node name="ModernBG" type="Sprite" parent="." index="0"] + +position = Vector2( 400, 277 ) +texture = ExtResource( 2 ) +__meta__ = { +"_edit_lock_": true +} + +[node name="WordrobeBG" type="Sprite" parent="." index="1"] + +position = Vector2( 492.609, 280.27 ) +texture = ExtResource( 3 ) +__meta__ = { +"_edit_lock_": true +} + +[node name="ClassicBG" type="Sprite" parent="." index="2"] + +visible = false +position = Vector2( 400, 277 ) +texture = ExtResource( 4 ) +__meta__ = { +"_edit_lock_": true +} + +[node name="GameTitle" type="Sprite" parent="." index="3"] + +position = Vector2( 489.565, 100.74 ) +texture = ExtResource( 5 ) +__meta__ = { +"_edit_lock_": true +} + +[node name="MenuRf" type="ReferenceRect" parent="." index="4"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 221.0 +margin_top = 147.0 +margin_right = 762.0 +margin_bottom = 462.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 + +[node name="StartVbox" type="VBoxContainer" parent="MenuRf" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 14.0 +margin_top = 14.0 +margin_right = 150.0 +margin_bottom = 99.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 1 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +alignment = 0 + +[node name="PlayBtn" type="Button" parent="MenuRf/StartVbox" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 136.0 +margin_bottom = 20.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 = true +enabled_focus_mode = 2 +shortcut = null +group = null +text = "KPLY" +flat = false +align = 1 + +[node name="CreditsBtn" type="Button" parent="MenuRf/StartVbox" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 24.0 +margin_right = 136.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 = "KCRE" +flat = false +align = 1 + +[node name="LicenseBtn" type="Button" parent="MenuRf/StartVbox" index="2"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 48.0 +margin_right = 136.0 +margin_bottom = 68.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 = "KLIC" +flat = false +align = 1 + +[node name="ModePanel" type="Panel" parent="MenuRf" index="1"] + +visible = false +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 168.0 +margin_top = 14.0 +margin_right = 314.0 +margin_bottom = 106.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 0 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 + +[node name="PlayVbox" type="VBoxContainer" parent="MenuRf/ModePanel" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 5.0 +margin_top = 5.0 +margin_right = -5.0 +margin_bottom = -5.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 1 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +alignment = 0 +_sections_unfolded = [ "Margin" ] +__meta__ = { +"_edit_lock_": true +} + +[node name="ModeLbl" type="Label" parent="MenuRf/ModePanel/PlayVbox" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 136.0 +margin_bottom = 14.0 +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +mouse_filter = 2 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 4 +text = "KGMO" +align = 1 +percent_visible = 1.0 +lines_skipped = 0 +max_lines_visible = -1 +__meta__ = { +"_edit_lock_": true +} + +[node name="ModernBtn" type="Button" parent="MenuRf/ModePanel/PlayVbox" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 18.0 +margin_right = 136.0 +margin_bottom = 38.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 = "Modern" +flat = false +align = 1 +__meta__ = { +"_edit_lock_": true +} + +[node name="ClassicBtn" type="Button" parent="MenuRf/ModePanel/PlayVbox" index="2"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 42.0 +margin_right = 136.0 +margin_bottom = 62.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 = "KCLS" +flat = false +align = 1 +__meta__ = { +"_edit_lock_": true +} + +[node name="WinDialogs" parent="." index="5" instance=ExtResource( 6 )] + +[connection signal="toggled" from="MenuRf/StartVbox/PlayBtn" to="." method="_on_PlayBtn_toggled"] + +[connection signal="pressed" from="MenuRf/StartVbox/CreditsBtn" to="." method="_on_CreditsBtn_pressed"] + +[connection signal="pressed" from="MenuRf/StartVbox/LicenseBtn" to="." method="_on_LicenseBtn_pressed"] + +[connection signal="pressed" from="MenuRf/ModePanel/PlayVbox/ModernBtn" to="." method="_on_ModernBtn_pressed"] + +[connection signal="mouse_entered" from="MenuRf/ModePanel/PlayVbox/ClassicBtn" to="." method="_on_ClassicBtn_mouse_entered"] + +[connection signal="mouse_exited" from="MenuRf/ModePanel/PlayVbox/ClassicBtn" to="." method="_on_ClassicBtn_mouse_exited"] + +[connection signal="pressed" from="MenuRf/ModePanel/PlayVbox/ClassicBtn" to="." method="_on_ClassicBtn_pressed"] + + diff --git a/project/WinDialogs.tscn b/project/WinDialogs.tscn index 810747d..5cad81d 100644 --- a/project/WinDialogs.tscn +++ b/project/WinDialogs.tscn @@ -3,7 +3,7 @@ [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"] +[node name="WinDialogs" type="Control" index="0"] anchor_left = 0.0 anchor_top = 0.0 @@ -26,163 +26,8 @@ autoplay = false mix_target = 0 bus = "Master" -[node name="AboutWin" type="WindowDialog" parent="." index="1"] +[node name="CreditsWin" type="AcceptDialog" parent="." index="1"] -editor/display_folded = true -visible = false -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_left = 199.0 -margin_top = 229.0 -margin_right = 620.0 -margin_bottom = 301.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -mouse_filter = 0 -mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 -size_flags_vertical = 1 -popup_exclusive = false -window_title = "KABO" -resizable = false -_sections_unfolded = [ "Dialog", "Rect" ] - -[node name="AboutRefRect" type="ReferenceRect" parent="AboutWin" index="1"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 1.0 -anchor_bottom = 1.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -mouse_filter = 0 -mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 -size_flags_vertical = 1 - -[node name="AboutTxt" type="RichTextLabel" parent="AboutWin/AboutRefRect" index="0"] - -anchor_left = 1.0 -anchor_top = 1.0 -anchor_right = 1.0 -anchor_bottom = 1.0 -margin_left = -415.0 -margin_top = -68.0 -margin_right = -5.0 -margin_bottom = -34.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = true -mouse_filter = 0 -mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 -size_flags_vertical = 1 -bbcode_enabled = false -bbcode_text = "" -visible_characters = -1 -percent_visible = 1.0 -meta_underlined = true -tab_size = 4 -text = "Zack's Dress Up is a dress up game created by Anthony Wilcox." -scroll_active = false -scroll_following = false -selection_enabled = false -override_selected_font_color = false -_sections_unfolded = [ "Anchor", "Margin", "Rect" ] - -[node name="AboutBtnHBox" type="HBoxContainer" parent="AboutWin/AboutRefRect" index="1"] - -anchor_left = 0.0 -anchor_top = 1.0 -anchor_right = 1.0 -anchor_bottom = 1.0 -margin_top = -28.0 -margin_bottom = -8.0 -rect_pivot_offset = Vector2( 0, 0 ) -rect_clip_content = false -mouse_filter = 1 -mouse_default_cursor_shape = 0 -size_flags_horizontal = 1 -size_flags_vertical = 1 -alignment = 1 -_sections_unfolded = [ "Margin", "Rect" ] - -[node name="LicenseBtn" type="Button" parent="AboutWin/AboutRefRect/AboutBtnHBox" index="0"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_left = 150.0 -margin_right = 190.0 -margin_bottom = 20.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 = "KLIC" -flat = false -align = 1 - -[node name="CreditsBtn" type="Button" parent="AboutWin/AboutRefRect/AboutBtnHBox" index="1"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_left = 194.0 -margin_right = 237.0 -margin_bottom = 20.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 = "KCRE" -flat = false -align = 1 - -[node name="CloseAbtBtn" type="Button" parent="AboutWin/AboutRefRect/AboutBtnHBox" index="2"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_left = 241.0 -margin_right = 271.0 -margin_bottom = 20.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 = "Ok" -flat = false -align = 1 - -[node name="CreditsWin" type="AcceptDialog" parent="." index="2"] - -editor/display_folded = true visible = false anchor_left = 0.0 anchor_top = 0.0 @@ -257,7 +102,7 @@ selection_enabled = true override_selected_font_color = false _sections_unfolded = [ "BBCode" ] -[node name="SettingsWin" type="AcceptDialog" parent="." index="3"] +[node name="SettingsWin" type="AcceptDialog" parent="." index="2"] editor/display_folded = true visible = false @@ -349,7 +194,7 @@ text = "KMUS" flat = false align = 1 -[node name="LicenseWin" type="AcceptDialog" parent="." index="4"] +[node name="LicenseWin" type="AcceptDialog" parent="." index="3"] editor/display_folded = true visible = false @@ -430,12 +275,6 @@ selection_enabled = false override_selected_font_color = false _sections_unfolded = [ "BBCode" ] -[connection signal="pressed" from="AboutWin/AboutRefRect/AboutBtnHBox/LicenseBtn" to="." method="_on_LicenseBtn_pressed"] - -[connection signal="pressed" from="AboutWin/AboutRefRect/AboutBtnHBox/CreditsBtn" to="." method="_on_CreditsBtn_pressed"] - -[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/dress_up_bg.png b/project/assets/classic_dress_up_bg.png similarity index 100% rename from project/assets/dress_up_bg.png rename to project/assets/classic_dress_up_bg.png diff --git a/project/assets/classic_dress_up_bg.png.import b/project/assets/classic_dress_up_bg.png.import new file mode 100644 index 0000000..16e23ce --- /dev/null +++ b/project/assets/classic_dress_up_bg.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/classic_dress_up_bg.png-1b33be640efcffd8de2c8f6fcb93e744.stex" + +[deps] + +source_file="res://assets/classic_dress_up_bg.png" +dest_files=[ "res://.import/classic_dress_up_bg.png-1b33be640efcffd8de2c8f6fcb93e744.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/assets/classic_dress_up_blurred_bg.png b/project/assets/classic_dress_up_blurred_bg.png new file mode 100644 index 0000000..494115b Binary files /dev/null and b/project/assets/classic_dress_up_blurred_bg.png differ diff --git a/project/assets/classic_dress_up_blurred_bg.png.import b/project/assets/classic_dress_up_blurred_bg.png.import new file mode 100644 index 0000000..eb14ebc --- /dev/null +++ b/project/assets/classic_dress_up_blurred_bg.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/classic_dress_up_blurred_bg.png-b938f8959e4f1478acf80be0ecd0cbcb.stex" + +[deps] + +source_file="res://assets/classic_dress_up_blurred_bg.png" +dest_files=[ "res://.import/classic_dress_up_blurred_bg.png-b938f8959e4f1478acf80be0ecd0cbcb.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/assets/dressup_blurred_wardrobe.png b/project/assets/dressup_blurred_wardrobe.png new file mode 100644 index 0000000..1508e01 Binary files /dev/null and b/project/assets/dressup_blurred_wardrobe.png differ diff --git a/project/assets/dressup_blurred_wardrobe.png.import b/project/assets/dressup_blurred_wardrobe.png.import new file mode 100644 index 0000000..d6673df --- /dev/null +++ b/project/assets/dressup_blurred_wardrobe.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/dressup_blurred_wardrobe.png-9f23933ae37429abefcdd1b04d488722.stex" + +[deps] + +source_file="res://assets/dressup_blurred_wardrobe.png" +dest_files=[ "res://.import/dressup_blurred_wardrobe.png-9f23933ae37429abefcdd1b04d488722.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/assets/dressup_title.svg b/project/assets/dressup_title.svg new file mode 100644 index 0000000..a553abb --- /dev/null +++ b/project/assets/dressup_title.svg @@ -0,0 +1,122 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/assets/dress_up_bg.png.import b/project/assets/dressup_title.svg.import similarity index 64% rename from project/assets/dress_up_bg.png.import rename to project/assets/dressup_title.svg.import index 473b002..63ae177 100644 --- a/project/assets/dress_up_bg.png.import +++ b/project/assets/dressup_title.svg.import @@ -2,12 +2,12 @@ importer="texture" type="StreamTexture" -path="res://.import/dress_up_bg.png-f85588b7b816c08fa2827a4f2a00be9e.stex" +path="res://.import/dressup_title.svg-8d2a8b65ef9e6151959385637bef7960.stex" [deps] -source_file="res://assets/dress_up_bg.png" -dest_files=[ "res://.import/dress_up_bg.png-f85588b7b816c08fa2827a4f2a00be9e.stex" ] +source_file="res://assets/dressup_title.svg" +dest_files=[ "res://.import/dressup_title.svg-8d2a8b65ef9e6151959385637bef7960.stex" ] [params] diff --git a/project/assets/dressup_wardrobe.png b/project/assets/dressup_wardrobe.png index 96779ec..1c72695 100644 Binary files a/project/assets/dressup_wardrobe.png and b/project/assets/dressup_wardrobe.png differ diff --git a/project/assets/15_dress_up_bg.png b/project/assets/modern_dress_up_bg.png similarity index 100% rename from project/assets/15_dress_up_bg.png rename to project/assets/modern_dress_up_bg.png diff --git a/project/assets/15_dress_up_bg.png.import b/project/assets/modern_dress_up_bg.png.import similarity index 63% rename from project/assets/15_dress_up_bg.png.import rename to project/assets/modern_dress_up_bg.png.import index 595a0d0..7c1b1b9 100644 --- a/project/assets/15_dress_up_bg.png.import +++ b/project/assets/modern_dress_up_bg.png.import @@ -2,12 +2,12 @@ importer="texture" type="StreamTexture" -path="res://.import/15_dress_up_bg.png-539edf16398b672e4b3f5a1602dc2b98.stex" +path="res://.import/modern_dress_up_bg.png-6393820664f1320a23b0c4aa117b655b.stex" [deps] -source_file="res://assets/15_dress_up_bg.png" -dest_files=[ "res://.import/15_dress_up_bg.png-539edf16398b672e4b3f5a1602dc2b98.stex" ] +source_file="res://assets/modern_dress_up_bg.png" +dest_files=[ "res://.import/modern_dress_up_bg.png-6393820664f1320a23b0c4aa117b655b.stex" ] [params] diff --git a/project/assets/modern_dress_up_blurred_bg.png b/project/assets/modern_dress_up_blurred_bg.png new file mode 100644 index 0000000..f5dc803 Binary files /dev/null and b/project/assets/modern_dress_up_blurred_bg.png differ diff --git a/project/assets/modern_dress_up_blurred_bg.png.import b/project/assets/modern_dress_up_blurred_bg.png.import new file mode 100644 index 0000000..c934e56 --- /dev/null +++ b/project/assets/modern_dress_up_blurred_bg.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/modern_dress_up_blurred_bg.png-25831e2973bc1b7f2d3095dd52febfd9.stex" + +[deps] + +source_file="res://assets/modern_dress_up_blurred_bg.png" +dest_files=[ "res://.import/modern_dress_up_blurred_bg.png-25831e2973bc1b7f2d3095dd52febfd9.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/lang/local.csv b/project/lang/local.csv index e4638ee..80c6887 100644 --- a/project/lang/local.csv +++ b/project/lang/local.csv @@ -9,10 +9,13 @@ KCLS,Classic,Klassisk KUND,Underwear,Underkläder KCLR,Clear,Klar KMUS,Music,Musik +KGMO,Game Mode,Spelläge KCRE,Credits,Eftertexter KABO,About,Handla om KLIC,License,Licens KSOO,Coming Soon,Kommer snart +KPLY,Play,Spela +KEXT,Exit,Utgång KHELP,Help,Hjälp KSET,Settings,Inställningar KLANG,Languages,Språk \ No newline at end of file diff --git a/project/lang/local.en.translation b/project/lang/local.en.translation index e7e66f1..a708a63 100644 Binary files a/project/lang/local.en.translation and b/project/lang/local.en.translation differ diff --git a/project/lang/local.sv.translation b/project/lang/local.sv.translation index b98b04f..8e725a8 100644 Binary files a/project/lang/local.sv.translation and b/project/lang/local.sv.translation differ diff --git a/project/project.godot b/project/project.godot index 30fed3c..788639a 100644 --- a/project/project.godot +++ b/project/project.godot @@ -11,7 +11,7 @@ config_version=3 [application] config/name="Zack's Dress Up" -run/main_scene="res://GameScreen.tscn" +run/main_scene="res://StartScn.tscn" config/use_custom_user_dir=true boot_splash/image="res://assets/game_splash.png" config/icon="res://icon.png" diff --git a/project/src/Interface.gd b/project/src/Interface.gd index a7bfc94..be4edac 100644 --- a/project/src/Interface.gd +++ b/project/src/Interface.gd @@ -2,14 +2,8 @@ # See the LICENSE file in the project root for more information. extends Control -func _on_AboutBtn_pressed(): - $WinDialogs/AboutWin.show() - func _on_SettingsBtn_pressed(): $WinDialogs/SettingsWin.show() -func _on_ClassicBtn_pressed(): - get_tree().change_scene("res://ClassicScreen.tscn") - -func _on_ModernBtn_pressed(): - get_tree().change_scene("res://GameScreen.tscn") +func _on_ExitBtn_pressed(): + get_tree().change_scene("res://StartScn.tscn") diff --git a/project/src/StartScn.gd b/project/src/StartScn.gd new file mode 100644 index 0000000..c4f942e --- /dev/null +++ b/project/src/StartScn.gd @@ -0,0 +1,31 @@ +# Anthony Wilcox licenses this file to you under the GPL license. +# See the LICENSE file in the project root for more information. +extends Node + +func _on_ClassicBtn_pressed(): + get_tree().change_scene("res://ClassicScn.tscn") + +func _on_ModernBtn_pressed(): + get_tree().change_scene("res://GameScn.tscn") + +func _on_ClassicBtn_mouse_entered(): + $ModernBG.hide() + $WordrobeBG.hide() + $ClassicBG.show() + +func _on_ClassicBtn_mouse_exited(): + $ClassicBG.hide() + $WordrobeBG.show() + $ModernBG.show() + +func _on_CreditsBtn_pressed(): + $WinDialogs/CreditsWin.show() + +func _on_LicenseBtn_pressed(): + $WinDialogs/LicenseWin.show() + +func _on_PlayBtn_toggled(button_pressed): + if button_pressed == true: + $MenuRf/ModePanel.show() + else: + $MenuRf/ModePanel.hide()