diff --git a/project/Clothes.tscn b/project/Clothes.tscn index 0f3ab1f..cfc1f11 100644 --- a/project/Clothes.tscn +++ b/project/Clothes.tscn @@ -1,81 +1,112 @@ -[gd_scene load_steps=20 format=2] +[gd_scene load_steps=19 format=2] [ext_resource path="res://src/Clothes.gd" type="Script" id=1] -[ext_resource path="res://assets/briefs.png" type="Texture" id=2] -[ext_resource path="res://assets/zbriefs.png" type="Texture" 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/old sweatshirt.png" type="Texture" id=7] +[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/snowboard coat.png" type="Texture" id=11] -[ext_resource path="res://src/ItemDrag.gd" type="Script" id=12] -[ext_resource path="res://assets/trench coat.png" type="Texture" id=13] -[ext_resource path="res://assets/blue tux.png" type="Texture" id=14] -[ext_resource path="res://assets/jp school girl.png" type="Texture" id=15] -[ext_resource path="res://assets/camera.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/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/briefs.png" type="Texture" id=14] +[ext_resource path="res://assets/zbriefs.png" type="Texture" id=15] +[ext_resource path="res://assets/owo_censor.png" type="Texture" id=16] +[ext_resource path="res://assets/bottoms_placeholder.png" type="Texture" id=17] +[ext_resource path="res://assets/tops_placeholder.png" type="Texture" id=18] [node name="Clothes" type="Node" index="0"] script = ExtResource( 1 ) -[node name="Wordrobe" type="ReferenceRect" parent="." index="0"] +[node name="RefRect" type="ReferenceRect" parent="." index="0"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 193.0 -margin_top = 17.0 -margin_right = 775.0 -margin_bottom = 527.0 +margin_left = 211.0 +margin_top = 9.0 +margin_right = 794.0 +margin_bottom = 447.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 ) +_sections_unfolded = [ "Theme" ] -[node name="Underwear" type="Node" parent="Wordrobe" index="0"] - -[node name="Briefs" type="TextureButton" parent="Wordrobe/Underwear" index="0"] +[node name="Wordrobe" type="TabContainer" parent="RefRect" index="0"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 506.0 -margin_top = 291.0 -margin_right = 612.0 -margin_bottom = 403.0 +margin_left = 13.0 +margin_top = 4.0 +margin_right = 575.0 +margin_bottom = 431.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( 2 ) +tab_align = 0 +tabs_visible = true +_sections_unfolded = [ "Theme" ] -[node name="ZBriefs" type="TextureButton" parent="Wordrobe/Underwear" index="1"] +[node name="Pants" type="Tabs" parent="RefRect/Wordrobe" index="0"] + +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 +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 ) +tab_align = 1 +scrolling_enabled = true +_sections_unfolded = [ "Theme" ] + +[node name="PantsGrid" type="GridContainer" parent="RefRect/Wordrobe/Pants" index="0"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 963.0 -margin_top = 360.0 -margin_right = 1069.0 -margin_bottom = 472.0 +margin_right = 551.0 +margin_bottom = 112.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 +columns = 6 + +[node name="Jeans" type="TextureButton" parent="RefRect/Wordrobe/Pants/PantsGrid" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 106.0 +margin_bottom = 112.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -90,18 +121,15 @@ group = null texture_normal = ExtResource( 3 ) _sections_unfolded = [ "Textures" ] -[node name="Bottoms" type="Node" parent="Wordrobe" index="1"] - -[node name="Jeans" type="TextureButton" parent="Wordrobe/Bottoms" index="0"] +[node name="DJ Shorts" type="TextureButton" parent="RefRect/Wordrobe/Pants/PantsGrid" index="1"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 628.0 -margin_top = 399.0 -margin_right = 734.0 -margin_bottom = 511.0 +margin_left = 110.0 +margin_right = 216.0 +margin_bottom = 112.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -114,18 +142,17 @@ enabled_focus_mode = 2 shortcut = null group = null texture_normal = ExtResource( 4 ) -_sections_unfolded = [ "Textures" ] +_sections_unfolded = [ "Anchor", "Textures" ] -[node name="DJ Shorts" type="TextureButton" parent="Wordrobe/Bottoms" index="1"] +[node name="Sweats" type="TextureButton" parent="RefRect/Wordrobe/Pants/PantsGrid" index="2"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 639.0 -margin_top = 286.0 -margin_right = 745.0 -margin_bottom = 398.0 +margin_left = 220.0 +margin_right = 323.0 +margin_bottom = 112.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -138,18 +165,17 @@ enabled_focus_mode = 2 shortcut = null group = null texture_normal = ExtResource( 5 ) -_sections_unfolded = [ "Anchor", "Textures" ] +_sections_unfolded = [ "Textures" ] -[node name="Sweats" type="TextureButton" parent="Wordrobe/Bottoms" index="2"] +[node name="Beat Up Jeans" type="TextureButton" parent="RefRect/Wordrobe/Pants/PantsGrid" index="3"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 499.0 -margin_top = 389.0 -margin_right = 605.0 -margin_bottom = 501.0 +margin_left = 327.0 +margin_right = 433.0 +margin_bottom = 112.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -164,18 +190,53 @@ group = null texture_normal = ExtResource( 6 ) _sections_unfolded = [ "Textures" ] -[node name="Tops" type="Node" parent="Wordrobe" index="2"] +[node name="Shirts" type="Tabs" parent="RefRect/Wordrobe" index="1"] -[node name="Sweatshirt" type="TextureButton" parent="Wordrobe/Tops" index="0"] +visible = false +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 +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 +tab_align = 1 +scrolling_enabled = true + +[node name="ShirtsGrid" type="GridContainer" parent="RefRect/Wordrobe/Shirts" index="0"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 654.0 -margin_top = 40.0 -margin_right = 739.0 -margin_bottom = 150.0 +margin_left = 4.0 +margin_top = 7.0 +margin_right = 549.0 +margin_bottom = 388.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 +columns = 6 +_sections_unfolded = [ "Grow Direction" ] + +[node name="Sweatshirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 85.0 +margin_bottom = 115.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -190,16 +251,15 @@ group = null texture_normal = ExtResource( 7 ) _sections_unfolded = [ "Textures" ] -[node name="DJ Shirt" type="TextureButton" parent="Wordrobe/Tops" index="1"] +[node name="DJ Shirt" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="1"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 651.0 -margin_top = 164.0 -margin_right = 736.0 -margin_bottom = 274.0 +margin_left = 89.0 +margin_right = 174.0 +margin_bottom = 115.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -214,16 +274,15 @@ group = null texture_normal = ExtResource( 8 ) _sections_unfolded = [ "Textures" ] -[node name="Raw" type="TextureButton" parent="Wordrobe/Tops" index="2"] +[node name="Raw" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="2"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 533.0 -margin_top = 177.0 -margin_right = 618.0 -margin_bottom = 290.0 +margin_left = 178.0 +margin_right = 263.0 +margin_bottom = 115.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -238,16 +297,15 @@ group = null texture_normal = ExtResource( 9 ) _sections_unfolded = [ "Textures" ] -[node name="Atomic" type="TextureButton" parent="Wordrobe/Tops" index="3"] +[node name="Atomic" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="3"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 533.0 -margin_top = 48.0 -margin_right = 614.0 -margin_bottom = 163.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 @@ -262,18 +320,15 @@ group = null texture_normal = ExtResource( 10 ) _sections_unfolded = [ "Textures" ] -[node name="Outfits" type="Node" parent="Wordrobe" index="3"] - -[node name="Snowboard" type="TextureButton" parent="Wordrobe/Outfits" index="0"] +[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 = 224.0 -margin_top = 303.0 -margin_right = 330.0 -margin_bottom = 515.0 +margin_left = 350.0 +margin_right = 431.0 +margin_bottom = 115.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -286,19 +341,40 @@ enabled_focus_mode = 2 shortcut = null group = null texture_normal = ExtResource( 11 ) -script = ExtResource( 12 ) _sections_unfolded = [ "Textures" ] -[node name="Trench Coat" type="TextureButton" parent="Wordrobe/Outfits" index="1"] +[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 = 355.0 -margin_top = 332.0 -margin_right = 461.0 -margin_bottom = 523.0 +margin_left = 435.0 +margin_right = 520.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( 12 ) +_sections_unfolded = [ "Textures" ] + +[node name="NL Jacket" type="TextureButton" parent="RefRect/Wordrobe/Shirts/ShirtsGrid" index="6"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 119.0 +margin_right = 85.0 +margin_bottom = 229.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -311,19 +387,52 @@ enabled_focus_mode = 2 shortcut = null group = null texture_normal = ExtResource( 13 ) -script = ExtResource( 12 ) _sections_unfolded = [ "Textures" ] -[node name="Blue Tux" type="TextureButton" parent="Wordrobe/Outfits" index="2"] +[node name="Underwear" type="Tabs" parent="RefRect/Wordrobe" index="2"] + +visible = false +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 +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 +tab_align = 1 +scrolling_enabled = true + +[node name="UndiesGrid" type="GridContainer" parent="RefRect/Wordrobe/Underwear" index="0"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 205.0 -margin_top = 52.0 -margin_right = 372.0 -margin_bottom = 276.0 +margin_right = 558.0 +margin_bottom = 112.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 +columns = 6 + +[node name="Briefs" type="TextureButton" parent="RefRect/Wordrobe/Underwear/UndiesGrid" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 106.0 +margin_bottom = 112.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -336,19 +445,16 @@ enabled_focus_mode = 2 shortcut = null group = null texture_normal = ExtResource( 14 ) -script = ExtResource( 12 ) -_sections_unfolded = [ "Textures" ] -[node name="School Girl" type="TextureButton" parent="Wordrobe/Outfits" index="3"] +[node name="ZBriefs" type="TextureButton" parent="RefRect/Wordrobe/Underwear/UndiesGrid" index="1"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 398.0 -margin_top = 172.0 -margin_right = 487.0 -margin_bottom = 322.0 +margin_left = 110.0 +margin_right = 216.0 +margin_bottom = 112.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -361,21 +467,17 @@ enabled_focus_mode = 2 shortcut = null group = null texture_normal = ExtResource( 15 ) -script = ExtResource( 12 ) _sections_unfolded = [ "Textures" ] -[node name="Accessories" type="Node" parent="Wordrobe" index="4"] - -[node name="Camera" type="TextureButton" parent="Wordrobe/Accessories" index="0"] +[node name="OwO Censor" type="TextureButton" parent="RefRect/Wordrobe/Underwear/UndiesGrid" index="2"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 409.0 -margin_top = 96.0 -margin_right = 458.0 -margin_bottom = 158.0 +margin_left = 220.0 +margin_right = 326.0 +margin_bottom = 112.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -388,19 +490,18 @@ enabled_focus_mode = 2 shortcut = null group = null texture_normal = ExtResource( 16 ) -script = ExtResource( 12 ) _sections_unfolded = [ "Textures" ] -[node name="OwO Censor" type="TextureButton" parent="Wordrobe/Accessories" index="1"] +[node name="ClearBtn" type="Button" parent="RefRect" index="1"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 381.0 -margin_top = 43.0 -margin_right = 486.0 -margin_bottom = 83.0 +margin_left = 514.0 +margin_top = 4.0 +margin_right = 575.0 +margin_bottom = 24.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -412,9 +513,9 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 17 ) -script = ExtResource( 12 ) -_sections_unfolded = [ "Textures" ] +text = "Clear" +flat = false +align = 1 [node name="Body" type="ReferenceRect" parent="." index="1"] @@ -423,7 +524,7 @@ anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 26.0 -margin_top = 297.0 +margin_top = 282.0 margin_right = 144.0 margin_bottom = 519.0 rect_pivot_offset = Vector2( 0, 0 ) @@ -433,36 +534,49 @@ mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 -[node name="Bottom" type="Sprite" parent="Body" index="0"] +[node name="Undies" type="Sprite" parent="Body" index="0"] -position = Vector2( 57.9419, 144.296 ) +position = Vector2( 57.9419, 159.296 ) +texture = ExtResource( 14 ) + +[node name="Bottom" type="Sprite" parent="Body" index="1"] + +position = Vector2( 57.9419, 159.296 ) +texture = ExtResource( 17 ) + +[node name="Top" type="Sprite" parent="Body" index="2"] + +position = Vector2( 65.0597, 65.3242 ) texture = ExtResource( 18 ) -[node name="Top" type="Sprite" parent="Body" index="1"] +[connection signal="pressed" from="RefRect/Wordrobe/Pants/PantsGrid/Jeans" to="." method="_on_Jeans_pressed"] -position = Vector2( 64.0597, 55.3242 ) -texture = ExtResource( 19 ) +[connection signal="pressed" from="RefRect/Wordrobe/Pants/PantsGrid/DJ Shorts" to="." method="_on_DJ_Shorts_pressed"] -[connection signal="pressed" from="Wordrobe/Underwear/Briefs" to="." method="_on_Briefs_pressed"] +[connection signal="pressed" from="RefRect/Wordrobe/Pants/PantsGrid/Sweats" to="." method="_on_Sweats_pressed"] -[connection signal="pressed" from="Wordrobe/Underwear/ZBriefs" to="." method="_on_ZBriefs_pressed"] +[connection signal="pressed" from="RefRect/Wordrobe/Pants/PantsGrid/Beat Up Jeans" to="." method="_on_Beat_Up_Jeans_pressed"] -[connection signal="pressed" from="Wordrobe/Bottoms/Jeans" to="." method="_on_Jeans_pressed"] +[connection signal="pressed" from="RefRect/Wordrobe/Shirts/ShirtsGrid/Sweatshirt" to="." method="_on_Sweatshirt_pressed"] -[connection signal="pressed" from="Wordrobe/Bottoms/DJ Shorts" to="." method="_on_DJ_Shorts_pressed"] +[connection signal="pressed" from="RefRect/Wordrobe/Shirts/ShirtsGrid/DJ Shirt" to="." method="_on_DJ_Shirt_pressed"] -[connection signal="pressed" from="Wordrobe/Bottoms/Sweats" to="." method="_on_Sweats_pressed"] +[connection signal="pressed" from="RefRect/Wordrobe/Shirts/ShirtsGrid/Raw" to="." method="_on_Raw_pressed"] -[connection signal="pressed" from="Wordrobe/Tops/Sweatshirt" to="." method="_on_Sweatshirt_pressed"] +[connection signal="pressed" from="RefRect/Wordrobe/Shirts/ShirtsGrid/Atomic" to="." method="_on_Atomic_pressed"] -[connection signal="pressed" from="Wordrobe/Tops/DJ Shirt" to="." method="_on_DJ_Shirt_pressed"] +[connection signal="pressed" from="RefRect/Wordrobe/Shirts/ShirtsGrid/Z Shirt" to="." method="_on_Z_Shirt_pressed"] -[connection signal="pressed" from="Wordrobe/Tops/Raw" to="." method="_on_Raw_pressed"] +[connection signal="pressed" from="RefRect/Wordrobe/Shirts/ShirtsGrid/Biker Jacket" to="." method="_on_Biker_Jacket_pressed"] -[connection signal="pressed" from="Wordrobe/Tops/Atomic" to="." method="_on_Atomic_pressed"] +[connection signal="pressed" from="RefRect/Wordrobe/Shirts/ShirtsGrid/NL Jacket" to="." method="_on_NL_Jacket_pressed"] -[connection signal="gui_input" from="Wordrobe/Accessories/Camera" to="Wordrobe/Accessories/Camera" method="_on_outfit_gui_input"] +[connection signal="pressed" from="RefRect/Wordrobe/Underwear/UndiesGrid/Briefs" to="." method="_on_Briefs_pressed"] -[connection signal="gui_input" from="Wordrobe/Accessories/OwO Censor" to="Wordrobe/Accessories/OwO Censor" method="_on_outfit_gui_input"] +[connection signal="pressed" from="RefRect/Wordrobe/Underwear/UndiesGrid/ZBriefs" to="." method="_on_ZBriefs_pressed"] + +[connection signal="pressed" from="RefRect/Wordrobe/Underwear/UndiesGrid/OwO Censor" to="." method="_on_OwO_Censor_pressed"] + +[connection signal="pressed" from="RefRect/ClearBtn" to="." method="_on_ClearBtn_pressed"] diff --git a/project/GameScreen.tscn b/project/GameScreen.tscn index 786a5fe..80456d7 100644 --- a/project/GameScreen.tscn +++ b/project/GameScreen.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=8 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/lights.png" type="Texture" id=3] +[ext_resource path="res://assets/15_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://Shell.tscn" type="PackedScene" id=6] @@ -20,14 +20,10 @@ __meta__ = { "_edit_lock_": true } -[node name="Lights" type="Sprite" parent="." index="1"] +[node name="PicFrame" type="Sprite" parent="." index="1"] -position = Vector2( 477.823, 100.811 ) +position = Vector2( 93.9417, 179.396 ) texture = ExtResource( 3 ) -_sections_unfolded = [ "Z Index" ] -__meta__ = { -"_edit_lock_": true -} [node name="Zack" parent="." index="2" instance=ExtResource( 4 )] diff --git a/project/Interface.tscn b/project/Interface.tscn index 9303a8e..36ef34f 100644 --- a/project/Interface.tscn +++ b/project/Interface.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://src/Interface.gd" type="Script" id=1] [ext_resource path="res://music/piano.ogg" type="AudioStream" id=2] -[node name="Interface" type="Control" index="0"] +[node name="Interface" type="Control"] anchor_left = 0.0 anchor_top = 0.0 @@ -35,10 +35,10 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 11.0 +margin_left = 16.0 margin_top = 16.0 -margin_right = 165.0 -margin_bottom = 178.0 +margin_right = 179.0 +margin_bottom = 95.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 @@ -55,7 +55,7 @@ anchor_bottom = 1.0 margin_left = 4.0 margin_top = 3.0 margin_right = -3.0 -margin_bottom = -3.0 +margin_bottom = -85.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -70,7 +70,7 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_right = 147.0 +margin_right = 156.0 margin_bottom = 20.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -94,7 +94,7 @@ anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_top = 24.0 -margin_right = 147.0 +margin_right = 156.0 margin_bottom = 44.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -118,7 +118,7 @@ anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_top = 48.0 -margin_right = 147.0 +margin_right = 156.0 margin_bottom = 68.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false @@ -175,13 +175,19 @@ mouse_filter = 0 mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 -bbcode_enabled = false -bbcode_text = "" +bbcode_enabled = true +bbcode_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/" visible_characters = -1 percent_visible = 1.0 meta_underlined = true tab_size = 4 -text = "Zack's Dress Up is a port of ZC's Dress Up, both created by Anthony Wilcox. +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. @@ -270,6 +276,7 @@ _sections_unfolded = [ "BBCode" ] [node name="SettingsWin" type="AcceptDialog" parent="." index="4"] +visible = false anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 diff --git a/project/Zack.tscn b/project/Zack.tscn index 2e41ff7..6d9abb8 100644 --- a/project/Zack.tscn +++ b/project/Zack.tscn @@ -1,38 +1,50 @@ -[gd_scene load_steps=22 format=2] +[gd_scene load_steps=26 format=2] -[ext_resource path="res://assets/zack_base.png" type="Texture" id=1] -[ext_resource path="res://assets/eyes/eyes1.png" type="Texture" id=2] -[ext_resource path="res://assets/eyes/eyes2.png" type="Texture" id=3] -[ext_resource path="res://assets/eyes/eyes3.png" type="Texture" id=4] -[ext_resource path="res://assets/eyes/eyes4.png" type="Texture" id=5] -[ext_resource path="res://assets/eyes/eyes5.png" type="Texture" id=6] -[ext_resource path="res://assets/eyes/eyes6.png" type="Texture" id=7] -[ext_resource path="res://assets/eyes/eyes7.png" type="Texture" id=8] -[ext_resource path="res://assets/mouth/mouth.png" type="Texture" id=9] -[ext_resource path="res://assets/mouth/mouth2.png" type="Texture" id=10] -[ext_resource path="res://assets/mouth/mouth3.png" type="Texture" id=11] -[ext_resource path="res://assets/mouth/mouth4.png" type="Texture" id=12] -[ext_resource path="res://assets/mouth/mouth5.png" type="Texture" id=13] -[ext_resource path="res://assets/mouth/mouth6.png" type="Texture" id=14] -[ext_resource path="res://assets/mouth/mouth7.png" type="Texture" id=15] -[ext_resource path="res://assets/mouth/mouth8.png" type="Texture" id=16] -[ext_resource path="res://assets/mouth/mouth9.png" type="Texture" id=17] -[ext_resource path="res://assets/mouth/mouth10.png" type="Texture" id=18] -[ext_resource path="res://assets/mouth/mouth12.png" type="Texture" id=19] +[ext_resource path="res://assets/tail/tail0.png" type="Texture" id=1] +[ext_resource path="res://assets/tail/tail1.png" type="Texture" id=2] +[ext_resource path="res://assets/tail/tail2.png" type="Texture" id=3] +[ext_resource path="res://assets/zack_base.png" type="Texture" id=4] +[ext_resource path="res://assets/eyes/eyes1.png" type="Texture" id=5] +[ext_resource path="res://assets/eyes/eyes2.png" type="Texture" id=6] +[ext_resource path="res://assets/eyes/eyes3.png" type="Texture" id=7] +[ext_resource path="res://assets/eyes/eyes4.png" type="Texture" id=8] +[ext_resource path="res://assets/eyes/eyes5.png" type="Texture" id=9] +[ext_resource path="res://assets/eyes/eyes6.png" type="Texture" id=10] +[ext_resource path="res://assets/eyes/eyes7.png" type="Texture" id=11] +[ext_resource path="res://assets/mouth/mouth.png" type="Texture" id=12] +[ext_resource path="res://assets/mouth/mouth2.png" type="Texture" id=13] +[ext_resource path="res://assets/mouth/mouth3.png" type="Texture" id=14] +[ext_resource path="res://assets/mouth/mouth4.png" type="Texture" id=15] +[ext_resource path="res://assets/mouth/mouth5.png" type="Texture" id=16] +[ext_resource path="res://assets/mouth/mouth6.png" type="Texture" id=17] +[ext_resource path="res://assets/mouth/mouth7.png" type="Texture" id=18] +[ext_resource path="res://assets/mouth/mouth8.png" type="Texture" id=19] +[ext_resource path="res://assets/mouth/mouth9.png" type="Texture" id=20] +[ext_resource path="res://assets/mouth/mouth10.png" type="Texture" id=21] +[ext_resource path="res://assets/mouth/mouth12.png" type="Texture" id=22] [sub_resource type="SpriteFrames" id=1] animations = [ { -"frames": [ ExtResource( 2 ), ExtResource( 2 ), ExtResource( 2 ), ExtResource( 2 ), ExtResource( 3 ), ExtResource( 3 ), ExtResource( 4 ), ExtResource( 4 ), ExtResource( 5 ), ExtResource( 5 ), ExtResource( 5 ), ExtResource( 5 ), ExtResource( 5 ), ExtResource( 6 ), ExtResource( 6 ), ExtResource( 7 ), ExtResource( 7 ), ExtResource( 8 ), ExtResource( 8 ) ], +"frames": [ ExtResource( 1 ), ExtResource( 1 ), ExtResource( 1 ), ExtResource( 2 ), ExtResource( 2 ), ExtResource( 2 ), ExtResource( 3 ), ExtResource( 3 ), ExtResource( 3 ) ], "loop": true, "name": "default", -"speed": 5.0 +"speed": 2.0 } ] [sub_resource type="SpriteFrames" id=2] animations = [ { -"frames": [ ExtResource( 9 ), ExtResource( 9 ), ExtResource( 10 ), ExtResource( 10 ), ExtResource( 11 ), ExtResource( 11 ), ExtResource( 12 ), ExtResource( 12 ), ExtResource( 13 ), ExtResource( 13 ), ExtResource( 14 ), ExtResource( 14 ), ExtResource( 15 ), ExtResource( 15 ), ExtResource( 15 ), ExtResource( 16 ), ExtResource( 16 ), ExtResource( 16 ), ExtResource( 16 ), ExtResource( 17 ), ExtResource( 17 ), ExtResource( 17 ), ExtResource( 17 ), ExtResource( 18 ), ExtResource( 18 ), ExtResource( 19 ), ExtResource( 19 ) ], +"frames": [ ExtResource( 5 ), ExtResource( 5 ), ExtResource( 5 ), ExtResource( 5 ), ExtResource( 6 ), ExtResource( 6 ), ExtResource( 7 ), ExtResource( 7 ), ExtResource( 8 ), ExtResource( 8 ), ExtResource( 8 ), ExtResource( 8 ), ExtResource( 8 ), ExtResource( 9 ), ExtResource( 9 ), ExtResource( 10 ), ExtResource( 10 ), ExtResource( 11 ), ExtResource( 11 ) ], +"loop": true, +"name": "default", +"speed": 5.0 +} ] + +[sub_resource type="SpriteFrames" id=3] + +animations = [ { +"frames": [ ExtResource( 12 ), ExtResource( 12 ), ExtResource( 13 ), ExtResource( 13 ), ExtResource( 14 ), ExtResource( 14 ), ExtResource( 15 ), ExtResource( 15 ), ExtResource( 16 ), ExtResource( 16 ), ExtResource( 17 ), ExtResource( 17 ), ExtResource( 18 ), ExtResource( 18 ), ExtResource( 18 ), ExtResource( 19 ), ExtResource( 19 ), ExtResource( 19 ), ExtResource( 19 ), ExtResource( 20 ), ExtResource( 20 ), ExtResource( 20 ), ExtResource( 20 ), ExtResource( 21 ), ExtResource( 21 ), ExtResource( 22 ), ExtResource( 22 ) ], "loop": true, "name": "default", "speed": 4.0 @@ -40,28 +52,35 @@ animations = [ { [node name="Zack" type="Node2D"] -[node name="Base" type="Sprite" parent="." index="0"] +[node name="Tail" type="AnimatedSprite" parent="." index="0"] + +position = Vector2( 50.6951, 374.417 ) +frames = SubResource( 1 ) +animation = "default" +frame = 6 +playing = true + +[node name="Base" type="Sprite" parent="." index="1"] position = Vector2( 92.6446, 354.064 ) -texture = ExtResource( 1 ) +texture = ExtResource( 4 ) __meta__ = { "_edit_lock_": true } -[node name="Eyes" type="AnimatedSprite" parent="." index="1"] +[node name="Eyes" type="AnimatedSprite" parent="." index="2"] position = Vector2( 109.519, 255.9 ) -frames = SubResource( 1 ) -animation = "default" -frame = 1 -playing = true - -[node name="Mouth" type="AnimatedSprite" parent="." index="2"] - -position = Vector2( 126.316, 257.474 ) frames = SubResource( 2 ) animation = "default" -frame = 22 +playing = true + +[node name="Mouth" type="AnimatedSprite" parent="." index="3"] + +position = Vector2( 126.316, 257.474 ) +frames = SubResource( 3 ) +animation = "default" +frame = 15 playing = true diff --git a/project/assets/15_dress_up_bg.png b/project/assets/15_dress_up_bg.png new file mode 100644 index 0000000..7705c4c Binary files /dev/null and b/project/assets/15_dress_up_bg.png differ diff --git a/project/assets/jp_school_girl.png.import b/project/assets/15_dress_up_bg.png.import similarity index 64% rename from project/assets/jp_school_girl.png.import rename to project/assets/15_dress_up_bg.png.import index be4a907..595a0d0 100644 --- a/project/assets/jp_school_girl.png.import +++ b/project/assets/15_dress_up_bg.png.import @@ -2,12 +2,12 @@ importer="texture" type="StreamTexture" -path="res://.import/jp_school_girl.png-3327135d27f4173adc771bbdc1467cbf.stex" +path="res://.import/15_dress_up_bg.png-539edf16398b672e4b3f5a1602dc2b98.stex" [deps] -source_file="res://assets/jp_school_girl.png" -dest_files=[ "res://.import/jp_school_girl.png-3327135d27f4173adc771bbdc1467cbf.stex" ] +source_file="res://assets/15_dress_up_bg.png" +dest_files=[ "res://.import/15_dress_up_bg.png-539edf16398b672e4b3f5a1602dc2b98.stex" ] [params] diff --git a/project/assets/DressUp.theme b/project/assets/DressUp.theme new file mode 100644 index 0000000..cf6a5dd Binary files /dev/null and b/project/assets/DressUp.theme differ diff --git a/project/assets/atomic_shirt.png b/project/assets/atomic_shirt.png index d497c9e..97f66c5 100644 Binary files a/project/assets/atomic_shirt.png and b/project/assets/atomic_shirt.png differ diff --git a/project/assets/beat_up_jeans.png b/project/assets/beat_up_jeans.png new file mode 100644 index 0000000..050a638 Binary files /dev/null and b/project/assets/beat_up_jeans.png differ diff --git a/project/assets/beat_up_jeans.png.import b/project/assets/beat_up_jeans.png.import new file mode 100644 index 0000000..24a9615 --- /dev/null +++ b/project/assets/beat_up_jeans.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/beat_up_jeans.png-838d665419522e21a8b4693229d0a65e.stex" + +[deps] + +source_file="res://assets/beat_up_jeans.png" +dest_files=[ "res://.import/beat_up_jeans.png-838d665419522e21a8b4693229d0a65e.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/biker_jacket.png b/project/assets/biker_jacket.png new file mode 100644 index 0000000..de582e0 Binary files /dev/null and b/project/assets/biker_jacket.png differ diff --git a/project/assets/biker_jacket.png.import b/project/assets/biker_jacket.png.import new file mode 100644 index 0000000..620334d --- /dev/null +++ b/project/assets/biker_jacket.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/biker_jacket.png-37525402abc6d2f5c512c374bb0d74cd.stex" + +[deps] + +source_file="res://assets/biker_jacket.png" +dest_files=[ "res://.import/biker_jacket.png-37525402abc6d2f5c512c374bb0d74cd.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/blue_tux.png b/project/assets/blue_tux.png deleted file mode 100644 index 7aae763..0000000 Binary files a/project/assets/blue_tux.png and /dev/null differ diff --git a/project/assets/briefs.png b/project/assets/briefs.png index 262f40f..a768800 100644 Binary files a/project/assets/briefs.png and b/project/assets/briefs.png differ diff --git a/project/assets/camera.png b/project/assets/camera.png deleted file mode 100644 index 9c38c7f..0000000 Binary files a/project/assets/camera.png and /dev/null differ diff --git a/project/assets/dj_shirt.png b/project/assets/dj_shirt.png index 67e6dbb..ee67e07 100644 Binary files a/project/assets/dj_shirt.png and b/project/assets/dj_shirt.png differ diff --git a/project/assets/icrazy_frame.png b/project/assets/icrazy_frame.png new file mode 100644 index 0000000..ed3fd55 Binary files /dev/null and b/project/assets/icrazy_frame.png differ diff --git a/project/assets/icrazy_frame.png.import b/project/assets/icrazy_frame.png.import new file mode 100644 index 0000000..f83b0eb --- /dev/null +++ b/project/assets/icrazy_frame.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/icrazy_frame.png-79d83c60163483ca15ed74de71734760.stex" + +[deps] + +source_file="res://assets/icrazy_frame.png" +dest_files=[ "res://.import/icrazy_frame.png-79d83c60163483ca15ed74de71734760.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/jp_school_girl.png b/project/assets/jp_school_girl.png deleted file mode 100644 index 97eb03f..0000000 Binary files a/project/assets/jp_school_girl.png and /dev/null differ diff --git a/project/assets/lights.png b/project/assets/lights.png deleted file mode 100644 index fe63e81..0000000 Binary files a/project/assets/lights.png and /dev/null differ diff --git a/project/assets/nl_jacket.png b/project/assets/nl_jacket.png new file mode 100644 index 0000000..6cb026f Binary files /dev/null and b/project/assets/nl_jacket.png differ diff --git a/project/assets/nl_jacket.png.import b/project/assets/nl_jacket.png.import new file mode 100644 index 0000000..24deada --- /dev/null +++ b/project/assets/nl_jacket.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/nl_jacket.png-fccc2e9afa0a716db647bed3f1c5ddf7.stex" + +[deps] + +source_file="res://assets/nl_jacket.png" +dest_files=[ "res://.import/nl_jacket.png-fccc2e9afa0a716db647bed3f1c5ddf7.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/owo_censor.png b/project/assets/owo_censor.png index 532644a..03f0764 100644 Binary files a/project/assets/owo_censor.png and b/project/assets/owo_censor.png differ diff --git a/project/assets/raw_shirt.png b/project/assets/raw_shirt.png index 45d5ea6..3e32bd7 100644 Binary files a/project/assets/raw_shirt.png and b/project/assets/raw_shirt.png differ diff --git a/project/assets/sixam.png b/project/assets/sixam.png deleted file mode 100644 index d705233..0000000 Binary files a/project/assets/sixam.png and /dev/null differ diff --git a/project/assets/snowboard_coat.png b/project/assets/snowboard_coat.png deleted file mode 100644 index 975ae52..0000000 Binary files a/project/assets/snowboard_coat.png and /dev/null differ diff --git a/project/assets/snowboard_coat.png.import b/project/assets/snowboard_coat.png.import deleted file mode 100644 index b3da6f6..0000000 --- a/project/assets/snowboard_coat.png.import +++ /dev/null @@ -1,29 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/snowboard_coat.png-ac37e5f55d9897ed3299c3aca9f97ada.stex" - -[deps] - -source_file="res://assets/snowboard_coat.png" -dest_files=[ "res://.import/snowboard_coat.png-ac37e5f55d9897ed3299c3aca9f97ada.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/tail/tail0.png b/project/assets/tail/tail0.png new file mode 100644 index 0000000..81cb64d Binary files /dev/null and b/project/assets/tail/tail0.png differ diff --git a/project/assets/sixam.png.import b/project/assets/tail/tail0.png.import similarity index 67% rename from project/assets/sixam.png.import rename to project/assets/tail/tail0.png.import index 9f6c3c8..26851a4 100644 --- a/project/assets/sixam.png.import +++ b/project/assets/tail/tail0.png.import @@ -2,12 +2,12 @@ importer="texture" type="StreamTexture" -path="res://.import/sixam.png-86f028bb567165a6240e42442182172e.stex" +path="res://.import/tail0.png-8e0ab14f54b7c6d3ffdcde1f27b47bc2.stex" [deps] -source_file="res://assets/sixam.png" -dest_files=[ "res://.import/sixam.png-86f028bb567165a6240e42442182172e.stex" ] +source_file="res://assets/tail/tail0.png" +dest_files=[ "res://.import/tail0.png-8e0ab14f54b7c6d3ffdcde1f27b47bc2.stex" ] [params] diff --git a/project/assets/tail/tail1.png b/project/assets/tail/tail1.png new file mode 100644 index 0000000..056301b Binary files /dev/null and b/project/assets/tail/tail1.png differ diff --git a/project/assets/lights.png.import b/project/assets/tail/tail1.png.import similarity index 66% rename from project/assets/lights.png.import rename to project/assets/tail/tail1.png.import index b31b11b..458df76 100644 --- a/project/assets/lights.png.import +++ b/project/assets/tail/tail1.png.import @@ -2,12 +2,12 @@ importer="texture" type="StreamTexture" -path="res://.import/lights.png-d3b638575074269eb55ef42e4442c95c.stex" +path="res://.import/tail1.png-17f4734e9e73f0d3f2a8e7f2e2b60438.stex" [deps] -source_file="res://assets/lights.png" -dest_files=[ "res://.import/lights.png-d3b638575074269eb55ef42e4442c95c.stex" ] +source_file="res://assets/tail/tail1.png" +dest_files=[ "res://.import/tail1.png-17f4734e9e73f0d3f2a8e7f2e2b60438.stex" ] [params] diff --git a/project/assets/tail/tail2.png b/project/assets/tail/tail2.png new file mode 100644 index 0000000..c41e7f5 Binary files /dev/null and b/project/assets/tail/tail2.png differ diff --git a/project/assets/camera.png.import b/project/assets/tail/tail2.png.import similarity index 66% rename from project/assets/camera.png.import rename to project/assets/tail/tail2.png.import index 3f6c585..a11f637 100644 --- a/project/assets/camera.png.import +++ b/project/assets/tail/tail2.png.import @@ -2,12 +2,12 @@ importer="texture" type="StreamTexture" -path="res://.import/camera.png-817ece2b3822eb2be7786670b43f8a42.stex" +path="res://.import/tail2.png-05065038925527f695bf6eb9533f4458.stex" [deps] -source_file="res://assets/camera.png" -dest_files=[ "res://.import/camera.png-817ece2b3822eb2be7786670b43f8a42.stex" ] +source_file="res://assets/tail/tail2.png" +dest_files=[ "res://.import/tail2.png-05065038925527f695bf6eb9533f4458.stex" ] [params] diff --git a/project/assets/tops_placeholder.png b/project/assets/tops_placeholder.png index 1fe698f..9d81011 100644 Binary files a/project/assets/tops_placeholder.png and b/project/assets/tops_placeholder.png differ diff --git a/project/assets/trench_coat.png b/project/assets/trench_coat.png deleted file mode 100644 index 3f86421..0000000 Binary files a/project/assets/trench_coat.png and /dev/null differ diff --git a/project/assets/trench_coat.png.import b/project/assets/trench_coat.png.import deleted file mode 100644 index 3827c8c..0000000 --- a/project/assets/trench_coat.png.import +++ /dev/null @@ -1,29 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/trench_coat.png-49504ebabbed78ee7882c0bd629e8f63.stex" - -[deps] - -source_file="res://assets/trench_coat.png" -dest_files=[ "res://.import/trench_coat.png-49504ebabbed78ee7882c0bd629e8f63.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/widgets/btn_color.stylebox b/project/assets/widgets/btn_color.stylebox new file mode 100644 index 0000000..45b218d Binary files /dev/null and b/project/assets/widgets/btn_color.stylebox differ diff --git a/project/assets/z_shirt.png b/project/assets/z_shirt.png new file mode 100644 index 0000000..7d5ebfe Binary files /dev/null and b/project/assets/z_shirt.png differ diff --git a/project/assets/blue_tux.png.import b/project/assets/z_shirt.png.import similarity index 66% rename from project/assets/blue_tux.png.import rename to project/assets/z_shirt.png.import index dd7f6e4..d54b295 100644 --- a/project/assets/blue_tux.png.import +++ b/project/assets/z_shirt.png.import @@ -2,12 +2,12 @@ importer="texture" type="StreamTexture" -path="res://.import/blue_tux.png-eae6fb6d110c4ca05fcff231eed0b334.stex" +path="res://.import/z_shirt.png-5e098d815f283a46a5d416e28aa7e977.stex" [deps] -source_file="res://assets/blue_tux.png" -dest_files=[ "res://.import/blue_tux.png-eae6fb6d110c4ca05fcff231eed0b334.stex" ] +source_file="res://assets/z_shirt.png" +dest_files=[ "res://.import/z_shirt.png-5e098d815f283a46a5d416e28aa7e977.stex" ] [params] diff --git a/project/assets/zbriefs.png b/project/assets/zbriefs.png index 3785e81..8ebd82d 100644 Binary files a/project/assets/zbriefs.png and b/project/assets/zbriefs.png differ diff --git a/project/project.godot b/project/project.godot index 329c680..f0ac40d 100644 --- a/project/project.godot +++ b/project/project.godot @@ -10,11 +10,12 @@ config_version=3 [application] -config/name="Zack's Dress Up 1½" +config/name="Zack's Dress Up" run/main_scene="res://GameScreen.tscn" +config/use_custom_user_dir=true boot_splash/image="res://assets/game splash.png" config/icon="res://icon.png" -name_sv="Zacks klä upp 1½" +name_sv="Zacks klä upp" [display] diff --git a/project/src/Clothes.gd b/project/src/Clothes.gd index 87037be..e701d0e 100644 --- a/project/src/Clothes.gd +++ b/project/src/Clothes.gd @@ -1,27 +1,53 @@ +# Anthony Wilcox licenses this file to you under the GPL license. +# See the LICENSE file in the project root for more information. extends Node onready var bottoms = load("res://assets/bottoms_placeholder.png") +onready var undies = load("res://assets/zbriefs.png") onready var tops = load("res://assets/tops_placeholder.png") func change_bottoms(new_bottom): bottoms = new_bottom + + if new_bottom == null: + $Body/Bottom.texture = bottoms + + if undies == load("res://assets/owo_censor.png"): + change_undies(null) + $Body/Bottom.texture = bottoms + +func change_undies(new_undies): + undies = new_undies + + if new_undies == null: + $Body/Undies.texture = undies + + $Body/Undies.texture = undies func change_tops(new_top): tops = new_top + + if new_top == null: + $Body/Top.texture = tops + $Body/Top.texture = tops func _on_DJ_Shorts_pressed(): change_bottoms(load("res://assets/dj_shorts.png")) func _on_ZBriefs_pressed(): - change_bottoms(load("res://assets/zbriefs.png")) + change_undies(load("res://assets/zbriefs.png")) func _on_Briefs_pressed(): - change_bottoms(load("res://assets/briefs.png")) + change_undies(load("res://assets/briefs.png")) func _on_Jeans_pressed(): change_bottoms(load("res://assets/jeans.png")) + +func _on_OwO_Censor_pressed(): + change_bottoms(null) + change_undies(load("res://assets/owo_censor.png")) func _on_Sweats_pressed(): change_bottoms(load("res://assets/sweat_pants.png")) @@ -30,10 +56,27 @@ func _on_Sweatshirt_pressed(): change_tops(load("res://assets/old_sweatshirt.png")) func _on_DJ_Shirt_pressed(): - change_tops(load("res://asssets/dj_shirt.png")) + change_tops(load("res://assets/dj_shirt.png")) func _on_Raw_pressed(): change_tops(load("res://assets/raw_shirt.png")) func _on_Atomic_pressed(): change_tops(load("res://assets/atomic_shirt.png")) + +func _on_Z_Shirt_pressed(): + change_tops(load("res://assets/z_shirt.png")) + +func _on_Biker_Jacket_pressed(): + change_tops(load("res://assets/biker_jacket.png")) + +func _on_Beat_Up_Jeans_pressed(): + change_bottoms(load("res://assets/beat_up_jeans.png")) + +func _on_NL_Jacket_pressed(): + change_tops(load("res://assets/nl_jacket.png")) + +func _on_ClearBtn_pressed(): + change_bottoms(null) + change_undies(null) + change_tops(null) diff --git a/project/src/GameScreen.gd b/project/src/GameScreen.gd index 67f61ab..9345cf7 100644 --- a/project/src/GameScreen.gd +++ b/project/src/GameScreen.gd @@ -16,7 +16,7 @@ func shell_interface(): cmdl.text = "" shell.show() - if cmdl.text == "help"and Input.is_key_pressed(KEY_ENTER): + if cmdl.text == "help" and Input.is_key_pressed(KEY_ENTER): cmdl_help.show() elif cmdl.text == "settings" and Input.is_key_pressed(KEY_ENTER): settingsWin.show()