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..c5e7047 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,7 @@
# 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
+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.
\ No newline at end of file
diff --git a/archive/dressup.swf b/archive/dressup.swf
new file mode 100644
index 0000000..5bffb1a
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/project.godot b/project.godot
index 351188f..81e4dd2 100644
--- a/project.godot
+++ b/project.godot
@@ -37,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"
diff --git a/resources/Game.theme b/resources/Game.theme
index 8f65826..c2f5ecb 100644
Binary files a/resources/Game.theme and b/resources/Game.theme differ
diff --git a/scenes/characterBase.tscn b/scenes/characterBase.tscn
index 5497eb7..d5cd89a 100644
--- a/scenes/characterBase.tscn
+++ b/scenes/characterBase.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=30 format=2]
+[gd_scene load_steps=31 format=2]
[ext_resource path="res://scripts/characterBase.gd" type="Script" id=1]
[ext_resource path="res://sprites/character/tail/tail0.svg" type="Texture" id=2]
@@ -26,6 +26,7 @@
[ext_resource path="res://sprites/clothes/briefs.svg" type="Texture" id=24]
[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 = [ {
@@ -55,13 +56,18 @@ animations = [ {
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 = 6
+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 )
@@ -69,27 +75,27 @@ texture = ExtResource( 5 )
[node name="Eyes" type="AnimatedSprite" parent="Base"]
position = Vector2( 114.227, 63.9224 )
frames = SubResource( 2 )
-frame = 15
+frame = 11
playing = true
[node name="Mouth" type="AnimatedSprite" parent="Base"]
position = Vector2( 131.024, 67.4964 )
frames = SubResource( 3 )
-frame = 19
+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/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/game.tscn b/scenes/game.tscn
index ff030e8..7ae2ff7 100644
--- a/scenes/game.tscn
+++ b/scenes/game.tscn
@@ -1,38 +1,66 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=9 format=2]
[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"]
+[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="characterBase" parent="." instance=ExtResource( 1 )]
-position = Vector2( 43, 250 )
+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="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/wardrobe.tscn b/scenes/wardrobe.tscn
index 52fefda..fcd408d 100644
--- a/scenes/wardrobe.tscn
+++ b/scenes/wardrobe.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=13 format=2]
+[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]
@@ -9,18 +9,25 @@
[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
@@ -29,10 +36,10 @@ __meta__ = {
[node name="Pants" type="Tabs" parent="."]
anchor_right = 1.0
anchor_bottom = 1.0
-margin_left = 4.0
-margin_top = 39.0
-margin_right = -4.0
-margin_bottom = -4.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"]
@@ -43,9 +50,10 @@ __meta__ = {
}
[node name="PantsGrid" type="GridContainer" parent="Pants/PantsScroll"]
-margin_right = 792.0
-margin_bottom = 228.0
+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 )]
@@ -68,21 +76,21 @@ margin_left = 220.0
margin_right = 326.0
margin_bottom = 112.0
-[node name="camoJeans2" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 8 )]
+[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="formalSkirt" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 6 )]
+[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="skirt" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 5 )]
+[node name="formalSkirt" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 6 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 110.0
@@ -90,11 +98,19 @@ margin_top = 116.0
margin_right = 216.0
margin_bottom = 228.0
-[node name="removePants" type="TextureButton" parent="Pants/PantsScroll/PantsGrid"]
+[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 )
@@ -102,10 +118,10 @@ texture_normal = ExtResource( 9 )
visible = false
anchor_right = 1.0
anchor_bottom = 1.0
-margin_left = 4.0
-margin_top = 39.0
-margin_right = -4.0
-margin_bottom = -4.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
@@ -114,16 +130,55 @@ margin_left = 10.0
margin_top = 10.0
[node name="ShirtsGrid" type="GridContainer" parent="Shirts/ShirtsScroll"]
-margin_right = 782.0
-margin_bottom = 112.0
+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 = 178.0
-margin_top = 238.0
-margin_right = 284.0
-margin_bottom = 353.0
+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 )
@@ -131,19 +186,20 @@ texture_normal = ExtResource( 9 )
visible = false
anchor_right = 1.0
anchor_bottom = 1.0
-margin_left = 4.0
-margin_top = 39.0
-margin_right = -4.0
-margin_bottom = -4.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 = 792.0
-margin_bottom = 112.0
+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 )]
@@ -164,10 +220,10 @@ margin_bottom = 112.0
visible = false
anchor_right = 1.0
anchor_bottom = 1.0
-margin_left = 4.0
-margin_top = 39.0
-margin_right = -4.0
-margin_bottom = -4.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
@@ -177,8 +233,9 @@ margin_bottom = 494.0
[node name="AccsGrid" type="GridContainer" parent="Accessoires/AccsScroll"]
margin_right = 350.0
-margin_bottom = 112.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 )]
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/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 @@
+
+
+
+
diff --git a/sprites/character/shadow.svg.import b/sprites/character/shadow.svg.import
new file mode 100644
index 0000000..5d17114
--- /dev/null
+++ b/sprites/character/shadow.svg.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/shadow.svg-5164915787bc95347e1112818d9bab36.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprites/character/shadow.svg"
+dest_files=[ "res://.import/shadow.svg-5164915787bc95347e1112818d9bab36.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/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" />