diff --git a/scenes/characterBase.tscn b/scenes/characterBase.tscn
index 8c44b73..d09de71 100644
--- a/scenes/characterBase.tscn
+++ b/scenes/characterBase.tscn
@@ -100,23 +100,29 @@ __meta__ = {
"_edit_lock_": true
}
-[node name="top" type="Sprite" parent="body"]
-position = Vector2( 7, 80 )
-texture = ExtResource( 25 )
-__meta__ = {
-"_edit_lock_": true
-}
-
[node name="legs" type="Sprite" parent="body"]
-position = Vector2( 3, 189 )
+position = Vector2( 1.47027, 192.868 )
texture = ExtResource( 5 )
+[node name="top" type="Sprite" parent="body"]
+position = Vector2( 7, 78 )
+texture = ExtResource( 25 )
+
[node name="head" type="Sprite" parent="body"]
-position = Vector2( 14.1214, -26.841 )
+position = Vector2( 14.1214, -28.841 )
texture = ExtResource( 27 )
-__meta__ = {
-"_edit_lock_": true
-}
+
+[node name="eyes" type="AnimatedSprite" parent="body/head"]
+position = Vector2( 17.6857, 4.22147 )
+frames = SubResource( 3 )
+frame = 6
+playing = true
+
+[node name="mouth" type="AnimatedSprite" parent="body/head"]
+position = Vector2( 38.1195, 8.68453 )
+frames = SubResource( 4 )
+frame = 6
+playing = true
[node name="accessory" type="Sprite" parent="body"]
position = Vector2( 9.54095, 73.0832 )
@@ -130,21 +136,3 @@ position = Vector2( 51.7305, -20.2165 )
__meta__ = {
"_edit_lock_": true
}
-
-[node name="eyes" type="AnimatedSprite" parent="body/emote"]
-position = Vector2( -19.9234, -2.40303 )
-frames = SubResource( 3 )
-frame = 3
-playing = true
-__meta__ = {
-"_edit_lock_": true
-}
-
-[node name="mouth" type="AnimatedSprite" parent="body/emote"]
-position = Vector2( 0.510399, 2.06003 )
-frames = SubResource( 4 )
-frame = 6
-playing = true
-__meta__ = {
-"_edit_lock_": true
-}
diff --git a/scenes/clothing/tops/retroShirt.tscn b/scenes/clothing/tops/retroShirt.tscn
new file mode 100644
index 0000000..01173bd
--- /dev/null
+++ b/scenes/clothing/tops/retroShirt.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/wardrobe.tscn b/scenes/wardrobe.tscn
index 04d41dd..6f61331 100644
--- a/scenes/wardrobe.tscn
+++ b/scenes/wardrobe.tscn
@@ -1,6 +1,7 @@
-[gd_scene load_steps=18 format=2]
+[gd_scene load_steps=20 format=2]
[ext_resource path="res://scenes/clothing/camera.tscn" type="PackedScene" id=1]
+[ext_resource path="res://sprites/clothes/retro_shirt.svg" type="Texture" 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]
@@ -16,6 +17,7 @@
[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/tops/retroShirt.tscn" type="PackedScene" id=18]
[ext_resource path="res://scripts/wardrobe.gd" type="Script" id=21]
[node name="Wordrobe" type="TabContainer"]
@@ -31,6 +33,7 @@ __meta__ = {
}
[node name="Pants" type="Tabs" parent="."]
+visible = false
anchor_right = 1.0
anchor_bottom = 1.0
margin_left = 5.0
@@ -63,21 +66,21 @@ texture_normal = ExtResource( 9 )
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 110.0
-margin_right = 220.0
+margin_right = 222.0
margin_bottom = 134.0
[node name="jeans" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 4 )]
anchor_right = 0.0
anchor_bottom = 0.0
-margin_left = 224.0
-margin_right = 330.0
+margin_left = 226.0
+margin_right = 337.0
margin_bottom = 134.0
[node name="camoJeans" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 7 )]
anchor_right = 0.0
anchor_bottom = 0.0
-margin_left = 334.0
-margin_right = 444.0
+margin_left = 341.0
+margin_right = 451.0
margin_bottom = 134.0
[node name="sweatPants" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 17 )]
@@ -92,27 +95,26 @@ anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 110.0
margin_top = 138.0
-margin_right = 220.0
+margin_right = 222.0
margin_bottom = 270.0
[node name="formalSkirt" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 6 )]
anchor_right = 0.0
anchor_bottom = 0.0
-margin_left = 224.0
+margin_left = 226.0
margin_top = 138.0
-margin_right = 330.0
+margin_right = 337.0
margin_bottom = 270.0
[node name="skirt" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 5 )]
anchor_right = 0.0
anchor_bottom = 0.0
-margin_left = 334.0
+margin_left = 341.0
margin_top = 138.0
-margin_right = 444.0
+margin_right = 451.0
margin_bottom = 270.0
[node name="Shirts" type="Tabs" parent="."]
-visible = false
anchor_right = 1.0
anchor_bottom = 1.0
margin_left = 5.0
@@ -134,51 +136,71 @@ size_flags_vertical = 3
columns = 4
[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
+margin_right = 106.0
+margin_bottom = 115.0
rect_min_size = Vector2( 0, 112 )
texture_normal = ExtResource( 9 )
[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 )]
+[node name="kormShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 13 )]
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 )]
+[node name="atomicShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 15 )]
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 )]
+[node name="nlShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 16 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 119.0
margin_right = 106.0
margin_bottom = 234.0
+[node name="rawShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 12 )]
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_left = 110.0
+margin_top = 119.0
+margin_right = 216.0
+margin_bottom = 234.0
+
+[node name="zShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 11 )]
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_left = 220.0
+margin_top = 119.0
+margin_right = 326.0
+margin_bottom = 234.0
+
+[node name="whatsNewShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 10 )]
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_left = 330.0
+margin_top = 119.0
+margin_right = 436.0
+margin_bottom = 234.0
+
+[node name="retroShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 18 )]
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_top = 238.0
+margin_right = 106.0
+margin_bottom = 353.0
+texture_normal = ExtResource( 2 )
+
[node name="Accessoires" type="Tabs" parent="."]
visible = false
anchor_right = 1.0
diff --git a/sprites/character_base_legs.svg b/sprites/character_base_legs.svg
index ccdeb3c..46b4bca 100644
--- a/sprites/character_base_legs.svg
+++ b/sprites/character_base_legs.svg
@@ -7,41 +7,41 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="29.356466mm"
- height="34.165901mm"
- viewBox="0 0 29.356466 34.165901"
- version="1.1"
- id="svg8"
+ sodipodi:docname="character_base_legs.svg"
inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
- sodipodi:docname="character_base_legs.svg">
+ id="svg8"
+ version="1.1"
+ viewBox="0 0 29.356466 33.044505"
+ height="33.044506mm"
+ width="29.356466mm">
+ inkscape:window-maximized="1"
+ inkscape:window-y="-9"
+ inkscape:window-x="-9"
+ inkscape:window-height="1001"
+ inkscape:window-width="1920"
+ showguides="true"
+ inkscape:pagecheckerboard="true"
+ fit-margin-bottom="0"
+ fit-margin-right="0"
+ fit-margin-left="0"
+ fit-margin-top="0"
+ showgrid="false"
+ inkscape:current-layer="layer3"
+ inkscape:document-units="mm"
+ inkscape:cy="-10.536605"
+ inkscape:cx="188.27602"
+ inkscape:zoom="2.8"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base" />
@@ -55,41 +55,40 @@
-
+
+ id="layer3"
+ inkscape:groupmode="layer">
+ d="m 31.277528,53.606473 c 0.123737,9.510183 1.595727,13.002971 0.897694,23.699107 5.989076,7.622458 -5.466142,9.257207 -8.457219,1.795388 0,-4.946536 0.06144,-10.808711 0.04725,-15.73326 -3.051778,4.577667 -6.271659,11.54185 -7.843006,17.103423 6.066786,9.10018 -9.274496,5.51039 -10.15811,0.18899 5.089364,-6.263833 9.457066,-19.113432 10.067485,-26.954038 6.174568,-0.184322 8.74291,-0.05561 15.445906,-0.09961 z"
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ id="path857"
+ d="m 15.270238,54.296281 c -0.52762,2.533268 6.446629,6.5124 8.920238,7.984749 4.741466,-1.55146 7.056167,-4.214834 7.606771,-7.654018 0.550604,-3.439184 0.377976,22.678568 0.377976,22.678568 0,0 2.67882,4.233216 0.566965,5.76414 -2.111855,1.530924 -7.638158,-0.210531 -9.024185,-3.968752 -1.386027,-3.758221 0.472473,-16.819938 0.472473,-16.819938 l -8.268229,18.1901 c 0,0 2.807966,4.177084 0.330729,5.764141 -2.477237,1.587057 -11.8033341,-3.743327 -10.488839,-5.57515 3.2620156,-4.545801 8.268229,-18.355467 8.268229,-18.355467 0,0 1.765492,-10.541641 1.237872,-8.008373 z"
+ style="fill:#0276b1;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ inkscape:label="Re-ink"
+ id="layer2"
+ inkscape:groupmode="layer">
+ id="path831"
+ d="m 31.277528,53.606473 c -0.05112,9.15583 1.595725,13.00297 0.897695,23.699107 5.989074,7.622458 -5.466143,9.257205 -8.45722,1.795387 0,-4.946535 0.06144,-10.808709 0.04725,-15.733259 -3.051778,4.577668 -6.271659,11.541849 -7.843006,17.103422 6.066786,9.10018 -9.2744956,5.510391 -10.1581101,0.188989 C 10.853501,74.396286 15.717297,60.625371 15.831622,53.706083"
+ style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
diff --git a/sprites/character_base_top.svg b/sprites/character_base_top.svg
index 4813e33..04c08f7 100644
--- a/sprites/character_base_top.svg
+++ b/sprites/character_base_top.svg
@@ -7,9 +7,9 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="24.488098mm"
- height="31.425005mm"
- viewBox="0 0 24.488098 31.425005"
+ width="24.504625mm"
+ height="29.090412mm"
+ viewBox="0 0 24.504625 29.090412"
version="1.1"
id="svg8"
inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
@@ -23,9 +23,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="2.8"
- inkscape:cx="18.91287"
- inkscape:cy="108.53187"
+ inkscape:zoom="5.6"
+ inkscape:cx="80.553227"
+ inkscape:cy="59.753864"
inkscape:document-units="mm"
inkscape:current-layer="layer2"
showgrid="false"
@@ -58,66 +58,86 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(-84.473399,-131.83647)"
+ transform="translate(-113.05078,-148.95219)"
style="display:inline" />
-
-
-
-
-
+ inkscape:label="Color" />
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sprites/clothes/beat_up_jeans.svg b/sprites/clothes/beat_up_jeans.svg
index 3895842..11d9ae3 100644
--- a/sprites/clothes/beat_up_jeans.svg
+++ b/sprites/clothes/beat_up_jeans.svg
@@ -7,40 +7,40 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- sodipodi:docname="beat_up_jeans.svg"
- inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
- id="svg2007"
+ width="29.35647mm"
+ height="33.53791mm"
+ viewBox="0 0 29.356471 33.537911"
version="1.1"
- viewBox="0 0 29.356467 35.498169"
- height="35.498169mm"
- width="29.356466mm">
+ id="svg2007"
+ inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+ sodipodi:docname="beat_up_jeans.svg">
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="5.6"
+ inkscape:cx="80.629541"
+ inkscape:cy="69.57743"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer3"
+ showgrid="false"
+ inkscape:pagecheckerboard="true"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ showguides="true"
+ inkscape:window-width="1920"
+ inkscape:window-height="1001"
+ inkscape:window-x="-9"
+ inkscape:window-y="-9"
+ inkscape:window-maximized="1"
+ inkscape:document-rotation="0" />
@@ -54,101 +54,81 @@
-
-
-
-
-
-
-
-
-
-
-
-
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-79.069227,-132.62721)">
+ sodipodi:nodetypes="cccccccc" />
+
+
+
+
+
+ inkscape:label="Re-ink"
+ transform="translate(-0.10999844,1.3894499)">
-
+
-
+
-
+
-
+
-
+
+ inkscape:connector-curvature="0" />
diff --git a/sprites/clothes/dj_shorts.svg b/sprites/clothes/dj_shorts.svg
index 82c126f..804619d 100644
--- a/sprites/clothes/dj_shorts.svg
+++ b/sprites/clothes/dj_shorts.svg
@@ -1,6 +1,4 @@
-
-
diff --git a/sprites/clothes/fundosi.svg b/sprites/clothes/fundosi.svg
index 6b6e07a..2ceb7c7 100644
--- a/sprites/clothes/fundosi.svg
+++ b/sprites/clothes/fundosi.svg
@@ -1,6 +1,4 @@
-
-
diff --git a/sprites/clothes/jeans.svg b/sprites/clothes/jeans.svg
index 5fc5bbd..3816eae 100644
--- a/sprites/clothes/jeans.svg
+++ b/sprites/clothes/jeans.svg
@@ -1,6 +1,4 @@
-
-
diff --git a/sprites/clothes/retro_shirt.svg b/sprites/clothes/retro_shirt.svg
index 345eaa2..42351bb 100644
--- a/sprites/clothes/retro_shirt.svg
+++ b/sprites/clothes/retro_shirt.svg
@@ -1,6 +1,4 @@
-
-