diff --git a/CC-BY b/ASSET-LICENSE similarity index 100% rename from CC-BY rename to ASSET-LICENSE diff --git a/README.md b/README.md index b4a4cc7..0ea0691 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,11 @@ # Tony's Dress Up -​Tony's Dress Up is a open source dress up game. It's a remake of my original Flash game, ZC's Dress Up. \ No newline at end of file +![](screenshot.png) + +​Tony's Dress Up is a open source dress up game. It's a remake of my original Flash game, ZC's Dress Up. I've included the original flash games in the ``/archive`` directory that can be played at [Ruffle](https://ruffle.rs/)'s demo page. +​ +## ​License + +The source and assets is licensed under the MPL 2.0 License and CC-BY, respectfully - see the [LICENSE](LICENSE) and [ASSET-LICENSE](ASSET-LICENSE) for more details. + +The flash games included are abandonware. Feel free to share them on archives. \ No newline at end of file diff --git a/archive/dressup.swf b/archive/dressup.swf new file mode 100644 index 0000000..ed56139 Binary files /dev/null and b/archive/dressup.swf differ diff --git a/archive/dressup2.swf b/archive/dressup2.swf new file mode 100644 index 0000000..f18502d Binary files /dev/null and b/archive/dressup2.swf differ diff --git a/icon.svg.import b/icon.svg.import index b806afb..1bc4b8a 100644 --- a/icon.svg.import +++ b/icon.svg.import @@ -20,7 +20,7 @@ compress/hdr_mode=0 compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 -flags/filter=true +flags/filter=false flags/mipmaps=false flags/anisotropic=false flags/srgb=2 @@ -30,5 +30,5 @@ process/HDR_as_SRGB=false process/invert_color=false stream=false size_limit=0 -detect_3d=true +detect_3d=false svg/scale=1.0 diff --git a/lang/local.en.translation b/lang/local.en.translation index 8889f17..267283c 100644 Binary files a/lang/local.en.translation and b/lang/local.en.translation differ diff --git a/lang/local.sv.translation b/lang/local.sv.translation index 12777ef..41ad3f7 100644 Binary files a/lang/local.sv.translation and b/lang/local.sv.translation differ diff --git a/project.godot b/project.godot index a1a4379..81e4dd2 100644 --- a/project.godot +++ b/project.godot @@ -8,9 +8,14 @@ config_version=4 -_global_script_classes=[ ] +_global_script_classes=[ { +"base": "Resource", +"class": "Character", +"language": "GDScript", +"path": "res://scripts/character.gd" +} ] _global_script_class_icons={ - +"Character": "" } [application] @@ -25,12 +30,6 @@ config/macos_native_icon="res://icon.icns" config/windows_native_icon="res://icon.ico" name_sv="Tonys klä upp" -[autoload] - -GameKit="*res://scripts/GameKit.gd" -UserSettings="*res://scripts/UserSettings.gd" -Soundtrack="*res://scripts/Soundtrack.gd" - [debug] gdscript/completion/autocomplete_setters_and_getters=true @@ -38,6 +37,7 @@ gdscript/completion/autocomplete_setters_and_getters=true [display] window/size/width=800 +window/size/height=500 window/dpi/allow_hidpi=true mouse_cursor/custom_image="res://sprites/clothes/cursor.png" window/stretch/mode="viewport" @@ -45,7 +45,7 @@ window/stretch/aspect="keep" [gui] -theme/custom="res://styles/Game.theme" +theme/custom="res://resources/Game.theme" theme/custom_font="res://fonts/montserrat_extra_bold_16.tres" [importer_defaults] diff --git a/resources/Game.theme b/resources/Game.theme new file mode 100644 index 0000000..c2f5ecb Binary files /dev/null and b/resources/Game.theme differ diff --git a/styles/KBlueBtnDisabled.tres b/resources/KBlueBtnDisabled.tres similarity index 100% rename from styles/KBlueBtnDisabled.tres rename to resources/KBlueBtnDisabled.tres diff --git a/styles/KBlueBtnNormal.tres b/resources/KBlueBtnNormal.tres similarity index 100% rename from styles/KBlueBtnNormal.tres rename to resources/KBlueBtnNormal.tres diff --git a/styles/KBlueBtnPressed.tres b/resources/KBlueBtnPressed.tres similarity index 100% rename from styles/KBlueBtnPressed.tres rename to resources/KBlueBtnPressed.tres diff --git a/styles/KGreyPanel.tres b/resources/KGreyPanel.tres similarity index 100% rename from styles/KGreyPanel.tres rename to resources/KGreyPanel.tres diff --git a/resources/character.tres b/resources/character.tres new file mode 100644 index 0000000..a61bf7c --- /dev/null +++ b/resources/character.tres @@ -0,0 +1,6 @@ +[gd_resource type="Resource" load_steps=2 format=2] + +[ext_resource path="res://scripts/character.gd" type="Script" id=1] + +[resource] +script = ExtResource( 1 ) diff --git a/scenes/Clothes.tscn b/scenes/Clothes.tscn deleted file mode 100644 index 223aa57..0000000 --- a/scenes/Clothes.tscn +++ /dev/null @@ -1,277 +0,0 @@ -[gd_scene load_steps=23 format=2] - -[ext_resource path="res://sprites/clothes/jeans.svg" type="Texture" id=3] -[ext_resource path="res://sprites/clothes/blue_skirt.svg" type="Texture" id=4] -[ext_resource path="res://sprites/clothes/sweat_pants.svg" type="Texture" id=5] -[ext_resource path="res://sprites/clothes/blue_camo_jeans.svg" type="Texture" id=6] -[ext_resource path="res://sprites/clothes/beat_up_jeans.svg" type="Texture" id=7] -[ext_resource path="res://sprites/clothes/formal_skirt.svg" type="Texture" id=8] -[ext_resource path="res://sprites/ui/x_button.svg" type="Texture" id=9] -[ext_resource path="res://sprites/clothes/old_sweatshirt.svg" type="Texture" id=10] -[ext_resource path="res://sprites/clothes/raw_shirt.svg" type="Texture" id=11] -[ext_resource path="res://sprites/clothes/retro_shirt.svg" type="Texture" id=12] -[ext_resource path="res://sprites/clothes/atomic_shirt.svg" type="Texture" id=13] -[ext_resource path="res://sprites/clothes/z_shirt.png" type="Texture" id=14] -[ext_resource path="res://sprites/clothes/biker_jacket.svg" type="Texture" id=15] -[ext_resource path="res://sprites/clothes/nl_jacket.png" type="Texture" id=16] -[ext_resource path="res://sprites/clothes/train_hoodie.svg" type="Texture" id=17] -[ext_resource path="res://sprites/clothes/korm_shirt.png" type="Texture" id=18] -[ext_resource path="res://sprites/clothes/whatsnew_shirt.svg" type="Texture" id=19] -[ext_resource path="res://sprites/clothes/owo_censor.svg" type="Texture" id=20] -[ext_resource path="res://sprites/clothes/briefs.svg" type="Texture" id=21] -[ext_resource path="res://sprites/clothes/z_briefs.svg" type="Texture" id=22] -[ext_resource path="res://sprites/clothes/fundosi.svg" type="Texture" id=23] -[ext_resource path="res://sprites/clothes/camera.png" type="Texture" id=24] - -[node name="Wordrobe" type="TabContainer"] -anchor_right = 1.0 -anchor_bottom = 1.0 -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 ) -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="Pants" type="Tabs" parent="."] -anchor_right = 1.0 -anchor_bottom = 1.0 -margin_left = 5.0 -margin_top = 41.0 -margin_right = -5.0 -margin_bottom = -10.0 -custom_constants/hseparation = 0 - -[node name="PantsScroll" type="ScrollContainer" parent="Pants"] -anchor_right = 1.0 -anchor_bottom = 1.0 -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="PantsGrid" type="GridContainer" parent="Pants/PantsScroll"] -margin_right = 790.0 -margin_bottom = 228.0 -size_flags_horizontal = 3 -columns = 4 - -[node name="Jeans" type="TextureButton" parent="Pants/PantsScroll/PantsGrid"] -margin_right = 106.0 -margin_bottom = 112.0 -texture_normal = ExtResource( 3 ) - -[node name="BlueSkirt" type="TextureButton" parent="Pants/PantsScroll/PantsGrid"] -margin_left = 110.0 -margin_right = 216.0 -margin_bottom = 112.0 -texture_normal = ExtResource( 4 ) - -[node name="Sweats" type="TextureButton" parent="Pants/PantsScroll/PantsGrid"] -margin_left = 220.0 -margin_right = 326.0 -margin_bottom = 112.0 -texture_normal = ExtResource( 5 ) - -[node name="BlueCamoJeans" type="TextureButton" parent="Pants/PantsScroll/PantsGrid"] -margin_left = 330.0 -margin_right = 436.0 -margin_bottom = 112.0 -texture_normal = ExtResource( 6 ) - -[node name="BeatUpJeans" type="TextureButton" parent="Pants/PantsScroll/PantsGrid"] -margin_top = 116.0 -margin_right = 106.0 -margin_bottom = 228.0 -texture_normal = ExtResource( 7 ) - -[node name="FormalSkirt" type="TextureButton" parent="Pants/PantsScroll/PantsGrid"] -margin_left = 110.0 -margin_top = 116.0 -margin_right = 216.0 -margin_bottom = 228.0 -texture_normal = ExtResource( 8 ) - -[node name="RemovePants" type="TextureButton" parent="Pants/PantsScroll/PantsGrid"] -margin_left = 220.0 -margin_top = 116.0 -margin_right = 326.0 -margin_bottom = 228.0 -rect_min_size = Vector2( 0, 112 ) -texture_normal = ExtResource( 9 ) - -[node name="Shirts" type="Tabs" parent="."] -visible = false -anchor_right = 1.0 -anchor_bottom = 1.0 -margin_left = 5.0 -margin_top = 41.0 -margin_right = -5.0 -margin_bottom = -10.0 - -[node name="ShirtsScroll" type="ScrollContainer" parent="Shirts"] -anchor_right = 1.0 -anchor_bottom = 1.0 -margin_left = 10.0 -margin_top = 10.0 - -[node name="ShirtsGrid" type="GridContainer" parent="Shirts/ShirtsScroll"] -margin_right = 780.0 -margin_bottom = 365.0 -size_flags_horizontal = 3 -columns = 4 - -[node name="Sweatshirt" type="TextureButton" parent="Shirts/ShirtsScroll/ShirtsGrid"] -margin_right = 85.0 -margin_bottom = 115.0 -texture_normal = ExtResource( 10 ) - -[node name="Raw" type="TextureButton" parent="Shirts/ShirtsScroll/ShirtsGrid"] -margin_left = 89.0 -margin_right = 207.0 -margin_bottom = 115.0 -texture_normal = ExtResource( 11 ) - -[node name="Retro" type="TextureButton" parent="Shirts/ShirtsScroll/ShirtsGrid"] -margin_left = 211.0 -margin_right = 296.0 -margin_bottom = 115.0 -texture_normal = ExtResource( 12 ) - -[node name="Atomic" type="TextureButton" parent="Shirts/ShirtsScroll/ShirtsGrid"] -margin_top = 119.0 -margin_right = 85.0 -margin_bottom = 234.0 -texture_normal = ExtResource( 13 ) - -[node name="ZShirt" type="TextureButton" parent="Shirts/ShirtsScroll/ShirtsGrid"] -margin_left = 89.0 -margin_top = 119.0 -margin_right = 207.0 -margin_bottom = 234.0 -texture_normal = ExtResource( 14 ) - -[node name="BikerJacket" type="TextureButton" parent="Shirts/ShirtsScroll/ShirtsGrid"] -margin_left = 211.0 -margin_top = 119.0 -margin_right = 296.0 -margin_bottom = 234.0 -texture_normal = ExtResource( 15 ) - -[node name="NLJacket" type="TextureButton" parent="Shirts/ShirtsScroll/ShirtsGrid"] -margin_top = 238.0 -margin_right = 85.0 -margin_bottom = 353.0 -texture_normal = ExtResource( 16 ) - -[node name="TrainHoodie" type="TextureButton" parent="Shirts/ShirtsScroll/ShirtsGrid"] -margin_left = 89.0 -margin_top = 238.0 -margin_right = 207.0 -margin_bottom = 353.0 -texture_normal = ExtResource( 17 ) - -[node name="KormShirt" type="TextureButton" parent="Shirts/ShirtsScroll/ShirtsGrid"] -margin_left = 211.0 -margin_top = 238.0 -margin_right = 296.0 -margin_bottom = 353.0 -texture_normal = ExtResource( 18 ) - -[node name="WhatsNewShirt" type="TextureButton" parent="Shirts/ShirtsScroll/ShirtsGrid"] -margin_top = 357.0 -margin_right = 85.0 -margin_bottom = 475.0 -texture_normal = ExtResource( 19 ) - -[node name="RemoveShirt" type="Button" parent="Shirts/ShirtsScroll/ShirtsGrid"] -margin_left = 89.0 -margin_top = 357.0 -margin_right = 207.0 -margin_bottom = 475.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( 9 ) -flat = true - -[node name="Underwear" type="Tabs" parent="."] -visible = false -anchor_right = 1.0 -anchor_bottom = 1.0 -margin_left = 5.0 -margin_top = 41.0 -margin_right = -5.0 -margin_bottom = -10.0 - -[node name="UndiesScroll" type="ScrollContainer" parent="Underwear"] -anchor_right = 1.0 -anchor_bottom = 1.0 - -[node name="UndiesGrid" type="GridContainer" parent="Underwear/UndiesScroll"] -margin_right = 790.0 -margin_bottom = 228.0 -size_flags_horizontal = 3 -columns = 3 - -[node name="OwOCensor" type="TextureButton" parent="Underwear/UndiesScroll/UndiesGrid"] -margin_right = 106.0 -margin_bottom = 112.0 -texture_normal = ExtResource( 20 ) - -[node name="Briefs" type="TextureButton" parent="Underwear/UndiesScroll/UndiesGrid"] -margin_left = 110.0 -margin_right = 216.0 -margin_bottom = 112.0 -texture_normal = ExtResource( 21 ) - -[node name="ZBriefs" type="TextureButton" parent="Underwear/UndiesScroll/UndiesGrid"] -margin_left = 220.0 -margin_right = 326.0 -margin_bottom = 112.0 -texture_normal = ExtResource( 22 ) - -[node name="Fundosi" type="TextureButton" parent="Underwear/UndiesScroll/UndiesGrid"] -margin_top = 116.0 -margin_right = 106.0 -margin_bottom = 228.0 -texture_normal = ExtResource( 23 ) - -[node name="Accessoires" type="Tabs" parent="."] -visible = false -anchor_right = 1.0 -anchor_bottom = 1.0 -margin_left = 5.0 -margin_top = 41.0 -margin_right = -5.0 -margin_bottom = -10.0 - -[node name="AccsScroll" type="ScrollContainer" parent="Accessoires"] -margin_left = 19.0 -margin_top = 22.0 -margin_right = 369.0 -margin_bottom = 494.0 - -[node name="AccsGrid" type="GridContainer" parent="Accessoires/AccsScroll"] -margin_right = 350.0 -margin_bottom = 127.0 -size_flags_horizontal = 3 -columns = 3 - -[node name="CanonCam" type="TextureButton" parent="Accessoires/AccsScroll/AccsGrid"] -margin_right = 85.0 -margin_bottom = 112.0 -texture_normal = ExtResource( 24 ) - -[node name="RemoveAccessory" type="Button" parent="Accessoires/AccsScroll/AccsGrid"] -margin_left = 89.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( 9 ) -flat = true diff --git a/scenes/Character.tscn b/scenes/characterBase.tscn similarity index 85% rename from scenes/Character.tscn rename to scenes/characterBase.tscn index afe085b..d5cd89a 100644 --- a/scenes/Character.tscn +++ b/scenes/characterBase.tscn @@ -1,6 +1,6 @@ -[gd_scene load_steps=30 format=2] +[gd_scene load_steps=31 format=2] -[ext_resource path="res://scripts/Character.gd" type="Script" id=1] +[ext_resource path="res://scripts/characterBase.gd" type="Script" id=1] [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] @@ -24,11 +24,9 @@ [ext_resource path="res://sprites/character/mouth/mouth10.png" type="Texture" id=22] [ext_resource path="res://sprites/character/mouth/mouth12.png" type="Texture" id=23] [ext_resource path="res://sprites/clothes/briefs.svg" type="Texture" id=24] -[ext_resource path="res://sprites/clothes/bottoms_placeholder.png" type="Texture" id=25] -[ext_resource path="res://sprites/clothes/tops_placeholder.png" type="Texture" id=26] - - - +[ext_resource path="res://sprites/clothes/blank_bottom.png" type="Texture" id=25] +[ext_resource path="res://sprites/clothes/blank_top.png" type="Texture" id=26] +[ext_resource path="res://sprites/character/shadow.svg" type="Texture" id=27] [sub_resource type="SpriteFrames" id=1] animations = [ { @@ -54,17 +52,22 @@ animations = [ { "speed": 10.0 } ] -[node name="Character" type="Node2D"] +[node name="characterBase" type="Node2D"] script = ExtResource( 1 ) [node name="Base" type="Node2D" parent="."] +position = Vector2( -103.897, -160.477 ) [node name="Tail" type="AnimatedSprite" parent="Base"] position = Vector2( 54.4027, 184.439 ) frames = SubResource( 1 ) -frame = 7 +frame = 5 playing = true +[node name="shadow" type="Sprite" parent="Base"] +position = Vector2( 91.524, 317.295 ) +texture = ExtResource( 27 ) + [node name="Tony" type="Sprite" parent="Base"] position = Vector2( 96.3522, 164.086 ) texture = ExtResource( 5 ) @@ -72,27 +75,27 @@ texture = ExtResource( 5 ) [node name="Eyes" type="AnimatedSprite" parent="Base"] position = Vector2( 114.227, 63.9224 ) frames = SubResource( 2 ) -frame = 1 +frame = 11 playing = true [node name="Mouth" type="AnimatedSprite" parent="Base"] position = Vector2( 131.024, 67.4964 ) frames = SubResource( 3 ) -frame = 11 +frame = 9 playing = true [node name="Undies" type="Sprite" parent="."] -position = Vector2( 86.5077, 256.295 ) +position = Vector2( -17.3889, 95.818 ) texture = ExtResource( 24 ) [node name="Bottom" type="Sprite" parent="."] -position = Vector2( 88.1872, 251.328 ) +position = Vector2( -15.7094, 90.851 ) texture = ExtResource( 25 ) [node name="Top" type="Sprite" parent="."] -position = Vector2( 96.3619, 160.432 ) +position = Vector2( -7.53471, -0.0449677 ) texture = ExtResource( 26 ) [node name="Accessory" type="Sprite" parent="."] -position = Vector2( 93.2243, 155.139 ) +position = Vector2( -10.6723, -5.33797 ) texture = ExtResource( 26 ) diff --git a/scenes/clothing/base/accessoryBase.tscn b/scenes/clothing/base/accessoryBase.tscn new file mode 100644 index 0000000..9cd8bfb --- /dev/null +++ b/scenes/clothing/base/accessoryBase.tscn @@ -0,0 +1,11 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://scripts/clothing/accessoryBase.gd" type="Script" id=1] +[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=2] + + + + +[node name="accessoryBase" instance=ExtResource( 2 )] +script = ExtResource( 1 ) +[connection signal="pressed" from="." to="." method="_on_accessory_pressed"] diff --git a/scenes/clothing/base/baseClothing.tscn b/scenes/clothing/base/baseClothing.tscn new file mode 100644 index 0000000..1cb5375 --- /dev/null +++ b/scenes/clothing/base/baseClothing.tscn @@ -0,0 +1,14 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://scripts/clothing/baseClothing.gd" type="Script" id=1] + +[node name="baseClothing" type="TextureButton"] +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_right = -694.0 +margin_bottom = -488.0 +rect_min_size = Vector2( 106, 112 ) +script = ExtResource( 1 ) +__meta__ = { +"_edit_use_anchors_": false +} diff --git a/scenes/clothing/base/bottomsBase.tscn b/scenes/clothing/base/bottomsBase.tscn new file mode 100644 index 0000000..661e10b --- /dev/null +++ b/scenes/clothing/base/bottomsBase.tscn @@ -0,0 +1,11 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=2] + + + + +[node name="bottomsBase" instance=ExtResource( 1 )] +script = ExtResource( 2 ) +[connection signal="pressed" from="." to="." method="_on_bottoms_pressed"] diff --git a/scenes/clothing/base/topsBase.tscn b/scenes/clothing/base/topsBase.tscn new file mode 100644 index 0000000..3ad95b0 --- /dev/null +++ b/scenes/clothing/base/topsBase.tscn @@ -0,0 +1,11 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/clothing/topsBase.gd" type="Script" id=2] + + + + +[node name="topsBase" instance=ExtResource( 1 )] +script = ExtResource( 2 ) +[connection signal="pressed" from="." to="." method="_on_tops_pressed"] diff --git a/scenes/clothing/base/undiesBase.tscn b/scenes/clothing/base/undiesBase.tscn new file mode 100644 index 0000000..df1ae8d --- /dev/null +++ b/scenes/clothing/base/undiesBase.tscn @@ -0,0 +1,11 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://scripts/clothing/undiesBase.gd" type="Script" id=1] +[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=2] + + + + +[node name="baseClothing" instance=ExtResource( 2 )] +script = ExtResource( 1 ) +[connection signal="pressed" from="." to="." method="_on_undies_pressed"] diff --git a/scenes/clothing/camera.tscn b/scenes/clothing/camera.tscn new file mode 100644 index 0000000..0209b39 --- /dev/null +++ b/scenes/clothing/camera.tscn @@ -0,0 +1,15 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://scenes/clothing/base/accessoryBase.tscn" type="PackedScene" id=1] +[ext_resource path="res://sprites/clothes/camera.png" type="Texture" id=2] + + + + +[node name="camera" instance=ExtResource( 1 )] +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 0.0 +margin_bottom = 0.0 +rect_min_size = Vector2( 0, 0 ) +texture_normal = ExtResource( 2 ) diff --git a/scenes/clothing/pants/beatUpJeans.tscn b/scenes/clothing/pants/beatUpJeans.tscn new file mode 100644 index 0000000..2ed835b --- /dev/null +++ b/scenes/clothing/pants/beatUpJeans.tscn @@ -0,0 +1,13 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=2] +[ext_resource path="res://sprites/clothes/beat_up_jeans.svg" type="Texture" id=3] + + + + +[node name="beatUpJeans" instance=ExtResource( 1 )] +texture_normal = ExtResource( 3 ) +script = ExtResource( 2 ) +[connection signal="pressed" from="." to="." method="_on_bottoms_pressed"] diff --git a/scenes/clothing/pants/camoJeans.tscn b/scenes/clothing/pants/camoJeans.tscn new file mode 100644 index 0000000..38e32bf --- /dev/null +++ b/scenes/clothing/pants/camoJeans.tscn @@ -0,0 +1,13 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://sprites/clothes/blue_camo_jeans.svg" type="Texture" id=1] +[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=2] +[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=3] + + + + +[node name="camoJeans" instance=ExtResource( 2 )] +texture_normal = ExtResource( 1 ) +script = ExtResource( 3 ) +[connection signal="pressed" from="." to="." method="_on_bottoms_pressed"] diff --git a/scenes/clothing/pants/djShorts.tscn b/scenes/clothing/pants/djShorts.tscn new file mode 100644 index 0000000..1b2d46d --- /dev/null +++ b/scenes/clothing/pants/djShorts.tscn @@ -0,0 +1,13 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://sprites/clothes/dj_shorts.svg" type="Texture" id=1] +[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=2] +[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=3] + + + + +[node name="camoJeans" instance=ExtResource( 2 )] +texture_normal = ExtResource( 1 ) +script = ExtResource( 3 ) +[connection signal="pressed" from="." to="." method="_on_bottoms_pressed"] diff --git a/scenes/clothing/pants/formalSkirt.tscn b/scenes/clothing/pants/formalSkirt.tscn new file mode 100644 index 0000000..0f7d544 --- /dev/null +++ b/scenes/clothing/pants/formalSkirt.tscn @@ -0,0 +1,11 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=2] +[ext_resource path="res://sprites/clothes/formal_skirt.svg" type="Texture" id=3] + + +[node name="formalSkirt" instance=ExtResource( 1 )] +texture_normal = ExtResource( 3 ) +script = ExtResource( 2 ) +[connection signal="pressed" from="." to="." method="_on_bottoms_pressed"] diff --git a/scenes/clothing/pants/jeans.tscn b/scenes/clothing/pants/jeans.tscn new file mode 100644 index 0000000..8cc5610 --- /dev/null +++ b/scenes/clothing/pants/jeans.tscn @@ -0,0 +1,11 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=2] +[ext_resource path="res://sprites/clothes/jeans.svg" type="Texture" id=3] + + +[node name="jeans" instance=ExtResource( 1 )] +texture_normal = ExtResource( 3 ) +script = ExtResource( 2 ) +[connection signal="pressed" from="." to="." method="_on_bottoms_pressed"] diff --git a/scenes/clothing/pants/skirt.tscn b/scenes/clothing/pants/skirt.tscn new file mode 100644 index 0000000..a8f64ab --- /dev/null +++ b/scenes/clothing/pants/skirt.tscn @@ -0,0 +1,11 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=2] +[ext_resource path="res://sprites/clothes/blue_skirt.svg" type="Texture" id=3] + + +[node name="skirt" instance=ExtResource( 1 )] +texture_normal = ExtResource( 3 ) +script = ExtResource( 2 ) +[connection signal="pressed" from="." to="." method="_on_bottoms_pressed"] diff --git a/scenes/clothing/pants/sweatPants.tscn b/scenes/clothing/pants/sweatPants.tscn new file mode 100644 index 0000000..1801a6c --- /dev/null +++ b/scenes/clothing/pants/sweatPants.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://sprites/clothes/sweat_pants.svg" type="Texture" id=1] +[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=2] +[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=3] + +[node name="sweatPants" instance=ExtResource( 2 )] +texture_normal = ExtResource( 1 ) +script = ExtResource( 3 ) +[connection signal="pressed" from="." to="." method="_on_bottoms_pressed"] diff --git a/scenes/clothing/tops/atomicShirt.tscn b/scenes/clothing/tops/atomicShirt.tscn new file mode 100644 index 0000000..4c0e92d --- /dev/null +++ b/scenes/clothing/tops/atomicShirt.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/clothing/topsBase.gd" type="Script" id=2] +[ext_resource path="res://sprites/clothes/atomic_shirt.svg" type="Texture" id=3] + +[node name="atomicShirt" instance=ExtResource( 1 )] +texture_normal = ExtResource( 3 ) +script = ExtResource( 2 ) +[connection signal="pressed" from="." to="." method="_on_tops_pressed"] diff --git a/scenes/clothing/tops/djShirt.tscn b/scenes/clothing/tops/djShirt.tscn new file mode 100644 index 0000000..bbe311d --- /dev/null +++ b/scenes/clothing/tops/djShirt.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/clothing/topsBase.gd" type="Script" id=2] +[ext_resource path="res://sprites/clothes/dj_shirt.png" type="Texture" id=3] + +[node name="djShirt" instance=ExtResource( 1 )] +texture_normal = ExtResource( 3 ) +script = ExtResource( 2 ) +[connection signal="pressed" from="." to="." method="_on_tops_pressed"] diff --git a/scenes/clothing/tops/kormShirt.tscn b/scenes/clothing/tops/kormShirt.tscn new file mode 100644 index 0000000..cf6fd0a --- /dev/null +++ b/scenes/clothing/tops/kormShirt.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/clothing/topsBase.gd" type="Script" id=2] +[ext_resource path="res://sprites/clothes/korm_shirt.png" type="Texture" id=3] + +[node name="kormShirt" instance=ExtResource( 1 )] +texture_normal = ExtResource( 3 ) +script = ExtResource( 2 ) +[connection signal="pressed" from="." to="." method="_on_tops_pressed"] diff --git a/scenes/clothing/tops/nlShirt.tscn b/scenes/clothing/tops/nlShirt.tscn new file mode 100644 index 0000000..01173bd --- /dev/null +++ b/scenes/clothing/tops/nlShirt.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/clothing/topsBase.gd" type="Script" id=2] +[ext_resource path="res://sprites/clothes/nl_jacket.png" type="Texture" id=3] + +[node name="nlShirt" instance=ExtResource( 1 )] +texture_normal = ExtResource( 3 ) +script = ExtResource( 2 ) +[connection signal="pressed" from="." to="." method="_on_tops_pressed"] diff --git a/scenes/clothing/tops/rawShirt.tscn b/scenes/clothing/tops/rawShirt.tscn new file mode 100644 index 0000000..c976520 --- /dev/null +++ b/scenes/clothing/tops/rawShirt.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/clothing/topsBase.gd" type="Script" id=2] +[ext_resource path="res://sprites/clothes/raw_shirt.svg" type="Texture" id=3] + +[node name="rawShirt" instance=ExtResource( 1 )] +texture_normal = ExtResource( 3 ) +script = ExtResource( 2 ) +[connection signal="pressed" from="." to="." method="_on_tops_pressed"] diff --git a/scenes/clothing/tops/whatsNewShirt.tscn b/scenes/clothing/tops/whatsNewShirt.tscn new file mode 100644 index 0000000..4545551 --- /dev/null +++ b/scenes/clothing/tops/whatsNewShirt.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/clothing/topsBase.gd" type="Script" id=2] +[ext_resource path="res://sprites/clothes/whatsnew_shirt.svg" type="Texture" id=3] + +[node name="whatsNewShirt" instance=ExtResource( 1 )] +texture_normal = ExtResource( 3 ) +script = ExtResource( 2 ) +[connection signal="pressed" from="." to="." method="_on_tops_pressed"] diff --git a/scenes/clothing/tops/zShirt.tscn b/scenes/clothing/tops/zShirt.tscn new file mode 100644 index 0000000..3a1a23f --- /dev/null +++ b/scenes/clothing/tops/zShirt.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/clothing/topsBase.gd" type="Script" id=2] +[ext_resource path="res://sprites/clothes/z_shirt.png" type="Texture" id=3] + +[node name="zShirt" instance=ExtResource( 1 )] +texture_normal = ExtResource( 3 ) +script = ExtResource( 2 ) +[connection signal="pressed" from="." to="." method="_on_tops_pressed"] diff --git a/scenes/clothing/undies/briefs.tscn b/scenes/clothing/undies/briefs.tscn new file mode 100644 index 0000000..fde30e2 --- /dev/null +++ b/scenes/clothing/undies/briefs.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://sprites/clothes/briefs.svg" type="Texture" id=1] +[ext_resource path="res://scenes/clothing/base/undiesBase.tscn" type="PackedScene" id=2] + + + + +[node name="briefs" instance=ExtResource( 2 )] +texture_normal = ExtResource( 1 ) diff --git a/scenes/clothing/undies/fundosi.tscn b/scenes/clothing/undies/fundosi.tscn new file mode 100644 index 0000000..5a0ac93 --- /dev/null +++ b/scenes/clothing/undies/fundosi.tscn @@ -0,0 +1,15 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://sprites/clothes/fundosi.svg" type="Texture" id=1] +[ext_resource path="res://scenes/clothing/base/undiesBase.tscn" type="PackedScene" id=2] + + + + +[node name="fundosi" instance=ExtResource( 2 )] +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 0.0 +margin_bottom = 0.0 +rect_min_size = Vector2( 0, 0 ) +texture_normal = ExtResource( 1 ) diff --git a/scenes/clothing/undies/zBriefs.tscn b/scenes/clothing/undies/zBriefs.tscn new file mode 100644 index 0000000..2e8d6af --- /dev/null +++ b/scenes/clothing/undies/zBriefs.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://sprites/clothes/z_briefs.svg" type="Texture" id=1] +[ext_resource path="res://scenes/clothing/base/undiesBase.tscn" type="PackedScene" id=2] + + + + +[node name="zBriefs" instance=ExtResource( 2 )] +texture_normal = ExtResource( 1 ) diff --git a/scenes/game.tscn b/scenes/game.tscn index b00fd88..7ae2ff7 100644 --- a/scenes/game.tscn +++ b/scenes/game.tscn @@ -1,48 +1,66 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=9 format=2] -[ext_resource path="res://scripts/GameScn.gd" type="Script" id=1] -[ext_resource path="res://scenes/pause.tscn" type="PackedScene" id=2] -[ext_resource path="res://scenes/character.tscn" type="PackedScene" id=3] -[ext_resource path="res://scenes/clothes.tscn" type="PackedScene" id=4] +[ext_resource path="res://scenes/characterBase.tscn" type="PackedScene" id=1] +[ext_resource path="res://sprites/clothes/background.svg" type="Texture" id=2] +[ext_resource path="res://sprites/ui/blue_boxCross.png" type="Texture" id=3] +[ext_resource path="res://scenes/wardrobe.tscn" type="PackedScene" id=4] [ext_resource path="res://sprites/clothes/icrazy_frame.svg" type="Texture" id=5] [ext_resource path="res://sprites/clothes/lights.png" type="Texture" id=6] +[ext_resource path="res://sprites/ui/grey_boxCross.png" type="Texture" id=7] +[ext_resource path="res://scripts/ui.gd" type="Script" id=8] -[node name="GameScreen" type="Node2D"] -script = ExtResource( 1 ) +[node name="game" type="Node2D"] -[node name="PicFrame" type="Sprite" parent="."] -position = Vector2( 163.773, 119.752 ) +[node name="background" type="Sprite" parent="."] +position = Vector2( 504.046, 202.426 ) +texture = ExtResource( 2 ) + +[node name="picFrame" type="Sprite" parent="."] +position = Vector2( 127.602, 96.8945 ) texture = ExtResource( 5 ) __meta__ = { "_edit_group_": true } -[node name="Light" type="Light2D" parent="PicFrame"] +[node name="light" type="Light2D" parent="picFrame"] position = Vector2( 35.118, -14.56 ) texture = ExtResource( 6 ) -[node name="Character" parent="." instance=ExtResource( 3 )] -position = Vector2( 61.8154, 246.831 ) +[node name="characterBase" parent="." instance=ExtResource( 1 )] +position = Vector2( 126.596, 319.219 ) -[node name="UI" type="CanvasLayer" parent="."] +[node name="ui" type="CanvasLayer" parent="."] -[node name="Base" type="Control" parent="UI"] +[node name="base" type="Control" parent="ui"] anchor_right = 1.0 anchor_bottom = 1.0 +script = ExtResource( 8 ) __meta__ = { "_edit_lock_": true, -"_edit_use_anchors_": false +"_edit_use_anchors_": true } -[node name="Wordrobe" parent="UI/Base" instance=ExtResource( 4 )] -margin_left = 276.0 -margin_top = 36.0 -margin_right = -20.0 -margin_bottom = -37.0 +[node name="wardrobe" parent="ui/base" instance=ExtResource( 4 )] +anchor_left = 0.345 +anchor_top = 0.072 +anchor_right = 0.975 +anchor_bottom = 0.658 +margin_left = -4.69434 +margin_top = -19.9716 +margin_right = 60.3057 +margin_bottom = 75.0284 -[node name="PauseScn" parent="UI/Base" instance=ExtResource( 2 )] -visible = false -margin_left = -150.0 -margin_top = -20.0 -margin_right = -150.0 -margin_bottom = -20.0 +[node name="clearBtn" type="TextureButton" parent="ui/base"] +margin_left = 752.0 +margin_top = 9.0 +margin_right = 788.0 +margin_bottom = 45.0 +hint_tooltip = "Clear all clothing" +texture_normal = ExtResource( 3 ) +texture_pressed = ExtResource( 3 ) +texture_hover = ExtResource( 7 ) +texture_disabled = ExtResource( 7 ) +__meta__ = { +"_edit_use_anchors_": false +} +[connection signal="pressed" from="ui/base/clearBtn" to="ui/base" method="_on_clearBtn_pressed"] diff --git a/scenes/pause.tscn b/scenes/pause.tscn deleted file mode 100644 index 3960567..0000000 --- a/scenes/pause.tscn +++ /dev/null @@ -1,147 +0,0 @@ -[gd_scene load_steps=2 format=2] - -[ext_resource path="res://scripts/PauseScn.gd" type="Script" id=2] - -[node name="WinDialogs" type="Control"] -anchor_right = 1.0 -anchor_bottom = 1.0 -margin_left = 400.0 -margin_top = 300.0 -margin_right = -400.0 -margin_bottom = -300.0 -script = ExtResource( 2 ) -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="PauseWin" type="PopupDialog" parent="."] -pause_mode = 2 -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -88.0 -margin_top = -57.0 -margin_right = 88.0 -margin_bottom = 94.0 - -[node name="PauseVbox" type="VBoxContainer" parent="PauseWin"] -anchor_right = 1.0 -anchor_bottom = 1.0 -margin_left = 10.0 -margin_top = 10.0 -margin_right = -10.0 -margin_bottom = -10.0 - -[node name="PauseLbl" type="Label" parent="PauseWin/PauseVbox"] -margin_right = 156.0 -margin_bottom = 29.0 -text = "KPUS" -align = 1 - -[node name="SettingsBtn" type="Button" parent="PauseWin/PauseVbox"] -margin_top = 33.0 -margin_right = 156.0 -margin_bottom = 62.0 -text = "KSET" - -[node name="ResumeBtn" type="Button" parent="PauseWin/PauseVbox"] -margin_top = 66.0 -margin_right = 156.0 -margin_bottom = 95.0 -text = "KRUS" - -[node name="ExitBtn" type="Button" parent="PauseWin/PauseVbox"] -margin_top = 99.0 -margin_right = 156.0 -margin_bottom = 128.0 -text = "KEXT" - -[node name="SettingsWin" type="AcceptDialog" parent="."] -pause_mode = 2 -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -76.0 -margin_top = -34.0 -margin_right = 76.0 -margin_bottom = 34.0 -window_title = "KSET" - -[node name="Grid" type="GridContainer" parent="SettingsWin"] -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -68.0 -margin_top = -36.5 -margin_right = 68.0 -margin_bottom = -7.5 -columns = 3 - -[node name="Languages" type="MenuButton" parent="SettingsWin/Grid"] -visible = false -margin_right = 56.0 -margin_bottom = 24.0 -text = "KLANG" -flat = false -items = [ "KENG", null, 0, true, false, -1, 0, null, "", false, "KSWD", null, 0, false, false, -1, 0, null, "", false ] - -[node name="MusicBtn" type="CheckBox" parent="SettingsWin/Grid"] -margin_right = 66.0 -margin_bottom = 21.0 -pressed = true -text = "KMUS" -align = 1 - -[node name="LicenseWin" type="AcceptDialog" parent="."] -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -214.0 -margin_top = -138.0 -margin_right = 217.0 -margin_bottom = 137.0 -window_title = "KLIC" -resizable = true - -[node name="LicenseTxt" type="RichTextLabel" parent="LicenseWin"] -anchor_left = 0.5 -anchor_right = 0.5 -margin_left = -207.5 -margin_top = 8.0 -margin_right = 207.5 -margin_bottom = 223.0 -bbcode_enabled = true -bbcode_text = "This Source Code Form is subject to the terms of the Mozilla Public -License, v. 2.0. If a copy of the MPL was not distributed with this -file, You can obtain one at http://mozilla.org/MPL/2.0/. - -[center]##########################[/center] - -Tony's Dress Up (c) by Anthony Wilcox - -Tony'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. -If not, see ." -text = "This Source Code Form is subject to the terms of the Mozilla Public -License, v. 2.0. If a copy of the MPL was not distributed with this -file, You can obtain one at http://mozilla.org/MPL/2.0/. - -########################## - -Tony's Dress Up (c) by Anthony Wilcox - -Tony'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. -If not, see ." -[connection signal="pressed" from="PauseWin/PauseVbox/SettingsBtn" to="." method="_on_SettingsBtn_pressed"] -[connection signal="pressed" from="PauseWin/PauseVbox/ResumeBtn" to="." method="_on_ResumeBtn_pressed"] -[connection signal="pressed" from="PauseWin/PauseVbox/ExitBtn" to="." method="_on_ExitBtn_pressed"] -[connection signal="toggled" from="SettingsWin/Grid/MusicBtn" to="." method="_on_MusicBtn_toggled"] diff --git a/scenes/wardrobe.tscn b/scenes/wardrobe.tscn new file mode 100644 index 0000000..fcd408d --- /dev/null +++ b/scenes/wardrobe.tscn @@ -0,0 +1,252 @@ +[gd_scene load_steps=21 format=2] + +[ext_resource path="res://scenes/clothing/camera.tscn" type="PackedScene" id=1] +[ext_resource path="res://scenes/clothing/undies/zBriefs.tscn" type="PackedScene" id=2] +[ext_resource path="res://scenes/clothing/pants/beatUpJeans.tscn" type="PackedScene" id=3] +[ext_resource path="res://scenes/clothing/pants/jeans.tscn" type="PackedScene" id=4] +[ext_resource path="res://scenes/clothing/pants/skirt.tscn" type="PackedScene" id=5] +[ext_resource path="res://scenes/clothing/pants/formalSkirt.tscn" type="PackedScene" id=6] +[ext_resource path="res://scenes/clothing/pants/camoJeans.tscn" type="PackedScene" id=7] +[ext_resource path="res://scenes/clothing/pants/djShorts.tscn" type="PackedScene" id=8] +[ext_resource path="res://sprites/ui/x_button.svg" type="Texture" id=9] +[ext_resource path="res://scenes/clothing/tops/whatsNewShirt.tscn" type="PackedScene" id=10] +[ext_resource path="res://scenes/clothing/tops/zShirt.tscn" type="PackedScene" id=11] +[ext_resource path="res://scenes/clothing/tops/rawShirt.tscn" type="PackedScene" id=12] +[ext_resource path="res://scenes/clothing/tops/kormShirt.tscn" type="PackedScene" id=13] +[ext_resource path="res://scenes/clothing/tops/djShirt.tscn" type="PackedScene" id=14] +[ext_resource path="res://scenes/clothing/tops/atomicShirt.tscn" type="PackedScene" id=15] +[ext_resource path="res://scenes/clothing/tops/nlShirt.tscn" type="PackedScene" id=16] +[ext_resource path="res://scenes/clothing/pants/sweatPants.tscn" type="PackedScene" id=17] +[ext_resource path="res://scenes/clothing/undies/briefs.tscn" type="PackedScene" id=20] +[ext_resource path="res://scripts/wardrobe.gd" type="Script" id=21] +[ext_resource path="res://scenes/clothing/undies/fundosi.tscn" type="PackedScene" id=22] + +[node name="Wordrobe" type="TabContainer"] +anchor_right = 1.0 +anchor_bottom = 1.0 +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 ) +tab_align = 0 +script = ExtResource( 21 ) +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Pants" type="Tabs" parent="."] +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 5.0 +margin_top = 41.0 +margin_right = -5.0 +margin_bottom = -10.0 +custom_constants/hseparation = 0 + +[node name="PantsScroll" type="ScrollContainer" parent="Pants"] +anchor_right = 1.0 +anchor_bottom = 1.0 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="PantsGrid" type="GridContainer" parent="Pants/PantsScroll"] +margin_right = 790.0 +margin_bottom = 449.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +columns = 4 + +[node name="beatUpJeans" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 3 )] +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 106.0 +margin_bottom = 112.0 + +[node name="jeans" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 4 )] +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 110.0 +margin_right = 216.0 +margin_bottom = 112.0 + +[node name="camoJeans" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 7 )] +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 220.0 +margin_right = 326.0 +margin_bottom = 112.0 + +[node name="sweatPants" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 17 )] +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 330.0 +margin_right = 436.0 +margin_bottom = 112.0 + +[node name="camoJeans2" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 8 )] +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 116.0 +margin_right = 106.0 +margin_bottom = 228.0 + +[node name="formalSkirt" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 6 )] +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 110.0 +margin_top = 116.0 +margin_right = 216.0 +margin_bottom = 228.0 + +[node name="skirt" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 5 )] +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 220.0 +margin_top = 116.0 +margin_right = 326.0 +margin_bottom = 228.0 + +[node name="removePants" type="TextureButton" parent="Pants/PantsScroll/PantsGrid"] +margin_left = 330.0 +margin_top = 116.0 +margin_right = 436.0 +margin_bottom = 228.0 +rect_min_size = Vector2( 0, 112 ) +texture_normal = ExtResource( 9 ) + +[node name="Shirts" type="Tabs" parent="."] +visible = false +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 5.0 +margin_top = 41.0 +margin_right = -5.0 +margin_bottom = -10.0 + +[node name="ShirtsScroll" type="ScrollContainer" parent="Shirts"] +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 10.0 +margin_top = 10.0 + +[node name="ShirtsGrid" type="GridContainer" parent="Shirts/ShirtsScroll"] +margin_right = 780.0 +margin_bottom = 439.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +columns = 4 + +[node name="djShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 14 )] +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 106.0 +margin_bottom = 115.0 + +[node name="kormShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 13 )] +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 110.0 +margin_right = 216.0 +margin_bottom = 115.0 + +[node name="atomicShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 15 )] + +[node name="nlShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 16 )] + +[node name="rawShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 12 )] +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 220.0 +margin_right = 326.0 +margin_bottom = 115.0 + +[node name="zShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 11 )] +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 330.0 +margin_right = 436.0 +margin_bottom = 115.0 + +[node name="whatsNewShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 10 )] +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 119.0 +margin_right = 106.0 +margin_bottom = 234.0 + +[node name="removeShirt" type="TextureButton" parent="Shirts/ShirtsScroll/ShirtsGrid"] +margin_left = 110.0 +margin_top = 119.0 +margin_right = 216.0 +margin_bottom = 234.0 +rect_min_size = Vector2( 0, 112 ) +texture_normal = ExtResource( 9 ) + +[node name="Underwear" type="Tabs" parent="."] +visible = false +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 5.0 +margin_top = 41.0 +margin_right = -5.0 +margin_bottom = -10.0 + +[node name="UndiesScroll" type="ScrollContainer" parent="Underwear"] +anchor_right = 1.0 +anchor_bottom = 1.0 + +[node name="UndiesGrid" type="GridContainer" parent="Underwear/UndiesScroll"] +margin_right = 790.0 +margin_bottom = 449.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +columns = 3 + +[node name="fundosi" parent="Underwear/UndiesScroll/UndiesGrid" instance=ExtResource( 22 )] +margin_right = 106.0 +margin_bottom = 112.0 + +[node name="zBriefs" parent="Underwear/UndiesScroll/UndiesGrid" instance=ExtResource( 2 )] +margin_left = 110.0 +margin_right = 216.0 +margin_bottom = 112.0 + +[node name="briefs" parent="Underwear/UndiesScroll/UndiesGrid" instance=ExtResource( 20 )] +margin_left = 220.0 +margin_right = 326.0 +margin_bottom = 112.0 + +[node name="Accessoires" type="Tabs" parent="."] +visible = false +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 5.0 +margin_top = 41.0 +margin_right = -5.0 +margin_bottom = -10.0 + +[node name="AccsScroll" type="ScrollContainer" parent="Accessoires"] +margin_left = 19.0 +margin_top = 22.0 +margin_right = 369.0 +margin_bottom = 494.0 + +[node name="AccsGrid" type="GridContainer" parent="Accessoires/AccsScroll"] +margin_right = 350.0 +margin_bottom = 472.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 +columns = 3 + +[node name="camera" parent="Accessoires/AccsScroll/AccsGrid" instance=ExtResource( 1 )] +margin_right = 85.0 +margin_bottom = 112.0 + +[node name="removeAccessory" type="TextureButton" parent="Accessoires/AccsScroll/AccsGrid"] +margin_left = 89.0 +margin_right = 195.0 +margin_bottom = 112.0 +texture_normal = ExtResource( 9 ) +[connection signal="pressed" from="Pants/PantsScroll/PantsGrid/removePants" to="." method="_on_removePants_pressed"] +[connection signal="pressed" from="Shirts/ShirtsScroll/ShirtsGrid/removeShirt" to="." method="_on_removeShirt_pressed"] +[connection signal="pressed" from="Accessoires/AccsScroll/AccsGrid/removeAccessory" to="." method="_on_removeAccessory_pressed"] 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/scripts/Character.gd b/scripts/Character.gd index 49167e9..8a16630 100644 --- a/scripts/Character.gd +++ b/scripts/Character.gd @@ -1,15 +1,7 @@ -# Anthony Wilcox licenses this file to you under the MPL license. -# See the LICENSE file in the project root for more information. -extends Node2D +extends Resource +class_name Character -# Declare member variables here. Examples: -# var a = 2 -# var b = "text" - -# Called when the node enters the scene tree for the first time. -func _ready(): - pass # Replace with function body. - -# Called every frame. 'delta' is the elapsed time since the previous frame. -#func _process(delta): -# pass +var top = null +var bottom = null +var underwear = null +var accessory = null diff --git a/scripts/GameKit.gd b/scripts/GameKit.gd deleted file mode 100644 index a0401cc..0000000 --- a/scripts/GameKit.gd +++ /dev/null @@ -1,29 +0,0 @@ -# Anthony Wilcox licenses this file to you under the MPL license. -# See the LICENSE file in the project root for more information. -extends Node - -var version = "2.0" - -func _ready(): - randomize() - -func is_game_paused(is_paused): - if is_paused == true: - get_tree().paused = true - else: - get_tree().paused = false - -func switch_scenes(new_mode): - if new_mode == "classic": - get_tree().change_scene("res://scenes/ClassicScn.tscn") - elif new_mode == "credits": - get_tree().change_scene("res://scenes/CreditsScn.tscn") - elif new_mode == "play": - get_tree().change_scene("res://scenes/GameScn.tscn") - elif new_mode == "title": - get_tree().change_scene("res://scenes/TitleScn.tscn") - -func if_file_exists(file): - var fileCheck = File.new() - var fileExists = fileCheck.file_exists(file) - fileCheck diff --git a/scripts/GameScn.gd b/scripts/GameScn.gd deleted file mode 100644 index 4203251..0000000 --- a/scripts/GameScn.gd +++ /dev/null @@ -1,154 +0,0 @@ -# Anthony Wilcox licenses this file to you under the MPL license. -# See the LICENSE file in the project root for more information. -extends Node2D - -enum ClothingLayer { - TOPS, - BOTTOMS, - UNDIES, - ACCESSORY, -} - -# Default clothing -onready var bottoms_placeholder = load("res://sprites/clothes/bottoms_placeholder.png") -onready var tops_placeholder = load("res://sprites/clothes/tops_placeholder.png") -onready var accessories_placeholder = load("res://sprites/clothes/tops_placeholder.png") - -onready var bottoms = $Character/Bottom -onready var tops = $Character/Top -onready var accessory = $Character/Accessory - -# var UndiesBtn = load("res://scenes/Clothing.tscenes") -# -#func _init(): -# init_underwear() - -func change_bottoms(new_bottom): - bottoms_placeholder = new_bottom - - if new_bottom == null: - bottoms.texture = bottoms_placeholder - UserSettings.Bottoms = bottoms_placeholder - -# if undies == load("res://sprites/clothes/owo_censor.svg"): -# change_undies(null) - - bottoms.texture = bottoms_placeholder - UserSettings.Bottoms = bottoms_placeholder - -func change_undies(new_undies): - $Character/Undies.texture = new_undies - UserSettings.Underwear = new_undies - -func change_tops(new_top): - tops_placeholder = new_top - - if new_top == null: - tops.texture = tops_placeholder - UserSettings.Tops = tops_placeholder - - tops.texture = tops_placeholder - UserSettings.Tops = tops_placeholder - -func change_accessoires(new_accessory): - accessories_placeholder = new_accessory - - if new_accessory == null: - accessory.texture = accessories_placeholder - UserSettings.Accessory = accessories_placeholder - - accessory.texture = accessories_placeholder - UserSettings.Accessory = accessories_placeholder - -#func init_underwear(): -# var undiesFile = File.new() -# undiesFile.open("res://undies.json", undiesFile.READ) -# var undiesJson = parse_json(undiesFile.get_as_text()) -# -# for object in undiesJson: -# var underwear = UndiesBtn.instance() -# -# underwear.texture = load(object.sprite) -# - -func _process(delta): - - # Change clothes - # =========================================================== - - if $UI/Base/Wordrobe/Accessoires/AccsScroll/AccsGrid/CanonCam.is_pressed(): - change_accessoires(load("res://sprites/clothes/camera.png")) - - if $UI/Base/Wordrobe/Pants/PantsScroll/PantsGrid/Jeans.is_pressed(): - change_bottoms(load("res://sprites/clothes/jeans.svg")) - - if $UI/Base/Wordrobe/Pants/PantsScroll/PantsGrid/Sweats.is_pressed(): - change_bottoms(load("res://sprites/clothes/sweat_pants.svg")) - - if $UI/Base/Wordrobe/Pants/PantsScroll/PantsGrid/BlueSkirt.is_pressed(): - change_bottoms(load("res://sprites/clothes/blue_skirt.svg")) - - if $UI/Base/Wordrobe/Pants/PantsScroll/PantsGrid/FormalSkirt.is_pressed(): - change_bottoms(load("res://sprites/clothes/formal_skirt.svg")) - - if $UI/Base/Wordrobe/Pants/PantsScroll/PantsGrid/BeatUpJeans.is_pressed(): - change_bottoms(load("res://sprites/clothes/beat_up_jeans.svg")) - - if $UI/Base/Wordrobe/Underwear/UndiesScroll/UndiesGrid/Briefs.is_pressed(): - change_undies(load("res://sprites/clothes/briefs.svg")) - - if $UI/Base/Wordrobe/Underwear/UndiesScroll/UndiesGrid/ZBriefs.is_pressed(): - change_undies(load("res://sprites/clothes/z_briefs.svg")) - - if $UI/Base/Wordrobe/Underwear/UndiesScroll/UndiesGrid/Fundosi.is_pressed(): - change_undies(load("res://sprites/clothes/fundosi.svg")) - - if $UI/Base/Wordrobe/Underwear/UndiesScroll/UndiesGrid/OwOCensor.is_pressed(): - change_bottoms(null) - change_undies(load("res://sprites/clothes/owo_censor.svg")) - - - if $UI/Base/Wordrobe/Pants/PantsScroll/PantsGrid/BlueCamoJeans.is_pressed(): - change_bottoms(load("res://sprites/clothes/blue_camo_jeans.svg")) - - if $UI/Base/Wordrobe/Shirts/ShirtsScroll/ShirtsGrid/TrainHoodie.is_pressed(): - change_tops(load("res://sprites/clothes/train_hoodie.svg")) - - if $UI/Base/Wordrobe/Shirts/ShirtsScroll/ShirtsGrid/Sweatshirt.is_pressed(): - change_tops(load("res://sprites/clothes/old_sweatshirt.svg")) - - if $UI/Base/Wordrobe/Shirts/ShirtsScroll/ShirtsGrid/Raw.is_pressed(): - change_tops(load("res://sprites/clothes/raw_shirt.svg")) - - if $UI/Base/Wordrobe/Shirts/ShirtsScroll/ShirtsGrid/ZShirt.is_pressed(): - change_tops(load("res://sprites/clothes/z_shirt.png")) - - if $UI/Base/Wordrobe/Shirts/ShirtsScroll/ShirtsGrid/WhatsNewShirt.is_pressed(): - change_tops(load("res://sprites/clothes/whatsnew_shirt.svg")) - - if $UI/Base/Wordrobe/Shirts/ShirtsScroll/ShirtsGrid/Retro.is_pressed(): - change_tops(load("res://sprites/clothes/retro_shirt.svg")) - - if $UI/Base/Wordrobe/Shirts/ShirtsScroll/ShirtsGrid/KormShirt.is_pressed(): - change_tops(load("res://sprites/clothes/korm_shirt.png")) - - if $UI/Base/Wordrobe/Shirts/ShirtsScroll/ShirtsGrid/BikerJacket.is_pressed(): - change_tops(load("res://sprites/clothes/biker_jacket.svg")) - - if $UI/Base/Wordrobe/Shirts/ShirtsScroll/ShirtsGrid/Atomic.is_pressed(): - change_tops(load("res://sprites/clothes/atomic_shirt.svg")) - - if $UI/Base/Wordrobe/Shirts/ShirtsScroll/ShirtsGrid/NLJacket.is_pressed(): - change_tops(load("res://sprites/clothes/nl_jacket.png")) - - # Remove clothes - # =========================================================== - - if $UI/Base/Wordrobe/Accessoires/AccsScroll/AccsGrid/RemoveAccessory.is_pressed(): - change_accessoires(null) - - if $UI/Base/Wordrobe/Shirts/ShirtsScroll/ShirtsGrid/RemoveShirt.is_pressed(): - change_tops(null) - - if $UI/Base/Wordrobe/Pants/PantsScroll/PantsGrid/RemovePants.is_pressed(): - change_bottoms(null) diff --git a/scripts/PauseScn.gd b/scripts/PauseScn.gd deleted file mode 100644 index 1957556..0000000 --- a/scripts/PauseScn.gd +++ /dev/null @@ -1,34 +0,0 @@ -# Anthony Wilcox licenses this file to you under the MPL license. -# See the LICENSE file in the project root for more information. -extends Node - -func _process(delta): - if Input.is_action_just_pressed("ui_pause"): - $PauseWin.show() - GameKit.is_game_paused(true) - -func _on_ExitBtn_pressed(): - GameKit.is_game_paused(false) - GameKit.switch_scenes("title") - -func _on_SettingsBtn_pressed(): - $SettingsWin.show() - -func _on_CreditsBtn_pressed(): - GameKit.switch_scenes("credits") - -func _on_LicenseBtn_pressed(): - $LicenseWin.show() - -func _on_CloseAbtBtn_pressed(): - $AboutWin.hide() - -func _on_MusicBtn_toggled(button_pressed): - if button_pressed == true: - UserSettings.IsMusicPaused = true - else: - UserSettings.IsMusicPaused = false - -func _on_ResumeBtn_pressed(): - $PauseWin.hide() - GameKit.is_game_paused(false) diff --git a/scripts/Soundtrack.gd b/scripts/Soundtrack.gd deleted file mode 100644 index a1b65b7..0000000 --- a/scripts/Soundtrack.gd +++ /dev/null @@ -1,42 +0,0 @@ -# Anthony Wilcox licenses this file to you under the MPL license. -# See the LICENSE file in the project root for more information. -extends AudioStreamPlayer - -var playlist = [] -var tracks = detect_music() - -func _ready(): - play_random_song() - connect("finished", self, "play_random_song") - - -func detect_music(): - var files = [] - var dir = Directory.new() - var music_dir = "res://music/"; - dir.open(music_dir) - dir.list_dir_begin() - - while true: - var file = dir.get_next() - if file == "": - break - elif not file.begins_with(".") and file.get_extension() == "ogg": - files.append(music_dir + file) - - dir.list_dir_end() - - return files - -func play_random_song(): - - if tracks.size() > 0: - playlist = tracks - var rand_song = randi() % playlist.size() - print_debug(playlist) -# var audiostream = load(playlist[rand_song]) -# stream = audiostream -# play() - print_debug(playlist[rand_song]) - else: - print_debug("Music not found") diff --git a/scripts/UserSettings.gd b/scripts/UserSettings.gd deleted file mode 100644 index 7171f99..0000000 --- a/scripts/UserSettings.gd +++ /dev/null @@ -1,9 +0,0 @@ -# Anthony Wilcox licenses this file to you under the MPL license. -# See the LICENSE file in the project root for more information. -extends Node - -var Tops: Texture -var Bottoms: Texture -var Underwear: Texture -var Accessory: Texture -var IsMusicPaused: bool \ No newline at end of file diff --git a/scripts/characterBase.gd b/scripts/characterBase.gd new file mode 100644 index 0000000..11cd684 --- /dev/null +++ b/scripts/characterBase.gd @@ -0,0 +1,22 @@ +# Anthony Wilcox licenses this file to you under the MPL license. +# See the LICENSE file in the project root for more information. +extends Node2D + +onready var character = preload("res://resources/character.tres") +onready var accessory = $Accessory +onready var underwear = $Undies +onready var bottom = $Bottom +onready var top = $Top + +func _process(delta): + if character.accessory != null: + accessory.texture = character.accessory + + if character.underwear != null: + underwear.texture = character.underwear + + if character.bottom != null: + bottom.texture = character.bottom + + if character.top != null: + top.texture = character.top diff --git a/scripts/clothing/accessoryBase.gd b/scripts/clothing/accessoryBase.gd new file mode 100644 index 0000000..75b7764 --- /dev/null +++ b/scripts/clothing/accessoryBase.gd @@ -0,0 +1,6 @@ +extends "res://scripts/clothing/baseClothing.gd" + +onready var character = preload("res://resources/character.tres") + +func _on_accessory_pressed(): + character.accessory = texture_normal diff --git a/scripts/clothing/baseClothing.gd b/scripts/clothing/baseClothing.gd new file mode 100644 index 0000000..7d09770 --- /dev/null +++ b/scripts/clothing/baseClothing.gd @@ -0,0 +1,2 @@ +extends TextureButton + diff --git a/scripts/clothing/bottomsBase.gd b/scripts/clothing/bottomsBase.gd new file mode 100644 index 0000000..5f20d50 --- /dev/null +++ b/scripts/clothing/bottomsBase.gd @@ -0,0 +1,6 @@ +extends "res://scripts/clothing/baseClothing.gd" + +onready var character = preload("res://resources/character.tres") + +func _on_bottoms_pressed(): + character.bottom = texture_normal diff --git a/scripts/clothing/topsBase.gd b/scripts/clothing/topsBase.gd new file mode 100644 index 0000000..f1842fd --- /dev/null +++ b/scripts/clothing/topsBase.gd @@ -0,0 +1,6 @@ +extends "res://scripts/clothing/baseClothing.gd" + +onready var character = preload("res://resources/character.tres") + +func _on_tops_pressed(): + character.top = texture_normal diff --git a/scripts/clothing/undiesBase.gd b/scripts/clothing/undiesBase.gd new file mode 100644 index 0000000..ca50e52 --- /dev/null +++ b/scripts/clothing/undiesBase.gd @@ -0,0 +1,6 @@ +extends "res://scripts/clothing/baseClothing.gd" + +onready var character = preload("res://resources/character.tres") + +func _on_undies_pressed(): + character.underwear = texture_normal diff --git a/scripts/ui.gd b/scripts/ui.gd new file mode 100644 index 0000000..b8afd1a --- /dev/null +++ b/scripts/ui.gd @@ -0,0 +1,10 @@ +extends Control + +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") + +func _on_clearBtn_pressed(): + character.accessory = blank_top + character.bottom = blank_bottom + character.top = blank_top diff --git a/scripts/wardrobe.gd b/scripts/wardrobe.gd new file mode 100644 index 0000000..bdd51cb --- /dev/null +++ b/scripts/wardrobe.gd @@ -0,0 +1,14 @@ +extends TabContainer + +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") + +func _on_removeAccessory_pressed(): + character.accessory = blank_top + +func _on_removePants_pressed(): + character.bottom = blank_bottom + +func _on_removeShirt_pressed(): + character.top = blank_top diff --git a/sprites/character/shadow.svg b/sprites/character/shadow.svg new file mode 100644 index 0000000..6fb130c --- /dev/null +++ b/sprites/character/shadow.svg @@ -0,0 +1,68 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/sprites/clothes/tops_placeholder.png.import b/sprites/character/shadow.svg.import similarity index 67% rename from sprites/clothes/tops_placeholder.png.import rename to sprites/character/shadow.svg.import index ebd27d1..5d17114 100644 --- a/sprites/clothes/tops_placeholder.png.import +++ b/sprites/character/shadow.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/tops_placeholder.png-f5a04655f1fc6c8a24a963628d2d193a.stex" +path="res://.import/shadow.svg-5164915787bc95347e1112818d9bab36.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/clothes/tops_placeholder.png" -dest_files=[ "res://.import/tops_placeholder.png-f5a04655f1fc6c8a24a963628d2d193a.stex" ] +source_file="res://sprites/character/shadow.svg" +dest_files=[ "res://.import/shadow.svg-5164915787bc95347e1112818d9bab36.stex" ] [params] diff --git a/sprites/clothes/background.svg b/sprites/clothes/background.svg index cbb328d..b12805d 100644 --- a/sprites/clothes/background.svg +++ b/sprites/clothes/background.svg @@ -14,7 +14,7 @@ viewBox="0 0 270.93332 158.75" version="1.1" id="svg8" - inkscape:version="0.92.3 (2405546, 2018-03-11)" + inkscape:version="0.92.2 5c3e80d, 2017-08-06" sodipodi:docname="background.svg"> @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="3.959798" - inkscape:cx="189.35891" - inkscape:cy="63.393406" + inkscape:cx="567.4085" + inkscape:cy="43.190355" inkscape:document-units="mm" inkscape:current-layer="layer2" showgrid="false" @@ -37,9 +37,9 @@ fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="1920" - inkscape:window-height="1001" - inkscape:window-x="-9" - inkscape:window-y="-9" + inkscape:window-height="992" + inkscape:window-x="0" + inkscape:window-y="0" inkscape:window-maximized="1" inkscape:measure-start="0,0" inkscape:measure-end="0,0" /> @@ -51,7 +51,7 @@ image/svg+xml - + @@ -73,19 +73,12 @@ y="3.7109376e-006" ry="0.29877809" /> - + y="136.54045" + ry="0.62699807" /> diff --git a/sprites/clothes/bottoms_placeholder.png b/sprites/clothes/blank_bottom.png similarity index 100% rename from sprites/clothes/bottoms_placeholder.png rename to sprites/clothes/blank_bottom.png diff --git a/sprites/clothes/bottoms_placeholder.png.import b/sprites/clothes/blank_bottom.png.import similarity index 66% rename from sprites/clothes/bottoms_placeholder.png.import rename to sprites/clothes/blank_bottom.png.import index 93e2cfe..686ad0f 100644 --- a/sprites/clothes/bottoms_placeholder.png.import +++ b/sprites/clothes/blank_bottom.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/bottoms_placeholder.png-57674ec9f26757b6fa01589150ad74c7.stex" +path="res://.import/blank_bottom.png-920e015ef605c266d02e19063b5738b4.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/clothes/bottoms_placeholder.png" -dest_files=[ "res://.import/bottoms_placeholder.png-57674ec9f26757b6fa01589150ad74c7.stex" ] +source_file="res://sprites/clothes/blank_bottom.png" +dest_files=[ "res://.import/blank_bottom.png-920e015ef605c266d02e19063b5738b4.stex" ] [params] diff --git a/sprites/clothes/tops_placeholder.png b/sprites/clothes/blank_top.png similarity index 100% rename from sprites/clothes/tops_placeholder.png rename to sprites/clothes/blank_top.png diff --git a/sprites/clothes/blank_top.png.import b/sprites/clothes/blank_top.png.import new file mode 100644 index 0000000..011dc2e --- /dev/null +++ b/sprites/clothes/blank_top.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/blank_top.png-e145e75e3bc30a0f4722046da43ef638.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/clothes/blank_top.png" +dest_files=[ "res://.import/blank_top.png-e145e75e3bc30a0f4722046da43ef638.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/styles/Game.theme b/styles/Game.theme deleted file mode 100644 index 0835f34..0000000 Binary files a/styles/Game.theme and /dev/null differ