diff --git a/project/Clothes.tscn b/project/Clothes.tscn index de69546..31deda3 100644 --- a/project/Clothes.tscn +++ b/project/Clothes.tscn @@ -1,48 +1,79 @@ -[gd_scene load_steps=22 format=2] +[gd_scene load_steps=27 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/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] +[ext_resource path="res://assets/dressup_wardrobe.png" type="Texture" id=2] +[ext_resource path="res://assets/DressUp.theme" type="Theme" id=3] +[ext_resource path="res://assets/jeans.png" type="Texture" id=4] +[ext_resource path="res://assets/dj_shorts.png" type="Texture" id=5] +[ext_resource path="res://assets/sweat_pants.png" type="Texture" id=6] +[ext_resource path="res://assets/blue_camo_jeans.png" type="Texture" id=7] +[ext_resource path="res://assets/beat_up_jeans.png" type="Texture" id=8] +[ext_resource path="res://assets/old_sweatshirt.png" type="Texture" id=9] +[ext_resource path="res://assets/dj_shirt.png" type="Texture" id=10] +[ext_resource path="res://assets/raw_shirt.png" type="Texture" id=11] +[ext_resource path="res://assets/atomic_shirt.png" type="Texture" id=12] +[ext_resource path="res://assets/z_shirt.png" type="Texture" id=13] +[ext_resource path="res://assets/biker_jacket.png" type="Texture" id=14] +[ext_resource path="res://assets/nl_jacket.png" type="Texture" id=15] +[ext_resource path="res://assets/train_hoodie.png" type="Texture" id=16] +[ext_resource path="res://assets/korm_shirt.png" type="Texture" id=17] +[ext_resource path="res://assets/whatsnew_shirt.png" type="Texture" id=18] +[ext_resource path="res://assets/briefs.png" type="Texture" id=19] +[ext_resource path="res://assets/zbriefs.png" type="Texture" id=20] +[ext_resource path="res://assets/owo_censor.png" type="Texture" id=21] +[ext_resource path="res://assets/bottoms_placeholder.png" type="Texture" id=22] +[ext_resource path="res://assets/tops_placeholder.png" type="Texture" id=23] + +[sub_resource type="StyleBoxEmpty" id=3] + +content_margin_left = 5.0 +content_margin_right = 5.0 +content_margin_top = 5.0 +content_margin_bottom = 10.0 +_sections_unfolded = [ "Content Margin" ] + +[sub_resource type="StyleBoxEmpty" id=1] + +resource_local_to_scene = true +content_margin_left = 5.0 +content_margin_right = 5.0 +content_margin_top = 5.0 +content_margin_bottom = 10.0 +_sections_unfolded = [ "Content Margin", "Resource" ] + +[sub_resource type="StyleBoxEmpty" id=2] + +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"] script = ExtResource( 1 ) -[node name="RefRect" type="ReferenceRect" parent="." index="0"] +[node name="Wordrobe BG" type="Sprite" parent="." index="0"] + +position = Vector2( 492.609, 279.27 ) +texture = ExtResource( 2 ) + +[node name="RefRect" type="ReferenceRect" parent="." index="1"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 211.0 -margin_top = 30.0 -margin_right = 794.0 -margin_bottom = 460.0 +margin_left = 209.0 +margin_top = 18.0 +margin_right = 808.0 +margin_bottom = 533.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 -theme = ExtResource( 2 ) +theme = ExtResource( 3 ) _sections_unfolded = [ "Theme" ] [node name="Wordrobe" type="TabContainer" parent="RefRect" index="0"] @@ -51,19 +82,24 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 13.0 -margin_top = 12.0 -margin_right = 575.0 -margin_bottom = 417.0 +margin_left = 28.0 +margin_top = 13.0 +margin_right = 585.0 +margin_bottom = 513.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 +custom_styles/tab_fg = SubResource( 3 ) +custom_styles/tab_bg = SubResource( 1 ) +custom_styles/panel = SubResource( 2 ) +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 tabs_visible = true -_sections_unfolded = [ "Theme" ] +_sections_unfolded = [ "custom_colors", "custom_styles" ] [node name="Pants" type="Tabs" parent="RefRect/Wordrobe" index="0"] @@ -71,19 +107,17 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = 4.0 -margin_top = 32.0 -margin_right = -4.0 -margin_bottom = -4.0 +margin_top = 29.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 +custom_constants/hseparation = 0 tab_align = 1 scrolling_enabled = true -_sections_unfolded = [ "Theme", "custom_icons" ] +_sections_unfolded = [ "Margin", "Rect", "Theme", "custom_fonts", "custom_icons", "custom_styles" ] [node name="PantsGrid" type="GridContainer" parent="RefRect/Wordrobe/Pants" index="0"] @@ -91,9 +125,10 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 2.0 -margin_right = 545.0 -margin_bottom = 330.0 +margin_left = -15.0 +margin_top = 22.0 +margin_right = 536.0 +margin_bottom = 322.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -101,6 +136,7 @@ mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 columns = 5 +_sections_unfolded = [ "Margin" ] [node name="Jeans" type="TextureButton" parent="RefRect/Wordrobe/Pants/PantsGrid" index="0"] @@ -121,7 +157,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 3 ) +texture_normal = ExtResource( 4 ) _sections_unfolded = [ "Textures" ] [node name="DJ Shorts" type="TextureButton" parent="RefRect/Wordrobe/Pants/PantsGrid" index="1"] @@ -144,7 +180,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 4 ) +texture_normal = ExtResource( 5 ) _sections_unfolded = [ "Anchor", "Textures" ] [node name="Sweats" type="TextureButton" parent="RefRect/Wordrobe/Pants/PantsGrid" index="2"] @@ -167,7 +203,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 5 ) +texture_normal = ExtResource( 6 ) _sections_unfolded = [ "Textures" ] [node name="Blue Camo Jeans" type="TextureButton" parent="RefRect/Wordrobe/Pants/PantsGrid" index="3"] @@ -190,7 +226,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 6 ) +texture_normal = ExtResource( 7 ) _sections_unfolded = [ "Textures" ] [node name="Beat Up Jeans" type="TextureButton" parent="RefRect/Wordrobe/Pants/PantsGrid" index="4"] @@ -213,7 +249,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="Remove Pants" type="Button" parent="RefRect/Wordrobe/Pants/PantsGrid" index="5"] @@ -233,6 +269,10 @@ 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 @@ -240,7 +280,7 @@ group = null text = "KRBT" flat = true align = 1 -_sections_unfolded = [ "Rect" ] +_sections_unfolded = [ "Rect", "custom_colors" ] [node name="Shirts" type="Tabs" parent="RefRect/Wordrobe" index="1"] @@ -249,10 +289,7 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = 4.0 -margin_top = 32.0 -margin_right = -4.0 -margin_bottom = -4.0 +margin_top = 10.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 @@ -261,6 +298,7 @@ size_flags_horizontal = 1 size_flags_vertical = 1 tab_align = 1 scrolling_enabled = true +_sections_unfolded = [ "Margin" ] [node name="ShirtsGrid" type="GridContainer" parent="RefRect/Wordrobe/Shirts" index="0"] @@ -268,10 +306,10 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 4.0 -margin_top = 7.0 -margin_right = 549.0 -margin_bottom = 388.0 +margin_left = -7.0 +margin_top = 21.0 +margin_right = 519.0 +margin_bottom = 464.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -279,7 +317,7 @@ mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 columns = 6 -_sections_unfolded = [ "Grow Direction" ] +_sections_unfolded = [ "Grow Direction", "Margin" ] [node name="Sweatshirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="0"] @@ -300,7 +338,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="DJ Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="1"] @@ -323,7 +361,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="Raw" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="2"] @@ -346,7 +384,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 10 ) +texture_normal = ExtResource( 11 ) _sections_unfolded = [ "Textures" ] [node name="Atomic" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="3"] @@ -369,7 +407,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 11 ) +texture_normal = ExtResource( 12 ) _sections_unfolded = [ "Textures" ] [node name="Z Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="4"] @@ -392,7 +430,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 12 ) +texture_normal = ExtResource( 13 ) _sections_unfolded = [ "Textures" ] [node name="Biker Jacket" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="5"] @@ -415,7 +453,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="NL Jacket" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="6"] @@ -438,10 +476,10 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 14 ) +texture_normal = ExtResource( 15 ) _sections_unfolded = [ "Textures" ] -[node name="Korm Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="7"] +[node name="Train Hoodie" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="7"] anchor_left = 0.0 anchor_top = 0.0 @@ -462,10 +500,10 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 15 ) +texture_normal = ExtResource( 16 ) _sections_unfolded = [ "Textures" ] -[node name="What's New Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="8"] +[node name="Korm Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="8"] anchor_left = 0.0 anchor_top = 0.0 @@ -473,7 +511,7 @@ anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 178.0 margin_top = 119.0 -margin_right = 284.0 +margin_right = 263.0 margin_bottom = 234.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -486,10 +524,10 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 16 ) -_sections_unfolded = [ "Rect", "Textures" ] +texture_normal = ExtResource( 17 ) +_sections_unfolded = [ "Textures" ] -[node name="Remove Shirt" type="Button" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="9"] +[node name="What's New Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="9"] anchor_left = 0.0 anchor_top = 0.0 @@ -497,7 +535,31 @@ anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 267.0 margin_top = 119.0 -margin_right = 373.0 +margin_right = 352.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( 18 ) +_sections_unfolded = [ "Rect", "Textures" ] + +[node name="Remove Shirt" type="Button" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="10"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 356.0 +margin_top = 119.0 +margin_right = 437.0 margin_bottom = 234.0 rect_min_size = Vector2( 0, 112 ) rect_pivot_offset = Vector2( 0, 0 ) @@ -507,6 +569,10 @@ 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 @@ -514,7 +580,7 @@ group = null text = "KRTP" flat = true align = 1 -_sections_unfolded = [ "Rect" ] +_sections_unfolded = [ "Rect", "custom_colors" ] [node name="Underwear" type="Tabs" parent="RefRect/Wordrobe" index="2"] @@ -523,10 +589,7 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = 4.0 -margin_top = 32.0 -margin_right = -4.0 -margin_bottom = -4.0 +margin_top = 18.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 @@ -535,6 +598,7 @@ size_flags_horizontal = 1 size_flags_vertical = 1 tab_align = 1 scrolling_enabled = true +_sections_unfolded = [ "Margin" ] [node name="UndiesGrid" type="GridContainer" parent="RefRect/Wordrobe/Underwear" index="0"] @@ -542,6 +606,7 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 +margin_top = 10.0 margin_right = 558.0 margin_bottom = 112.0 rect_pivot_offset = Vector2( 0, 0 ) @@ -551,6 +616,7 @@ mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 columns = 6 +_sections_unfolded = [ "Margin" ] [node name="Briefs" type="TextureButton" parent="RefRect/Wordrobe/Underwear/UndiesGrid" index="0"] @@ -571,7 +637,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 17 ) +texture_normal = ExtResource( 19 ) [node name="ZBriefs" type="TextureButton" parent="RefRect/Wordrobe/Underwear/UndiesGrid" index="1"] @@ -593,7 +659,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 18 ) +texture_normal = ExtResource( 20 ) _sections_unfolded = [ "Textures" ] [node name="OwO Censor" type="TextureButton" parent="RefRect/Wordrobe/Underwear/UndiesGrid" index="2"] @@ -616,7 +682,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 19 ) +texture_normal = ExtResource( 21 ) _sections_unfolded = [ "Textures" ] [node name="ClearBtn" type="Button" parent="RefRect" index="1"] @@ -625,10 +691,10 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 504.0 -margin_top = 9.0 -margin_right = 575.0 -margin_bottom = 29.0 +margin_left = 245.0 +margin_top = 16.0 +margin_right = 316.0 +margin_bottom = 36.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -641,10 +707,10 @@ enabled_focus_mode = 2 shortcut = null group = null text = "KCLR" -flat = false +flat = true align = 1 -[node name="Body" type="ReferenceRect" parent="." index="1"] +[node name="Body" type="ReferenceRect" parent="." index="2"] anchor_left = 0.0 anchor_top = 0.0 @@ -660,21 +726,33 @@ mouse_filter = 0 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 +__meta__ = { +"_edit_lock_": true +} [node name="Undies" type="Sprite" parent="Body" index="0"] position = Vector2( 57.9419, 159.296 ) -texture = ExtResource( 17 ) +texture = ExtResource( 19 ) +__meta__ = { +"_edit_lock_": true +} [node name="Bottom" type="Sprite" parent="Body" index="1"] position = Vector2( 57.9419, 159.296 ) -texture = ExtResource( 20 ) +texture = ExtResource( 22 ) +__meta__ = { +"_edit_lock_": true +} [node name="Top" type="Sprite" parent="Body" index="2"] position = Vector2( 65.0597, 65.3242 ) -texture = ExtResource( 21 ) +texture = ExtResource( 23 ) +__meta__ = { +"_edit_lock_": true +} [connection signal="pressed" from="RefRect/Wordrobe/Pants/PantsGrid/Jeans" to="." method="_on_Jeans_pressed"] @@ -702,6 +780,8 @@ texture = ExtResource( 21 ) [connection signal="pressed" from="RefRect/Wordrobe/Shirts/ShirtsGrid/NL Jacket" to="." method="_on_NL_Jacket_pressed"] +[connection signal="pressed" from="RefRect/Wordrobe/Shirts/ShirtsGrid/Train Hoodie" to="." method="_on_Train_Hoodie_pressed"] + [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"] diff --git a/project/Interface.tscn b/project/Interface.tscn index 573dd05..92b81fb 100644 --- a/project/Interface.tscn +++ b/project/Interface.tscn @@ -31,13 +31,14 @@ bus = "Master" [node name="GMRefRect" type="ReferenceRect" parent="." index="1"] +editor/display_folded = true anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 7.0 +margin_top = 8.0 margin_right = 800.0 -margin_bottom = 31.0 +margin_bottom = 36.0 rect_min_size = Vector2( 800, 0 ) rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -47,25 +48,15 @@ size_flags_horizontal = 1 size_flags_vertical = 1 _sections_unfolded = [ "Anchor", "Grow Direction", "Margin", "Rect" ] -[node name="GPanel" type="Panel" parent="GMRefRect" index="0"] - -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="HBoxContainer" type="HBoxContainer" parent="GMRefRect/GPanel" index="0"] +[node name="GMenuHbox" type="HBoxContainer" parent="GMRefRect" index="0"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 1.0 anchor_bottom = 1.0 +margin_left = 10.0 +margin_top = 6.0 +margin_right = -10.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -73,15 +64,16 @@ mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 alignment = 0 +_sections_unfolded = [ "Margin" ] -[node name="SettingsBtn" type="Button" parent="GMRefRect/GPanel/HBoxContainer" index="0"] +[node name="SettingsBtn" 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 = 24.0 +margin_bottom = 22.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -89,6 +81,10 @@ 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 @@ -96,40 +92,17 @@ group = null text = "KSET" flat = true align = 1 +_sections_unfolded = [ "custom_colors" ] -[node name="CreditsBtn" type="Button" parent="GMRefRect/GPanel/HBoxContainer" index="1"] +[node name="AboutBtn" 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 = 88.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 -toggle_mode = false -enabled_focus_mode = 2 -shortcut = null -group = null -text = "KCRE" -flat = true -align = 1 - -[node name="AboutBtn" type="Button" parent="GMRefRect/GPanel/HBoxContainer" index="2"] - -anchor_left = 0.0 -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_left = 92.0 -margin_right = 141.0 -margin_bottom = 24.0 +margin_right = 94.0 +margin_bottom = 22.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -137,6 +110,10 @@ 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 @@ -144,7 +121,7 @@ group = null text = "KABO" flat = true align = 1 -_sections_unfolded = [ "Margin" ] +_sections_unfolded = [ "Margin", "custom_colors" ] [node name="AboutWin" type="WindowDialog" parent="." index="2"] @@ -205,7 +182,7 @@ 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_active = false scroll_following = false selection_enabled = false override_selected_font_color = false @@ -234,8 +211,8 @@ 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_left = 150.0 +margin_right = 190.0 margin_bottom = 20.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -252,14 +229,38 @@ text = "KLIC" flat = false align = 1 -[node name="CloseAbtBtn" type="Button" parent="AboutWin/AboutRefRect/AboutBtnHBox" index="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 = 217.0 -margin_right = 247.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 @@ -278,6 +279,7 @@ align = 1 [node name="CreditsWin" type="AcceptDialog" parent="." index="3"] +editor/display_folded = true visible = false anchor_left = 0.0 anchor_top = 0.0 @@ -326,8 +328,6 @@ Clothing inspired by Megawolf77 Canon Rhode -########################## - [img]assets/sixam_logo_200px.png[/img] SixAM is a brand by Anthony Wilcox. [/center]" @@ -345,8 +345,6 @@ Clothing inspired by Megawolf77 Canon Rhode -########################## - SixAM is a brand by Anthony Wilcox. " @@ -530,14 +528,14 @@ 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/GMenuHbox/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="GMRefRect/GMenuHbox/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/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/dressup_wardrobe.png b/project/assets/dressup_wardrobe.png new file mode 100644 index 0000000..c9e0745 Binary files /dev/null and b/project/assets/dressup_wardrobe.png differ diff --git a/project/assets/dressup_wardrobe.png.import b/project/assets/dressup_wardrobe.png.import new file mode 100644 index 0000000..adeef36 --- /dev/null +++ b/project/assets/dressup_wardrobe.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/dressup_wardrobe.png-5cd33aab3d3a86571db259626c636761.stex" + +[deps] + +source_file="res://assets/dressup_wardrobe.png" +dest_files=[ "res://.import/dressup_wardrobe.png-5cd33aab3d3a86571db259626c636761.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/train_hoodie.png b/project/assets/train_hoodie.png new file mode 100644 index 0000000..d42ebc0 Binary files /dev/null and b/project/assets/train_hoodie.png differ diff --git a/project/assets/train_hoodie.png.import b/project/assets/train_hoodie.png.import new file mode 100644 index 0000000..0c0f10f --- /dev/null +++ b/project/assets/train_hoodie.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/train_hoodie.png-bdda6c44a54736929bd0247dcdb359d4.stex" + +[deps] + +source_file="res://assets/train_hoodie.png" +dest_files=[ "res://.import/train_hoodie.png-bdda6c44a54736929bd0247dcdb359d4.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/src/Clothes.gd b/project/src/Clothes.gd index 1a85d71..2936202 100644 --- a/project/src/Clothes.gd +++ b/project/src/Clothes.gd @@ -68,6 +68,9 @@ func _on_Z_Shirt_pressed(): func _on_Biker_Jacket_pressed(): change_tops(load("res://assets/biker_jacket.png")) + +func _on_Train_Hoodie_pressed(): + change_tops(load("res://assets/train_hoodie.png")) func _on_Beat_Up_Jeans_pressed(): change_bottoms(load("res://assets/beat_up_jeans.png")) diff --git a/screenshot.png b/screenshot.png index 0984722..a5fa281 100644 Binary files a/screenshot.png and b/screenshot.png differ