diff --git a/project/ClassicClothes.tscn b/project/ClassicClothes.tscn index df40f63..e8c56d7 100644 --- a/project/ClassicClothes.tscn +++ b/project/ClassicClothes.tscn @@ -1,25 +1,26 @@ -[gd_scene load_steps=19 format=2] +[gd_scene load_steps=20 format=2] -[ext_resource path="res://assets/briefs_classic.png" type="Texture" id=1] +[ext_resource path="res://assets/classic/briefs_classic.png" type="Texture" id=1] [ext_resource path="res://src/ItemDrag.gd" type="Script" id=2] -[ext_resource path="res://assets/zbriefs_classic.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/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/whatsnew_shirt.png" type="Texture" id=15] -[ext_resource path="res://assets/train_hoodie.png" type="Texture" id=16] -[ext_resource path="res://assets/camera.png" type="Texture" id=17] -[ext_resource path="res://assets/owo_censor_classic.png" type="Texture" id=18] +[ext_resource path="res://assets/classic/zbriefs_classic.png" type="Texture" id=3] +[ext_resource path="res://assets/classic/fundosi_classic.png" type="Texture" id=4] +[ext_resource path="res://assets/jeans.png" type="Texture" id=5] +[ext_resource path="res://assets/dj_shorts.png" type="Texture" id=6] +[ext_resource path="res://assets/sweat_pants.png" type="Texture" id=7] +[ext_resource path="res://assets/blue_camo_jeans.png" type="Texture" id=8] +[ext_resource path="res://assets/beat_up_jeans.png" type="Texture" id=9] +[ext_resource path="res://assets/old_sweatshirt.png" type="Texture" id=10] +[ext_resource path="res://assets/dj_shirt.png" type="Texture" id=11] +[ext_resource path="res://assets/raw_shirt.png" type="Texture" id=12] +[ext_resource path="res://assets/atomic_shirt.png" type="Texture" id=13] +[ext_resource path="res://assets/z_shirt.png" type="Texture" id=14] +[ext_resource path="res://assets/biker_jacket.png" type="Texture" id=15] +[ext_resource path="res://assets/whatsnew_shirt.png" type="Texture" id=16] +[ext_resource path="res://assets/train_hoodie.png" type="Texture" id=17] +[ext_resource path="res://assets/classic/camera_classic.png" type="Texture" id=18] +[ext_resource path="res://assets/classic/owo_censor_classic.png" type="Texture" id=19] -[node name="Clothes" type="Node"] +[node name="Clothes" type="Node" index="0"] [node name="Wordrobe" type="ReferenceRect" parent="." index="0"] @@ -46,10 +47,10 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 517.0 -margin_top = 462.0 -margin_right = 585.0 -margin_bottom = 496.0 +margin_left = 64.0 +margin_top = 397.0 +margin_right = 132.0 +margin_bottom = 431.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -70,10 +71,10 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 403.0 -margin_top = 463.0 -margin_right = 471.0 -margin_bottom = 497.0 +margin_left = 371.0 +margin_top = 460.0 +margin_right = 439.0 +margin_bottom = 494.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -89,6 +90,31 @@ texture_normal = ExtResource( 3 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] +[node name="Fundosi" type="TextureButton" parent="Wordrobe/Underwear" index="2"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 508.0 +margin_top = 459.0 +margin_right = 576.0 +margin_bottom = 499.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( 4 ) +script = ExtResource( 2 ) +_sections_unfolded = [ "Textures" ] + [node name="Bottoms" type="Node" parent="Wordrobe" index="1"] [node name="Jeans" type="TextureButton" parent="Wordrobe/Bottoms" index="0"] @@ -112,7 +138,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 4 ) +texture_normal = ExtResource( 5 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -137,7 +163,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 5 ) +texture_normal = ExtResource( 6 ) script = ExtResource( 2 ) _sections_unfolded = [ "Anchor", "Textures" ] @@ -162,7 +188,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 6 ) +texture_normal = ExtResource( 7 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -187,7 +213,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 7 ) +texture_normal = ExtResource( 8 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -212,7 +238,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 8 ) +texture_normal = ExtResource( 9 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -239,7 +265,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 9 ) +texture_normal = ExtResource( 10 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -264,7 +290,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 10 ) +texture_normal = ExtResource( 11 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -289,7 +315,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 11 ) +texture_normal = ExtResource( 12 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -314,7 +340,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 12 ) +texture_normal = ExtResource( 13 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -339,7 +365,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 13 ) +texture_normal = ExtResource( 14 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -364,7 +390,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 14 ) +texture_normal = ExtResource( 15 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -389,7 +415,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 15 ) +texture_normal = ExtResource( 16 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -414,7 +440,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 16 ) +texture_normal = ExtResource( 17 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -441,7 +467,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 17 ) +texture_normal = ExtResource( 18 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -466,7 +492,7 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 18 ) +texture_normal = ExtResource( 19 ) script = ExtResource( 2 ) _sections_unfolded = [ "Textures" ] @@ -474,6 +500,8 @@ _sections_unfolded = [ "Textures" ] [connection signal="gui_input" from="Wordrobe/Underwear/ZBriefs" to="Wordrobe/Underwear/ZBriefs" method="_on_outfit_gui_input"] +[connection signal="gui_input" from="Wordrobe/Underwear/Fundosi" to="Wordrobe/Underwear/Fundosi" method="_on_outfit_gui_input"] + [connection signal="gui_input" from="Wordrobe/Bottoms/Jeans" to="Wordrobe/Bottoms/Jeans" method="_on_outfit_gui_input"] [connection signal="gui_input" from="Wordrobe/Bottoms/DJ Shorts" to="Wordrobe/Bottoms/DJ Shorts" method="_on_outfit_gui_input"] diff --git a/project/Clothes.tscn b/project/Clothes.tscn index 1a27344..7588add 100644 --- a/project/Clothes.tscn +++ b/project/Clothes.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=28 format=2] +[gd_scene load_steps=30 format=2] [ext_resource path="res://src/Clothes.gd" type="Script" id=1] [ext_resource path="res://assets/dressup_wardrobe.png" type="Texture" id=2] @@ -19,11 +19,13 @@ [ext_resource path="res://assets/train_hoodie.png" type="Texture" id=17] [ext_resource path="res://assets/korm_shirt.png" type="Texture" id=18] [ext_resource path="res://assets/whatsnew_shirt.png" type="Texture" id=19] -[ext_resource path="res://assets/briefs.png" type="Texture" id=20] -[ext_resource path="res://assets/zbriefs.png" type="Texture" id=21] -[ext_resource path="res://assets/owo_censor.png" type="Texture" id=22] -[ext_resource path="res://assets/bottoms_placeholder.png" type="Texture" id=23] -[ext_resource path="res://assets/tops_placeholder.png" type="Texture" id=24] +[ext_resource path="res://assets/owo_censor.png" type="Texture" id=20] +[ext_resource path="res://assets/briefs.png" type="Texture" id=21] +[ext_resource path="res://assets/zbriefs.png" type="Texture" id=22] +[ext_resource path="res://assets/fundosi.png" type="Texture" id=23] +[ext_resource path="res://assets/camera.png" type="Texture" id=24] +[ext_resource path="res://assets/bottoms_placeholder.png" type="Texture" id=25] +[ext_resource path="res://assets/tops_placeholder.png" type="Texture" id=26] [sub_resource type="StyleBoxEmpty" id=1] @@ -108,6 +110,7 @@ _sections_unfolded = [ "custom_colors", "custom_styles" ] [node name="Pants" type="Tabs" parent="RefRect/Wordrobe" index="0"] +visible = false anchor_left = 0.0 anchor_top = 0.0 anchor_right = 1.0 @@ -611,9 +614,10 @@ anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 +margin_left = -20.0 margin_top = 10.0 -margin_right = 558.0 -margin_bottom = 112.0 +margin_right = 538.0 +margin_bottom = 122.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 1 @@ -623,51 +627,7 @@ size_flags_vertical = 1 columns = 6 _sections_unfolded = [ "Margin" ] -[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 -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( 20 ) - -[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 = 110.0 -margin_right = 216.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( 21 ) -_sections_unfolded = [ "Textures" ] - -[node name="OwO Censor" type="TextureButton" parent="RefRect/Wordrobe/Underwear/UndiesGrid" index="2"] +[node name="OwO Censor" type="TextureButton" parent="RefRect/Wordrobe/Underwear/UndiesGrid" index="0"] anchor_left = 0.0 anchor_top = 0.0 @@ -687,19 +647,17 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -texture_normal = ExtResource( 22 ) +texture_normal = ExtResource( 20 ) _sections_unfolded = [ "Textures" ] -[node name="ClearBtn" type="Button" parent="RefRect" index="1"] +[node name="Briefs" 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 = 245.0 -margin_top = 16.0 -margin_right = 316.0 -margin_bottom = 36.0 +margin_right = 106.0 +margin_bottom = 112.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false focus_mode = 2 @@ -711,13 +669,142 @@ toggle_mode = false enabled_focus_mode = 2 shortcut = null group = null -text = "KCLR" +texture_normal = ExtResource( 21 ) + +[node name="ZBriefs" 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 = 110.0 +margin_right = 216.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( 22 ) +_sections_unfolded = [ "Textures" ] + +[node name="Fundosi" type="TextureButton" parent="RefRect/Wordrobe/Underwear/UndiesGrid" index="3"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 330.0 +margin_right = 436.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( 23 ) +_sections_unfolded = [ "Textures" ] + +[node name="Accessoires" type="Tabs" parent="RefRect/Wordrobe" index="3"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 1.0 +anchor_bottom = 1.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 +tab_align = 1 +scrolling_enabled = true + +[node name="AccessoiresGrid" type="GridContainer" parent="RefRect/Wordrobe/Accessoires" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = -14.0 +margin_top = 14.0 +margin_right = 536.0 +margin_bottom = 119.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="Camera" type="TextureButton" parent="RefRect/Wordrobe/Accessoires/AccessoiresGrid" index="0"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 85.0 +margin_bottom = 105.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( 24 ) +_sections_unfolded = [ "Rect", "Textures" ] + +[node name="RemoveAccessoryBtn" type="Button" parent="RefRect/Wordrobe/Accessoires/AccessoiresGrid" index="1"] + +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 89.0 +margin_right = 222.0 +margin_bottom = 105.0 +rect_min_size = Vector2( 85, 105 ) +rect_pivot_offset = Vector2( 0, 0 ) +rect_clip_content = false +focus_mode = 2 +mouse_filter = 0 +mouse_default_cursor_shape = 0 +size_flags_horizontal = 1 +size_flags_vertical = 1 +custom_colors/font_color_disabled = Color( 0, 0, 0, 1 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_colors/font_color_hover = Color( 0, 0, 0, 1 ) +custom_colors/font_color_pressed = Color( 0, 0, 0, 1 ) +toggle_mode = false +enabled_focus_mode = 2 +shortcut = null +group = null +text = "Remove Accessory" flat = true align = 1 +_sections_unfolded = [ "custom_colors" ] [node name="Body" type="ReferenceRect" parent="." index="3"] -editor/display_folded = true anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 @@ -739,7 +826,7 @@ __meta__ = { [node name="Undies" type="Sprite" parent="Body" index="0"] position = Vector2( 57.9419, 159.296 ) -texture = ExtResource( 20 ) +texture = ExtResource( 21 ) __meta__ = { "_edit_lock_": true } @@ -747,7 +834,7 @@ __meta__ = { [node name="Bottom" type="Sprite" parent="Body" index="1"] position = Vector2( 57.9419, 159.296 ) -texture = ExtResource( 23 ) +texture = ExtResource( 25 ) __meta__ = { "_edit_lock_": true } @@ -755,7 +842,15 @@ __meta__ = { [node name="Top" type="Sprite" parent="Body" index="2"] position = Vector2( 65.0597, 65.3242 ) -texture = ExtResource( 24 ) +texture = ExtResource( 26 ) +__meta__ = { +"_edit_lock_": true +} + +[node name="Accessory" type="Sprite" parent="Body" index="3"] + +position = Vector2( 65.0597, 65.3242 ) +texture = ExtResource( 26 ) __meta__ = { "_edit_lock_": true } @@ -794,12 +889,16 @@ __meta__ = { [connection signal="pressed" from="RefRect/Wordrobe/Shirts/ShirtsGrid/Remove Shirt" to="." method="_on_Remove_Shirt_pressed"] +[connection signal="pressed" from="RefRect/Wordrobe/Underwear/UndiesGrid/OwO Censor" to="." method="_on_OwO_Censor_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"] -[connection signal="pressed" from="RefRect/Wordrobe/Underwear/UndiesGrid/OwO Censor" to="." method="_on_OwO_Censor_pressed"] +[connection signal="pressed" from="RefRect/Wordrobe/Underwear/UndiesGrid/Fundosi" to="." method="_on_Fundosi_pressed"] -[connection signal="pressed" from="RefRect/ClearBtn" to="." method="_on_ClearBtn_pressed"] +[connection signal="pressed" from="RefRect/Wordrobe/Accessoires/AccessoiresGrid/Camera" to="." method="_on_Camera_pressed"] + +[connection signal="pressed" from="RefRect/Wordrobe/Accessoires/AccessoiresGrid/RemoveAccessoryBtn" to="." method="_on_RemoveAccessoryBtn_pressed"] diff --git a/project/StartScn.tscn b/project/TitleScn.tscn similarity index 99% rename from project/StartScn.tscn rename to project/TitleScn.tscn index ad26cf0..19cfaf3 100644 --- a/project/StartScn.tscn +++ b/project/TitleScn.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=7 format=2] -[ext_resource path="res://src/StartScn.gd" type="Script" id=1] +[ext_resource path="res://src/TitleScn.gd" type="Script" id=1] [ext_resource path="res://assets/modern_dress_up_blurred_bg.png" type="Texture" id=2] [ext_resource path="res://assets/dressup_blurred_wardrobe.png" type="Texture" id=3] [ext_resource path="res://assets/classic_dress_up_blurred_bg.png" type="Texture" id=4] diff --git a/project/WinDialogs.tscn b/project/WinDialogs.tscn index 8beb38b..7062941 100644 --- a/project/WinDialogs.tscn +++ b/project/WinDialogs.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://src/WinDialogs.gd" type="Script" id=1] [ext_resource path="res://music/song.ogg" type="AudioStream" id=2] -[node name="WinDialogs" type="Node" index="0"] +[node name="WinDialogs" type="Node"] script = ExtResource( 1 ) @@ -151,7 +151,6 @@ align = 1 [node name="CreditsWin" type="AcceptDialog" parent="." index="2"] -editor/display_folded = true visible = false anchor_left = 0.0 anchor_top = 0.0 @@ -200,6 +199,7 @@ Augmentality Clothing inspired by Megawolf77 Canon Rhode +Raier [img]assets/sixam_logo_200px.png[/img] SixAM is a brand by Anthony Wilcox. @@ -217,6 +217,7 @@ Augmentality Clothing inspired by Megawolf77 Canon Rhode +Raier SixAM is a brand by Anthony Wilcox. diff --git a/project/assets/camera.png b/project/assets/camera.png index 9c38c7f..b2e8ec2 100644 Binary files a/project/assets/camera.png and b/project/assets/camera.png differ diff --git a/project/assets/briefs_classic.png b/project/assets/classic/briefs_classic.png similarity index 100% rename from project/assets/briefs_classic.png rename to project/assets/classic/briefs_classic.png diff --git a/project/assets/zbriefs_classic.png.import b/project/assets/classic/briefs_classic.png.import similarity index 63% rename from project/assets/zbriefs_classic.png.import rename to project/assets/classic/briefs_classic.png.import index f8f224a..bd74765 100644 --- a/project/assets/zbriefs_classic.png.import +++ b/project/assets/classic/briefs_classic.png.import @@ -2,12 +2,12 @@ importer="texture" type="StreamTexture" -path="res://.import/zbriefs_classic.png-b65972aac07d113b8851bf9970c417fe.stex" +path="res://.import/briefs_classic.png-5487ab623b54f94967d6ff5b328427f3.stex" [deps] -source_file="res://assets/zbriefs_classic.png" -dest_files=[ "res://.import/zbriefs_classic.png-b65972aac07d113b8851bf9970c417fe.stex" ] +source_file="res://assets/classic/briefs_classic.png" +dest_files=[ "res://.import/briefs_classic.png-5487ab623b54f94967d6ff5b328427f3.stex" ] [params] diff --git a/project/assets/classic/camera_classic.png b/project/assets/classic/camera_classic.png new file mode 100644 index 0000000..9c38c7f Binary files /dev/null and b/project/assets/classic/camera_classic.png differ diff --git a/project/assets/owo_censor_classic.png.import b/project/assets/classic/camera_classic.png.import similarity index 63% rename from project/assets/owo_censor_classic.png.import rename to project/assets/classic/camera_classic.png.import index 67c4da8..c2d9e59 100644 --- a/project/assets/owo_censor_classic.png.import +++ b/project/assets/classic/camera_classic.png.import @@ -2,12 +2,12 @@ importer="texture" type="StreamTexture" -path="res://.import/owo_censor_classic.png-accfb640096736f1f4fdb643b79a5ab6.stex" +path="res://.import/camera_classic.png-453c3e0207587652023bd4cbcc9c9d94.stex" [deps] -source_file="res://assets/owo_censor_classic.png" -dest_files=[ "res://.import/owo_censor_classic.png-accfb640096736f1f4fdb643b79a5ab6.stex" ] +source_file="res://assets/classic/camera_classic.png" +dest_files=[ "res://.import/camera_classic.png-453c3e0207587652023bd4cbcc9c9d94.stex" ] [params] diff --git a/project/assets/classic/fundosi_classic.png b/project/assets/classic/fundosi_classic.png new file mode 100644 index 0000000..60b2ab6 Binary files /dev/null and b/project/assets/classic/fundosi_classic.png differ diff --git a/project/assets/classic/fundosi_classic.png.import b/project/assets/classic/fundosi_classic.png.import new file mode 100644 index 0000000..f6d6c8b --- /dev/null +++ b/project/assets/classic/fundosi_classic.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/fundosi_classic.png-1903b77553b97a7d54a429286954d16b.stex" + +[deps] + +source_file="res://assets/classic/fundosi_classic.png" +dest_files=[ "res://.import/fundosi_classic.png-1903b77553b97a7d54a429286954d16b.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_classic.png b/project/assets/classic/owo_censor_classic.png similarity index 100% rename from project/assets/owo_censor_classic.png rename to project/assets/classic/owo_censor_classic.png diff --git a/project/assets/classic/owo_censor_classic.png.import b/project/assets/classic/owo_censor_classic.png.import new file mode 100644 index 0000000..a439242 --- /dev/null +++ b/project/assets/classic/owo_censor_classic.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/owo_censor_classic.png-c35dd5945ab9c4d0b13859d9afa1c636.stex" + +[deps] + +source_file="res://assets/classic/owo_censor_classic.png" +dest_files=[ "res://.import/owo_censor_classic.png-c35dd5945ab9c4d0b13859d9afa1c636.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/zbriefs_classic.png b/project/assets/classic/zbriefs_classic.png similarity index 100% rename from project/assets/zbriefs_classic.png rename to project/assets/classic/zbriefs_classic.png diff --git a/project/assets/classic/zbriefs_classic.png.import b/project/assets/classic/zbriefs_classic.png.import new file mode 100644 index 0000000..d217eb4 --- /dev/null +++ b/project/assets/classic/zbriefs_classic.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/zbriefs_classic.png-be93fa3f8bbe034f9930c67e848c889d.stex" + +[deps] + +source_file="res://assets/classic/zbriefs_classic.png" +dest_files=[ "res://.import/zbriefs_classic.png-be93fa3f8bbe034f9930c67e848c889d.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/fundosi.png b/project/assets/fundosi.png new file mode 100644 index 0000000..98b1e33 Binary files /dev/null and b/project/assets/fundosi.png differ diff --git a/project/assets/game_splash.png.import b/project/assets/fundosi.png.import similarity index 65% rename from project/assets/game_splash.png.import rename to project/assets/fundosi.png.import index ec7bd41..7b6f2f6 100644 --- a/project/assets/game_splash.png.import +++ b/project/assets/fundosi.png.import @@ -2,12 +2,12 @@ importer="texture" type="StreamTexture" -path="res://.import/game_splash.png-e50a14b18c17eee1a97a55d939054e18.stex" +path="res://.import/fundosi.png-6ff98faa2a1236de2edfe494a858560c.stex" [deps] -source_file="res://assets/game_splash.png" -dest_files=[ "res://.import/game_splash.png-e50a14b18c17eee1a97a55d939054e18.stex" ] +source_file="res://assets/fundosi.png" +dest_files=[ "res://.import/fundosi.png-6ff98faa2a1236de2edfe494a858560c.stex" ] [params] diff --git a/project/assets/game_splash.png b/project/assets/game_splash.png deleted file mode 100644 index 80e0adf..0000000 Binary files a/project/assets/game_splash.png and /dev/null differ diff --git a/project/boot_splash.png b/project/boot_splash.png new file mode 100644 index 0000000..972d9f0 Binary files /dev/null and b/project/boot_splash.png differ diff --git a/project/assets/briefs_classic.png.import b/project/boot_splash.png.import similarity index 64% rename from project/assets/briefs_classic.png.import rename to project/boot_splash.png.import index 450844f..529b82b 100644 --- a/project/assets/briefs_classic.png.import +++ b/project/boot_splash.png.import @@ -2,12 +2,12 @@ importer="texture" type="StreamTexture" -path="res://.import/briefs_classic.png-24bd0b0972f2d8988c31dd608024e714.stex" +path="res://.import/boot_splash.png-939509db304f9fb6a281cb6f13babf6e.stex" [deps] -source_file="res://assets/briefs_classic.png" -dest_files=[ "res://.import/briefs_classic.png-24bd0b0972f2d8988c31dd608024e714.stex" ] +source_file="res://boot_splash.png" +dest_files=[ "res://.import/boot_splash.png-939509db304f9fb6a281cb6f13babf6e.stex" ] [params] diff --git a/project/lang/local.csv b/project/lang/local.csv index fd7b175..683ee21 100644 --- a/project/lang/local.csv +++ b/project/lang/local.csv @@ -7,7 +7,6 @@ KRTP,Remove Shirt,Ta av skjortan KRBT,Remove Pants,Ta bort byxor KCLS,Classic,Klassisk KUND,Underwear,Underkläder -KCLR,Clear,Klar KRUS,Resume,Återuppta KPUS,Paused,Pausad KMUS,Music,Musik diff --git a/project/lang/local.en.translation b/project/lang/local.en.translation index 299478b..dc87fff 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 a85e985..db3036a 100644 Binary files a/project/lang/local.sv.translation and b/project/lang/local.sv.translation differ diff --git a/project/project.godot b/project/project.godot index e9a2583..bc4e684 100644 --- a/project/project.godot +++ b/project/project.godot @@ -11,12 +11,18 @@ config_version=3 [application] config/name="Zack's Dress Up" -run/main_scene="res://StartScn.tscn" +run/main_scene="res://TitleScn.tscn" config/use_custom_user_dir=true -boot_splash/image="res://assets/game_splash.png" +boot_splash/image="res://boot_splash.png" +boot_splash/bg_color=Color( 0.8, 0.8, 0.4, 1 ) config/icon="res://icon.png" name_sv="Zacks klä upp" +[autoload] + +GameKit="*res://src/GameKit.gd" +WinDialogs="*res://WinDialogs.tscn" + [display] window/size/width=800 diff --git a/project/src/Clothes.gd b/project/src/Clothes.gd index 2936202..43c9a60 100644 --- a/project/src/Clothes.gd +++ b/project/src/Clothes.gd @@ -2,9 +2,13 @@ # See the LICENSE file in the project root for more information. extends Node +# Default clothing onready var bottoms = load("res://assets/bottoms_placeholder.png") -onready var undies = load("res://assets/briefs.png") onready var tops = load("res://assets/tops_placeholder.png") +onready var accessory = load("res://assets/tops_placeholder.png") +# ZC's Dress Up was stylized to be cute, not adult. +# Underwear cam be suggestive but never lewd. +onready var undies = load("res://assets/briefs.png") func change_bottoms(new_bottom): bottoms = new_bottom @@ -28,6 +32,14 @@ func change_tops(new_top): $Body/Top.texture = tops $Body/Top.texture = tops + +func change_accessoires(new_accessory): + accessory = new_accessory + + if new_accessory == null: + $Body/Top.texture = accessory + + $Body/Accessory.texture = accessory func _on_DJ_Shorts_pressed(): change_bottoms(load("res://assets/dj_shorts.png")) @@ -81,11 +93,6 @@ func _on_NL_Jacket_pressed(): 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")) @@ -94,3 +101,12 @@ func _on_Remove_Shirt_pressed(): func _on_Remove_Pants_pressed(): change_bottoms(null) + +func _on_Fundosi_pressed(): + change_undies(load("res://assets/fundosi.png")) + +func _on_Camera_pressed(): + change_accessoires(load("res://assets/camera.png")) + +func _on_RemoveAccessoryBtn_pressed(): + change_accessoires(null) diff --git a/project/src/GameKit.gd b/project/src/GameKit.gd index 2de1c4f..34392cb 100644 --- a/project/src/GameKit.gd +++ b/project/src/GameKit.gd @@ -13,5 +13,5 @@ func switch_scenes(new_mode): get_tree().change_scene("res://ClassicScn.tscn") elif new_mode == "modern": get_tree().change_scene("res://ModernScn.tscn") - elif new_mode == "start": - get_tree().change_scene("res://StartScn.tscn") \ No newline at end of file + elif new_mode == "title": + get_tree().change_scene("res://TitleScn.tscn") \ No newline at end of file diff --git a/project/src/StartScn.gd b/project/src/TitleScn.gd similarity index 100% rename from project/src/StartScn.gd rename to project/src/TitleScn.gd diff --git a/project/src/WinDialogs.gd b/project/src/WinDialogs.gd index 5c7f0d4..c0062f9 100644 --- a/project/src/WinDialogs.gd +++ b/project/src/WinDialogs.gd @@ -4,7 +4,7 @@ extends "res://src/GameKit.gd" func _on_ExitBtn_pressed(): is_game_paused(false) - switch_scenes("start") + switch_scenes("title") func _on_SettingsBtn_pressed(): $SettingsWin.show()