diff --git a/README.md b/README.md
index 6c988ed..73c316b 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,7 @@
Tony's Dress Up is a re-imagining of my first Flash game, ZC's Dress Up, developed back in 2007. I've included the Flash copies in the ``/archive`` directory. They can be played at [Ruffle](https://ruffle.rs/)'s demo page.
+
## Getting Started
### Prerequisites
@@ -12,10 +13,12 @@
## Authors
-- **Anthony Wilcox** - *Initial work* - [tonytins](https://github.com/tonytins)
-- **Kenney** - *UI assets* - [kenny.nl](https://www.kenney.nl/)
-
-## License
+* **Anthony Wilcox** - *Initial work* - [tonytins](https://github.com/tonytins)
+* **Kenney** - *UI assets* - [kenny.nl](https://www.kenney.nl/)
+* **Twemoji** - *Emojis* - [twemoji.twitter.com](https://twemoji.twitter.com/)
+
+
+ ## License
The source and assets are licensed under the MPL 2.0 License and CC-BY, respectfully - see the [LICENSE](LICENSE) and [ASSET-LICENSE](ASSET-LICENSE) for more details.
diff --git a/scenes/character_base.tscn b/scenes/character_base.tscn
index 4971703..7dd38d8 100644
--- a/scenes/character_base.tscn
+++ b/scenes/character_base.tscn
@@ -38,8 +38,11 @@ onready var accessory = $body/accessory
#onready var underwear = $Undies
onready var bottom = $body/legs
onready var top = $body/top
+onready var eyes = $body/head/eyes
+onready var mouth = $body/head/mouth
func _process(delta):
+
if character.accessory != null:
accessory.texture = character.accessory
@@ -53,7 +56,7 @@ func _process(delta):
top.texture = character.top
"
-[sub_resource type="SpriteFrames" id=2]
+[sub_resource type="SpriteFrames" id=4]
animations = [ {
"frames": [ ExtResource( 2 ), ExtResource( 3 ), ExtResource( 4 ) ],
"loop": true,
@@ -61,7 +64,7 @@ animations = [ {
"speed": 2.0
} ]
-[sub_resource type="SpriteFrames" id=3]
+[sub_resource type="SpriteFrames" id=2]
animations = [ {
"frames": [ ExtResource( 6 ), ExtResource( 7 ), ExtResource( 8 ), ExtResource( 9 ), ExtResource( 10 ), ExtResource( 11 ), ExtResource( 12 ) ],
"loop": true,
@@ -69,7 +72,7 @@ animations = [ {
"speed": 2.0
} ]
-[sub_resource type="SpriteFrames" id=4]
+[sub_resource type="SpriteFrames" id=3]
animations = [ {
"frames": [ ExtResource( 13 ), ExtResource( 14 ), ExtResource( 15 ), ExtResource( 16 ), ExtResource( 17 ), ExtResource( 18 ), ExtResource( 19 ), ExtResource( 20 ), ExtResource( 21 ), ExtResource( 22 ), ExtResource( 28 ), ExtResource( 23 ) ],
"loop": true,
@@ -91,14 +94,10 @@ __meta__ = {
}
[node name="tail" type="AnimatedSprite" parent="body"]
-position = Vector2( -41.9999, 100.157 )
+position = Vector2( -33.7592, 99.4079 )
scale = Vector2( 0.927713, 1 )
-frames = SubResource( 2 )
-frame = 1
+frames = SubResource( 4 )
playing = true
-__meta__ = {
-"_edit_lock_": true
-}
[node name="legs" type="Sprite" parent="body"]
position = Vector2( 1.47027, 192.868 )
@@ -109,19 +108,19 @@ position = Vector2( 7, 78 )
texture = ExtResource( 25 )
[node name="head" type="Sprite" parent="body"]
-position = Vector2( 14.1214, -28.841 )
+position = Vector2( 10.6805, -25.1047 )
texture = ExtResource( 27 )
[node name="eyes" type="AnimatedSprite" parent="body/head"]
position = Vector2( 17.6857, 4.22147 )
-frames = SubResource( 3 )
-frame = 2
+frames = SubResource( 2 )
+frame = 3
playing = true
[node name="mouth" type="AnimatedSprite" parent="body/head"]
position = Vector2( 38.1195, 8.68453 )
-frames = SubResource( 4 )
-frame = 9
+frames = SubResource( 3 )
+frame = 2
playing = true
[node name="accessory" type="Sprite" parent="body"]
diff --git a/scenes/clothing/base/bottomsBase.tscn b/scenes/clothing/base/bottoms_base.tscn
similarity index 100%
rename from scenes/clothing/base/bottomsBase.tscn
rename to scenes/clothing/base/bottoms_base.tscn
diff --git a/scenes/clothing/pants/beatUpJeans.tscn b/scenes/clothing/pants/beat_Jeans.tscn
similarity index 98%
rename from scenes/clothing/pants/beatUpJeans.tscn
rename to scenes/clothing/pants/beat_Jeans.tscn
index 7547fb2..01a233c 100644
--- a/scenes/clothing/pants/beatUpJeans.tscn
+++ b/scenes/clothing/pants/beat_Jeans.tscn
@@ -4,11 +4,6 @@
[ext_resource path="res://scripts/clothing/bottoms_base.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 )
diff --git a/scenes/clothing/pants/djShorts.tscn b/scenes/clothing/pants/dj_shorts.tscn
similarity index 63%
rename from scenes/clothing/pants/djShorts.tscn
rename to scenes/clothing/pants/dj_shorts.tscn
index bb58543..24a40bb 100644
--- a/scenes/clothing/pants/djShorts.tscn
+++ b/scenes/clothing/pants/dj_shorts.tscn
@@ -1,15 +1,10 @@
[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/clothing_base.tscn" type="PackedScene" id=2]
-[ext_resource path="res://scripts/clothing/bottoms_base.gd" type="Script" id=3]
+[ext_resource path="res://scenes/clothing/base/clothing_base.tscn" type="PackedScene" id=1]
+[ext_resource path="res://scripts/clothing/bottoms_base.gd" type="Script" id=2]
+[ext_resource path="res://sprites/clothes/dj_shorts.svg" type="Texture" id=3]
-
-
-
-
-
-[node name="camoJeans" instance=ExtResource( 2 )]
-texture_normal = ExtResource( 1 )
-script = ExtResource( 3 )
+[node name="camoJeans" 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/formalSkirt.tscn b/scenes/clothing/pants/formal_skirt.tscn
similarity index 99%
rename from scenes/clothing/pants/formalSkirt.tscn
rename to scenes/clothing/pants/formal_skirt.tscn
index 3b65d93..ceaeaac 100644
--- a/scenes/clothing/pants/formalSkirt.tscn
+++ b/scenes/clothing/pants/formal_skirt.tscn
@@ -4,9 +4,6 @@
[ext_resource path="res://scripts/clothing/bottoms_base.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 )
diff --git a/scenes/clothing/tops/fullsnack_shirt.tscn b/scenes/clothing/tops/fullsnack_shirt.tscn
new file mode 100644
index 0000000..4f2fc8e
--- /dev/null
+++ b/scenes/clothing/tops/fullsnack_shirt.tscn
@@ -0,0 +1,10 @@
+[gd_scene load_steps=4 format=2]
+
+[ext_resource path="res://scenes/clothing/base/clothing_base.tscn" type="PackedScene" id=1]
+[ext_resource path="res://scripts/clothing/tops_base.gd" type="Script" id=2]
+[ext_resource path="res://sprites/clothes/fullsnack_shirt.svg" type="Texture" id=3]
+
+[node name="fullsnackShirt" 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/skate_shirt.tscn b/scenes/clothing/tops/skate_shirt.tscn
new file mode 100644
index 0000000..f88c40f
--- /dev/null
+++ b/scenes/clothing/tops/skate_shirt.tscn
@@ -0,0 +1,10 @@
+[gd_scene load_steps=4 format=2]
+
+[ext_resource path="res://scenes/clothing/base/clothing_base.tscn" type="PackedScene" id=1]
+[ext_resource path="res://scripts/clothing/tops_base.gd" type="Script" id=2]
+[ext_resource path="res://sprites/clothes/skate_shirt.svg" type="Texture" id=3]
+
+[node name="skateShirt" 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/train_hoodie.tscn b/scenes/clothing/tops/train_hoodie.tscn
new file mode 100644
index 0000000..f36fe22
--- /dev/null
+++ b/scenes/clothing/tops/train_hoodie.tscn
@@ -0,0 +1,10 @@
+[gd_scene load_steps=4 format=2]
+
+[ext_resource path="res://scenes/clothing/base/clothing_base.tscn" type="PackedScene" id=1]
+[ext_resource path="res://scripts/clothing/tops_base.gd" type="Script" id=2]
+[ext_resource path="res://sprites/clothes/train_hoodie.svg" type="Texture" id=3]
+
+[node name="trainHoodie" 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/zBriefs.tscn b/scenes/clothing/undies/z_briefs.tscn
similarity index 100%
rename from scenes/clothing/undies/zBriefs.tscn
rename to scenes/clothing/undies/z_briefs.tscn
diff --git a/scenes/game.tscn b/scenes/game.tscn
index f510c09..99bfbed 100644
--- a/scenes/game.tscn
+++ b/scenes/game.tscn
@@ -40,16 +40,17 @@ __meta__ = {
"_edit_lock_": true,
"_edit_use_anchors_": true
}
+version = "1.5"
[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
+margin_left = -5.0
+margin_top = -20.0
+margin_right = 60.0
+margin_bottom = 109.0
[node name="clearBtn" type="TextureButton" parent="ui/base"]
margin_left = 752.0
@@ -67,4 +68,18 @@ __meta__ = {
[node name="clear" type="AudioStreamPlayer" parent="ui/base"]
stream = ExtResource( 9 )
+
+[node name="versionLbl" type="Label" parent="ui/base"]
+anchor_left = 1.0
+anchor_top = 1.0
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_left = -81.0
+margin_top = -28.0
+text = "[version]"
+align = 2
+valign = 3
+__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 008697c..73fb038 100644
--- a/scenes/wardrobe.tscn
+++ b/scenes/wardrobe.tscn
@@ -1,30 +1,23 @@
-[gd_scene load_steps=20 format=2]
+[gd_scene load_steps=18 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/beat_Jeans.tscn" type="PackedScene" id=3]
+[ext_resource path="res://scenes/clothing/tops/skate_shirt.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/formal_skirt.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://scenes/clothing/pants/dj_shorts.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/whatsnew_shirt.tscn" type="PackedScene" id=10]
-[ext_resource path="res://scenes/clothing/tops/z_shirt.tscn" type="PackedScene" id=11]
+[ext_resource path="res://scenes/clothing/tops/fullsnack_shirt.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/korm_shirt.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/atomic_shirt.tscn" type="PackedScene" id=15]
-[ext_resource path="res://scenes/clothing/tops/nl_shirt.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/retro_shirt.tscn" type="PackedScene" id=18]
+[ext_resource path="res://scenes/clothing/tops/train_hoodie.tscn" type="PackedScene" id=19]
[ext_resource path="res://scripts/wardrobe.gd" type="Script" id=21]
-
-
-
-
-
[node name="Wordrobe" type="TabContainer"]
anchor_right = 1.0
anchor_bottom = 1.0
@@ -61,62 +54,54 @@ size_flags_vertical = 3
columns = 4
[node name="removePants" type="TextureButton" parent="Pants/PantsScroll/PantsGrid"]
-margin_right = 106.0
-margin_bottom = 134.0
+margin_right = 113.0
+margin_bottom = 128.0
rect_min_size = Vector2( 0, 112 )
texture_normal = ExtResource( 9 )
[node name="beatUpJeans" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 3 )]
anchor_right = 0.0
anchor_bottom = 0.0
-margin_left = 110.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 = 226.0
-margin_right = 337.0
-margin_bottom = 134.0
+margin_left = 117.0
+margin_right = 227.0
+margin_bottom = 128.0
[node name="camoJeans" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 7 )]
anchor_right = 0.0
anchor_bottom = 0.0
-margin_left = 341.0
-margin_right = 451.0
-margin_bottom = 134.0
+margin_left = 231.0
+margin_right = 342.0
+margin_bottom = 128.0
[node name="sweatPants" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 17 )]
anchor_right = 0.0
anchor_bottom = 0.0
-margin_top = 138.0
-margin_right = 106.0
-margin_bottom = 270.0
+margin_left = 346.0
+margin_right = 457.0
+margin_bottom = 128.0
[node name="camoJeans2" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 8 )]
anchor_right = 0.0
anchor_bottom = 0.0
-margin_left = 110.0
-margin_top = 138.0
-margin_right = 222.0
-margin_bottom = 270.0
+margin_top = 132.0
+margin_right = 113.0
+margin_bottom = 264.0
[node name="formalSkirt" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 6 )]
anchor_right = 0.0
anchor_bottom = 0.0
-margin_left = 226.0
-margin_top = 138.0
-margin_right = 337.0
-margin_bottom = 270.0
+margin_left = 117.0
+margin_top = 132.0
+margin_right = 227.0
+margin_bottom = 264.0
[node name="skirt" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 5 )]
anchor_right = 0.0
anchor_bottom = 0.0
-margin_left = 341.0
-margin_top = 138.0
-margin_right = 451.0
-margin_bottom = 270.0
+margin_left = 231.0
+margin_top = 132.0
+margin_right = 342.0
+margin_bottom = 264.0
[node name="Shirts" type="Tabs" parent="."]
visible = false
@@ -142,68 +127,61 @@ columns = 4
[node name="removeShirt" type="TextureButton" parent="Shirts/ShirtsScroll/ShirtsGrid"]
margin_right = 106.0
-margin_bottom = 115.0
+margin_bottom = 113.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_left = 110.0
-margin_right = 216.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 = 220.0
-margin_right = 326.0
-margin_bottom = 115.0
-
[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
+margin_left = 110.0
+margin_right = 216.0
+margin_bottom = 113.0
-[node name="nlShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 16 )]
+[node name="skateShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 4 )]
anchor_right = 0.0
anchor_bottom = 0.0
-margin_top = 119.0
-margin_right = 106.0
-margin_bottom = 234.0
+margin_left = 220.0
+margin_right = 326.0
+margin_bottom = 113.0
+
+[node name="fullsnackShirt" 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 = 113.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
+margin_top = 117.0
+margin_right = 106.0
+margin_bottom = 229.0
-[node name="zShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 11 )]
+[node name="trainHoodie" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 19 )]
anchor_right = 0.0
anchor_bottom = 0.0
-margin_left = 220.0
-margin_top = 119.0
-margin_right = 326.0
-margin_bottom = 234.0
+margin_left = 110.0
+margin_top = 117.0
+margin_right = 216.0
+margin_bottom = 229.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
+margin_left = 220.0
+margin_top = 117.0
+margin_right = 326.0
+margin_bottom = 229.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
+margin_left = 330.0
+margin_top = 117.0
+margin_right = 436.0
+margin_bottom = 229.0
texture_normal = ExtResource( 2 )
[node name="Accessoires" type="Tabs" parent="."]
@@ -229,13 +207,13 @@ size_flags_vertical = 3
columns = 3
[node name="removeAccessory" type="TextureButton" parent="Accessoires/AccsScroll/AccsGrid"]
-margin_left = 89.0
-margin_right = 195.0
+margin_right = 106.0
margin_bottom = 112.0
texture_normal = ExtResource( 9 )
[node name="camera" parent="Accessoires/AccsScroll/AccsGrid" instance=ExtResource( 1 )]
-margin_right = 85.0
+margin_left = 110.0
+margin_right = 195.0
margin_bottom = 112.0
[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"]
diff --git a/scripts/ui.gd b/scripts/ui.gd
index c86509b..5867720 100644
--- a/scripts/ui.gd
+++ b/scripts/ui.gd
@@ -1,10 +1,16 @@
extends Control
+export var version: String = "1.0.0"
+
onready var character = preload("res://resources/character.tres")
onready var blank_accessory = preload("res://sprites/clothes/blank_top.png")
onready var base_top = preload("res://sprites/character_base_top.svg")
onready var base_bottom = preload("res://sprites/character_base_legs.svg")
+func _ready():
+ var verLabel = $versionLbl
+ verLabel.text = "v" + version
+
func _on_clearBtn_pressed():
$clear.play()
character.accessory = blank_accessory
diff --git a/scripts/wardrobe.gd b/scripts/wardrobe.gd
index 317cd62..3e2d94a 100644
--- a/scripts/wardrobe.gd
+++ b/scripts/wardrobe.gd
@@ -45,10 +45,8 @@ func check_for_dlc(dlc_pack):
# Lists the files in each of their respective directories
var shirts_dir = "res://scenes/dlc/shirts/"
var pants_dir = "res://scenes/dlc/pants/"
-# var undies_dir = "res://scenes/dlc/undies/"
var dlc_shirts = list_files_in_directory(shirts_dir)
var dlc_pants = list_files_in_directory(pants_dir)
-# var dlc_undies = list_files_in_directory(undies_dir)
# Make sure each file actually exist, instance them
# and add them to their respective tabs
@@ -63,15 +61,9 @@ func check_for_dlc(dlc_pack):
var init = load(pants_dir + pants).instance()
shirts_grid.add_child(init)
print_debug("Initialized: " + pants_dir + pants)
-
-# for undies in dlc_undies:
-# if dir.file_exists(undies_dir + undies):
-# var init = load(undies_dir + undies).instance()
-# shirts_grid.add_child(init)
-# print_debug("Initialized: " + undies_dir + undies)
func _ready():
-# check_for_dlc("testdlc.pck")
+ check_for_dlc("emojidlc.pck")
pass
func _on_removeAccessory_pressed():
diff --git a/sprites/character_base_head.svg b/sprites/character_base_head.svg
index 302a498..9908a7c 100644
--- a/sprites/character_base_head.svg
+++ b/sprites/character_base_head.svg
@@ -31,11 +31,11 @@
fit-margin-left="0"
fit-margin-top="0"
showgrid="false"
- inkscape:current-layer="layer3"
+ inkscape:current-layer="layer2"
inkscape:document-units="mm"
- inkscape:cy="144.59338"
- inkscape:cx="57.651847"
- inkscape:zoom="2.8"
+ inkscape:cy="116.76192"
+ inkscape:cx="99.955459"
+ inkscape:zoom="11.2"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
borderopacity="1.0"
@@ -50,7 +50,7 @@
image/svg+xml
-
+
@@ -72,10 +72,10 @@
d="m 12.756696,20.042186 c -3.0330485,3.485978 -6.9287479,8.842867 -10.6778266,9.780135 5.411336,2.216856 13.7737856,1.25077 18.6153276,-3.590773 -1.673498,-3.036966 -4.542199,-5.822302 -7.937501,-6.189362 z"
style="fill:#333333;fill-opacity:1;stroke:#000000;stroke-width:1.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
image/svg+xml
-
+
@@ -61,6 +61,7 @@
transform="translate(-113.05078,-148.95219)"
style="display:inline" />
-
-
-
-
-
-
-
-
-
-
-
-
-
+ inkscape:label="Layer 1"
+ id="layer1-0"
+ transform="translate(-48.000601,-87.118817)"
+ style="display:inline" />
+
+
+
+
+
+
+
+
diff --git a/sprites/clothes/atomic_shirt.png b/sprites/clothes/atomic_shirt.png
deleted file mode 100644
index 97f66c5..0000000
Binary files a/sprites/clothes/atomic_shirt.png and /dev/null differ
diff --git a/sprites/clothes/atomic_shirt.png.import b/sprites/clothes/atomic_shirt.png.import
deleted file mode 100644
index 5b2aab9..0000000
--- a/sprites/clothes/atomic_shirt.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/atomic_shirt.png-e1562af2eed6677399909eaf790f9e4c.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://sprites/clothes/atomic_shirt.png"
-dest_files=[ "res://.import/atomic_shirt.png-e1562af2eed6677399909eaf790f9e4c.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/atomic_shirt.svg b/sprites/clothes/atomic_shirt.svg
index 1c218f6..17d0688 100644
--- a/sprites/clothes/atomic_shirt.svg
+++ b/sprites/clothes/atomic_shirt.svg
@@ -1,6 +1,4 @@
-
-
diff --git a/sprites/clothes/beat_up_jeans.png b/sprites/clothes/beat_up_jeans.png
deleted file mode 100644
index 050a638..0000000
Binary files a/sprites/clothes/beat_up_jeans.png and /dev/null differ
diff --git a/sprites/clothes/biker_jacket.png b/sprites/clothes/biker_jacket.png
deleted file mode 100644
index de582e0..0000000
Binary files a/sprites/clothes/biker_jacket.png and /dev/null differ
diff --git a/sprites/clothes/biker_jacket.png.import b/sprites/clothes/biker_jacket.png.import
deleted file mode 100644
index 3a14972..0000000
--- a/sprites/clothes/biker_jacket.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/biker_jacket.png-49a94ec6ef89c92948186608cc0de2ea.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://sprites/clothes/biker_jacket.png"
-dest_files=[ "res://.import/biker_jacket.png-49a94ec6ef89c92948186608cc0de2ea.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/blue_camo_jeans.png b/sprites/clothes/blue_camo_jeans.png
deleted file mode 100644
index 404d7c8..0000000
Binary files a/sprites/clothes/blue_camo_jeans.png and /dev/null differ
diff --git a/sprites/clothes/blue_camo_jeans.png.import b/sprites/clothes/blue_camo_jeans.png.import
deleted file mode 100644
index 71206a9..0000000
--- a/sprites/clothes/blue_camo_jeans.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/blue_camo_jeans.png-5ecdedc43f67022a5b8fca3601587a75.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://sprites/clothes/blue_camo_jeans.png"
-dest_files=[ "res://.import/blue_camo_jeans.png-5ecdedc43f67022a5b8fca3601587a75.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/briefs.png b/sprites/clothes/briefs.png
deleted file mode 100644
index a768800..0000000
Binary files a/sprites/clothes/briefs.png and /dev/null differ
diff --git a/sprites/clothes/briefs.png.import b/sprites/clothes/briefs.png.import
deleted file mode 100644
index 8e8d687..0000000
--- a/sprites/clothes/briefs.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/briefs.png-f2fba0226797db266d542131d9f44a11.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://sprites/clothes/briefs.png"
-dest_files=[ "res://.import/briefs.png-f2fba0226797db266d542131d9f44a11.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/classic/briefs_classic.png b/sprites/clothes/classic/briefs_classic.png
deleted file mode 100644
index 9536ca1..0000000
Binary files a/sprites/clothes/classic/briefs_classic.png and /dev/null differ
diff --git a/sprites/clothes/classic/briefs_classic.png.import b/sprites/clothes/classic/briefs_classic.png.import
deleted file mode 100644
index 7121c87..0000000
--- a/sprites/clothes/classic/briefs_classic.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/briefs_classic.png-2ce669e823e59b371b99b2a937ab4263.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://sprites/clothes/classic/briefs_classic.png"
-dest_files=[ "res://.import/briefs_classic.png-2ce669e823e59b371b99b2a937ab4263.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/classic/camera_classic.png b/sprites/clothes/classic/camera_classic.png
deleted file mode 100644
index 9c38c7f..0000000
Binary files a/sprites/clothes/classic/camera_classic.png and /dev/null differ
diff --git a/sprites/clothes/classic/camera_classic.png.import b/sprites/clothes/classic/camera_classic.png.import
deleted file mode 100644
index 64c5f40..0000000
--- a/sprites/clothes/classic/camera_classic.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/camera_classic.png-390efe87cd947affce3f4778f00b583b.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://sprites/clothes/classic/camera_classic.png"
-dest_files=[ "res://.import/camera_classic.png-390efe87cd947affce3f4778f00b583b.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/classic/fundosi_classic.png b/sprites/clothes/classic/fundosi_classic.png
deleted file mode 100644
index 60b2ab6..0000000
Binary files a/sprites/clothes/classic/fundosi_classic.png and /dev/null differ
diff --git a/sprites/clothes/classic/fundosi_classic.png.import b/sprites/clothes/classic/fundosi_classic.png.import
deleted file mode 100644
index 5d8405d..0000000
--- a/sprites/clothes/classic/fundosi_classic.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/fundosi_classic.png-2471228693a783e3dc3309151fc92092.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://sprites/clothes/classic/fundosi_classic.png"
-dest_files=[ "res://.import/fundosi_classic.png-2471228693a783e3dc3309151fc92092.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/classic/owo_censor_classic.png b/sprites/clothes/classic/owo_censor_classic.png
deleted file mode 100644
index 532644a..0000000
Binary files a/sprites/clothes/classic/owo_censor_classic.png and /dev/null differ
diff --git a/sprites/clothes/classic/owo_censor_classic.png.import b/sprites/clothes/classic/owo_censor_classic.png.import
deleted file mode 100644
index 8f897d4..0000000
--- a/sprites/clothes/classic/owo_censor_classic.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/owo_censor_classic.png-1e98f07ed783bcc8b8f9ab01b6c21ef8.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://sprites/clothes/classic/owo_censor_classic.png"
-dest_files=[ "res://.import/owo_censor_classic.png-1e98f07ed783bcc8b8f9ab01b6c21ef8.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/classic/z_briefs_classic.png b/sprites/clothes/classic/z_briefs_classic.png
deleted file mode 100644
index 404a411..0000000
Binary files a/sprites/clothes/classic/z_briefs_classic.png and /dev/null differ
diff --git a/sprites/clothes/classic/z_briefs_classic.png.import b/sprites/clothes/classic/z_briefs_classic.png.import
deleted file mode 100644
index ac2e1c0..0000000
--- a/sprites/clothes/classic/z_briefs_classic.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/z_briefs_classic.png-10d3d58b4454e62be8efb64c0a2e448e.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://sprites/clothes/classic/z_briefs_classic.png"
-dest_files=[ "res://.import/z_briefs_classic.png-10d3d58b4454e62be8efb64c0a2e448e.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/dj_shorts.png b/sprites/clothes/dj_shorts.png
deleted file mode 100644
index 2873015..0000000
Binary files a/sprites/clothes/dj_shorts.png and /dev/null differ
diff --git a/sprites/clothes/dj_shorts.svg b/sprites/clothes/dj_shorts.svg
index 239008b..bd84649 100644
--- a/sprites/clothes/dj_shorts.svg
+++ b/sprites/clothes/dj_shorts.svg
@@ -7,13 +7,13 @@
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"
- inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
- sodipodi:docname="dj_shorts.svg"
- viewBox="0 0 113.25831 125.01931"
- height="125.01931"
- width="113.25831"
+ version="1.1"
id="svg815"
- version="1.1">
+ width="113.25831"
+ height="125.01931"
+ viewBox="0 0 113.25831 125.01931"
+ sodipodi:docname="dj_shorts.svg"
+ inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
@@ -22,162 +22,160 @@
image/svg+xml
-
+
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1920"
+ inkscape:window-height="1001"
+ id="namedview817"
+ showgrid="false"
+ inkscape:zoom="10.202541"
+ inkscape:cx="98.573183"
+ inkscape:cy="50.799978"
+ inkscape:window-x="-9"
+ inkscape:window-y="-9"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="layer2"
+ inkscape:pagecheckerboard="true"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:document-rotation="0" />
+ inkscape:label="Original"
+ transform="translate(7.6590499,-5.4233452)"
+ style="display:inline">
+ d="m 91.17402,5.5626896 c 0.46767,35.9439984 6.03109,49.1450874 3.39286,89.5714244 22.63588,28.809296 -20.65944,34.987876 -31.9643,6.785726 0,-18.695576 0.23222,-40.851826 0.17859,-59.464294 C 51.246889,59.756965 39.07726,86.078284 33.13831,107.09841 56.067895,141.49279 -1.914904,127.92508 -5.254547,107.8127 13.980845,84.138364 30.488695,35.572955 32.79579,5.9391683 56.132741,5.2425186 65.83986,5.7289896 91.17402,5.5626896 Z"
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4.53543;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ d="m 30.674024,8.169838 c -1.994154,9.574556 24.365212,24.613795 33.714286,30.178579 17.9205,-5.863786 26.66898,-15.930082 28.75,-28.928572 2.08102,-12.9984904 1.42857,85.714269 1.42857,85.714269 0,0 10.12468,15.999566 2.14286,21.785736 -7.98181,5.78617 -28.86863,-0.79571 -34.10716,-15.00001 -5.238522,-14.204306 1.78573,-63.571423 1.78573,-63.571423 l -31.25,68.749983 c 0,0 10.612785,15.78741 1.25,21.78573 -9.362786,5.99833 -44.611028,-14.148 -39.642857,-21.07143 12.328877,-17.180986 31.25,-69.374996 31.25,-69.374996 0,0 6.672726,-39.8424224 4.678571,-30.267866 z"
+ style="fill:#0276b1;fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ d="m 91.17402,5.5626896 c -0.19321,34.6047114 6.03109,49.1450834 3.39286,89.5714244 22.63587,28.809296 -20.65944,34.987866 -31.9643,6.785716 0,-18.695566 0.23222,-40.851816 0.17859,-59.464284 C 51.246889,59.756969 39.07726,86.078284 33.13831,107.0984 56.067895,141.49279 -1.914902,127.92508 -5.254548,107.81269 13.980845,84.138364 32.363696,32.090808 32.79579,5.9391683"
+ style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:4.53543;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ id="path3894" />
+ id="path3896" />
+ id="path3900"
+ sodipodi:nodetypes="ccccc" />
+ inkscape:label="Color"
+ transform="translate(7.055088,-3.8985927)">
-
+
-
+
-
+
-
+
+ id="path938-9"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csscc" />
+ inkscape:label="Re-ink"
+ style="display:inline"
+ transform="translate(7.055088,-3.8985927)">
-
+ sodipodi:nodetypes="ssscssszs" />
+ cx="66.488861"
+ cy="21.361532"
+ rx="7.6451545"
+ ry="5.6358509" />
+
-
+
-
+
-
+
+ id="path959-8"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="zcczz" />
diff --git a/sprites/clothes/formal_skirt.svg b/sprites/clothes/formal_skirt.svg
index cd0b278..9efb523 100644
--- a/sprites/clothes/formal_skirt.svg
+++ b/sprites/clothes/formal_skirt.svg
@@ -1,6 +1,4 @@
-
-
diff --git a/sprites/clothes/fullsnack_shirt.svg b/sprites/clothes/fullsnack_shirt.svg
new file mode 100644
index 0000000..0d66500
--- /dev/null
+++ b/sprites/clothes/fullsnack_shirt.svg
@@ -0,0 +1,261 @@
+
+
diff --git a/sprites/clothes/beat_up_jeans.png.import b/sprites/clothes/fullsnack_shirt.svg.import
similarity index 67%
rename from sprites/clothes/beat_up_jeans.png.import
rename to sprites/clothes/fullsnack_shirt.svg.import
index 91eb022..573a377 100644
--- a/sprites/clothes/beat_up_jeans.png.import
+++ b/sprites/clothes/fullsnack_shirt.svg.import
@@ -2,15 +2,15 @@
importer="texture"
type="StreamTexture"
-path="res://.import/beat_up_jeans.png-563d36a45fd402c2c8bee9ed9bcd86ff.stex"
+path="res://.import/fullsnack_shirt.svg-fe727b0ca40952cd32596f7250f1aa9d.stex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://sprites/clothes/beat_up_jeans.png"
-dest_files=[ "res://.import/beat_up_jeans.png-563d36a45fd402c2c8bee9ed9bcd86ff.stex" ]
+source_file="res://sprites/clothes/fullsnack_shirt.svg"
+dest_files=[ "res://.import/fullsnack_shirt.svg-fe727b0ca40952cd32596f7250f1aa9d.stex" ]
[params]
diff --git a/sprites/clothes/fundosi.png b/sprites/clothes/fundosi.png
deleted file mode 100644
index 98b1e33..0000000
Binary files a/sprites/clothes/fundosi.png and /dev/null differ
diff --git a/sprites/clothes/fundosi.png.import b/sprites/clothes/fundosi.png.import
deleted file mode 100644
index 9cc7aab..0000000
--- a/sprites/clothes/fundosi.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/fundosi.png-d90a95087bb6d0b75606acf5d41632c9.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://sprites/clothes/fundosi.png"
-dest_files=[ "res://.import/fundosi.png-d90a95087bb6d0b75606acf5d41632c9.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/icrazy_frame.png b/sprites/clothes/icrazy_frame.png
deleted file mode 100644
index ed3fd55..0000000
Binary files a/sprites/clothes/icrazy_frame.png and /dev/null differ
diff --git a/sprites/clothes/icrazy_frame.png.import b/sprites/clothes/icrazy_frame.png.import
deleted file mode 100644
index bdce86f..0000000
--- a/sprites/clothes/icrazy_frame.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/icrazy_frame.png-b5e146a49c044ebe70b5af8f2c06006d.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://sprites/clothes/icrazy_frame.png"
-dest_files=[ "res://.import/icrazy_frame.png-b5e146a49c044ebe70b5af8f2c06006d.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/jeans.png b/sprites/clothes/jeans.png
deleted file mode 100644
index 35b7b6f..0000000
Binary files a/sprites/clothes/jeans.png and /dev/null differ
diff --git a/sprites/clothes/jeans.png.import b/sprites/clothes/jeans.png.import
deleted file mode 100644
index d05ba53..0000000
--- a/sprites/clothes/jeans.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/jeans.png-cb872dec1c87d219bb56d373215c361d.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://sprites/clothes/jeans.png"
-dest_files=[ "res://.import/jeans.png-cb872dec1c87d219bb56d373215c361d.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/jeans.svg b/sprites/clothes/jeans.svg
index 3816eae..b574abc 100644
--- a/sprites/clothes/jeans.svg
+++ b/sprites/clothes/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="jeans.svg"
- inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
- id="svg2007"
+ width="29.456085mm"
+ height="34.453861mm"
+ viewBox="0 0 29.456086 34.453861"
version="1.1"
- viewBox="0 0 29.473656 34.394779"
- height="34.394779mm"
- width="29.473656mm">
+ id="svg2007"
+ inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+ sodipodi:docname="jeans.svg">
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="2.8"
+ inkscape:cx="55.33311"
+ inkscape:cy="80.173641"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:pagecheckerboard="true"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ showguides="false"
+ 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,89 +54,110 @@
+ id="layer1"
+ transform="translate(-113.83015,-134.49517)">
+ transform="translate(34.982358,0.41212184)"
+ id="layer1-7"
+ inkscape:label="Layer 1">
-
-
-
-
-
-
+ transform="translate(78.947411,133.03874)"
+ id="g865">
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+ inkscape:label="Re-ink"
+ transform="translate(-34.87092,-0.47851244)">
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sprites/clothes/old_sweatshirt.png b/sprites/clothes/old_sweatshirt.png
deleted file mode 100644
index e4114b5..0000000
Binary files a/sprites/clothes/old_sweatshirt.png and /dev/null differ
diff --git a/sprites/clothes/old_sweatshirt.png.import b/sprites/clothes/old_sweatshirt.png.import
deleted file mode 100644
index 46dcf83..0000000
--- a/sprites/clothes/old_sweatshirt.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/old_sweatshirt.png-dbf47e037ee1cc1a851f14c93ca3e55b.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://sprites/clothes/old_sweatshirt.png"
-dest_files=[ "res://.import/old_sweatshirt.png-dbf47e037ee1cc1a851f14c93ca3e55b.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/old_sweatshirt.svg b/sprites/clothes/old_sweatshirt.svg
index 26907ca..acdc82a 100644
--- a/sprites/clothes/old_sweatshirt.svg
+++ b/sprites/clothes/old_sweatshirt.svg
@@ -1,6 +1,4 @@
-
-
diff --git a/sprites/clothes/owo_censor.png b/sprites/clothes/owo_censor.png
deleted file mode 100644
index 03f0764..0000000
Binary files a/sprites/clothes/owo_censor.png and /dev/null differ
diff --git a/sprites/clothes/owo_censor.png.import b/sprites/clothes/owo_censor.png.import
deleted file mode 100644
index d9380be..0000000
--- a/sprites/clothes/owo_censor.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/owo_censor.png-2a498f144203dc5d2648b236b3ec8a4f.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://sprites/clothes/owo_censor.png"
-dest_files=[ "res://.import/owo_censor.png-2a498f144203dc5d2648b236b3ec8a4f.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/owo_censor.svg b/sprites/clothes/owo_censor.svg
index 31fcae8..2e80468 100644
--- a/sprites/clothes/owo_censor.svg
+++ b/sprites/clothes/owo_censor.svg
@@ -1,6 +1,4 @@
-
-
diff --git a/sprites/clothes/raw_shirt.png b/sprites/clothes/raw_shirt.png
deleted file mode 100644
index 3e32bd7..0000000
Binary files a/sprites/clothes/raw_shirt.png and /dev/null differ
diff --git a/sprites/clothes/raw_shirt.png.import b/sprites/clothes/raw_shirt.png.import
deleted file mode 100644
index 903751c..0000000
--- a/sprites/clothes/raw_shirt.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/raw_shirt.png-7da25ac67de42dedb246944fe382a09a.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://sprites/clothes/raw_shirt.png"
-dest_files=[ "res://.import/raw_shirt.png-7da25ac67de42dedb246944fe382a09a.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/raw_shirt.svg b/sprites/clothes/raw_shirt.svg
index 618fe67..e1ac227 100644
--- a/sprites/clothes/raw_shirt.svg
+++ b/sprites/clothes/raw_shirt.svg
@@ -1,6 +1,4 @@
-
-
+ sodipodi:nodetypes="csscczccc" />
diff --git a/sprites/clothes/retro_shirt.svg b/sprites/clothes/retro_shirt.svg
index 42351bb..4dcff76 100644
--- a/sprites/clothes/retro_shirt.svg
+++ b/sprites/clothes/retro_shirt.svg
@@ -7,39 +7,39 @@
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="retro_shirt.svg"
- inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
- id="svg8"
- version="1.1"
- viewBox="0 0 24.636646 29.835097"
+ width="24.636646mm"
height="29.835096mm"
- width="24.636646mm">
+ viewBox="0 0 24.636646 29.835097"
+ version="1.1"
+ id="svg8"
+ inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+ sodipodi:docname="retro_shirt.svg">
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.2"
+ inkscape:cx="57.951723"
+ inkscape:cy="16.861876"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:pagecheckerboard="true"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ 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-maximized="1"
+ inkscape:document-rotation="0" />
@@ -48,152 +48,145 @@
image/svg+xml
-
+
+ id="layer1"
+ transform="translate(-329.97283,-265.24728)"
+ style="display:inline">
+ transform="translate(329.97283,264.31884)">
+ id="layer1-0"
+ inkscape:label="Layer 1" />
+ transform="translate(-7.8954188,-28.530371)">
+ d="m 28.94971,30.372591 c 1.635877,2.807358 3.434163,11.019746 2.186079,19.813197 -0.03749,2.612124 -0.948812,7.588671 -0.948812,8.244208 0,0 -3.899134,0.09989 -7.229493,0.03625 -3.330358,-0.06364 -4.796869,0.06737 -8.216413,0.06336 0.02949,-1.657652 -5.3976359,-4.790926 -2.267857,-8.343822 0,-5.167442 -0.342243,-10.519109 0.47247,-15.449778 0.254528,-4.326972 4.855698,-2.933067 7.181548,-4.677457 2.923695,-0.409606 5.221022,-0.526781 8.822478,0.314042 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" />
+ d="m 16.725446,36.81488 c 0.260421,-2.556769 3.401786,-6.756331 3.401786,-6.756331 0,0 -3.924968,-0.245138 -5.293773,1.202229 -4.368124,4.618829 -2.360245,18.925011 -2.360245,18.925011 0,0 -4.5795761,2.614718 -4.1562481,4.060169 0.59027,2.01547 5.9800391,4.399895 6.4241051,2.696156 0.444066,-1.703739 1.28661,-13.276693 1.984375,-20.127234 z"
+ style="fill:#0276b1;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-
+ d="m 28.454828,29.974412 c -2.411571,0.04514 0.895384,3.690053 0.649336,8.446866 -0.246048,4.756813 2.173364,14.126862 2.173364,14.126862 0,0 2.178654,-16.525137 -1.476976,-21.955536 -0.567383,-0.842841 1.065847,-0.663335 -1.345724,-0.618192 z"
+ style="fill:#0276b1;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ id="layer2-2"
+ transform="translate(-7.8954188,-28.530371)">
+
+
-
-
+ d="m 29.104165,38.421279 c -0.654058,4.302781 1.087122,12.790482 1.082812,20.008717"
+ style="fill:none;stroke:#000000;stroke-width:1.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ inkscape:label="Re-ink"
+ transform="translate(-106.0295,-13.937037)"
+ style="display:inline">
-
+
-
+
-
+
+ id="path820"
+ inkscape:connector-curvature="0" />
+ id="path867"
+ inkscape:connector-curvature="0" />
-
+
+ id="path871"
+ inkscape:connector-curvature="0" />
+ id="path873"
+ inkscape:connector-curvature="0" />
+ id="path820-4"
+ inkscape:connector-curvature="0" />
-
+
+ id="path833"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="czc" />
diff --git a/sprites/clothes/skate_shirt.svg b/sprites/clothes/skate_shirt.svg
new file mode 100644
index 0000000..b8731b9
--- /dev/null
+++ b/sprites/clothes/skate_shirt.svg
@@ -0,0 +1,274 @@
+
+
diff --git a/sprites/clothes/dj_shorts.png.import b/sprites/clothes/skate_shirt.svg.import
similarity index 68%
rename from sprites/clothes/dj_shorts.png.import
rename to sprites/clothes/skate_shirt.svg.import
index 6cdc150..76634d6 100644
--- a/sprites/clothes/dj_shorts.png.import
+++ b/sprites/clothes/skate_shirt.svg.import
@@ -2,15 +2,15 @@
importer="texture"
type="StreamTexture"
-path="res://.import/dj_shorts.png-577f070e856586307ddbbd955ca04f3a.stex"
+path="res://.import/skate_shirt.svg-f6dd325cc91a89a1f7a63cf7771a25ab.stex"
metadata={
"vram_texture": false
}
[deps]
-source_file="res://sprites/clothes/dj_shorts.png"
-dest_files=[ "res://.import/dj_shorts.png-577f070e856586307ddbbd955ca04f3a.stex" ]
+source_file="res://sprites/clothes/skate_shirt.svg"
+dest_files=[ "res://.import/skate_shirt.svg-f6dd325cc91a89a1f7a63cf7771a25ab.stex" ]
[params]
diff --git a/sprites/clothes/sweat_pants.png b/sprites/clothes/sweat_pants.png
deleted file mode 100644
index daea1bf..0000000
Binary files a/sprites/clothes/sweat_pants.png and /dev/null differ
diff --git a/sprites/clothes/sweat_pants.png.import b/sprites/clothes/sweat_pants.png.import
deleted file mode 100644
index d1cb99f..0000000
--- a/sprites/clothes/sweat_pants.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/sweat_pants.png-d8ccfd16bd13d1a37fa594caf5da185b.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://sprites/clothes/sweat_pants.png"
-dest_files=[ "res://.import/sweat_pants.png-d8ccfd16bd13d1a37fa594caf5da185b.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/sweat_pants.svg b/sprites/clothes/sweat_pants.svg
index 2d5dcc5..1257ce8 100644
--- a/sprites/clothes/sweat_pants.svg
+++ b/sprites/clothes/sweat_pants.svg
@@ -1,6 +1,4 @@
-
-
diff --git a/sprites/clothes/train_hoodie.png b/sprites/clothes/train_hoodie.png
deleted file mode 100644
index d42ebc0..0000000
Binary files a/sprites/clothes/train_hoodie.png and /dev/null differ
diff --git a/sprites/clothes/train_hoodie.png.import b/sprites/clothes/train_hoodie.png.import
deleted file mode 100644
index ee97aca..0000000
--- a/sprites/clothes/train_hoodie.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/train_hoodie.png-ef75f26eae784b263936f7a14cf90b00.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://sprites/clothes/train_hoodie.png"
-dest_files=[ "res://.import/train_hoodie.png-ef75f26eae784b263936f7a14cf90b00.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/train_hoodie.svg b/sprites/clothes/train_hoodie.svg
index 3d8fa6d..0bc7b9c 100644
--- a/sprites/clothes/train_hoodie.svg
+++ b/sprites/clothes/train_hoodie.svg
@@ -1,6 +1,4 @@
-
-
+ style="display:inline"
+ transform="translate(6.0028667,-0.63918115)">
-
-
+ sodipodi:nodetypes="zccsscccsssz" />
+
+ style="opacity:1"
+ transform="matrix(0.29289323,0,0,0.29289322,71.420755,27.773676)"
+ id="g945">
+ fill="#a7a9ac"
+ d="m -41.62508,44.095025 h 32 l -11,-17 h -10 z"
+ id="path881" />
+ fill="#58595b"
+ d="m -38.62508,44.095025 h 26 l -10,-17 h -6 z"
+ id="path883" />
+ fill="#808285"
+ d="m -35.62508,44.095025 h 20 l -9,-17 h -2 z"
+ id="path885" />
+ fill="#a7a9ac"
+ d="m -15.62508,43.095025 a 1,1 0 0 1 -1,1 h -18 a 1,1 0 1 1 0,-2 h 18 a 1,1 0 0 1 1,1 z m -2,-4 a 1,1 0 0 1 -1,1 h -14 a 1,1 0 1 1 0,-2 h 14 a 1,1 0 0 1 1,1 z"
+ id="path887" />
+
+
+
+
+
+
+
diff --git a/sprites/clothes/whatsnew_shirt.png b/sprites/clothes/whatsnew_shirt.png
deleted file mode 100644
index 5b1c58d..0000000
Binary files a/sprites/clothes/whatsnew_shirt.png and /dev/null differ
diff --git a/sprites/clothes/whatsnew_shirt.png.import b/sprites/clothes/whatsnew_shirt.png.import
deleted file mode 100644
index 33c9815..0000000
--- a/sprites/clothes/whatsnew_shirt.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/whatsnew_shirt.png-42b2ca70dd4fab6afb076d118bf9155b.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://sprites/clothes/whatsnew_shirt.png"
-dest_files=[ "res://.import/whatsnew_shirt.png-42b2ca70dd4fab6afb076d118bf9155b.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/whatsnew_shirt.svg b/sprites/clothes/whatsnew_shirt.svg
index 30fb38a..2b47130 100644
--- a/sprites/clothes/whatsnew_shirt.svg
+++ b/sprites/clothes/whatsnew_shirt.svg
@@ -1,6 +1,4 @@
-
-