diff --git a/project/ImportItems.gd b/project/ImportItems.gd new file mode 100644 index 0000000..53d8bb0 --- /dev/null +++ b/project/ImportItems.gd @@ -0,0 +1,12 @@ +extends Node + +# export (String, FILE, "*.json") var item_file : String + +func load_items(file_path) -> Dictionary: + var file = File.new() + assert file.file_exists(file_path) + + file.open(file_path) + var items = parse_json(file.get_as_text()) + assert items.size() > 0 + return items \ No newline at end of file diff --git a/project/boot_splash.png b/project/boot_splash.png deleted file mode 100644 index 972d9f0..0000000 Binary files a/project/boot_splash.png and /dev/null differ diff --git a/project/fonts/RobotLight.res b/project/fonts/RobotLight.res new file mode 100644 index 0000000..573a3a0 Binary files /dev/null and b/project/fonts/RobotLight.res differ diff --git a/project/fonts/montserrat/Montserrat-ExtraBold.otf b/project/fonts/montserrat/Montserrat-ExtraBold.otf new file mode 100644 index 0000000..d572750 Binary files /dev/null and b/project/fonts/montserrat/Montserrat-ExtraBold.otf differ diff --git a/project/fonts/montserrat_extra_bold_16.tres b/project/fonts/montserrat_extra_bold_16.tres new file mode 100644 index 0000000..d5a2ce4 --- /dev/null +++ b/project/fonts/montserrat_extra_bold_16.tres @@ -0,0 +1,8 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[ext_resource path="res://fonts/montserrat/Montserrat-ExtraBold.otf" type="DynamicFontData" id=1] + +[resource] +use_mipmaps = true +use_filter = true +font_data = ExtResource( 1 ) diff --git a/project/fonts/montserrat_extra_bold_24.tres b/project/fonts/montserrat_extra_bold_24.tres new file mode 100644 index 0000000..abe38e1 --- /dev/null +++ b/project/fonts/montserrat_extra_bold_24.tres @@ -0,0 +1,9 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[ext_resource path="res://fonts/montserrat/Montserrat-ExtraBold.otf" type="DynamicFontData" id=1] + +[resource] +size = 32 +use_mipmaps = true +use_filter = true +font_data = ExtResource( 1 ) diff --git a/project/fonts/montserrat_extra_bold_32.tres b/project/fonts/montserrat_extra_bold_32.tres new file mode 100644 index 0000000..da82d19 --- /dev/null +++ b/project/fonts/montserrat_extra_bold_32.tres @@ -0,0 +1,9 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[ext_resource path="res://fonts/montserrat/montserrat/Montserrat-ExtraBold.otf" type="DynamicFontData" id=1] + +[resource] +size = 32 +use_mipmaps = true +use_filter = true +font_data = ExtResource( 1 ) diff --git a/project/fonts/montserrat_extra_bold_48.tres b/project/fonts/montserrat_extra_bold_48.tres new file mode 100644 index 0000000..25617b7 --- /dev/null +++ b/project/fonts/montserrat_extra_bold_48.tres @@ -0,0 +1,13 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[ext_resource path="res://fonts/montserrat/Montserrat-ExtraBold.otf" type="DynamicFontData" id=1] + + +[resource] + +size = 48 +use_mipmaps = true +use_filter = true +font_data = ExtResource( 1 ) +_sections_unfolded = [ "Settings" ] + diff --git a/project/fonts/montserrat_extra_bold_62.tres b/project/fonts/montserrat_extra_bold_62.tres new file mode 100644 index 0000000..f1fa875 --- /dev/null +++ b/project/fonts/montserrat_extra_bold_62.tres @@ -0,0 +1,13 @@ +[gd_resource type="DynamicFont" load_steps=2 format=2] + +[ext_resource path="res://fonts/montserrat/Montserrat-ExtraBold.otf" type="DynamicFontData" id=1] + + +[resource] + +size = 62 +use_mipmaps = true +use_filter = true +font_data = ExtResource( 1 ) +_sections_unfolded = [ "Settings" ] + diff --git a/project/fonts/roboto/LICENSE.txt b/project/fonts/roboto/LICENSE.txt new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/project/fonts/roboto/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/project/fonts/roboto/Roboto-Light.ttf b/project/fonts/roboto/Roboto-Light.ttf new file mode 100644 index 0000000..94c6bcc Binary files /dev/null and b/project/fonts/roboto/Roboto-Light.ttf differ diff --git a/project/fonts/roboto/Roboto-Medium.ttf b/project/fonts/roboto/Roboto-Medium.ttf new file mode 100644 index 0000000..39c63d7 Binary files /dev/null and b/project/fonts/roboto/Roboto-Medium.ttf differ diff --git a/project/fonts/roboto/Roboto-Thin.ttf b/project/fonts/roboto/Roboto-Thin.ttf new file mode 100644 index 0000000..d695550 Binary files /dev/null and b/project/fonts/roboto/Roboto-Thin.ttf differ diff --git a/project/icon.png b/project/icon.png index 294d96d..98e171f 100644 Binary files a/project/icon.png and b/project/icon.png differ diff --git a/project/icon.svg b/project/icon.svg new file mode 100644 index 0000000..12bf384 --- /dev/null +++ b/project/icon.svg @@ -0,0 +1,196 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/boot_splash.png.import b/project/icon.svg.import similarity index 70% rename from project/boot_splash.png.import rename to project/icon.svg.import index 15f9b66..b806afb 100644 --- a/project/boot_splash.png.import +++ b/project/icon.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/boot_splash.png-939509db304f9fb6a281cb6f13babf6e.stex" +path="res://.import/icon.svg-218a8f2b3041327d8a5756f3a245f83b.stex" metadata={ "vram_texture": false } [deps] -source_file="res://boot_splash.png" -dest_files=[ "res://.import/boot_splash.png-939509db304f9fb6a281cb6f13babf6e.stex" ] +source_file="res://icon.svg" +dest_files=[ "res://.import/icon.svg-218a8f2b3041327d8a5756f3a245f83b.stex" ] [params] diff --git a/project/music/mushrooms.ogg b/project/music/mushrooms.ogg new file mode 100644 index 0000000..efcbb80 Binary files /dev/null and b/project/music/mushrooms.ogg differ diff --git a/project/music/mushrooms.ogg.import b/project/music/mushrooms.ogg.import new file mode 100644 index 0000000..3dd6c1e --- /dev/null +++ b/project/music/mushrooms.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/mushrooms.ogg-5d11893cda0d4333d75a0ef8474477bb.oggstr" + +[deps] + +source_file="res://music/mushrooms.ogg" +dest_files=[ "res://.import/mushrooms.ogg-5d11893cda0d4333d75a0ef8474477bb.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/project/project.godot b/project/project.godot index cb47b4c..6b1497c 100644 --- a/project/project.godot +++ b/project/project.godot @@ -18,7 +18,7 @@ _global_script_class_icons={ config/name="Nathan's Dress Up" run/main_scene="res://scn/TitleScn.tscn" config/use_custom_user_dir=true -boot_splash/image="res://boot_splash.png" +boot_splash/image="res://icon.png" boot_splash/bg_color=Color( 0.8, 0.8, 0.4, 1 ) config/icon="res://icon.png" name_sv="Nathans klä upp" @@ -26,7 +26,10 @@ name_sv="Nathans klä upp" [autoload] GameKit="*res://src/GameKit.gd" -WinDialogs="*res://scn/WinDialogs.tscn" + +[debug] + +gdscript/completion/autocomplete_setters_and_getters=true [debug] @@ -54,7 +57,6 @@ translations=PoolStringArray( "res://lang/local.en.translation", "res://lang/loc [rendering] -quality/driver/driver_name="GLES2" quality/intended_usage/framebuffer_allocation=0 quality/intended_usage/framebuffer_allocation.mobile=0 quality/2d/use_pixel_snap=true diff --git a/project/scn/Character.tscn b/project/scn/Character.tscn index 4a20c2f..c4fc0f3 100644 --- a/project/scn/Character.tscn +++ b/project/scn/Character.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=29 format=2] -[ext_resource path="res://sprites/tail/tail0.png" type="Texture" id=1] -[ext_resource path="res://sprites/tail/tail1.png" type="Texture" id=2] -[ext_resource path="res://sprites/tail/tail2.png" type="Texture" id=3] +[ext_resource path="res://sprites/tail/tail0.svg" type="Texture" id=1] +[ext_resource path="res://sprites/tail/tail1.svg" type="Texture" id=2] +[ext_resource path="res://sprites/tail/tail2.svg" type="Texture" id=3] [ext_resource path="res://sprites/character_base.svg" type="Texture" id=4] [ext_resource path="res://sprites/eyes/eyes1.png" type="Texture" id=5] [ext_resource path="res://sprites/eyes/eyes2.png" type="Texture" id=6] @@ -57,7 +57,7 @@ animations = [ { [node name="Tail" type="AnimatedSprite" parent="Base"] position = Vector2( 54.4027, 184.439 ) frames = SubResource( 1 ) -frame = 6 +frame = 8 playing = true [node name="Nathan" type="Sprite" parent="Base"] @@ -67,13 +67,13 @@ texture = ExtResource( 4 ) [node name="Eyes" type="AnimatedSprite" parent="Base"] position = Vector2( 114.227, 63.9224 ) frames = SubResource( 2 ) -frame = 11 +frame = 4 playing = true [node name="Mouth" type="AnimatedSprite" parent="Base"] position = Vector2( 131.024, 67.4964 ) frames = SubResource( 3 ) -frame = 16 +frame = 2 playing = true [node name="Undies" type="Sprite" parent="."] diff --git a/project/scn/ClassicScn.tscn b/project/scn/ClassicScn.tscn index 5c3cf92..66907df 100644 --- a/project/scn/ClassicScn.tscn +++ b/project/scn/ClassicScn.tscn @@ -1,9 +1,8 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=4 format=2] [ext_resource path="res://src/ClassicScn.gd" type="Script" id=1] [ext_resource path="res://scn/ClassicClothes.tscn" type="PackedScene" id=2] -[ext_resource path="res://scn/WinDialogs.tscn" type="PackedScene" id=3] -[ext_resource path="res://scn/GlobalMenu.tscn" type="PackedScene" id=4] +[ext_resource path="res://scn/PauseScn.tscn" type="PackedScene" id=3] [node name="GameScreen" type="Node"] script = ExtResource( 1 ) @@ -11,5 +10,3 @@ script = ExtResource( 1 ) [node name="Clothes" parent="." instance=ExtResource( 2 )] [node name="WinDialogs" parent="." instance=ExtResource( 3 )] - -[node name="GlobalMenu" parent="." instance=ExtResource( 4 )] diff --git a/project/scn/Clothes.tscn b/project/scn/Clothes.tscn index 3409802..5a5bdfb 100644 --- a/project/scn/Clothes.tscn +++ b/project/scn/Clothes.tscn @@ -1,30 +1,26 @@ -[gd_scene load_steps=26 format=2] +[gd_scene load_steps=22 format=2] [ext_resource path="res://styles/DressUpTheme.res" type="Theme" id=1] -[ext_resource path="res://styles/tab.stylebox" type="StyleBox" id=2] -[ext_resource path="res://styles/tabbg.stylebox" type="StyleBox" id=3] -[ext_resource path="res://styles/wordrobe_panel.stylebox" type="StyleBox" id=4] -[ext_resource path="res://sprites/lights.png" type="Texture" id=5] -[ext_resource path="res://sprites/jeans.svg" type="Texture" id=6] -[ext_resource path="res://sprites/sweat_pants.svg" type="Texture" id=7] -[ext_resource path="res://sprites/blue_camo_jeans.svg" type="Texture" id=8] -[ext_resource path="res://sprites/beat_up_jeans.svg" type="Texture" id=9] -[ext_resource path="res://sprites/x_button.svg" type="Texture" id=10] -[ext_resource path="res://sprites/old_sweatshirt.png" type="Texture" id=11] -[ext_resource path="res://sprites/dj_shirt.png" type="Texture" id=12] -[ext_resource path="res://sprites/raw_shirt.svg" type="Texture" id=13] -[ext_resource path="res://sprites/atomic_shirt.svg" type="Texture" id=14] -[ext_resource path="res://sprites/z_shirt.png" type="Texture" id=15] -[ext_resource path="res://sprites/biker_jacket.png" type="Texture" id=16] -[ext_resource path="res://sprites/nl_jacket.png" type="Texture" id=17] -[ext_resource path="res://sprites/train_hoodie.png" type="Texture" id=18] -[ext_resource path="res://sprites/korm_shirt.png" type="Texture" id=19] -[ext_resource path="res://sprites/whatsnew_shirt.png" type="Texture" id=20] -[ext_resource path="res://sprites/owo_censor.svg" type="Texture" id=21] -[ext_resource path="res://sprites/briefs.svg" type="Texture" id=22] -[ext_resource path="res://sprites/z_briefs.svg" type="Texture" id=23] -[ext_resource path="res://sprites/fundosi.svg" type="Texture" id=24] -[ext_resource path="res://sprites/camera.png" type="Texture" id=25] +[ext_resource path="res://styles/wordrobe_panel.stylebox" type="StyleBox" id=2] +[ext_resource path="res://sprites/jeans.svg" type="Texture" id=3] +[ext_resource path="res://sprites/sweat_pants.svg" type="Texture" id=4] +[ext_resource path="res://sprites/blue_camo_jeans.svg" type="Texture" id=5] +[ext_resource path="res://sprites/beat_up_jeans.svg" type="Texture" id=6] +[ext_resource path="res://sprites/x_button.svg" type="Texture" id=7] +[ext_resource path="res://sprites/old_sweatshirt.svg" type="Texture" id=8] +[ext_resource path="res://sprites/raw_shirt.svg" type="Texture" id=9] +[ext_resource path="res://sprites/atomic_shirt.svg" type="Texture" id=10] +[ext_resource path="res://sprites/z_shirt.png" type="Texture" id=11] +[ext_resource path="res://sprites/biker_jacket.svg" type="Texture" id=12] +[ext_resource path="res://sprites/nl_jacket.png" type="Texture" id=13] +[ext_resource path="res://sprites/train_hoodie.svg" type="Texture" id=14] +[ext_resource path="res://sprites/korm_shirt.png" type="Texture" id=15] +[ext_resource path="res://sprites/whatsnew_shirt.svg" type="Texture" id=16] +[ext_resource path="res://sprites/owo_censor.svg" type="Texture" id=17] +[ext_resource path="res://sprites/briefs.svg" type="Texture" id=18] +[ext_resource path="res://sprites/z_briefs.svg" type="Texture" id=19] +[ext_resource path="res://sprites/fundosi.svg" type="Texture" id=20] +[ext_resource path="res://sprites/camera.png" type="Texture" id=21] [node name="Clothes" type="Node"] @@ -33,25 +29,20 @@ anchor_left = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 margin_left = -721.0 -margin_top = 32.0 +margin_top = 21.0 margin_right = -25.0 -margin_bottom = -6.0 +margin_bottom = -35.0 theme = ExtResource( 1 ) -custom_styles/tab_fg = ExtResource( 2 ) -custom_styles/tab_bg = ExtResource( 3 ) -custom_styles/panel = ExtResource( 4 ) +custom_styles/panel = ExtResource( 2 ) custom_colors/font_color_disabled = Color( 0, 0, 0, 1 ) custom_colors/font_color_bg = Color( 0.921569, 0.921569, 0.921569, 1 ) custom_colors/font_color_fg = Color( 1, 1, 1, 1 ) -[node name="Lights" type="Sprite" parent="Wordrobe"] -position = Vector2( 346.41, 165.623 ) -texture = ExtResource( 5 ) - [node name="Pants" type="Tabs" parent="Wordrobe"] +visible = false anchor_right = 1.0 anchor_bottom = 1.0 -margin_top = 29.0 +margin_top = 31.0 custom_constants/hseparation = 0 [node name="PantsGrid" type="GridContainer" parent="Wordrobe/Pants"] @@ -63,45 +54,43 @@ columns = 5 [node name="Jeans" type="TextureButton" parent="Wordrobe/Pants/PantsGrid"] margin_right = 106.0 -margin_bottom = 118.0 -texture_normal = ExtResource( 6 ) +margin_bottom = 112.0 +texture_normal = ExtResource( 3 ) [node name="Sweats" type="TextureButton" parent="Wordrobe/Pants/PantsGrid"] margin_left = 110.0 margin_right = 216.0 -margin_bottom = 118.0 -texture_normal = ExtResource( 7 ) +margin_bottom = 112.0 +texture_normal = ExtResource( 4 ) [node name="BlueCamoJeans" type="TextureButton" parent="Wordrobe/Pants/PantsGrid"] margin_left = 220.0 margin_right = 326.0 -margin_bottom = 118.0 -texture_normal = ExtResource( 8 ) +margin_bottom = 112.0 +texture_normal = ExtResource( 5 ) [node name="BeatUpJeans" type="TextureButton" parent="Wordrobe/Pants/PantsGrid"] margin_left = 330.0 margin_right = 436.0 -margin_bottom = 118.0 -texture_normal = ExtResource( 9 ) +margin_bottom = 112.0 +texture_normal = ExtResource( 6 ) [node name="RemovePants" type="Button" parent="Wordrobe/Pants/PantsGrid"] -margin_left = 440.0 -margin_right = 558.0 -margin_bottom = 118.0 +margin_top = 116.0 +margin_right = 106.0 +margin_bottom = 228.0 rect_min_size = Vector2( 0, 112 ) 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 ) -icon = ExtResource( 10 ) +icon = ExtResource( 7 ) flat = true [node name="Shirts" type="Tabs" parent="Wordrobe"] -editor/display_folded = true -visible = false anchor_right = 1.0 anchor_bottom = 1.0 -margin_top = 29.0 +margin_top = 31.0 [node name="ShirtsGrid" type="GridContainer" parent="Wordrobe/Shirts"] margin_left = 18.0 @@ -113,75 +102,68 @@ columns = 7 [node name="Sweatshirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] margin_right = 85.0 margin_bottom = 115.0 -texture_normal = ExtResource( 11 ) +texture_normal = ExtResource( 8 ) -[node name="DJShirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] +[node name="Raw" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] margin_left = 89.0 margin_right = 174.0 margin_bottom = 115.0 +texture_normal = ExtResource( 9 ) + +[node name="Atomic" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] +margin_left = 178.0 +margin_right = 284.0 +margin_bottom = 115.0 +texture_normal = ExtResource( 10 ) + +[node name="ZShirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] +margin_left = 288.0 +margin_right = 369.0 +margin_bottom = 115.0 +texture_normal = ExtResource( 11 ) + +[node name="BikerJacket" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] +margin_left = 373.0 +margin_right = 458.0 +margin_bottom = 115.0 texture_normal = ExtResource( 12 ) -[node name="Raw" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] -margin_left = 178.0 -margin_right = 263.0 +[node name="NLJacket" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] +margin_left = 462.0 +margin_right = 547.0 margin_bottom = 115.0 texture_normal = ExtResource( 13 ) -[node name="Atomic" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] -margin_left = 267.0 -margin_right = 385.0 +[node name="TrainHoodie" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] +margin_left = 551.0 +margin_right = 636.0 margin_bottom = 115.0 texture_normal = ExtResource( 14 ) -[node name="ZShirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] -margin_left = 389.0 -margin_right = 470.0 -margin_bottom = 115.0 -texture_normal = ExtResource( 15 ) - -[node name="BikerJacket" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] -margin_left = 474.0 -margin_right = 559.0 -margin_bottom = 115.0 -texture_normal = ExtResource( 16 ) - -[node name="NLJacket" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] -margin_left = 563.0 -margin_right = 648.0 -margin_bottom = 115.0 -texture_normal = ExtResource( 17 ) - -[node name="TrainHoodie" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] +[node name="KormShirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] margin_top = 119.0 margin_right = 85.0 -margin_bottom = 237.0 -texture_normal = ExtResource( 18 ) +margin_bottom = 234.0 +texture_normal = ExtResource( 15 ) -[node name="KormShirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] +[node name="WhatsNewShirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] margin_left = 89.0 margin_top = 119.0 margin_right = 174.0 -margin_bottom = 237.0 -texture_normal = ExtResource( 19 ) - -[node name="WhatsNewShirt" type="TextureButton" parent="Wordrobe/Shirts/ShirtsGrid"] -margin_left = 178.0 -margin_top = 119.0 -margin_right = 263.0 -margin_bottom = 237.0 -texture_normal = ExtResource( 20 ) +margin_bottom = 234.0 +texture_normal = ExtResource( 16 ) [node name="RemoveShirt" type="Button" parent="Wordrobe/Shirts/ShirtsGrid"] -margin_left = 267.0 +margin_left = 178.0 margin_top = 119.0 -margin_right = 385.0 -margin_bottom = 237.0 +margin_right = 284.0 +margin_bottom = 234.0 rect_min_size = Vector2( 0, 112 ) 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 ) -icon = ExtResource( 10 ) +icon = ExtResource( 7 ) flat = true [node name="Underwear" type="Tabs" parent="Wordrobe"] @@ -189,7 +171,7 @@ editor/display_folded = true visible = false anchor_right = 1.0 anchor_bottom = 1.0 -margin_top = 29.0 +margin_top = 31.0 [node name="UndiesGrid" type="GridContainer" parent="Wordrobe/Underwear"] margin_left = 21.0 @@ -201,32 +183,32 @@ columns = 6 [node name="OwOCensor" type="TextureButton" parent="Wordrobe/Underwear/UndiesGrid"] margin_right = 106.0 margin_bottom = 112.0 -texture_normal = ExtResource( 21 ) +texture_normal = ExtResource( 17 ) [node name="Briefs" type="TextureButton" parent="Wordrobe/Underwear/UndiesGrid"] margin_left = 110.0 margin_right = 216.0 margin_bottom = 112.0 -texture_normal = ExtResource( 22 ) +texture_normal = ExtResource( 18 ) [node name="ZBriefs" type="TextureButton" parent="Wordrobe/Underwear/UndiesGrid"] margin_left = 220.0 margin_right = 326.0 margin_bottom = 112.0 -texture_normal = ExtResource( 23 ) +texture_normal = ExtResource( 19 ) [node name="Fundosi" type="TextureButton" parent="Wordrobe/Underwear/UndiesGrid"] margin_left = 330.0 margin_right = 436.0 margin_bottom = 112.0 -texture_normal = ExtResource( 24 ) +texture_normal = ExtResource( 20 ) [node name="Accessoires" type="Tabs" parent="Wordrobe"] editor/display_folded = true visible = false anchor_right = 1.0 anchor_bottom = 1.0 -margin_top = 29.0 +margin_top = 31.0 [node name="AccsGrid" type="GridContainer" parent="Wordrobe/Accessoires"] margin_left = 20.0 @@ -237,17 +219,17 @@ columns = 6 [node name="CanonCam" type="TextureButton" parent="Wordrobe/Accessoires/AccsGrid"] margin_right = 85.0 -margin_bottom = 118.0 -texture_normal = ExtResource( 25 ) +margin_bottom = 112.0 +texture_normal = ExtResource( 21 ) [node name="RemoveAccessory" type="Button" parent="Wordrobe/Accessoires/AccsGrid"] margin_left = 89.0 -margin_right = 207.0 -margin_bottom = 118.0 +margin_right = 195.0 +margin_bottom = 112.0 rect_min_size = Vector2( 85, 105 ) 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 ) -icon = ExtResource( 10 ) +icon = ExtResource( 7 ) flat = true diff --git a/project/scn/CreditsScn.tscn b/project/scn/CreditsScn.tscn new file mode 100644 index 0000000..051ca30 --- /dev/null +++ b/project/scn/CreditsScn.tscn @@ -0,0 +1,71 @@ +[gd_scene load_steps=6 format=2] + +[ext_resource path="res://src/CreditsScn.gd" type="Script" id=1] +[ext_resource path="res://styles/DressUpTheme.res" type="Theme" id=2] +[ext_resource path="res://scn/Character.tscn" type="PackedScene" id=3] +[ext_resource path="res://scn/PauseScn.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/Soundtrack.gd" type="Script" id=5] + +[node name="Credits" type="Node"] +script = ExtResource( 1 ) + +[node name="RichTextLabel" type="RichTextLabel" parent="."] +margin_left = 33.0 +margin_top = 19.0 +margin_right = 320.0 +margin_bottom = 206.0 +theme = ExtResource( 2 ) +bbcode_text = "Nathan's Dress Up is a remake of Zack's Dress Up, a flash game created from 2006 to 2009. The character use to be a blue fox named Zack but was changed to a blue fennec named Nathan." +text = "Nathan's Dress Up is a remake of Zack's Dress Up, a flash game created from 2006 to 2009. The character use to be a blue fox named Zack but was changed to a blue fennec named Nathan." + +[node name="Credits" type="RichTextLabel" parent="."] +anchor_left = 0.5 +anchor_right = 0.5 +margin_left = -159.0 +margin_right = 160.0 +margin_bottom = 586.0 +theme = ExtResource( 2 ) +bbcode_enabled = true +bbcode_text = "[center]Created by +Anthony Wilcox + +Music by +Michael Carey + +Clothing inspired by +Megawolf77 +Canon Rhode +Raier + +Made with +Godot Engine +[/center]" +text = "Created by +Anthony Wilcox + +Music by +Michael Carey + +Clothing inspired by +Megawolf77 +Canon Rhode +Raier + +Made with +Godot Engine +" + +[node name="Character" parent="." instance=ExtResource( 3 )] +position = Vector2( 68.8273, 256.845 ) + +[node name="WinDialogs" parent="." instance=ExtResource( 4 )] + +[node name="Music" type="AudioStreamPlayer" parent="."] +script = ExtResource( 5 ) + +[node name="Version" type="Label" parent="."] +margin_left = 950.908 +margin_top = 568.64 +margin_right = 990.908 +margin_bottom = 582.64 +text = "Version" diff --git a/project/scn/GameScn.tscn b/project/scn/GameScn.tscn index a5def0c..6ab3670 100644 --- a/project/scn/GameScn.tscn +++ b/project/scn/GameScn.tscn @@ -1,28 +1,30 @@ [gd_scene load_steps=8 format=2] [ext_resource path="res://src/GameScn.gd" type="Script" id=1] -[ext_resource path="res://sprites/icrazy_frame.png" type="Texture" id=2] -[ext_resource path="res://scn/Clothes.tscn" type="PackedScene" id=3] -[ext_resource path="res://src/Soundtrack.gd" type="Script" id=4] -[ext_resource path="res://scn/WinDialogs.tscn" type="PackedScene" id=5] -[ext_resource path="res://scn/GlobalMenu.tscn" type="PackedScene" id=6] +[ext_resource path="res://sprites/icrazy_frame.svg" type="Texture" id=2] +[ext_resource path="res://sprites/lights.png" type="Texture" id=3] +[ext_resource path="res://scn/Clothes.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/Soundtrack.gd" type="Script" id=5] +[ext_resource path="res://scn/PauseScn.tscn" type="PackedScene" id=6] [ext_resource path="res://scn/Character.tscn" type="PackedScene" id=7] [node name="GameScreen" type="Node"] script = ExtResource( 1 ) [node name="PicFrame" type="Sprite" parent="."] -position = Vector2( 167.38, 140.341 ) +position = Vector2( 165.38, 245.341 ) texture = ExtResource( 2 ) -[node name="Clothes" parent="." instance=ExtResource( 3 )] +[node name="Light" type="Light2D" parent="."] +position = Vector2( 201.79, 232.073 ) +texture = ExtResource( 3 ) + +[node name="Clothes" parent="." instance=ExtResource( 4 )] [node name="Music" type="AudioStreamPlayer" parent="."] -script = ExtResource( 4 ) +script = ExtResource( 5 ) -[node name="WinDialogs" parent="." instance=ExtResource( 5 )] - -[node name="GlobalMenu" parent="." instance=ExtResource( 6 )] +[node name="PauseScn" parent="." instance=ExtResource( 6 )] [node name="Nathan" parent="." instance=ExtResource( 7 )] position = Vector2( 84.5004, 252.934 ) diff --git a/project/scn/WinDialogs.tscn b/project/scn/PauseScn.tscn similarity index 94% rename from project/scn/WinDialogs.tscn rename to project/scn/PauseScn.tscn index 567ae0a..3ff02da 100644 --- a/project/scn/WinDialogs.tscn +++ b/project/scn/PauseScn.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://styles/DressUpTheme.res" type="Theme" id=1] -[ext_resource path="res://src/WinDialogs.gd" type="Script" id=2] +[ext_resource path="res://src/PauseScn.gd" type="Script" id=2] [node name="WinDialogs" type="Control"] anchor_left = 0.5 @@ -13,7 +13,6 @@ script = ExtResource( 2 ) [node name="PauseWin" type="PopupDialog" parent="."] pause_mode = 2 -editor/display_folded = true anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -33,26 +32,26 @@ margin_bottom = -10.0 [node name="PauseLbl" type="Label" parent="PauseWin/PauseVbox"] margin_right = 156.0 -margin_bottom = 14.0 +margin_bottom = 21.0 text = "KPUS" align = 1 [node name="SettingsBtn" type="Button" parent="PauseWin/PauseVbox"] -margin_top = 18.0 +margin_top = 25.0 margin_right = 156.0 -margin_bottom = 38.0 +margin_bottom = 46.0 text = "KSET" [node name="ResumeBtn" type="Button" parent="PauseWin/PauseVbox"] -margin_top = 42.0 +margin_top = 50.0 margin_right = 156.0 -margin_bottom = 62.0 +margin_bottom = 71.0 text = "KRUS" [node name="ExitBtn" type="Button" parent="PauseWin/PauseVbox"] -margin_top = 66.0 +margin_top = 75.0 margin_right = 156.0 -margin_bottom = 86.0 +margin_bottom = 96.0 text = "KEXT" [node name="CreditsWin" type="AcceptDialog" parent="."] @@ -73,7 +72,7 @@ anchor_bottom = 1.0 margin_left = 8.0 margin_top = 8.0 margin_right = -8.0 -margin_bottom = -41.0 +margin_bottom = -37.0 focus_mode = 2 bbcode_enabled = true bbcode_text = "[center]Created by @@ -133,7 +132,7 @@ anchor_bottom = 0.5 margin_left = -68.0 margin_top = -26.0 margin_right = 68.0 -margin_bottom = -7.0 +margin_bottom = -3.0 columns = 3 [node name="Languages" type="MenuButton" parent="SettingsWin/Grid"] @@ -169,7 +168,7 @@ anchor_right = 0.5 margin_left = -194.0 margin_top = 8.0 margin_right = 194.0 -margin_bottom = 234.0 +margin_bottom = 238.0 bbcode_enabled = true bbcode_text = "Nathan's Dress Up is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. diff --git a/project/scn/TitleScn.tscn b/project/scn/TitleScn.tscn index 9b9f5d3..3948f01 100644 --- a/project/scn/TitleScn.tscn +++ b/project/scn/TitleScn.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://src/TitleScn.gd" type="Script" id=1] [ext_resource path="res://styles/DressUpTheme.res" type="Theme" id=2] [ext_resource path="res://sprites/title.svg" type="Texture" id=3] -[ext_resource path="res://scn/WinDialogs.tscn" type="PackedScene" id=4] +[ext_resource path="res://scn/PauseScn.tscn" type="PackedScene" id=4] [node name="Start" type="Node"] script = ExtResource( 1 ) @@ -28,27 +28,26 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -margin_left = -68.0 +margin_left = -67.5 margin_top = -42.5 -margin_right = 68.0 -margin_bottom = 42.5 +margin_right = 68.5 +margin_bottom = 61.5 [node name="PlayBtn" type="Button" parent="MenuRf/StartVbox"] margin_right = 136.0 -margin_bottom = 25.0 -toggle_mode = true +margin_bottom = 21.0 text = "KPLY" [node name="CreditsBtn" type="Button" parent="MenuRf/StartVbox"] -margin_top = 29.0 +margin_top = 25.0 margin_right = 136.0 -margin_bottom = 54.0 +margin_bottom = 46.0 text = "KCRE" [node name="LicenseBtn" type="Button" parent="MenuRf/StartVbox"] -margin_top = 58.0 +margin_top = 50.0 margin_right = 136.0 -margin_bottom = 83.0 +margin_bottom = 71.0 text = "KLIC" [node name="ModePanel" type="WindowDialog" parent="MenuRf"] @@ -92,6 +91,13 @@ margin_left = 97.0 margin_top = 37.0 margin_right = 97.0 margin_bottom = 37.0 + +[node name="Version" type="Label" parent="."] +margin_left = 950.908 +margin_top = 568.64 +margin_right = 990.908 +margin_bottom = 582.64 +text = "Version" [connection signal="pressed" from="MenuRf/StartVbox/PlayBtn" to="." method="_on_PlayBtn_pressed"] [connection signal="pressed" from="MenuRf/StartVbox/CreditsBtn" to="." method="_on_CreditsBtn_pressed"] [connection signal="pressed" from="MenuRf/StartVbox/LicenseBtn" to="." method="_on_LicenseBtn_pressed"] diff --git a/project/sprites/biker_jacket.svg b/project/sprites/biker_jacket.svg new file mode 100644 index 0000000..0130602 --- /dev/null +++ b/project/sprites/biker_jacket.svg @@ -0,0 +1,137 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/sprites/sixam_wordmark.png.import b/project/sprites/biker_jacket.svg.import similarity index 68% rename from project/sprites/sixam_wordmark.png.import rename to project/sprites/biker_jacket.svg.import index c3a9736..c391efe 100644 --- a/project/sprites/sixam_wordmark.png.import +++ b/project/sprites/biker_jacket.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/sixam_wordmark.png-a838e2a1a647ca5f6d38732caafef5a1.stex" +path="res://.import/biker_jacket.svg-e4eb87ceed9266fe4354ce7432371bfb.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/sixam_wordmark.png" -dest_files=[ "res://.import/sixam_wordmark.png-a838e2a1a647ca5f6d38732caafef5a1.stex" ] +source_file="res://sprites/biker_jacket.svg" +dest_files=[ "res://.import/biker_jacket.svg-e4eb87ceed9266fe4354ce7432371bfb.stex" ] [params] diff --git a/project/sprites/camera.svg b/project/sprites/camera.svg new file mode 100644 index 0000000..edb7fe2 --- /dev/null +++ b/project/sprites/camera.svg @@ -0,0 +1,117 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/project/sprites/camera.svg.import b/project/sprites/camera.svg.import new file mode 100644 index 0000000..bc513d3 --- /dev/null +++ b/project/sprites/camera.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/camera.svg-9305287ba29f8c72100325a8b8ece10a.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/camera.svg" +dest_files=[ "res://.import/camera.svg-9305287ba29f8c72100325a8b8ece10a.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=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 +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/sprites/dj_shirt.svg b/project/sprites/dj_shirt.svg new file mode 100644 index 0000000..3e7ef0a --- /dev/null +++ b/project/sprites/dj_shirt.svg @@ -0,0 +1,136 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/sprites/dj_shirt.svg.import b/project/sprites/dj_shirt.svg.import new file mode 100644 index 0000000..7149e71 --- /dev/null +++ b/project/sprites/dj_shirt.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/dj_shirt.svg-5d74e0cb2b3928aecd132f88a5420703.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/dj_shirt.svg" +dest_files=[ "res://.import/dj_shirt.svg-5d74e0cb2b3928aecd132f88a5420703.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=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 +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/sprites/dressup_panel.svg b/project/sprites/dressup_panel.svg new file mode 100644 index 0000000..265b15b --- /dev/null +++ b/project/sprites/dressup_panel.svg @@ -0,0 +1,89 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/project/sprites/dressup_panel.svg.import b/project/sprites/dressup_panel.svg.import new file mode 100644 index 0000000..1426226 --- /dev/null +++ b/project/sprites/dressup_panel.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/dressup_panel.svg-32ea153065247fc0395a2e1e29e6c510.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/dressup_panel.svg" +dest_files=[ "res://.import/dressup_panel.svg-32ea153065247fc0395a2e1e29e6c510.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=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 +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/sprites/exit_symbol.svg b/project/sprites/exit_symbol.svg new file mode 100644 index 0000000..072c26d --- /dev/null +++ b/project/sprites/exit_symbol.svg @@ -0,0 +1,67 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/project/sprites/exit_symbol.svg.import b/project/sprites/exit_symbol.svg.import new file mode 100644 index 0000000..572ea79 --- /dev/null +++ b/project/sprites/exit_symbol.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/exit_symbol.svg-73dc57ed97dd06b8f096295150b1975b.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/exit_symbol.svg" +dest_files=[ "res://.import/exit_symbol.svg-73dc57ed97dd06b8f096295150b1975b.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=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 +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/sprites/icrazy_frame.svg b/project/sprites/icrazy_frame.svg new file mode 100644 index 0000000..bf53e75 --- /dev/null +++ b/project/sprites/icrazy_frame.svg @@ -0,0 +1,191 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/sprites/icrazy_frame.svg.import b/project/sprites/icrazy_frame.svg.import new file mode 100644 index 0000000..5f54b48 --- /dev/null +++ b/project/sprites/icrazy_frame.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/icrazy_frame.svg-5b50831a46f310682a70f3d23d28a5f9.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/icrazy_frame.svg" +dest_files=[ "res://.import/icrazy_frame.svg-5b50831a46f310682a70f3d23d28a5f9.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=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 +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/sprites/lights.png b/project/sprites/lights.png index fe63e81..f87d606 100644 Binary files a/project/sprites/lights.png and b/project/sprites/lights.png differ diff --git a/project/sprites/old_sweatshirt.png b/project/sprites/old_sweatshirt.png index ffaba62..e4114b5 100644 Binary files a/project/sprites/old_sweatshirt.png and b/project/sprites/old_sweatshirt.png differ diff --git a/project/sprites/old_sweatshirt.svg b/project/sprites/old_sweatshirt.svg new file mode 100644 index 0000000..26907ca --- /dev/null +++ b/project/sprites/old_sweatshirt.svg @@ -0,0 +1,116 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/project/sprites/old_sweatshirt.svg.import b/project/sprites/old_sweatshirt.svg.import new file mode 100644 index 0000000..def2449 --- /dev/null +++ b/project/sprites/old_sweatshirt.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/old_sweatshirt.svg-30079f7163aabdff1203e8d8d45de87f.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/old_sweatshirt.svg" +dest_files=[ "res://.import/old_sweatshirt.svg-30079f7163aabdff1203e8d8d45de87f.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=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 +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/sprites/shirt_icon.svg b/project/sprites/shirt_icon.svg new file mode 100644 index 0000000..2f163a1 --- /dev/null +++ b/project/sprites/shirt_icon.svg @@ -0,0 +1,44 @@ + + + + + + + diff --git a/project/sprites/shirt_icon.svg.import b/project/sprites/shirt_icon.svg.import new file mode 100644 index 0000000..736dff8 --- /dev/null +++ b/project/sprites/shirt_icon.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/shirt_icon.svg-7b696f9c6cc160cdbf6b29c4ffa97174.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/shirt_icon.svg" +dest_files=[ "res://.import/shirt_icon.svg-7b696f9c6cc160cdbf6b29c4ffa97174.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=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 +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/sprites/sixam_wordmark.png b/project/sprites/sixam_wordmark.png deleted file mode 100644 index 3f36f06..0000000 Binary files a/project/sprites/sixam_wordmark.png and /dev/null differ diff --git a/project/sprites/sixam_wordmark.svg b/project/sprites/sixam_wordmark.svg new file mode 100644 index 0000000..869638a --- /dev/null +++ b/project/sprites/sixam_wordmark.svg @@ -0,0 +1,96 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/project/sprites/sixam_wordmark.svg.import b/project/sprites/sixam_wordmark.svg.import new file mode 100644 index 0000000..e667915 --- /dev/null +++ b/project/sprites/sixam_wordmark.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/sixam_wordmark.svg-b71d21b034a1362d87ee40fbd49bcca6.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/sixam_wordmark.svg" +dest_files=[ "res://.import/sixam_wordmark.svg-b71d21b034a1362d87ee40fbd49bcca6.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=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 +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/sprites/tail/tail0.svg b/project/sprites/tail/tail0.svg new file mode 100644 index 0000000..4ac35cc --- /dev/null +++ b/project/sprites/tail/tail0.svg @@ -0,0 +1,87 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/project/sprites/tail/tail0.svg.import b/project/sprites/tail/tail0.svg.import new file mode 100644 index 0000000..cc1d626 --- /dev/null +++ b/project/sprites/tail/tail0.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/tail0.svg-bacfc76d37c28f8c2feaf754c1d87074.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/tail/tail0.svg" +dest_files=[ "res://.import/tail0.svg-bacfc76d37c28f8c2feaf754c1d87074.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=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 +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/sprites/tail/tail1.svg b/project/sprites/tail/tail1.svg new file mode 100644 index 0000000..745d127 --- /dev/null +++ b/project/sprites/tail/tail1.svg @@ -0,0 +1,81 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/project/sprites/tail/tail1.svg.import b/project/sprites/tail/tail1.svg.import new file mode 100644 index 0000000..7a82d7a --- /dev/null +++ b/project/sprites/tail/tail1.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/tail1.svg-04a971ec08c55d1a9d26808d9c04b6ee.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/tail/tail1.svg" +dest_files=[ "res://.import/tail1.svg-04a971ec08c55d1a9d26808d9c04b6ee.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=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 +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/sprites/tail/tail2.svg b/project/sprites/tail/tail2.svg new file mode 100644 index 0000000..2ca86ad --- /dev/null +++ b/project/sprites/tail/tail2.svg @@ -0,0 +1,87 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/project/sprites/tail/tail2.svg.import b/project/sprites/tail/tail2.svg.import new file mode 100644 index 0000000..86a6693 --- /dev/null +++ b/project/sprites/tail/tail2.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/tail2.svg-79368b37193b7b118b6a6740d6e3834b.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/tail/tail2.svg" +dest_files=[ "res://.import/tail2.svg-79368b37193b7b118b6a6740d6e3834b.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=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 +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/sprites/tops.json b/project/sprites/tops.json new file mode 100644 index 0000000..05ca6c7 --- /dev/null +++ b/project/sprites/tops.json @@ -0,0 +1,7 @@ +{ + "accessoires": { + "camera": { + "sprite": {} + } + } +} \ No newline at end of file diff --git a/project/sprites/train_hoodie.svg b/project/sprites/train_hoodie.svg new file mode 100644 index 0000000..3d8fa6d --- /dev/null +++ b/project/sprites/train_hoodie.svg @@ -0,0 +1,125 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/sprites/train_hoodie.svg.import b/project/sprites/train_hoodie.svg.import new file mode 100644 index 0000000..408dce7 --- /dev/null +++ b/project/sprites/train_hoodie.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/train_hoodie.svg-437ba1a0f0dc90d83164909d14ede895.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/train_hoodie.svg" +dest_files=[ "res://.import/train_hoodie.svg-437ba1a0f0dc90d83164909d14ede895.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=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 +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/sprites/whatsnew_shirt.svg b/project/sprites/whatsnew_shirt.svg new file mode 100644 index 0000000..30fb38a --- /dev/null +++ b/project/sprites/whatsnew_shirt.svg @@ -0,0 +1,121 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/project/sprites/whatsnew_shirt.svg.import b/project/sprites/whatsnew_shirt.svg.import new file mode 100644 index 0000000..edca9a1 --- /dev/null +++ b/project/sprites/whatsnew_shirt.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/whatsnew_shirt.svg-3679963ea83eef4aef7bdf8f4503eb3e.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/whatsnew_shirt.svg" +dest_files=[ "res://.import/whatsnew_shirt.svg-3679963ea83eef4aef7bdf8f4503eb3e.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=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 +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project/src/ClassicScn.gd b/project/src/ClassicScn.gd new file mode 100644 index 0000000..9d0b2ee --- /dev/null +++ b/project/src/ClassicScn.gd @@ -0,0 +1,8 @@ +# Anthony Wilcox licenses this file to you under the GPL license. +# See the LICENSE file in the project root for more information. +extends Node + +func _process(delta): + if Input.is_action_pressed("ui_pause"): + GameKit.is_game_paused(true) + $WinDialogs/PauseWin.show() \ No newline at end of file diff --git a/project/src/CreditsScn.gd b/project/src/CreditsScn.gd new file mode 100644 index 0000000..ab90972 --- /dev/null +++ b/project/src/CreditsScn.gd @@ -0,0 +1,4 @@ +extends Node + +func _ready(): + $Version.text = GameKit.version \ No newline at end of file diff --git a/project/src/GameKit.gd b/project/src/GameKit.gd index 0ce7bf5..e7f7783 100644 --- a/project/src/GameKit.gd +++ b/project/src/GameKit.gd @@ -2,6 +2,8 @@ # See the LICENSE file in the project root for more information. extends Node +var version = "2.0" + func is_game_paused(is_paused): if is_paused == true: get_tree().paused = true @@ -11,7 +13,9 @@ func is_game_paused(is_paused): func switch_scenes(new_mode): if new_mode == "classic": get_tree().change_scene("res://scn/ClassicScn.tscn") - elif new_mode == "modern": + elif new_mode == "credits": + get_tree().change_scene("res://scn/CreditsScn.tscn") + elif new_mode == "play": get_tree().change_scene("res://scn/GameScn.tscn") elif new_mode == "title": get_tree().change_scene("res://scn/TitleScn.tscn") \ No newline at end of file diff --git a/project/src/GameScn.gd b/project/src/GameScn.gd index dadef6a..07398cd 100644 --- a/project/src/GameScn.gd +++ b/project/src/GameScn.gd @@ -37,10 +37,11 @@ func change_accessoires(new_accessory): accessory = new_accessory if new_accessory == null: - $Nathan/Top.texture = accessory + $Nathan/Accessory.texture = accessory $Nathan/Accessory.texture = accessory +# warning-ignore:unused_argument func _process(delta): # Change clothes @@ -51,16 +52,13 @@ func _process(delta): if $Clothes/Wordrobe/Pants/PantsGrid/Jeans.is_pressed(): change_bottoms(load("res://sprites/jeans.svg")) - + if $Clothes/Wordrobe/Pants/PantsGrid/Sweats.is_pressed(): change_bottoms(load("res://sprites/sweat_pants.svg")) if $Clothes/Wordrobe/Pants/PantsGrid/BeatUpJeans.is_pressed(): change_bottoms(load("res://sprites/beat_up_jeans.svg")) - # if $Clothes/Wordrobe/Pants/PantsGrid/DJShorts.is_pressed(): - # change_bottoms(load("res://sprites/dj_shorts.svg")) - if $Clothes/Wordrobe/Underwear/UndiesGrid/Briefs.is_pressed(): change_undies(load("res://sprites/briefs.svg")) @@ -78,6 +76,12 @@ func _process(delta): if $Clothes/Wordrobe/Pants/PantsGrid/BlueCamoJeans.is_pressed(): change_bottoms(load("res://sprites/blue_camo_jeans.svg")) + if $Clothes/Wordrobe/Shirts/ShirtsGrid/TrainHoodie.is_pressed(): + change_tops(load("res://sprites/train_hoodie.svg")) + + if $Clothes/Wordrobe/Shirts/ShirtsGrid/Sweatshirt.is_pressed(): + change_tops(load("res://sprites/old_sweatshirt.svg")) + # Remove clothes # =========================================================== diff --git a/project/src/WinDialogs.gd b/project/src/PauseScn.gd similarity index 66% rename from project/src/WinDialogs.gd rename to project/src/PauseScn.gd index c0062f9..617b648 100644 --- a/project/src/WinDialogs.gd +++ b/project/src/PauseScn.gd @@ -1,16 +1,21 @@ # Anthony Wilcox licenses this file to you under the GPL license. # See the LICENSE file in the project root for more information. -extends "res://src/GameKit.gd" +extends Node + +func _process(delta): + if Input.is_action_just_pressed("ui_pause"): + $PauseWin.show() + GameKit.is_game_paused(true) func _on_ExitBtn_pressed(): - is_game_paused(false) - switch_scenes("title") + GameKit.is_game_paused(false) + GameKit.switch_scenes("title") func _on_SettingsBtn_pressed(): $SettingsWin.show() func _on_CreditsBtn_pressed(): - $CreditsWin.show() + GameKit.switch_scenes("credits") func _on_LicenseBtn_pressed(): $LicenseWin.show() @@ -26,4 +31,4 @@ func _on_MusicBtn_toggled(button_pressed): func _on_ResumeBtn_pressed(): $PauseWin.hide() - is_game_paused(false) \ No newline at end of file + GameKit.is_game_paused(false) \ No newline at end of file diff --git a/project/src/Soundtrack.gd b/project/src/Soundtrack.gd index 24e401c..acc94bc 100644 --- a/project/src/Soundtrack.gd +++ b/project/src/Soundtrack.gd @@ -1,9 +1,12 @@ +# Anthony Wilcox licenses this file to you under the GPL license. +# See the LICENSE file in the project root for more information. extends AudioStreamPlayer const tracks = [ 'reminiscing', 'together_again', 'at_the_lake', + 'mushrooms', ] func _ready(): diff --git a/project/src/TitleScn.gd b/project/src/TitleScn.gd index df4c1cb..237f5b5 100644 --- a/project/src/TitleScn.gd +++ b/project/src/TitleScn.gd @@ -1,18 +1,21 @@ # Anthony Wilcox licenses this file to you under the GPL license. # See the LICENSE file in the project root for more information. -extends "res://src/GameKit.gd" +extends Node + +func _ready(): + $Version.text = GameKit.version func _on_ClassicBtn_pressed(): - switch_scenes("classic") + GameKit.switch_scenes("classic") func _on_ModernBtn_pressed(): - switch_scenes("modern") + GameKit.switch_scenes("play") func _on_CreditsBtn_pressed(): - $WinDialogs/CreditsWin.show() + GameKit.switch_scenes("credits") func _on_LicenseBtn_pressed(): $WinDialogs/LicenseWin.show() func _on_PlayBtn_pressed(): - switch_scenes("modern") + GameKit.switch_scenes("play") diff --git a/project/styles/DressUpTheme.res b/project/styles/DressUpTheme.res new file mode 100644 index 0000000..d7db511 Binary files /dev/null and b/project/styles/DressUpTheme.res differ diff --git a/project/styles/button.stylebox b/project/styles/button.stylebox new file mode 100644 index 0000000..4df4c44 Binary files /dev/null and b/project/styles/button.stylebox differ diff --git a/project/styles/button_hover.stylebox b/project/styles/button_hover.stylebox new file mode 100644 index 0000000..d77aa81 Binary files /dev/null and b/project/styles/button_hover.stylebox differ diff --git a/project/styles/button_press.stylebox b/project/styles/button_press.stylebox new file mode 100644 index 0000000..dfee421 Binary files /dev/null and b/project/styles/button_press.stylebox differ diff --git a/project/styles/global_menu.stylebox b/project/styles/global_menu.stylebox new file mode 100644 index 0000000..f754018 Binary files /dev/null and b/project/styles/global_menu.stylebox differ diff --git a/project/styles/tab.stylebox b/project/styles/tab.stylebox new file mode 100644 index 0000000..545beb7 Binary files /dev/null and b/project/styles/tab.stylebox differ diff --git a/project/styles/tabbg.stylebox b/project/styles/tabbg.stylebox new file mode 100644 index 0000000..78fe295 Binary files /dev/null and b/project/styles/tabbg.stylebox differ diff --git a/project/styles/wordrobe_panel.stylebox b/project/styles/wordrobe_panel.stylebox new file mode 100644 index 0000000..6d851af Binary files /dev/null and b/project/styles/wordrobe_panel.stylebox differ