diff --git a/project/Clothes.tscn b/project/Clothes.tscn index 9c7825a..de69546 100644 --- a/project/Clothes.tscn +++ b/project/Clothes.tscn @@ -1,24 +1,26 @@ -[gd_scene load_steps=20 format=2] +[gd_scene load_steps=22 format=2] [ext_resource path="res://src/Clothes.gd" type="Script" id=1] [ext_resource path="res://assets/DressUp.theme" type="Theme" id=2] [ext_resource path="res://assets/jeans.png" type="Texture" id=3] [ext_resource path="res://assets/dj_shorts.png" type="Texture" id=4] [ext_resource path="res://assets/sweat_pants.png" type="Texture" id=5] -[ext_resource path="res://assets/beat_up_jeans.png" type="Texture" id=6] -[ext_resource path="res://assets/old_sweatshirt.png" type="Texture" id=7] -[ext_resource path="res://assets/dj_shirt.png" type="Texture" id=8] -[ext_resource path="res://assets/raw_shirt.png" type="Texture" id=9] -[ext_resource path="res://assets/atomic_shirt.png" type="Texture" id=10] -[ext_resource path="res://assets/z_shirt.png" type="Texture" id=11] -[ext_resource path="res://assets/biker_jacket.png" type="Texture" id=12] -[ext_resource path="res://assets/nl_jacket.png" type="Texture" id=13] -[ext_resource path="res://assets/korm_shirt.png" type="Texture" id=14] -[ext_resource path="res://assets/briefs.png" type="Texture" id=15] -[ext_resource path="res://assets/zbriefs.png" type="Texture" id=16] -[ext_resource path="res://assets/owo_censor.png" type="Texture" id=17] -[ext_resource path="res://assets/bottoms_placeholder.png" type="Texture" id=18] -[ext_resource path="res://assets/tops_placeholder.png" type="Texture" id=19] +[ext_resource path="res://assets/blue_camo_jeans.png" type="Texture" id=6] +[ext_resource path="res://assets/beat_up_jeans.png" type="Texture" id=7] +[ext_resource path="res://assets/old_sweatshirt.png" type="Texture" id=8] +[ext_resource path="res://assets/dj_shirt.png" type="Texture" id=9] +[ext_resource path="res://assets/raw_shirt.png" type="Texture" id=10] +[ext_resource path="res://assets/atomic_shirt.png" type="Texture" id=11] +[ext_resource path="res://assets/z_shirt.png" type="Texture" id=12] +[ext_resource path="res://assets/biker_jacket.png" type="Texture" id=13] +[ext_resource path="res://assets/nl_jacket.png" type="Texture" id=14] +[ext_resource path="res://assets/korm_shirt.png" type="Texture" id=15] +[ext_resource path="res://assets/whatsnew_shirt.png" type="Texture" id=16] +[ext_resource path="res://assets/briefs.png" type="Texture" id=17] +[ext_resource path="res://assets/zbriefs.png" type="Texture" id=18] +[ext_resource path="res://assets/owo_censor.png" type="Texture" id=19] +[ext_resource path="res://assets/bottoms_placeholder.png" type="Texture" id=20] +[ext_resource path="res://assets/tops_placeholder.png" type="Texture" id=21] [node name="Clothes" type="Node" index="0"] @@ -90,7 +92,7 @@ anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 2.0 -margin_right = 559.0 +margin_right = 545.0 margin_bottom = 330.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -98,7 +100,7 @@ mouse_filter = 1 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 -columns = 6 +columns = 5 [node name="Jeans" type="TextureButton" parent="RefRect/Wordrobe/Pants/PantsGrid" index="0"] @@ -168,7 +170,7 @@ group = null texture_normal = ExtResource( 5 ) _sections_unfolded = [ "Textures" ] -[node name="Beat Up Jeans" type="TextureButton" parent="RefRect/Wordrobe/Pants/PantsGrid" index="3"] +[node name="Blue Camo Jeans" type="TextureButton" parent="RefRect/Wordrobe/Pants/PantsGrid" index="3"] anchor_left = 0.0 anchor_top = 0.0 @@ -191,6 +193,55 @@ group = null texture_normal = ExtResource( 6 ) _sections_unfolded = [ "Textures" ] +[node name="Beat Up Jeans" type="TextureButton" parent="RefRect/Wordrobe/Pants/PantsGrid" index="4"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 437.0 +margin_right = 543.0 +margin_bottom = 112.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 +texture_normal = ExtResource( 7 ) +_sections_unfolded = [ "Textures" ] + +[node name="Remove Pants" type="Button" parent="RefRect/Wordrobe/Pants/PantsGrid" index="5"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 116.0 +margin_right = 106.0 +margin_bottom = 228.0 +rect_min_size = Vector2( 0, 112 ) +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 = "KRBT" +flat = true +align = 1 +_sections_unfolded = [ "Rect" ] + [node name="Shirts" type="Tabs" parent="RefRect/Wordrobe" index="1"] visible = false @@ -249,7 +300,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 7 ) +texture_normal = ExtResource( 8 ) _sections_unfolded = [ "Textures" ] [node name="DJ Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="1"] @@ -272,7 +323,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 8 ) +texture_normal = ExtResource( 9 ) _sections_unfolded = [ "Textures" ] [node name="Raw" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="2"] @@ -295,7 +346,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 9 ) +texture_normal = ExtResource( 10 ) _sections_unfolded = [ "Textures" ] [node name="Atomic" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="3"] @@ -305,30 +356,7 @@ anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 267.0 -margin_right = 346.0 -margin_bottom = 115.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 -texture_normal = ExtResource( 10 ) -_sections_unfolded = [ "Textures" ] - -[node name="Z Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="4"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_left = 350.0 -margin_right = 431.0 +margin_right = 352.0 margin_bottom = 115.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -344,14 +372,14 @@ group = null texture_normal = ExtResource( 11 ) _sections_unfolded = [ "Textures" ] -[node name="Biker Jacket" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="5"] +[node name="Z Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="4"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 435.0 -margin_right = 520.0 +margin_left = 356.0 +margin_right = 437.0 margin_bottom = 115.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -367,6 +395,29 @@ group = null texture_normal = ExtResource( 12 ) _sections_unfolded = [ "Textures" ] +[node name="Biker Jacket" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="5"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 441.0 +margin_right = 526.0 +margin_bottom = 115.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 +texture_normal = ExtResource( 13 ) +_sections_unfolded = [ "Textures" ] + [node name="NL Jacket" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="6"] anchor_left = 0.0 @@ -387,7 +438,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 13 ) +texture_normal = ExtResource( 14 ) _sections_unfolded = [ "Textures" ] [node name="Korm Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="7"] @@ -411,9 +462,60 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 14 ) +texture_normal = ExtResource( 15 ) _sections_unfolded = [ "Textures" ] +[node name="What's New Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="8"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 178.0 +margin_top = 119.0 +margin_right = 284.0 +margin_bottom = 234.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 +texture_normal = ExtResource( 16 ) +_sections_unfolded = [ "Rect", "Textures" ] + +[node name="Remove Shirt" type="Button" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="9"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 267.0 +margin_top = 119.0 +margin_right = 373.0 +margin_bottom = 234.0 +rect_min_size = Vector2( 0, 112 ) +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 = "KRTP" +flat = true +align = 1 +_sections_unfolded = [ "Rect" ] + [node name="Underwear" type="Tabs" parent="RefRect/Wordrobe" index="2"] visible = false @@ -469,7 +571,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 15 ) +texture_normal = ExtResource( 17 ) [node name="ZBriefs" type="TextureButton" parent="RefRect/Wordrobe/Underwear/UndiesGrid" index="1"] @@ -491,7 +593,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 16 ) +texture_normal = ExtResource( 18 ) _sections_unfolded = [ "Textures" ] [node name="OwO Censor" type="TextureButton" parent="RefRect/Wordrobe/Underwear/UndiesGrid" index="2"] @@ -514,7 +616,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 17 ) +texture_normal = ExtResource( 19 ) _sections_unfolded = [ "Textures" ] [node name="ClearBtn" type="Button" parent="RefRect" index="1"] @@ -562,17 +664,17 @@ size_flags_vertical = 1 [node name="Undies" type="Sprite" parent="Body" index="0"] position = Vector2( 57.9419, 159.296 ) -texture = ExtResource( 15 ) +texture = ExtResource( 17 ) [node name="Bottom" type="Sprite" parent="Body" index="1"] position = Vector2( 57.9419, 159.296 ) -texture = ExtResource( 18 ) +texture = ExtResource( 20 ) [node name="Top" type="Sprite" parent="Body" index="2"] position = Vector2( 65.0597, 65.3242 ) -texture = ExtResource( 19 ) +texture = ExtResource( 21 ) [connection signal="pressed" from="RefRect/Wordrobe/Pants/PantsGrid/Jeans" to="." method="_on_Jeans_pressed"] @@ -580,8 +682,12 @@ texture = ExtResource( 19 ) [connection signal="pressed" from="RefRect/Wordrobe/Pants/PantsGrid/Sweats" to="." method="_on_Sweats_pressed"] +[connection signal="pressed" from="RefRect/Wordrobe/Pants/PantsGrid/Blue Camo Jeans" to="." method="_on_Blue_Camo_Jeans_pressed"] + [connection signal="pressed" from="RefRect/Wordrobe/Pants/PantsGrid/Beat Up Jeans" to="." method="_on_Beat_Up_Jeans_pressed"] +[connection signal="pressed" from="RefRect/Wordrobe/Pants/PantsGrid/Remove Pants" to="." method="_on_Remove_Pants_pressed"] + [connection signal="pressed" from="RefRect/Wordrobe/Shirts/ShirtsGrid/Sweatshirt" to="." method="_on_Sweatshirt_pressed"] [connection signal="pressed" from="RefRect/Wordrobe/Shirts/ShirtsGrid/DJ Shirt" to="." method="_on_DJ_Shirt_pressed"] @@ -598,6 +704,10 @@ texture = ExtResource( 19 ) [connection signal="pressed" from="RefRect/Wordrobe/Shirts/ShirtsGrid/Korm Shirt" to="." method="_on_Korm_Shirt_pressed"] +[connection signal="pressed" from="RefRect/Wordrobe/Shirts/ShirtsGrid/What's New Shirt" to="." method="_on_Whats_New_Shirt_pressed"] + +[connection signal="pressed" from="RefRect/Wordrobe/Shirts/ShirtsGrid/Remove Shirt" to="." method="_on_Remove_Shirt_pressed"] + [connection signal="pressed" from="RefRect/Wordrobe/Underwear/UndiesGrid/Briefs" to="." method="_on_Briefs_pressed"] [connection signal="pressed" from="RefRect/Wordrobe/Underwear/UndiesGrid/ZBriefs" to="." method="_on_ZBriefs_pressed"] diff --git a/project/GameScreen.tscn b/project/GameScreen.tscn index ac93505..4d6e536 100644 --- a/project/GameScreen.tscn +++ b/project/GameScreen.tscn @@ -7,7 +7,7 @@ [ext_resource path="res://Clothes.tscn" type="PackedScene" id=5] [ext_resource path="res://Interface.tscn" type="PackedScene" id=6] -[node name="GameScreen" type="Node" index="0"] +[node name="GameScreen" type="Node"] script = ExtResource( 1 ) diff --git a/project/Interface.tscn b/project/Interface.tscn index ae16773..573dd05 100644 --- a/project/Interface.tscn +++ b/project/Interface.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://src/Interface.gd" type="Script" id=1] -[ext_resource path="res://music/piano.ogg" type="AudioStream" id=2] +[ext_resource path="res://music/song.ogg" type="AudioStream" id=2] [node name="Interface" type="Control"] @@ -25,11 +25,11 @@ script = ExtResource( 1 ) stream = ExtResource( 2 ) volume_db = 0.0 pitch_scale = 1.0 -autoplay = false +autoplay = true mix_target = 0 bus = "Master" -[node name="RefRect" type="ReferenceRect" parent="." index="1"] +[node name="GMRefRect" type="ReferenceRect" parent="." index="1"] anchor_left = 0.0 anchor_top = 0.0 @@ -47,7 +47,7 @@ size_flags_horizontal = 1 size_flags_vertical = 1 _sections_unfolded = [ "Anchor", "Grow Direction", "Margin", "Rect" ] -[node name="GPanel" type="Panel" parent="RefRect" index="0"] +[node name="GPanel" type="Panel" parent="GMRefRect" index="0"] anchor_left = 0.0 anchor_top = 0.0 @@ -60,7 +60,7 @@ mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 -[node name="HBoxContainer" type="HBoxContainer" parent="RefRect/GPanel" index="0"] +[node name="HBoxContainer" type="HBoxContainer" parent="GMRefRect/GPanel" index="0"] anchor_left = 0.0 anchor_top = 0.0 @@ -74,7 +74,7 @@ size_flags_horizontal = 1 size_flags_vertical = 1 alignment = 0 -[node name="SettingsBtn" type="Button" parent="RefRect/GPanel/HBoxContainer" index="0"] +[node name="SettingsBtn" type="Button" parent="GMRefRect/GPanel/HBoxContainer" index="0"] anchor_left = 0.0 anchor_top = 0.0 @@ -97,7 +97,7 @@ text = "KSET" flat = true align = 1 -[node name="CreditsBtn" type="Button" parent="RefRect/GPanel/HBoxContainer" index="1"] +[node name="CreditsBtn" type="Button" parent="GMRefRect/GPanel/HBoxContainer" index="1"] anchor_left = 0.0 anchor_top = 0.0 @@ -121,7 +121,7 @@ text = "KCRE" flat = true align = 1 -[node name="AboutBtn" type="Button" parent="RefRect/GPanel/HBoxContainer" index="2"] +[node name="AboutBtn" type="Button" parent="GMRefRect/GPanel/HBoxContainer" index="2"] anchor_left = 0.0 anchor_top = 0.0 @@ -146,17 +146,18 @@ flat = true align = 1 _sections_unfolded = [ "Margin" ] -[node name="AboutWin" type="AcceptDialog" parent="." index="2"] +[node name="AboutWin" type="WindowDialog" parent="." index="2"] +editor/display_folded = true visible = false anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 260.0 -margin_top = 132.0 -margin_right = 608.0 -margin_bottom = 400.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 @@ -166,49 +167,114 @@ size_flags_vertical = 1 popup_exclusive = false window_title = "KABO" resizable = false -dialog_hide_on_ok = true +_sections_unfolded = [ "Dialog", "Rect" ] -[node name="AboutTxt" type="RichTextLabel" parent="AboutWin" index="3"] +[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 -margin_left = 8.0 -margin_top = 8.0 -margin_right = -8.0 -margin_bottom = -36.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 = true +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 = 173.0 +margin_right = 213.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 -bbcode_enabled = true -bbcode_text = "Zack's Dress Up is a dress up game created by Anthony Wilcox. +toggle_mode = false +enabled_focus_mode = 2 +shortcut = null +group = null +text = "KLIC" +flat = false +align = 1 -This is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. +[node name="CloseAbtBtn" type="Button" parent="AboutWin/AboutRefRect/AboutBtnHBox" index="1"] -Zack's Dress Up is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with Zack's Dress Up. If not, see: https://www.gnu.org/licenses/" -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. - -This is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. - -Zack's Dress Up is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with Zack's Dress Up. If not, see: https://www.gnu.org/licenses/" -scroll_active = true -scroll_following = false -selection_enabled = true -override_selected_font_color = false -_sections_unfolded = [ "BBCode" ] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 217.0 +margin_right = 247.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="3"] @@ -253,6 +319,9 @@ bbcode_enabled = true bbcode_text = "[center]Created by Anthony Wilcox +Music by +Augmentality + Clothing inspired by Megawolf77 Canon Rhode @@ -269,6 +338,9 @@ tab_size = 4 text = "Created by Anthony Wilcox +Music by +Augmentality + Clothing inspired by Megawolf77 Canon Rhode @@ -286,15 +358,16 @@ _sections_unfolded = [ "BBCode" ] [node name="SettingsWin" type="AcceptDialog" parent="." index="4"] +editor/display_folded = true visible = false anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 241.0 -margin_top = 186.0 -margin_right = 382.0 -margin_bottom = 254.0 +margin_left = 320.0 +margin_top = 211.0 +margin_right = 472.0 +margin_bottom = 279.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 @@ -313,9 +386,9 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -margin_left = -62.5 +margin_left = -68.0 margin_top = -26.0 -margin_right = 62.5 +margin_right = 68.0 margin_bottom = -2.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -323,7 +396,7 @@ mouse_filter = 1 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 -columns = 2 +columns = 3 [node name="Languages" type="MenuButton" parent="SettingsWin/Grid" index="0"] @@ -358,8 +431,7 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 60.0 -margin_right = 125.0 +margin_right = 65.0 margin_bottom = 24.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -369,6 +441,7 @@ mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 toggle_mode = true +pressed = true enabled_focus_mode = 2 shortcut = null group = null @@ -376,11 +449,96 @@ text = "KMUS" flat = false align = 1 -[connection signal="pressed" from="RefRect/GPanel/HBoxContainer/SettingsBtn" to="." method="_on_SettingsBtn_pressed"] +[node name="LicenseWin" type="AcceptDialog" parent="." index="5"] -[connection signal="pressed" from="RefRect/GPanel/HBoxContainer/CreditsBtn" to="." method="_on_CreditsBtn_pressed"] +editor/display_folded = true +visible = false +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 209.0 +margin_top = 129.0 +margin_right = 613.0 +margin_bottom = 404.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 = "KLIC" +resizable = false +dialog_hide_on_ok = true +_sections_unfolded = [ "Dialog" ] -[connection signal="pressed" from="RefRect/GPanel/HBoxContainer/AboutBtn" to="." method="_on_AboutBtn_pressed"] +[node name="LicenseTxt" type="RichTextLabel" parent="LicenseWin" index="3"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 8.0 +margin_top = 8.0 +margin_right = 396.0 +margin_bottom = 239.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 = true +bbcode_text = "Zack's Dress Up is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. + +Zack's Dress Up is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with Zack's Dress Up. If not, see: https://www.gnu.org/licenses/ + +[center]##########################[/center] + +Zack's Dress Up (c) by Anthony Wilcox + +Zack's Dress Up is licensed under a Creative Commons +Attribution-ShareAlike 4.0 International License. + +You should have received a copy of the license along with this work. +If not, see ." +visible_characters = -1 +percent_visible = 1.0 +meta_underlined = true +tab_size = 4 +text = "Zack's Dress Up is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. + +Zack's Dress Up is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with Zack's Dress Up. If not, see: https://www.gnu.org/licenses/ + +########################## + +Zack's Dress Up (c) by Anthony Wilcox + +Zack's Dress Up is licensed under a Creative Commons +Attribution-ShareAlike 4.0 International License. + +You should have received a copy of the license along with this work. +If not, see ." +scroll_active = true +scroll_following = false +selection_enabled = false +override_selected_font_color = false +_sections_unfolded = [ "BBCode" ] + +[connection signal="pressed" from="GMRefRect/GPanel/HBoxContainer/SettingsBtn" to="." method="_on_SettingsBtn_pressed"] + +[connection signal="pressed" from="GMRefRect/GPanel/HBoxContainer/CreditsBtn" to="." method="_on_CreditsBtn_pressed"] + +[connection signal="pressed" from="GMRefRect/GPanel/HBoxContainer/AboutBtn" to="." method="_on_AboutBtn_pressed"] + +[connection signal="pressed" from="AboutWin/AboutRefRect/AboutBtnHBox/LicenseBtn" to="." method="_on_LicenseBtn_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/blue_camo_jeans.png b/project/assets/blue_camo_jeans.png new file mode 100644 index 0000000..404d7c8 Binary files /dev/null and b/project/assets/blue_camo_jeans.png differ diff --git a/project/assets/blue_camo_jeans.png.import b/project/assets/blue_camo_jeans.png.import new file mode 100644 index 0000000..84a6f2e --- /dev/null +++ b/project/assets/blue_camo_jeans.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/blue_camo_jeans.png-e934035eccf64527f681d6518f218b74.stex" + +[deps] + +source_file="res://assets/blue_camo_jeans.png" +dest_files=[ "res://.import/blue_camo_jeans.png-e934035eccf64527f681d6518f218b74.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/whatsnew_shirt.png b/project/assets/whatsnew_shirt.png new file mode 100644 index 0000000..5b1c58d Binary files /dev/null and b/project/assets/whatsnew_shirt.png differ diff --git a/project/assets/whatsnew_shirt.png.import b/project/assets/whatsnew_shirt.png.import new file mode 100644 index 0000000..785f909 --- /dev/null +++ b/project/assets/whatsnew_shirt.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/whatsnew_shirt.png-7b6d957b05ad5f72c43f8a178748f7d2.stex" + +[deps] + +source_file="res://assets/whatsnew_shirt.png" +dest_files=[ "res://.import/whatsnew_shirt.png-7b6d957b05ad5f72c43f8a178748f7d2.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/zack_base.png b/project/assets/zack_base.png index 05d00d7..7b475aa 100644 Binary files a/project/assets/zack_base.png and b/project/assets/zack_base.png differ diff --git a/project/lang/local.csv b/project/lang/local.csv index a96296f..4c81c0e 100644 --- a/project/lang/local.csv +++ b/project/lang/local.csv @@ -3,11 +3,14 @@ KENG,English,Engelsk KSWD,Swedish,Svenska KBOT,Pants,Byxor KTOP,Shirts,Skjorta +KRTP,Remove Shirt,Ta av skjortan +KRBT,Remove Pants,Ta bort byxor KUND,Underwear,Underkläder KCLR,Clear,Klar KMUS,Music,Musik KCRE,Credits,Eftertexter KABO,About,Handla om +KLIC,License,Licens KSOO,Coming Soon,Kommer snart KHELP,Help,Hjälp KSET,Settings,Inställningar diff --git a/project/lang/local.en.translation b/project/lang/local.en.translation index 2507e0c..e282998 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 7d6d3b3..eac680e 100644 Binary files a/project/lang/local.sv.translation and b/project/lang/local.sv.translation differ diff --git a/project/music/piano.ogg b/project/music/piano.ogg deleted file mode 100644 index 0018809..0000000 Binary files a/project/music/piano.ogg and /dev/null differ diff --git a/project/music/piano.ogg.import b/project/music/piano.ogg.import deleted file mode 100644 index 4539da1..0000000 --- a/project/music/piano.ogg.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="ogg_vorbis" -type="AudioStreamOGGVorbis" -path="res://.import/piano.ogg-602f57d4990192de77ef3342b8d9390c.oggstr" - -[deps] - -source_file="res://music/piano.ogg" -dest_files=[ "res://.import/piano.ogg-602f57d4990192de77ef3342b8d9390c.oggstr" ] - -[params] - -loop=true -loop_offset=0 diff --git a/project/music/song.ogg b/project/music/song.ogg new file mode 100644 index 0000000..9947e30 Binary files /dev/null and b/project/music/song.ogg differ diff --git a/project/music/song.ogg.import b/project/music/song.ogg.import new file mode 100644 index 0000000..8e54875 --- /dev/null +++ b/project/music/song.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/song.ogg-e028209760e5df62f8d96269815a3497.oggstr" + +[deps] + +source_file="res://music/song.ogg" +dest_files=[ "res://.import/song.ogg-e028209760e5df62f8d96269815a3497.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/project/src/Clothes.gd b/project/src/Clothes.gd index bb9e40a..1a85d71 100644 --- a/project/src/Clothes.gd +++ b/project/src/Clothes.gd @@ -74,8 +74,20 @@ func _on_Beat_Up_Jeans_pressed(): func _on_NL_Jacket_pressed(): change_tops(load("res://assets/nl_jacket.png")) + +func _on_Blue_Camo_Jeans_pressed(): + change_bottoms(load("res://assets/blue_camo_jeans.png")) func _on_ClearBtn_pressed(): change_bottoms(null) change_undies(load("res://assets/briefs.png")) change_tops(null) + +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) diff --git a/project/src/Interface.gd b/project/src/Interface.gd index 9a14f73..cc1ceb4 100644 --- a/project/src/Interface.gd +++ b/project/src/Interface.gd @@ -2,21 +2,23 @@ # See the LICENSE file in the project root for more information. extends Control -onready var about_win = $AboutWin -onready var credits_win = $CreditsWin -onready var settings_win = $SettingsWin - func _on_AboutBtn_pressed(): - about_win.show() + $AboutWin.show() func _on_CreditsBtn_pressed(): - credits_win.show() + $CreditsWin.show() func _on_SettingsBtn_pressed(): - settings_win.show() + $SettingsWin.show() + +func _on_LicenseBtn_pressed(): + $LicenseWin.show() + +func _on_CloseAbtBtn_pressed(): + $AboutWin.hide() func _on_MusicBtn_toggled(button_pressed): if button_pressed == true: - $Music.play() + $Music.playing = true else: - $Music.stop() \ No newline at end of file + $Music.playing = false \ No newline at end of file