diff --git a/.gitignore b/.gitignore index bbbd981..93ab071 100644 --- a/.gitignore +++ b/.gitignore @@ -602,4 +602,5 @@ FodyWeavers.xsd # Custom rules (everything added below won't be overriden by 'Generate .gitignore File' if you use 'Update' option) -*.cfg \ No newline at end of file +*.cfg +export/* \ No newline at end of file diff --git a/ZC Dress Up 3E preview.png b/ZC Dress Up 3E preview.png new file mode 100644 index 0000000..bacab9f Binary files /dev/null and b/ZC Dress Up 3E preview.png differ diff --git a/ZC Dress Up 3E preview.png.import b/ZC Dress Up 3E preview.png.import new file mode 100644 index 0000000..a54d96c --- /dev/null +++ b/ZC Dress Up 3E preview.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bjcmfv162frgy" +path="res://.godot/imported/ZC Dress Up 3E preview.png-f9f3bd7bd3d8cf561b0c5ee7c1f8d2ef.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://ZC Dress Up 3E preview.png" +dest_files=["res://.godot/imported/ZC Dress Up 3E preview.png-f9f3bd7bd3d8cf561b0c5ee7c1f8d2ef.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/addons/fontawesome/fonts/fa-brands-400.woff2.import b/addons/fontawesome/fonts/fa-brands-400.woff2.import index 7d05bf8..8e74fbf 100644 --- a/addons/fontawesome/fonts/fa-brands-400.woff2.import +++ b/addons/fontawesome/fonts/fa-brands-400.woff2.import @@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/fa-brands-400.woff2-01946f939132baa0e37dbdeac Rendering=null antialiasing=1 generate_mipmaps=false +disable_embedded_bitmaps=true multichannel_signed_distance_field=false msdf_pixel_range=8 msdf_size=48 diff --git a/addons/fontawesome/fonts/fa-regular-400.woff2.import b/addons/fontawesome/fonts/fa-regular-400.woff2.import index 19f5a74..98d5a7f 100644 --- a/addons/fontawesome/fonts/fa-regular-400.woff2.import +++ b/addons/fontawesome/fonts/fa-regular-400.woff2.import @@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/fa-regular-400.woff2-bb494eebb9050a2fb4b1382e Rendering=null antialiasing=1 generate_mipmaps=false +disable_embedded_bitmaps=true multichannel_signed_distance_field=false msdf_pixel_range=8 msdf_size=48 diff --git a/addons/fontawesome/fonts/fa-solid-900.woff2.import b/addons/fontawesome/fonts/fa-solid-900.woff2.import index 17de0cc..a28e057 100644 --- a/addons/fontawesome/fonts/fa-solid-900.woff2.import +++ b/addons/fontawesome/fonts/fa-solid-900.woff2.import @@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/fa-solid-900.woff2-a9219e5bf1517e35af66843433 Rendering=null antialiasing=1 generate_mipmaps=false +disable_embedded_bitmaps=true multichannel_signed_distance_field=false msdf_pixel_range=8 msdf_size=48 diff --git a/archive/dressup3.swf b/archive/dressup3.swf new file mode 100644 index 0000000..476fba0 Binary files /dev/null and b/archive/dressup3.swf differ diff --git a/project.godot b/project.godot index ae3c936..24059ab 100644 --- a/project.godot +++ b/project.godot @@ -10,11 +10,11 @@ config_version=5 [application] -config/name="Dress Up Zack" +config/name="Dress Up Zack 3" config/version="1" run/main_scene="res://src/scenes/game.tscn" config/use_custom_user_dir=true -config/features=PackedStringArray("4.2") +config/features=PackedStringArray("4.3") boot_splash/bg_color=Color(0.8, 0.8, 0.4, 1) boot_splash/image="res://src/sprites/logo.png" config/icon="res://icon.png" @@ -43,7 +43,7 @@ project/assembly_name="Dress Up Zack" [editor_plugins] -enabled=PackedStringArray("res://addons/fontawesome/plugin.cfg") +enabled=PackedStringArray() [file_customization] @@ -101,7 +101,7 @@ click={ } exit={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194305,"key_label":0,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194305,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) ] } diff --git a/src/fonts/kenny_bold.ttf.import b/src/fonts/kenny_bold.ttf.import index 774e87c..69443de 100644 --- a/src/fonts/kenny_bold.ttf.import +++ b/src/fonts/kenny_bold.ttf.import @@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/kenny_bold.ttf-482484f054cb16536fa4559be80b4c Rendering=null antialiasing=1 generate_mipmaps=false +disable_embedded_bitmaps=true multichannel_signed_distance_field=false msdf_pixel_range=8 msdf_size=48 diff --git a/src/fonts/kenny_pixel.ttf.import b/src/fonts/kenny_pixel.ttf.import index 40dfe18..acdd91b 100644 --- a/src/fonts/kenny_pixel.ttf.import +++ b/src/fonts/kenny_pixel.ttf.import @@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/kenny_pixel.ttf-54757b3d28db3ebfb5c3ec1c2a4cd Rendering=null antialiasing=1 generate_mipmaps=false +disable_embedded_bitmaps=true multichannel_signed_distance_field=false msdf_pixel_range=8 msdf_size=48 diff --git a/src/fonts/montserrat/Montserrat-ExtraBold.otf.import b/src/fonts/montserrat/Montserrat-ExtraBold.otf.import index 707ec07..38f1bf5 100644 --- a/src/fonts/montserrat/Montserrat-ExtraBold.otf.import +++ b/src/fonts/montserrat/Montserrat-ExtraBold.otf.import @@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/Montserrat-ExtraBold.otf-f651f793753ddfdb2c1e Rendering=null antialiasing=1 generate_mipmaps=false +disable_embedded_bitmaps=true multichannel_signed_distance_field=false msdf_pixel_range=8 msdf_size=48 diff --git a/src/fonts/roboto/Roboto-Light.ttf.import b/src/fonts/roboto/Roboto-Light.ttf.import index 5611a42..69f34a8 100644 --- a/src/fonts/roboto/Roboto-Light.ttf.import +++ b/src/fonts/roboto/Roboto-Light.ttf.import @@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/Roboto-Light.ttf-f1da56b9b08e442dbc8aff252dba Rendering=null antialiasing=1 generate_mipmaps=false +disable_embedded_bitmaps=true multichannel_signed_distance_field=false msdf_pixel_range=8 msdf_size=48 diff --git a/src/fonts/roboto/Roboto-Medium.ttf.import b/src/fonts/roboto/Roboto-Medium.ttf.import index f1bb87a..ae3027a 100644 --- a/src/fonts/roboto/Roboto-Medium.ttf.import +++ b/src/fonts/roboto/Roboto-Medium.ttf.import @@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/Roboto-Medium.ttf-fb0306ac8685d51c6d191b499c6 Rendering=null antialiasing=1 generate_mipmaps=false +disable_embedded_bitmaps=true multichannel_signed_distance_field=false msdf_pixel_range=8 msdf_size=48 diff --git a/src/fonts/roboto/Roboto-Thin.ttf.import b/src/fonts/roboto/Roboto-Thin.ttf.import index 27ad229..26734c2 100644 --- a/src/fonts/roboto/Roboto-Thin.ttf.import +++ b/src/fonts/roboto/Roboto-Thin.ttf.import @@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/Roboto-Thin.ttf-803aada29405452165ce767c8cf46 Rendering=null antialiasing=1 generate_mipmaps=false +disable_embedded_bitmaps=true multichannel_signed_distance_field=false msdf_pixel_range=8 msdf_size=48 diff --git a/src/scenes/game.tscn b/src/scenes/game.tscn index 24f810f..fd61975 100644 --- a/src/scenes/game.tscn +++ b/src/scenes/game.tscn @@ -38,7 +38,7 @@ [sub_resource type="SpriteFrames" id="SpriteFrames_wfogq"] animations = [{ "frames": [{ -"duration": 1.0, +"duration": 10.0, "texture": ExtResource("8_op8gm") }, { "duration": 1.0, @@ -101,6 +101,7 @@ stream = ExtResource("4_1vpui") stream = ExtResource("4_ce266") [node name="World" type="Node2D" parent="."] +metadata/_edit_lock_ = true [node name="Background" type="Sprite2D" parent="World"] position = Vector2(306.682, 194.039) @@ -120,6 +121,7 @@ texture = ExtResource("2_n1kmf") [node name="Fan" type="AnimatedSprite2D" parent="World"] position = Vector2(523.641, 120.505) sprite_frames = SubResource("SpriteFrames_wfogq") +frame_progress = 0.631716 [node name="Shelf" type="Sprite2D" parent="World"] position = Vector2(522.056, 189.082) @@ -128,6 +130,7 @@ texture = ExtResource("22_kss16") [node name="Character" parent="." instance=ExtResource("6_tdil0")] position = Vector2(291.682, 143.132) rotation = -0.00207467 +metadata/_edit_lock_ = true [node name="Seperate" type="Node2D" parent="Character"] position = Vector2(-299.61, -133.222) @@ -224,8 +227,8 @@ alignment = 1 metadata/_edit_use_anchors_ = true [node name="ShirtIcon" type="Label" parent="Canvas/UI/SettingsCtrls"] +auto_translate_mode = 2 layout_mode = 2 -auto_translate = false localize_numeral_system = false theme_override_colors/font_color = Color(0, 0.290196, 1, 1) theme_override_fonts/font = ExtResource("11_e3r4r") @@ -240,11 +243,11 @@ icon_name = "shirt" layout_mode = 2 theme_type_variation = &"FlatButton" theme_override_fonts/font = ExtResource("12_0f8fj") -theme_override_styles/normal = ExtResource("11_a038t") +theme_override_styles/focus = ExtResource("11_a038t") +theme_override_styles/disabled = ExtResource("15_0xxs0") theme_override_styles/hover = ExtResource("11_a038t") theme_override_styles/pressed = ExtResource("11_a038t") -theme_override_styles/disabled = ExtResource("15_0xxs0") -theme_override_styles/focus = ExtResource("11_a038t") +theme_override_styles/normal = ExtResource("11_a038t") text = "Outfits" metadata/_edit_use_anchors_ = true @@ -252,17 +255,17 @@ metadata/_edit_use_anchors_ = true layout_mode = 2 theme_type_variation = &"FlatButton" theme_override_fonts/font = ExtResource("12_0f8fj") -theme_override_styles/normal = ExtResource("11_a038t") +theme_override_styles/focus = ExtResource("11_a038t") +theme_override_styles/disabled = ExtResource("15_0xxs0") theme_override_styles/hover = ExtResource("11_a038t") theme_override_styles/pressed = ExtResource("11_a038t") -theme_override_styles/disabled = ExtResource("15_0xxs0") -theme_override_styles/focus = ExtResource("11_a038t") +theme_override_styles/normal = ExtResource("11_a038t") text = "Seperate" metadata/_edit_use_anchors_ = true [node name="FontAwesome" type="Label" parent="Canvas/UI/SettingsCtrls"] +auto_translate_mode = 2 layout_mode = 2 -auto_translate = false localize_numeral_system = false theme_override_colors/font_color = Color(0, 0.290196, 1, 1) theme_override_fonts/font = ExtResource("11_e3r4r") @@ -277,21 +280,21 @@ icon_name = "gear" layout_mode = 2 theme_type_variation = &"FlatButton" theme_override_fonts/font = ExtResource("12_0f8fj") -theme_override_styles/normal = ExtResource("11_a038t") +theme_override_styles/focus = ExtResource("11_a038t") +theme_override_styles/disabled = ExtResource("15_0xxs0") theme_override_styles/hover = ExtResource("11_a038t") theme_override_styles/pressed = ExtResource("11_a038t") -theme_override_styles/disabled = ExtResource("15_0xxs0") -theme_override_styles/focus = ExtResource("11_a038t") +theme_override_styles/normal = ExtResource("11_a038t") text = "Save" [node name="ExitBtn" type="Button" parent="Canvas/UI/SettingsCtrls"] layout_mode = 2 theme_override_fonts/font = ExtResource("12_0f8fj") -theme_override_styles/normal = ExtResource("11_a038t") +theme_override_styles/focus = ExtResource("11_a038t") +theme_override_styles/disabled = ExtResource("15_0xxs0") theme_override_styles/hover = ExtResource("11_a038t") theme_override_styles/pressed = ExtResource("11_a038t") -theme_override_styles/disabled = ExtResource("15_0xxs0") -theme_override_styles/focus = ExtResource("11_a038t") +theme_override_styles/normal = ExtResource("11_a038t") text = "Exit" [node name="Social" type="HBoxContainer" parent="Canvas/UI"] @@ -304,8 +307,8 @@ alignment = 2 metadata/_edit_lock_ = true [node name="CC" type="Label" parent="Canvas/UI/Social"] +auto_translate_mode = 2 layout_mode = 2 -auto_translate = false localize_numeral_system = false theme_override_fonts/font = ExtResource("18_px6h4") theme_override_font_sizes/font_size = 16 @@ -317,8 +320,8 @@ icon_type = "brands" icon_name = "creative-commons" [node name="Zero" type="Label" parent="Canvas/UI/Social"] +auto_translate_mode = 2 layout_mode = 2 -auto_translate = false localize_numeral_system = false theme_override_fonts/font = ExtResource("18_px6h4") theme_override_font_sizes/font_size = 16 @@ -333,9 +336,9 @@ icon_name = "creative-commons-zero" layout_mode = 1 anchors_preset = -1 anchor_left = 0.866667 -anchor_top = 0.4075 +anchor_top = 0.408333 anchor_right = 0.88 -anchor_bottom = 0.4225 +anchor_bottom = 0.423333 toggle_mode = true texture_normal = ExtResource("33_oenpt") metadata/_edit_use_anchors_ = true @@ -347,4 +350,5 @@ metadata/_edit_use_anchors_ = true [connection signal="pressed" from="Canvas/UI/SettingsCtrls/FullbodyBtn" to="." method="_on_fullbody_btn_pressed"] [connection signal="pressed" from="Canvas/UI/SettingsCtrls/SeparateBtn" to="." method="_on_separate_btn_pressed"] [connection signal="pressed" from="Canvas/UI/SettingsCtrls/SaveBtn" to="." method="_on_save_btn_pressed"] +[connection signal="pressed" from="Canvas/UI/SettingsCtrls/ExitBtn" to="." method="_on_exit_btn_pressed"] [connection signal="toggled" from="Canvas/UI/FanBtn" to="." method="_on_fan_btn_toggled"] diff --git a/src/scripts/game.gd b/src/scripts/game.gd index 54a9e2c..4156185 100644 --- a/src/scripts/game.gd +++ b/src/scripts/game.gd @@ -8,6 +8,8 @@ extends Node @onready var outfits = $Character/Outfits @onready var fan = $World/Fan @onready var forward_click = $ForwardClick +@onready var exit_btn = $Canvas/UI/SettingsCtrls/ExitBtn +@onready var save_btn = $Canvas/UI/SettingsCtrls/SaveBtn @onready var back_click = $BackClick @onready var fan_click = $FanClick @onready var fan_asmr = $FanAsmr @@ -45,6 +47,13 @@ func _ready(): # Set window size DisplayServer.window_set_size(Vector2i(window_width, window_height)) + + fan.play("default") + fan_asmr.play() + + if OS.get_name() == "Web": + exit_btn.disabled = true + save_btn.disabled = true func save_all(): Config.save_game(tops.frame, bottoms.frame, outfits.frame, save_file, true) @@ -91,21 +100,13 @@ func _on_bottoms_bck_btn_pressed(): func _on_bottoms_fwd_btn_pressed(): next_frame(bottoms, bottoms.sprite_frames, "bottoms") -func _on_outfits_btn_pressed(): - is_seperate = false - is_outfits = true - seperate_items.hide() - bottoms_bck.hide() - bottoms_fwd.hide() - outfits.show() - func _on_separate_btn_pressed(): - is_seperate = true - is_outfits = false seperate_items.show() bottoms_bck.show() bottoms_fwd.show() outfits.hide() + is_seperate = true + is_outfits = false func _on_fan_btn_toggled(toggled_on): if toggled_on: @@ -116,3 +117,16 @@ func _on_fan_btn_toggled(toggled_on): fan_click.play() fan.stop() fan_asmr.stop() + +func _on_exit_btn_pressed() -> void: + save_all() + get_tree().quit() + + +func _on_fullbody_btn_pressed() -> void: + seperate_items.hide() + bottoms_bck.hide() + bottoms_fwd.hide() + outfits.show() + is_seperate = false + is_outfits = true