diff --git a/project/Zack.tscn b/project/Character.tscn similarity index 91% rename from project/Zack.tscn rename to project/Character.tscn index 9497aa9..ed265cc 100644 --- a/project/Zack.tscn +++ b/project/Character.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://assets/tail/tail0.png" type="Texture" id=1] [ext_resource path="res://assets/tail/tail1.png" type="Texture" id=2] [ext_resource path="res://assets/tail/tail2.png" type="Texture" id=3] -[ext_resource path="res://assets/zack_base.png" type="Texture" id=4] +[ext_resource path="res://assets/character_base.png" type="Texture" id=4] [ext_resource path="res://assets/eyes/eyes1.png" type="Texture" id=5] [ext_resource path="res://assets/eyes/eyes2.png" type="Texture" id=6] [ext_resource path="res://assets/eyes/eyes3.png" type="Texture" id=7] @@ -50,35 +50,47 @@ animations = [ { "speed": 4.0 } ] -[node name="Zack" type="Node2D"] +[node name="Nathane" type="Node2D" index="0"] [node name="Tail" type="AnimatedSprite" parent="." index="0"] position = Vector2( 49.6951, 374.417 ) frames = SubResource( 1 ) animation = "default" -frame = 3 +frame = 5 playing = true +__meta__ = { +"_edit_lock_": true +} [node name="Base" type="Sprite" parent="." index="1"] position = Vector2( 91.6446, 354.064 ) texture = ExtResource( 4 ) +__meta__ = { +"_edit_lock_": true +} [node name="Eyes" type="AnimatedSprite" parent="." index="2"] -position = Vector2( 109.519, 255.9 ) +position = Vector2( 109.519, 253.9 ) frames = SubResource( 2 ) animation = "default" -frame = 2 +frame = 18 playing = true +__meta__ = { +"_edit_lock_": true +} [node name="Mouth" type="AnimatedSprite" parent="." index="3"] position = Vector2( 126.316, 257.474 ) frames = SubResource( 3 ) animation = "default" -frame = 18 +frame = 13 playing = true +__meta__ = { +"_edit_lock_": true +} diff --git a/project/ClassicClothes.tscn b/project/ClassicClothes.tscn index e8c56d7..9772e3f 100644 --- a/project/ClassicClothes.tscn +++ b/project/ClassicClothes.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://assets/classic/briefs_classic.png" type="Texture" id=1] [ext_resource path="res://src/ItemDrag.gd" type="Script" id=2] -[ext_resource path="res://assets/classic/zbriefs_classic.png" type="Texture" id=3] +[ext_resource path="res://assets/classic/z_briefs_classic.png" type="Texture" id=3] [ext_resource path="res://assets/classic/fundosi_classic.png" type="Texture" id=4] [ext_resource path="res://assets/jeans.png" type="Texture" id=5] [ext_resource path="res://assets/dj_shorts.png" type="Texture" id=6] @@ -20,6 +20,7 @@ [ext_resource path="res://assets/classic/camera_classic.png" type="Texture" id=18] [ext_resource path="res://assets/classic/owo_censor_classic.png" type="Texture" id=19] + [node name="Clothes" type="Node" index="0"] [node name="Wordrobe" type="ReferenceRect" parent="." index="0"] diff --git a/project/ClassicScn.tscn b/project/ClassicScn.tscn index fd6bac5..53291fd 100644 --- a/project/ClassicScn.tscn +++ b/project/ClassicScn.tscn @@ -3,11 +3,11 @@ [ext_resource path="res://src/GameScn.gd" type="Script" id=1] [ext_resource path="res://assets/classic_dress_up_bg.png" type="Texture" id=2] [ext_resource path="res://assets/lights.png" type="Texture" id=3] -[ext_resource path="res://Zack.tscn" type="PackedScene" id=4] +[ext_resource path="res://Character.tscn" type="PackedScene" id=4] [ext_resource path="res://ClassicClothes.tscn" type="PackedScene" id=5] [ext_resource path="res://WinDialogs.tscn" type="PackedScene" id=6] -[node name="GameScreen" type="Node"] +[node name="GameScreen" type="Node" index="0"] script = ExtResource( 1 ) @@ -28,7 +28,7 @@ __meta__ = { "_edit_lock_": true } -[node name="Zack" parent="." index="2" instance=ExtResource( 4 )] +[node name="Nathan" parent="." index="2" instance=ExtResource( 4 )] [node name="Clothes" parent="." index="3" instance=ExtResource( 5 )] diff --git a/project/Clothes.tscn b/project/Clothes.tscn index 16506a2..a169f2e 100644 --- a/project/Clothes.tscn +++ b/project/Clothes.tscn @@ -21,7 +21,7 @@ [ext_resource path="res://assets/whatsnew_shirt.png" type="Texture" id=19] [ext_resource path="res://assets/owo_censor.png" type="Texture" id=20] [ext_resource path="res://assets/briefs.png" type="Texture" id=21] -[ext_resource path="res://assets/zbriefs.png" type="Texture" id=22] +[ext_resource path="res://assets/z_briefs.png" type="Texture" id=22] [ext_resource path="res://assets/fundosi.png" type="Texture" id=23] [ext_resource path="res://assets/camera.png" type="Texture" id=24] [ext_resource path="res://assets/bottoms_placeholder.png" type="Texture" id=25] @@ -50,7 +50,7 @@ content_margin_right = -1.0 content_margin_top = -1.0 content_margin_bottom = -1.0 -[node name="Clothes" type="Node" index="0"] +[node name="Clothes" type="Node"] script = ExtResource( 1 ) diff --git a/project/ModernScn.tscn b/project/ModernScn.tscn index d10ecc4..9f983ce 100644 --- a/project/ModernScn.tscn +++ b/project/ModernScn.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://src/GameScn.gd" type="Script" id=1] [ext_resource path="res://assets/modern_dress_up_bg.png" type="Texture" id=2] [ext_resource path="res://assets/icrazy_frame.png" type="Texture" id=3] -[ext_resource path="res://Zack.tscn" type="PackedScene" id=4] +[ext_resource path="res://Character.tscn" type="PackedScene" id=4] [ext_resource path="res://Clothes.tscn" type="PackedScene" id=5] [ext_resource path="res://WinDialogs.tscn" type="PackedScene" id=6] @@ -21,14 +21,13 @@ __meta__ = { [node name="PicFrame" type="Sprite" parent="." index="1"] -position = Vector2( 93.9417, 121.396 ) +position = Vector2( 93.9417, 98.396 ) texture = ExtResource( 3 ) -__meta__ = { -"_edit_lock_": true -} -[node name="Zack" parent="." index="2" instance=ExtResource( 4 )] +[node name="Nathan" parent="." index="2" instance=ExtResource( 4 )] [node name="Clothes" parent="." index="3" instance=ExtResource( 5 )] -[node name="WinDialogs" parent="." index="4" instance=ExtResource( 6 )] \ No newline at end of file +[node name="WinDialogs" parent="." index="4" instance=ExtResource( 6 )] + + diff --git a/project/TitleScn.tscn b/project/TitleScn.tscn index 526e5ae..8fed44d 100644 --- a/project/TitleScn.tscn +++ b/project/TitleScn.tscn @@ -1,11 +1,10 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://src/TitleScn.gd" type="Script" id=1] [ext_resource path="res://assets/modern_dress_up_blurred_bg.png" type="Texture" id=2] [ext_resource path="res://assets/dressup_blurred_wardrobe.png" type="Texture" id=3] [ext_resource path="res://assets/classic_dress_up_blurred_bg.png" type="Texture" id=4] -[ext_resource path="res://assets/dressup_title.svg" type="Texture" id=5] -[ext_resource path="res://WinDialogs.tscn" type="PackedScene" id=6] +[ext_resource path="res://WinDialogs.tscn" type="PackedScene" id=5] [node name="Start" type="Node"] @@ -38,24 +37,16 @@ __meta__ = { "_edit_lock_": true } -[node name="GameTitle" type="Sprite" parent="." index="2"] - -position = Vector2( 489.565, 100.74 ) -texture = ExtResource( 5 ) -__meta__ = { -"_edit_lock_": true -} - -[node name="MenuRf" type="ReferenceRect" parent="." index="3"] +[node name="MenuRf" type="ReferenceRect" parent="." index="2"] anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 221.0 -margin_top = 147.0 +margin_top = 80.0 margin_right = 762.0 -margin_bottom = 462.0 +margin_bottom = 395.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 0 @@ -270,7 +261,7 @@ __meta__ = { "_edit_lock_": true } -[node name="WinDialogs" parent="." index="4" instance=ExtResource( 6 )] +[node name="WinDialogs" parent="." index="3" instance=ExtResource( 5 )] [connection signal="toggled" from="MenuRf/StartVbox/PlayBtn" to="." method="_on_PlayBtn_toggled"] diff --git a/project/WinDialogs.tscn b/project/WinDialogs.tscn index 7062941..939a1a8 100644 --- a/project/WinDialogs.tscn +++ b/project/WinDialogs.tscn @@ -363,17 +363,17 @@ mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 bbcode_enabled = true -bbcode_text = "Zack'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. +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. -Zack's Dress Up is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +Nathan's Dress Up is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License along with Zack's Dress Up. If not, see: https://www.gnu.org/licenses/ +You should have received a copy of the GNU General Public License along with Nathan's Dress Up. If not, see: https://www.gnu.org/licenses/ [center]##########################[/center] -Zack's Dress Up (c) by Anthony Wilcox +Nathan's Dress Up (c) by Anthony Wilcox -Zack's Dress Up is licensed under a Creative Commons +Nathan's Dress Up is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License. You should have received a copy of the license along with this work. @@ -382,17 +382,17 @@ visible_characters = -1 percent_visible = 1.0 meta_underlined = true tab_size = 4 -text = "Zack'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. +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. -Zack's Dress Up is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +Nathan's Dress Up is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License along with Zack's Dress Up. If not, see: https://www.gnu.org/licenses/ +You should have received a copy of the GNU General Public License along with Nathan's Dress Up. If not, see: https://www.gnu.org/licenses/ ########################## -Zack's Dress Up (c) by Anthony Wilcox +Nathan's Dress Up (c) by Anthony Wilcox -Zack's Dress Up is licensed under a Creative Commons +Nathan's Dress Up is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License. You should have received a copy of the license along with this work. diff --git a/project/assets/character_base.png b/project/assets/character_base.png new file mode 100644 index 0000000..ccd8347 Binary files /dev/null and b/project/assets/character_base.png differ diff --git a/project/assets/zack_base.png.import b/project/assets/character_base.png.import similarity index 64% rename from project/assets/zack_base.png.import rename to project/assets/character_base.png.import index d1c3c79..2539632 100644 --- a/project/assets/zack_base.png.import +++ b/project/assets/character_base.png.import @@ -2,12 +2,12 @@ importer="texture" type="StreamTexture" -path="res://.import/zack_base.png-2923a5a1e7ff4f3f0fc3145ae1dd489a.stex" +path="res://.import/character_base.png-c05d8228393f46719940bcc9f76f4273.stex" [deps] -source_file="res://assets/zack_base.png" -dest_files=[ "res://.import/zack_base.png-2923a5a1e7ff4f3f0fc3145ae1dd489a.stex" ] +source_file="res://assets/character_base.png" +dest_files=[ "res://.import/character_base.png-c05d8228393f46719940bcc9f76f4273.stex" ] [params] diff --git a/project/assets/classic/zbriefs_classic.png b/project/assets/classic/z_briefs_classic.png similarity index 100% rename from project/assets/classic/zbriefs_classic.png rename to project/assets/classic/z_briefs_classic.png diff --git a/project/assets/classic/zbriefs_classic.png.import b/project/assets/classic/z_briefs_classic.png.import similarity index 62% rename from project/assets/classic/zbriefs_classic.png.import rename to project/assets/classic/z_briefs_classic.png.import index d217eb4..861281b 100644 --- a/project/assets/classic/zbriefs_classic.png.import +++ b/project/assets/classic/z_briefs_classic.png.import @@ -2,12 +2,12 @@ importer="texture" type="StreamTexture" -path="res://.import/zbriefs_classic.png-be93fa3f8bbe034f9930c67e848c889d.stex" +path="res://.import/z_briefs_classic.png-fff4d99cab4cf23d5d12c4632f3692b2.stex" [deps] -source_file="res://assets/classic/zbriefs_classic.png" -dest_files=[ "res://.import/zbriefs_classic.png-be93fa3f8bbe034f9930c67e848c889d.stex" ] +source_file="res://assets/classic/z_briefs_classic.png" +dest_files=[ "res://.import/z_briefs_classic.png-fff4d99cab4cf23d5d12c4632f3692b2.stex" ] [params] diff --git a/project/assets/dressup_title.svg b/project/assets/dressup_title.svg deleted file mode 100644 index a553abb..0000000 --- a/project/assets/dressup_title.svg +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - diff --git a/project/assets/dressup_title.svg.import b/project/assets/dressup_title.svg.import deleted file mode 100644 index 63ae177..0000000 --- a/project/assets/dressup_title.svg.import +++ /dev/null @@ -1,29 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/dressup_title.svg-8d2a8b65ef9e6151959385637bef7960.stex" - -[deps] - -source_file="res://assets/dressup_title.svg" -dest_files=[ "res://.import/dressup_title.svg-8d2a8b65ef9e6151959385637bef7960.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/project/assets/tail/tail0.png b/project/assets/tail/tail0.png index 81cb64d..a4f5600 100644 Binary files a/project/assets/tail/tail0.png and b/project/assets/tail/tail0.png differ diff --git a/project/assets/tail/tail1.png b/project/assets/tail/tail1.png index 056301b..6bb868a 100644 Binary files a/project/assets/tail/tail1.png and b/project/assets/tail/tail1.png differ diff --git a/project/assets/tail/tail2.png b/project/assets/tail/tail2.png index c41e7f5..8794768 100644 Binary files a/project/assets/tail/tail2.png and b/project/assets/tail/tail2.png differ diff --git a/project/assets/zbriefs.png b/project/assets/z_briefs.png similarity index 100% rename from project/assets/zbriefs.png rename to project/assets/z_briefs.png diff --git a/project/assets/zbriefs.png.import b/project/assets/z_briefs.png.import similarity index 66% rename from project/assets/zbriefs.png.import rename to project/assets/z_briefs.png.import index beddf1b..8219703 100644 --- a/project/assets/zbriefs.png.import +++ b/project/assets/z_briefs.png.import @@ -2,12 +2,12 @@ importer="texture" type="StreamTexture" -path="res://.import/zbriefs.png-f4229ea1a519f46e9fae5401bbc40f9e.stex" +path="res://.import/z_briefs.png-5ae8d134419e24e714d28c40a74cd0ce.stex" [deps] -source_file="res://assets/zbriefs.png" -dest_files=[ "res://.import/zbriefs.png-f4229ea1a519f46e9fae5401bbc40f9e.stex" ] +source_file="res://assets/z_briefs.png" +dest_files=[ "res://.import/z_briefs.png-5ae8d134419e24e714d28c40a74cd0ce.stex" ] [params] diff --git a/project/assets/zack_base.png b/project/assets/zack_base.png deleted file mode 100644 index 7b475aa..0000000 Binary files a/project/assets/zack_base.png and /dev/null differ diff --git a/project/lang/local.en.translation b/project/lang/local.en.translation index dc87fff..a1ac938 100644 Binary files a/project/lang/local.en.translation and b/project/lang/local.en.translation differ diff --git a/project/lang/local.sv.translation b/project/lang/local.sv.translation index db3036a..5411e70 100644 Binary files a/project/lang/local.sv.translation and b/project/lang/local.sv.translation differ diff --git a/project/project.godot b/project/project.godot index bc4e684..3370eab 100644 --- a/project/project.godot +++ b/project/project.godot @@ -10,13 +10,13 @@ config_version=3 [application] -config/name="Zack's Dress Up" +config/name="Nathan's Dress Up" run/main_scene="res://TitleScn.tscn" config/use_custom_user_dir=true boot_splash/image="res://boot_splash.png" boot_splash/bg_color=Color( 0.8, 0.8, 0.4, 1 ) config/icon="res://icon.png" -name_sv="Zacks klä upp" +name_sv="Nathans klä upp" [autoload] diff --git a/project/src/Clothes.gd b/project/src/Clothes.gd index 605d0e9..31df7ab 100644 --- a/project/src/Clothes.gd +++ b/project/src/Clothes.gd @@ -54,7 +54,7 @@ func _on_DJ_Shorts_pressed(): change_bottoms(load("res://assets/dj_shorts.png")) func _on_ZBriefs_pressed(): - change_undies(load("res://assets/zbriefs.png")) + change_undies(load("res://assets/z_briefs.png")) func _on_Briefs_pressed(): change_undies(load("res://assets/briefs.png"))