diff --git a/.gitignore b/.gitignore index 0657785..0f6f0a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -# Created by https://www.toptal.com/developers/gitignore/api/macos,linux,godot,backup,windows,dotnetcore,executable,monodevelop,visualstudiocode,web -# Edit at https://www.toptal.com/developers/gitignore?templates=macos,linux,godot,backup,windows,dotnetcore,executable,monodevelop,visualstudiocode,web +# Created by https://www.gitignore.io/api/linux,godot,macos,backup,windows,dotnetcore,executable,monodevelop,visualstudiocode +# Edit at https://www.gitignore.io/?templates=linux,godot,macos,backup,windows,dotnetcore,executable,monodevelop,visualstudiocode ### Backup ### *.bak @@ -10,13 +10,14 @@ ### DotnetCore ### # .NET Core build folders -bin/ -obj/ +/bin +/obj # Common node modules locations /node_modules /wwwroot/node_modules + ### Executable ### *.app *.bat @@ -36,12 +37,8 @@ obj/ export.cfg export_presets.cfg -# Imported translations (automatically generated from CSV files) -*.translation - # Mono-specific ignores .mono/ -data_*/ ### Linux ### *~ @@ -102,27 +99,11 @@ test-results/ !.vscode/tasks.json !.vscode/launch.json !.vscode/extensions.json -*.code-workspace ### VisualStudioCode Patch ### # Ignore all local history of files .history -### Web ### -*.asp -*.cer -*.csr -*.css -*.htm -*.html -*.js -*.jsp -*.php -*.rss -*.wasm -*.wat -*.xhtml - ### Windows ### # Windows thumbnail cache files Thumbs.db @@ -149,4 +130,4 @@ $RECYCLE.BIN/ # Windows shortcuts *.lnk -# End of https://www.toptal.com/developers/gitignore/api/macos,linux,godot,backup,windows,dotnetcore,executable,monodevelop,visualstudiocode,web \ No newline at end of file +# End of https://www.gitignore.io/api/linux,godot,macos,backup,windows,dotnetcore,executable,monodevelop,visualstudiocode \ No newline at end of file diff --git a/README.md b/README.md index 6c988ed..1186bbe 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Tony's Dress Up -![](screenshot.gif) +![](screenshot.png) ​Tony's Dress Up is a re-imagining of my first Flash game, ZC's Dress Up, developed back in 2007. I've included the Flash copies in the ``/archive`` directory. They can be played at [Ruffle](https://ruffle.rs/)'s demo page. ​ diff --git a/scenes/characterBase.tscn b/scenes/characterBase.tscn index 1d473c9..1a6ce60 100644 --- a/scenes/characterBase.tscn +++ b/scenes/characterBase.tscn @@ -4,7 +4,7 @@ [ext_resource path="res://sprites/character/tail/tail0.svg" type="Texture" id=2] [ext_resource path="res://sprites/character/tail/tail1.svg" type="Texture" id=3] [ext_resource path="res://sprites/character/tail/tail2.svg" type="Texture" id=4] -[ext_resource path="res://sprites/character_base.svg" type="Texture" id=5] +[ext_resource path="res://sprites/clothes/character_base.svg" type="Texture" id=5] [ext_resource path="res://sprites/character/eyes/eyes1.png" type="Texture" id=6] [ext_resource path="res://sprites/character/eyes/eyes2.png" type="Texture" id=7] [ext_resource path="res://sprites/character/eyes/eyes3.png" type="Texture" id=8] @@ -62,7 +62,6 @@ position = Vector2( -103.897, -160.477 ) [node name="Tail" type="AnimatedSprite" parent="base"] position = Vector2( 55.0701, 172.425 ) frames = SubResource( 1 ) -frame = 2 playing = true [node name="shadow" type="Sprite" parent="base"] @@ -76,12 +75,13 @@ texture = ExtResource( 5 ) [node name="Eyes" type="AnimatedSprite" parent="base"] position = Vector2( 114.227, 63.9224 ) frames = SubResource( 2 ) +frame = 6 playing = true [node name="Mouth" type="AnimatedSprite" parent="base"] position = Vector2( 148.505, 68.0261 ) frames = SubResource( 3 ) -frame = 7 +frame = 11 playing = true [node name="Undies" type="Sprite" parent="."] diff --git a/screenshot.gif b/screenshot.gif deleted file mode 100644 index cd2f408..0000000 Binary files a/screenshot.gif and /dev/null differ diff --git a/screenshot.png b/screenshot.png new file mode 100644 index 0000000..6fed88d Binary files /dev/null and b/screenshot.png differ diff --git a/sprites/character_base.png.import b/screenshot.png.import similarity index 68% rename from sprites/character_base.png.import rename to screenshot.png.import index 7016ee9..d6ff86c 100644 --- a/sprites/character_base.png.import +++ b/screenshot.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/character_base.png-5792404fa83b4fad07f738418ce65c16.stex" +path="res://.import/screenshot.png-024a21af5d37bf0f0dd0e2bccdd149d0.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/character_base.png" -dest_files=[ "res://.import/character_base.png-5792404fa83b4fad07f738418ce65c16.stex" ] +source_file="res://screenshot.png" +dest_files=[ "res://.import/screenshot.png-024a21af5d37bf0f0dd0e2bccdd149d0.stex" ] [params] diff --git a/scripts/wardrobe.gd b/scripts/wardrobe.gd index 4741a96..bdd51cb 100644 --- a/scripts/wardrobe.gd +++ b/scripts/wardrobe.gd @@ -4,75 +4,6 @@ onready var character = preload("res://resources/character.tres") onready var blank_top = preload("res://sprites/clothes/blank_top.png") onready var blank_bottom = preload("res://sprites/clothes/blank_bottom.png") -onready var pants_grid = $Pants/PantsScroll/PantsGrid -onready var shirts_grid = $Shirts/ShirtsScroll/ShirtsGrid -onready var undies_grid = $Underwear/UndiesScroll/UndiesGrid -onready var accs_grid = $Accessoires/AccsScroll/AccsGrid - -func list_files_in_directory(path): - var files = [] - var dir = Directory.new() - dir.open(path) - dir.list_dir_begin() - - while true: - var file = dir.get_next() - if file == "": - break - elif not file.begins_with("."): - files.append(file) - - dir.list_dir_end() - - return files - -func check_for_dlc(dlc_pack): - var usr_dir = "user://dlc/" - var dlc_path = usr_dir + dlc_pack - var load_pck = ProjectSettings.load_resource_pack(dlc_path, false) - print_debug("Loaded " + dlc_path + ": " + str(load_pck)) - - # Check if the DLC is actually there - if load_pck == true: - - # Loads the DLC - ProjectSettings.load_resource_pack(dlc_path, false) - - var dir = Directory.new() - dir.list_dir_begin() - - # Lists the files in each of their respective directories - var shirts_dir = "res://scenes/dlc/shirts/" - var pants_dir = "res://scenes/dlc/pants/" - var undies_dir = "res://scenes/dlc/undies/" - var dlc_shirts = list_files_in_directory(shirts_dir) - var dlc_pants = list_files_in_directory(pants_dir) - var dlc_undies = list_files_in_directory(undies_dir) - - # Make sure each file actually exist, instance them - # and add them to their respective tabs - for shirt in dlc_shirts: - if dir.file_exists(shirts_dir + shirt): - var init = load(shirts_dir + shirt).instance() - shirts_grid.add_child(init) - print_debug("Initialized: " + shirts_dir + shirt) - - for pants in dlc_pants: - if dir.file_exists(pants_dir + pants): - var init = load(pants_dir + pants).instance() - shirts_grid.add_child(init) - print_debug("Initialized: " + pants_dir + pants) - - for undies in dlc_undies: - if dir.file_exists(undies_dir + undies): - var init = load(undies_dir + undies).instance() - shirts_grid.add_child(init) - print_debug("Initialized: " + undies_dir + undies) - -func _ready(): -# check_for_dlc("testdlc.pck") - pass - func _on_removeAccessory_pressed(): character.accessory = blank_top diff --git a/sprites/atomic shirt.png.import b/sprites/atomic shirt.png.import new file mode 100644 index 0000000..b370717 --- /dev/null +++ b/sprites/atomic shirt.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/atomic shirt.png-d26cc1b5ebd91e875597b24efab7e108.stex" + +[deps] + +source_file="res://assets/atomic shirt.png" +dest_files=[ "res://.import/atomic shirt.png-d26cc1b5ebd91e875597b24efab7e108.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/sprites/blue tux.png.import b/sprites/blue tux.png.import new file mode 100644 index 0000000..f9f4ff3 --- /dev/null +++ b/sprites/blue tux.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/blue tux.png-e74dcea6593b7b5d27c231432c1497a4.stex" + +[deps] + +source_file="res://assets/blue tux.png" +dest_files=[ "res://.import/blue tux.png-e74dcea6593b7b5d27c231432c1497a4.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/sprites/character_base.png b/sprites/clothes/character_base.png similarity index 100% rename from sprites/character_base.png rename to sprites/clothes/character_base.png diff --git a/sprites/clothes/character_base.png.import b/sprites/clothes/character_base.png.import new file mode 100644 index 0000000..2401657 --- /dev/null +++ b/sprites/clothes/character_base.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/character_base.png-240b103219887692bbf047c7786ade98.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/clothes/character_base.png" +dest_files=[ "res://.import/character_base.png-240b103219887692bbf047c7786ade98.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=false +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=false +svg/scale=1.0 diff --git a/sprites/character_base.svg b/sprites/clothes/character_base.svg similarity index 100% rename from sprites/character_base.svg rename to sprites/clothes/character_base.svg diff --git a/sprites/character_base.svg.import b/sprites/clothes/character_base.svg.import similarity index 67% rename from sprites/character_base.svg.import rename to sprites/clothes/character_base.svg.import index a2ac768..3f928f3 100644 --- a/sprites/character_base.svg.import +++ b/sprites/clothes/character_base.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/character_base.svg-5ea6954c66ca6e666096a6a63d2174dc.stex" +path="res://.import/character_base.svg-2a3498e2077081015c7a2d1f387a2594.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/character_base.svg" -dest_files=[ "res://.import/character_base.svg-5ea6954c66ca6e666096a6a63d2174dc.stex" ] +source_file="res://sprites/clothes/character_base.svg" +dest_files=[ "res://.import/character_base.svg-2a3498e2077081015c7a2d1f387a2594.stex" ] [params] diff --git a/sprites/dj shirt.png.import b/sprites/dj shirt.png.import new file mode 100644 index 0000000..9712d0a --- /dev/null +++ b/sprites/dj shirt.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/dj shirt.png-678439338bef2f51a00d62d0b4aa6e53.stex" + +[deps] + +source_file="res://assets/dj shirt.png" +dest_files=[ "res://.import/dj shirt.png-678439338bef2f51a00d62d0b4aa6e53.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/sprites/dj shorts.png.import b/sprites/dj shorts.png.import new file mode 100644 index 0000000..f48fe89 --- /dev/null +++ b/sprites/dj shorts.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/dj shorts.png-2620c5746e1ce4d9f2b948f76c51004a.stex" + +[deps] + +source_file="res://assets/dj shorts.png" +dest_files=[ "res://.import/dj shorts.png-2620c5746e1ce4d9f2b948f76c51004a.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/sprites/dress up bg.png.import b/sprites/dress up bg.png.import new file mode 100644 index 0000000..fcb421b --- /dev/null +++ b/sprites/dress up bg.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/dress up bg.png-a4e05076ce6a2a490f741107b52fb791.stex" + +[deps] + +source_file="res://assets/dress up bg.png" +dest_files=[ "res://.import/dress up bg.png-a4e05076ce6a2a490f741107b52fb791.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/sprites/game splash.png.import b/sprites/game splash.png.import new file mode 100644 index 0000000..5edd989 --- /dev/null +++ b/sprites/game splash.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/game splash.png-e86e0cec6e75a90aba695b23cd9d7cf2.stex" + +[deps] + +source_file="res://assets/game splash.png" +dest_files=[ "res://.import/game splash.png-e86e0cec6e75a90aba695b23cd9d7cf2.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/sprites/jp school girl.png.import b/sprites/jp school girl.png.import new file mode 100644 index 0000000..28ad447 --- /dev/null +++ b/sprites/jp school girl.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/jp school girl.png-76639cac18d3d789027705837bf2061a.stex" + +[deps] + +source_file="res://assets/jp school girl.png" +dest_files=[ "res://.import/jp school girl.png-76639cac18d3d789027705837bf2061a.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/sprites/new_character_base.svg b/sprites/new_character_base.svg deleted file mode 100644 index 12dc8aa..0000000 --- a/sprites/new_character_base.svg +++ /dev/null @@ -1,186 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sprites/old sweatshirt.png.import b/sprites/old sweatshirt.png.import new file mode 100644 index 0000000..f1441f3 --- /dev/null +++ b/sprites/old sweatshirt.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/old sweatshirt.png-0840b8f71c7697cf2fe3165844974c64.stex" + +[deps] + +source_file="res://assets/old sweatshirt.png" +dest_files=[ "res://.import/old sweatshirt.png-0840b8f71c7697cf2fe3165844974c64.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/sprites/owo censor.png.import b/sprites/owo censor.png.import new file mode 100644 index 0000000..0cbde98 --- /dev/null +++ b/sprites/owo censor.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/owo censor.png-b85e8d8b11ff48447e26c6c121a89919.stex" + +[deps] + +source_file="res://assets/owo censor.png" +dest_files=[ "res://.import/owo censor.png-b85e8d8b11ff48447e26c6c121a89919.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/sprites/raw shirt.png.import b/sprites/raw shirt.png.import new file mode 100644 index 0000000..7d6386c --- /dev/null +++ b/sprites/raw shirt.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/raw shirt.png-150c35dbb41a5202591e557baf54357f.stex" + +[deps] + +source_file="res://assets/raw shirt.png" +dest_files=[ "res://.import/raw shirt.png-150c35dbb41a5202591e557baf54357f.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/sprites/snowboard coat.png.import b/sprites/snowboard coat.png.import new file mode 100644 index 0000000..b5c85d2 --- /dev/null +++ b/sprites/snowboard coat.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/snowboard coat.png-84eee0b9120b2b6eb9b42a778f7eb18d.stex" + +[deps] + +source_file="res://assets/snowboard coat.png" +dest_files=[ "res://.import/snowboard coat.png-84eee0b9120b2b6eb9b42a778f7eb18d.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/sprites/sweat pants.png.import b/sprites/sweat pants.png.import new file mode 100644 index 0000000..fabd9a5 --- /dev/null +++ b/sprites/sweat pants.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/sweat pants.png-e8fd5ce0b8945bdecc584c33bf29ed21.stex" + +[deps] + +source_file="res://assets/sweat pants.png" +dest_files=[ "res://.import/sweat pants.png-e8fd5ce0b8945bdecc584c33bf29ed21.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/sprites/tops.json b/sprites/tops.json new file mode 100644 index 0000000..05ca6c7 --- /dev/null +++ b/sprites/tops.json @@ -0,0 +1,7 @@ +{ + "accessoires": { + "camera": { + "sprite": {} + } + } +} \ No newline at end of file diff --git a/sprites/trench coat.png.import b/sprites/trench coat.png.import new file mode 100644 index 0000000..e2f86ca --- /dev/null +++ b/sprites/trench coat.png.import @@ -0,0 +1,29 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/trench coat.png-9da5d37fc9237bc90e5a1539679466d7.stex" + +[deps] + +source_file="res://assets/trench coat.png" +dest_files=[ "res://.import/trench coat.png-9da5d37fc9237bc90e5a1539679466d7.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