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/project.godot b/project.godot index 4bcd87a..e85e42e 100644 --- a/project.godot +++ b/project.godot @@ -34,8 +34,9 @@ gdscript/completion/autocomplete_setters_and_getters=true window/size/width=800 window/size/height=500 window/size/resizable=false +window/energy_saving/keep_screen_on=false mouse_cursor/custom_image="res://sprites/clothes/cursor.png" -window/stretch/mode="viewport" +window/stretch/mode="2d" window/stretch/aspect="keep" [gui] diff --git a/scenes/characterBase.tscn b/scenes/character_base.tscn similarity index 59% rename from scenes/characterBase.tscn rename to scenes/character_base.tscn index 1d473c9..7dd38d8 100644 --- a/scenes/characterBase.tscn +++ b/scenes/character_base.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=32 format=2] -[ext_resource path="res://scripts/characterBase.gd" type="Script" id=1] +[ext_resource path="res://sprites/character/shadow.svg" type="Texture" id=1] [ext_resource path="res://sprites/character/tail/tail0.svg" type="Texture" id=2] [ext_resource path="res://sprites/character/tail/tail1.svg" type="Texture" id=3] [ext_resource path="res://sprites/character/tail/tail2.svg" type="Texture" id=4] -[ext_resource path="res://sprites/character_base.svg" type="Texture" id=5] +[ext_resource path="res://sprites/character_base_legs.svg" type="Texture" id=5] [ext_resource path="res://sprites/character/eyes/eyes1.png" type="Texture" id=6] [ext_resource path="res://sprites/character/eyes/eyes2.png" type="Texture" id=7] [ext_resource path="res://sprites/character/eyes/eyes3.png" type="Texture" id=8] @@ -23,13 +23,40 @@ [ext_resource path="res://sprites/character/mouth/mouth9.png" type="Texture" id=21] [ext_resource path="res://sprites/character/mouth/mouth10.png" type="Texture" id=22] [ext_resource path="res://sprites/character/mouth/mouth12.png" type="Texture" id=23] -[ext_resource path="res://sprites/clothes/briefs.svg" type="Texture" id=24] -[ext_resource path="res://sprites/clothes/blank_bottom.png" type="Texture" id=25] +[ext_resource path="res://sprites/character_base_top.svg" 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] +[ext_resource path="res://sprites/character_base_head.svg" type="Texture" id=27] [ext_resource path="res://sprites/character/mouth/mouth11.png" type="Texture" id=28] -[sub_resource type="SpriteFrames" id=1] +[sub_resource type="GDScript" id=1] +script/source = "# Anthony Wilcox licenses this file to you under the MPL license. +# See the LICENSE file in the project root for more information. +extends Node2D + +onready var character = preload(\"res://resources/character.tres\") +onready var accessory = $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 + +# if character.underwear != null: +# underwear.texture = character.underwear + + if character.bottom != null: + bottom.texture = character.bottom + + if character.top != null: + top.texture = character.top +" + +[sub_resource type="SpriteFrames" id=4] animations = [ { "frames": [ ExtResource( 2 ), ExtResource( 3 ), ExtResource( 4 ) ], "loop": true, @@ -54,48 +81,51 @@ animations = [ { } ] [node name="characterBase" type="Node2D"] -script = ExtResource( 1 ) +position = Vector2( -19, -92 ) +script = SubResource( 1 ) -[node name="base" type="Node2D" parent="."] -position = Vector2( -103.897, -160.477 ) +[node name="shadow" type="Sprite" parent="."] +position = Vector2( 4.84271, 244.714 ) +texture = ExtResource( 1 ) -[node name="Tail" type="AnimatedSprite" parent="base"] -position = Vector2( 55.0701, 172.425 ) -frames = SubResource( 1 ) +[node name="body" type="Node2D" parent="."] +__meta__ = { +"_edit_lock_": true +} + +[node name="tail" type="AnimatedSprite" parent="body"] +position = Vector2( -33.7592, 99.4079 ) +scale = Vector2( 0.927713, 1 ) +frames = SubResource( 4 ) +playing = true + +[node name="legs" type="Sprite" parent="body"] +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( 10.6805, -25.1047 ) +texture = ExtResource( 27 ) + +[node name="eyes" type="AnimatedSprite" parent="body/head"] +position = Vector2( 17.6857, 4.22147 ) +frames = SubResource( 2 ) +frame = 3 +playing = true + +[node name="mouth" type="AnimatedSprite" parent="body/head"] +position = Vector2( 38.1195, 8.68453 ) +frames = SubResource( 3 ) frame = 2 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 ) - -[node name="Eyes" type="AnimatedSprite" parent="base"] -position = Vector2( 114.227, 63.9224 ) -frames = SubResource( 2 ) -playing = true - -[node name="Mouth" type="AnimatedSprite" parent="base"] -position = Vector2( 148.505, 68.0261 ) -frames = SubResource( 3 ) -frame = 7 -playing = true - -[node name="Undies" type="Sprite" parent="."] -position = Vector2( -17.3889, 95.818 ) -texture = ExtResource( 24 ) - -[node name="Bottom" type="Sprite" parent="."] -position = Vector2( -15.7094, 90.851 ) -texture = ExtResource( 25 ) - -[node name="Top" type="Sprite" parent="."] -position = Vector2( -7.53471, -0.0449677 ) -texture = ExtResource( 26 ) - -[node name="Accessory" type="Sprite" parent="."] -position = Vector2( -10.6723, -5.33797 ) +[node name="accessory" type="Sprite" parent="body"] +position = Vector2( 9.54095, 73.0832 ) texture = ExtResource( 26 ) +__meta__ = { +"_edit_lock_": true +} diff --git a/scenes/clothing/base/accessoryBase.tscn b/scenes/clothing/base/accessoryBase.tscn deleted file mode 100644 index d7e3746..0000000 --- a/scenes/clothing/base/accessoryBase.tscn +++ /dev/null @@ -1,8 +0,0 @@ -[gd_scene load_steps=3 format=2] - -[ext_resource path="res://scripts/clothing/accessoryBase.gd" type="Script" id=1] -[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=2] - -[node name="accessoryBase" instance=ExtResource( 2 )] -script = ExtResource( 1 ) -[connection signal="pressed" from="." to="." method="_on_accessory_pressed"] diff --git a/scenes/clothing/base/accessory_base.tscn b/scenes/clothing/base/accessory_base.tscn new file mode 100644 index 0000000..4ad8233 --- /dev/null +++ b/scenes/clothing/base/accessory_base.tscn @@ -0,0 +1,9 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://scenes/clothing/base/clothing_base.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/clothing/accessory_base.gd" type="Script" id=2] + + +[node name="accessoryBase" instance=ExtResource( 1 )] +script = ExtResource( 2 ) +[connection signal="pressed" from="." to="." method="_on_accessory_pressed"] diff --git a/scenes/clothing/base/bottomsBase.tscn b/scenes/clothing/base/bottoms_base.tscn similarity index 51% rename from scenes/clothing/base/bottomsBase.tscn rename to scenes/clothing/base/bottoms_base.tscn index 317ba4c..ea9c653 100644 --- a/scenes/clothing/base/bottomsBase.tscn +++ b/scenes/clothing/base/bottoms_base.tscn @@ -1,7 +1,9 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] -[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=2] +[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] + + [node name="bottomsBase" instance=ExtResource( 1 )] script = ExtResource( 2 ) diff --git a/scenes/clothing/base/baseClothing.tscn b/scenes/clothing/base/clothing_base.tscn similarity index 84% rename from scenes/clothing/base/baseClothing.tscn rename to scenes/clothing/base/clothing_base.tscn index d199229..8f28ed7 100644 --- a/scenes/clothing/base/baseClothing.tscn +++ b/scenes/clothing/base/clothing_base.tscn @@ -1,9 +1,8 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://scripts/clothing/baseClothing.gd" type="Script" id=1] +[ext_resource path="res://scripts/clothing/clothing_base.gd" type="Script" id=1] [ext_resource path="res://sounds/select_001.ogg" type="AudioStream" id=2] - [node name="baseClothing" type="TextureButton"] anchor_right = 1.0 anchor_bottom = 1.0 diff --git a/scenes/clothing/base/topsBase.tscn b/scenes/clothing/base/tops_base.tscn similarity index 51% rename from scenes/clothing/base/topsBase.tscn rename to scenes/clothing/base/tops_base.tscn index 10d750c..36d3053 100644 --- a/scenes/clothing/base/topsBase.tscn +++ b/scenes/clothing/base/tops_base.tscn @@ -1,7 +1,9 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] -[ext_resource path="res://scripts/clothing/topsBase.gd" type="Script" id=2] +[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] + + [node name="topsBase" instance=ExtResource( 1 )] script = ExtResource( 2 ) diff --git a/scenes/clothing/base/undiesBase.tscn b/scenes/clothing/base/undies_base.tscn similarity index 52% rename from scenes/clothing/base/undiesBase.tscn rename to scenes/clothing/base/undies_base.tscn index 569e1b8..74bba12 100644 --- a/scenes/clothing/base/undiesBase.tscn +++ b/scenes/clothing/base/undies_base.tscn @@ -1,7 +1,9 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://scripts/clothing/undiesBase.gd" type="Script" id=1] -[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=2] +[ext_resource path="res://scripts/clothing/undies_base.gd" type="Script" id=1] +[ext_resource path="res://scenes/clothing/base/clothing_base.tscn" type="PackedScene" id=2] + + [node name="baseClothing" instance=ExtResource( 2 )] script = ExtResource( 1 ) diff --git a/scenes/clothing/camera.tscn b/scenes/clothing/camera.tscn index 0209b39..104d91d 100644 --- a/scenes/clothing/camera.tscn +++ b/scenes/clothing/camera.tscn @@ -1,11 +1,12 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://scenes/clothing/base/accessoryBase.tscn" type="PackedScene" id=1] +[ext_resource path="res://scenes/clothing/base/accessory_base.tscn" type="PackedScene" id=1] [ext_resource path="res://sprites/clothes/camera.png" type="Texture" id=2] + [node name="camera" instance=ExtResource( 1 )] anchor_right = 0.0 anchor_bottom = 0.0 diff --git a/scenes/clothing/pants/beatUpJeans.tscn b/scenes/clothing/pants/beat_Jeans.tscn similarity index 63% rename from scenes/clothing/pants/beatUpJeans.tscn rename to scenes/clothing/pants/beat_Jeans.tscn index 2ed835b..01a233c 100644 --- a/scenes/clothing/pants/beatUpJeans.tscn +++ b/scenes/clothing/pants/beat_Jeans.tscn @@ -1,12 +1,9 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] -[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=2] +[ext_resource path="res://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/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/camoJeans.tscn b/scenes/clothing/pants/camoJeans.tscn index 38e32bf..6b529b3 100644 --- a/scenes/clothing/pants/camoJeans.tscn +++ b/scenes/clothing/pants/camoJeans.tscn @@ -1,8 +1,10 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://sprites/clothes/blue_camo_jeans.svg" type="Texture" id=1] -[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=2] -[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=3] +[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] + + diff --git a/scenes/clothing/pants/djShorts.tscn b/scenes/clothing/pants/djShorts.tscn deleted file mode 100644 index 1b2d46d..0000000 --- a/scenes/clothing/pants/djShorts.tscn +++ /dev/null @@ -1,13 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://sprites/clothes/dj_shorts.svg" type="Texture" id=1] -[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=2] -[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=3] - - - - -[node name="camoJeans" instance=ExtResource( 2 )] -texture_normal = ExtResource( 1 ) -script = ExtResource( 3 ) -[connection signal="pressed" from="." to="." method="_on_bottoms_pressed"] diff --git a/scenes/clothing/pants/dj_shorts.tscn b/scenes/clothing/pants/dj_shorts.tscn new file mode 100644 index 0000000..24a40bb --- /dev/null +++ b/scenes/clothing/pants/dj_shorts.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/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( 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 63% rename from scenes/clothing/pants/formalSkirt.tscn rename to scenes/clothing/pants/formal_skirt.tscn index 0f7d544..ceaeaac 100644 --- a/scenes/clothing/pants/formalSkirt.tscn +++ b/scenes/clothing/pants/formal_skirt.tscn @@ -1,10 +1,9 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] -[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=2] +[ext_resource path="res://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/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/pants/jeans.tscn b/scenes/clothing/pants/jeans.tscn index 8cc5610..74866cc 100644 --- a/scenes/clothing/pants/jeans.tscn +++ b/scenes/clothing/pants/jeans.tscn @@ -1,10 +1,12 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] -[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=2] +[ext_resource path="res://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/jeans.svg" type="Texture" id=3] + + [node name="jeans" instance=ExtResource( 1 )] texture_normal = ExtResource( 3 ) script = ExtResource( 2 ) diff --git a/scenes/clothing/pants/skirt.tscn b/scenes/clothing/pants/skirt.tscn index a8f64ab..d2c3d1d 100644 --- a/scenes/clothing/pants/skirt.tscn +++ b/scenes/clothing/pants/skirt.tscn @@ -1,10 +1,12 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] -[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=2] +[ext_resource path="res://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/blue_skirt.svg" type="Texture" id=3] + + [node name="skirt" instance=ExtResource( 1 )] texture_normal = ExtResource( 3 ) script = ExtResource( 2 ) diff --git a/scenes/clothing/pants/sweatPants.tscn b/scenes/clothing/pants/sweatPants.tscn index 1801a6c..d75ef84 100644 --- a/scenes/clothing/pants/sweatPants.tscn +++ b/scenes/clothing/pants/sweatPants.tscn @@ -1,8 +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] +[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] + + [node name="sweatPants" instance=ExtResource( 2 )] texture_normal = ExtResource( 1 ) diff --git a/scenes/clothing/tops/atomicShirt.tscn b/scenes/clothing/tops/atomic_shirt.tscn similarity index 63% rename from scenes/clothing/tops/atomicShirt.tscn rename to scenes/clothing/tops/atomic_shirt.tscn index 4c0e92d..041c664 100644 --- a/scenes/clothing/tops/atomicShirt.tscn +++ b/scenes/clothing/tops/atomic_shirt.tscn @@ -1,7 +1,7 @@ [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://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/atomic_shirt.svg" type="Texture" id=3] [node name="atomicShirt" instance=ExtResource( 1 )] diff --git a/scenes/clothing/tops/djShirt.tscn b/scenes/clothing/tops/dj_shirt.tscn similarity index 63% rename from scenes/clothing/tops/djShirt.tscn rename to scenes/clothing/tops/dj_shirt.tscn index bbe311d..ed902ba 100644 --- a/scenes/clothing/tops/djShirt.tscn +++ b/scenes/clothing/tops/dj_shirt.tscn @@ -1,7 +1,7 @@ [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://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/dj_shirt.png" type="Texture" id=3] [node name="djShirt" instance=ExtResource( 1 )] 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/kormShirt.tscn b/scenes/clothing/tops/korm_shirt.tscn similarity index 63% rename from scenes/clothing/tops/kormShirt.tscn rename to scenes/clothing/tops/korm_shirt.tscn index cf6fd0a..1f232c7 100644 --- a/scenes/clothing/tops/kormShirt.tscn +++ b/scenes/clothing/tops/korm_shirt.tscn @@ -1,7 +1,7 @@ [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://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/korm_shirt.png" type="Texture" id=3] [node name="kormShirt" instance=ExtResource( 1 )] diff --git a/scenes/clothing/tops/nlShirt.tscn b/scenes/clothing/tops/nl_shirt.tscn similarity index 63% rename from scenes/clothing/tops/nlShirt.tscn rename to scenes/clothing/tops/nl_shirt.tscn index 01173bd..de1dcaf 100644 --- a/scenes/clothing/tops/nlShirt.tscn +++ b/scenes/clothing/tops/nl_shirt.tscn @@ -1,7 +1,7 @@ [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://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/nl_jacket.png" type="Texture" id=3] [node name="nlShirt" instance=ExtResource( 1 )] diff --git a/scenes/clothing/tops/rawShirt.tscn b/scenes/clothing/tops/rawShirt.tscn index c976520..97b5837 100644 --- a/scenes/clothing/tops/rawShirt.tscn +++ b/scenes/clothing/tops/rawShirt.tscn @@ -1,9 +1,11 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] -[ext_resource path="res://scripts/clothing/topsBase.gd" type="Script" id=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/raw_shirt.svg" type="Texture" id=3] + + [node name="rawShirt" instance=ExtResource( 1 )] texture_normal = ExtResource( 3 ) script = ExtResource( 2 ) diff --git a/scenes/clothing/tops/retro_shirt.tscn b/scenes/clothing/tops/retro_shirt.tscn new file mode 100644 index 0000000..de1dcaf --- /dev/null +++ b/scenes/clothing/tops/retro_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/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/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/tops/whatsNewShirt.tscn b/scenes/clothing/tops/whatsnew_shirt.tscn similarity index 64% rename from scenes/clothing/tops/whatsNewShirt.tscn rename to scenes/clothing/tops/whatsnew_shirt.tscn index 4545551..2f23ea2 100644 --- a/scenes/clothing/tops/whatsNewShirt.tscn +++ b/scenes/clothing/tops/whatsnew_shirt.tscn @@ -1,7 +1,7 @@ [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://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/whatsnew_shirt.svg" type="Texture" id=3] [node name="whatsNewShirt" instance=ExtResource( 1 )] diff --git a/scenes/clothing/tops/zShirt.tscn b/scenes/clothing/tops/z_shirt.tscn similarity index 63% rename from scenes/clothing/tops/zShirt.tscn rename to scenes/clothing/tops/z_shirt.tscn index 3a1a23f..8266145 100644 --- a/scenes/clothing/tops/zShirt.tscn +++ b/scenes/clothing/tops/z_shirt.tscn @@ -1,7 +1,7 @@ [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://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/z_shirt.png" type="Texture" id=3] [node name="zShirt" instance=ExtResource( 1 )] diff --git a/scenes/clothing/undies/briefs.tscn b/scenes/clothing/undies/briefs.tscn index fde30e2..7e96b28 100644 --- a/scenes/clothing/undies/briefs.tscn +++ b/scenes/clothing/undies/briefs.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://sprites/clothes/briefs.svg" type="Texture" id=1] -[ext_resource path="res://scenes/clothing/base/undiesBase.tscn" type="PackedScene" id=2] +[ext_resource path="res://scenes/clothing/base/undies_base.tscn" type="PackedScene" id=2] + diff --git a/scenes/clothing/undies/fundosi.tscn b/scenes/clothing/undies/fundosi.tscn index 5a0ac93..e2cec05 100644 --- a/scenes/clothing/undies/fundosi.tscn +++ b/scenes/clothing/undies/fundosi.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://sprites/clothes/fundosi.svg" type="Texture" id=1] -[ext_resource path="res://scenes/clothing/base/undiesBase.tscn" type="PackedScene" id=2] +[ext_resource path="res://scenes/clothing/base/undies_base.tscn" type="PackedScene" id=2] + diff --git a/scenes/clothing/undies/zBriefs.tscn b/scenes/clothing/undies/z_briefs.tscn similarity index 68% rename from scenes/clothing/undies/zBriefs.tscn rename to scenes/clothing/undies/z_briefs.tscn index 2e8d6af..2419428 100644 --- a/scenes/clothing/undies/zBriefs.tscn +++ b/scenes/clothing/undies/z_briefs.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://sprites/clothes/z_briefs.svg" type="Texture" id=1] -[ext_resource path="res://scenes/clothing/base/undiesBase.tscn" type="PackedScene" id=2] +[ext_resource path="res://scenes/clothing/base/undies_base.tscn" type="PackedScene" id=2] + diff --git a/scenes/game.tscn b/scenes/game.tscn index 90967cf..99bfbed 100644 --- a/scenes/game.tscn +++ b/scenes/game.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=10 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://scenes/character_base.tscn" type="PackedScene" id=1] +[ext_resource path="res://sprites/world/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] @@ -28,7 +28,7 @@ position = Vector2( 35.118, -14.56 ) texture = ExtResource( 6 ) [node name="characterBase" parent="." instance=ExtResource( 1 )] -position = Vector2( 126.596, 319.219 ) +position = Vector2( 145.146, 205.536 ) [node name="ui" type="CanvasLayer" parent="."] @@ -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 64503e0..b42c813 100644 --- a/scenes/wardrobe.tscn +++ b/scenes/wardrobe.tscn @@ -1,25 +1,21 @@ -[gd_scene load_steps=21 format=2] +[gd_scene load_steps=17 format=2] [ext_resource path="res://scenes/clothing/camera.tscn" type="PackedScene" id=1] -[ext_resource path="res://scenes/clothing/undies/zBriefs.tscn" type="PackedScene" id=2] -[ext_resource path="res://scenes/clothing/pants/beatUpJeans.tscn" type="PackedScene" id=3] -[ext_resource path="res://scenes/clothing/pants/jeans.tscn" type="PackedScene" id=4] +[ext_resource path="res://sprites/clothes/retro_shirt.svg" type="Texture" id=2] +[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/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/whatsnew_shirt.tscn" type="PackedScene" id=10] +[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/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/tops/atomic_shirt.tscn" type="PackedScene" id=15] [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://scenes/clothing/tops/retro_shirt.tscn" type="PackedScene" id=18] [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 @@ -57,62 +53,54 @@ size_flags_vertical = 3 columns = 4 [node name="removePants" type="TextureButton" parent="Pants/PantsScroll/PantsGrid"] -margin_right = 106.0 -margin_bottom = 112.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 = 216.0 -margin_bottom = 112.0 - -[node name="jeans" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 4 )] -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_left = 220.0 -margin_right = 326.0 -margin_bottom = 112.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 = 330.0 -margin_right = 436.0 -margin_bottom = 112.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 = 116.0 -margin_right = 106.0 -margin_bottom = 228.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 = 116.0 -margin_right = 216.0 -margin_bottom = 228.0 +margin_top = 132.0 +margin_right = 113.0 +margin_bottom = 258.0 [node name="formalSkirt" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 6 )] anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 220.0 -margin_top = 116.0 -margin_right = 326.0 -margin_bottom = 228.0 +margin_left = 117.0 +margin_top = 132.0 +margin_right = 227.0 +margin_bottom = 258.0 [node name="skirt" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 5 )] anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 330.0 -margin_top = 116.0 -margin_right = 436.0 -margin_bottom = 228.0 +margin_left = 231.0 +margin_top = 132.0 +margin_right = 342.0 +margin_bottom = 258.0 [node name="Shirts" type="Tabs" parent="."] visible = false @@ -137,84 +125,55 @@ 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 = 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_right = 106.0 -margin_bottom = 115.0 - -[node name="kormShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 13 )] +[node name="atomicShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 15 )] anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 110.0 margin_right = 216.0 -margin_bottom = 115.0 +margin_bottom = 113.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="skateShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 4 )] anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 220.0 margin_right = 326.0 -margin_bottom = 115.0 +margin_bottom = 113.0 -[node name="zShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 11 )] +[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 = 115.0 +margin_bottom = 113.0 + +[node name="rawShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 12 )] +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_top = 117.0 +margin_right = 106.0 +margin_bottom = 229.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="Underwear" type="Tabs" parent="."] -visible = false -anchor_right = 1.0 -anchor_bottom = 1.0 -margin_left = 5.0 -margin_top = 40.0 -margin_right = -5.0 -margin_bottom = -10.0 - -[node name="UndiesScroll" type="ScrollContainer" parent="Underwear"] -anchor_right = 1.0 -anchor_bottom = 1.0 - -[node name="UndiesGrid" type="GridContainer" parent="Underwear/UndiesScroll"] -margin_right = 790.0 -margin_bottom = 450.0 -size_flags_horizontal = 3 -size_flags_vertical = 3 -columns = 3 - -[node name="fundosi" parent="Underwear/UndiesScroll/UndiesGrid" instance=ExtResource( 22 )] -margin_right = 106.0 -margin_bottom = 112.0 - -[node name="zBriefs" parent="Underwear/UndiesScroll/UndiesGrid" instance=ExtResource( 2 )] -margin_left = 110.0 -margin_right = 216.0 -margin_bottom = 112.0 - -[node name="briefs" parent="Underwear/UndiesScroll/UndiesGrid" instance=ExtResource( 20 )] margin_left = 220.0 +margin_top = 117.0 margin_right = 326.0 -margin_bottom = 112.0 +margin_bottom = 229.0 + +[node name="retroShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 18 )] +anchor_right = 0.0 +anchor_bottom = 0.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="."] visible = false @@ -239,13 +198,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/characterBase.gd b/scripts/character_base.gd similarity index 100% rename from scripts/characterBase.gd rename to scripts/character_base.gd diff --git a/scripts/clothing/accessoryBase.gd b/scripts/clothing/accessory_base.gd similarity index 62% rename from scripts/clothing/accessoryBase.gd rename to scripts/clothing/accessory_base.gd index 043eb9a..d2102c7 100644 --- a/scripts/clothing/accessoryBase.gd +++ b/scripts/clothing/accessory_base.gd @@ -1,4 +1,4 @@ -extends "res://scripts/clothing/baseClothing.gd" +extends "res://scripts/clothing/clothing_base.gd" func _on_accessory_pressed(): character.accessory = texture_normal diff --git a/scripts/clothing/bottomsBase.gd b/scripts/clothing/bottoms_base.gd similarity index 61% rename from scripts/clothing/bottomsBase.gd rename to scripts/clothing/bottoms_base.gd index 35d7929..db36aca 100644 --- a/scripts/clothing/bottomsBase.gd +++ b/scripts/clothing/bottoms_base.gd @@ -1,4 +1,4 @@ -extends "res://scripts/clothing/baseClothing.gd" +extends "res://scripts/clothing/clothing_base.gd" func _on_bottoms_pressed(): character.bottom = texture_normal diff --git a/scripts/clothing/baseClothing.gd b/scripts/clothing/clothing_base.gd similarity index 100% rename from scripts/clothing/baseClothing.gd rename to scripts/clothing/clothing_base.gd diff --git a/scripts/clothing/topsBase.gd b/scripts/clothing/tops_base.gd similarity index 59% rename from scripts/clothing/topsBase.gd rename to scripts/clothing/tops_base.gd index 3500f76..88bcff2 100644 --- a/scripts/clothing/topsBase.gd +++ b/scripts/clothing/tops_base.gd @@ -1,4 +1,4 @@ -extends "res://scripts/clothing/baseClothing.gd" +extends "res://scripts/clothing/clothing_base.gd" func _on_tops_pressed(): character.top = texture_normal diff --git a/scripts/clothing/undiesBase.gd b/scripts/clothing/undies_base.gd similarity index 62% rename from scripts/clothing/undiesBase.gd rename to scripts/clothing/undies_base.gd index 66a174e..4f96176 100644 --- a/scripts/clothing/undiesBase.gd +++ b/scripts/clothing/undies_base.gd @@ -1,4 +1,4 @@ -extends "res://scripts/clothing/baseClothing.gd" +extends "res://scripts/clothing/clothing_base.gd" func _on_undies_pressed(): character.underwear = texture_normal diff --git a/scripts/game_info.gd b/scripts/game_info.gd new file mode 100644 index 0000000..1eccaec --- /dev/null +++ b/scripts/game_info.gd @@ -0,0 +1,16 @@ +extends Node + + +# Declare member variables here. Examples: +# var a = 2 +# var b = "text" + + +# Called when the node enters the scene tree for the first time. +func _ready(): + pass # Replace with function body. + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +#func _process(delta): +# pass diff --git a/scripts/ui.gd b/scripts/ui.gd index f9d17e1..5867720 100644 --- a/scripts/ui.gd +++ b/scripts/ui.gd @@ -1,12 +1,18 @@ -tool extends Control +export var version: String = "1.0.0" + 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") +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_top - character.bottom = blank_bottom - character.top = blank_top + character.accessory = blank_accessory + character.bottom = base_bottom + character.top = base_top diff --git a/scripts/wardrobe.gd b/scripts/wardrobe.gd index 4741a96..3e2d94a 100644 --- a/scripts/wardrobe.gd +++ b/scripts/wardrobe.gd @@ -1,12 +1,13 @@ extends TabContainer onready var character = preload("res://resources/character.tres") -onready var blank_top = preload("res://sprites/clothes/blank_top.png") -onready var blank_bottom = preload("res://sprites/clothes/blank_bottom.png") +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") onready var pants_grid = $Pants/PantsScroll/PantsGrid onready var shirts_grid = $Shirts/ShirtsScroll/ShirtsGrid -onready var undies_grid = $Underwear/UndiesScroll/UndiesGrid +#onready var undies_grid = $Underwear/UndiesScroll/UndiesGrid onready var accs_grid = $Accessoires/AccsScroll/AccsGrid func list_files_in_directory(path): @@ -44,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 @@ -62,22 +61,16 @@ 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(): - character.accessory = blank_top + character.accessory = blank_accessory func _on_removePants_pressed(): - character.bottom = blank_bottom + character.bottom = base_bottom func _on_removeShirt_pressed(): - character.top = blank_top + character.top = base_top diff --git a/sprites/character_base.svg b/sprites/character_base.svg index 925e51f..8de1b63 100644 --- a/sprites/character_base.svg +++ b/sprites/character_base.svg @@ -1,6 +1,4 @@ - - + version="1.1" + viewBox="0 0 43.377262 37.227165" + height="37.227165mm" + width="43.377262mm"> + inkscape:pagecheckerboard="true" + fit-margin-bottom="0" + fit-margin-right="0" + fit-margin-left="0" + fit-margin-top="0" + showgrid="false" + inkscape:current-layer="layer2" + inkscape:document-units="mm" + inkscape:cy="121.24583" + inkscape:cx="93.607727" + inkscape:zoom="2.8" + inkscape:pageshadow="2" + inkscape:pageopacity="0.0" + borderopacity="1.0" + bordercolor="#666666" + pagecolor="#ffffff" + id="base" /> @@ -51,149 +50,115 @@ image/svg+xml - + - + + inkscape:groupmode="layer"> + 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" /> + d="m 34.726561,20.939881 c 1.424506,0.409095 2.905617,0.519717 4.441219,0.519717 -0.631436,0.891699 -1.802839,1.33673 -2.834817,1.795387 0.679627,2.000634 1.918615,4.085352 2.55134,6.236608 -0.196308,-1.699022 -1.726382,-2.566554 -2.976563,-3.449034 -1.289203,1.845106 -2.413179,3.349977 -4.441222,4.110492 -0.02396,-1.807178 -0.561611,-3.490928 -2.102492,-4.464845 -1.266898,0.154353 -2.719548,0.200395 -2.62221,1.063057 0.225306,1.996779 1.707495,3.473391 3.168393,4.548419 2.475619,10.439903 -17.224345,5.695069 -9.782977,-1.241126 2.338792,-1.754093 0.344395,-5.168508 -2.315104,-4.346726 -1.654478,0.194645 -1.540993,1.586536 -1.417411,3.023812 -1.143466,-0.96755 -1.993973,-1.935806 -2.315104,-3.449035 -0.922523,0.41001 -1.163668,0.859591 -1.464658,1.937128 -0.205894,-1.750106 0.388371,-3.429513 1.228423,-4.960938 -0.815374,-0.582409 -1.342158,-1.351465 -2.078869,-2.078869 1.223677,0.71981 2.536848,1.181155 3.96875,1.181176 8.399753,-4.993925 13.806413,-4.295882 18.993302,-0.425223 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 31.513766,4.4697399 33.171594,0.92059932 36.191219,5.9184807 Z" + style="fill:#0276b1;fill-opacity:1;stroke:none;stroke-width:1.42187;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 15.733259,21.365104 c 8.031531,-1.988559 12.40585,-4.181396 18.993303,-0.425223 4.457472,-16.6670615 -22.644325,-7.978795 -21.296268,-1.23851 0.0953,0.476477 1.928934,1.360996 2.302965,1.663733" + style="fill:#0276b1;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + d="M 12.756695,20.042186 C 18.416439,16.062161 25.70522,12.477728 32.978422,13.285862 32.369584,9.9866232 33.699225,7.6646882 36.19122,6.1988082 29.207101,0.4402425 18.893463,6.8361942 13.370906,11.25424 c -0.378768,2.73809 -0.978309,7.149508 -0.614211,8.787946 z" + style="fill:#6699cc;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 24.993675,13.852831 C 23.111329,11.112846 22.776665,7.1008422 24.899181,4.5924141 28.443308,3.5516118 32.34615,3.7638575 35.151786,5.8680839 34.290793,8.2025937 31.848954,10.704232 32.978422,13.285862" + style="fill:#333333;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> - + id="path5045" + d="m 32.97842,13.285862 c -1.622684,-1.035005 -4.693573,-0.02406 -6.709075,0.0945" + style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + + d="M 15.537908,8.9384397 C 13.980201,6.756896 10.705056,5.0717367 8.3808294,3.6521391 8.0327779,4.6634621 8.1572432,5.7312218 8.0376818,6.7672806 8.4787557,6.6562752 8.5984797,6.227326 8.8710403,5.9648957 8.9919797,7.3299488 9.1194496,8.5491118 9.7534199,9.6936258 10.049714,9.24812 10.142439,8.5379754 10.341673,7.9944576 c 0.285982,1.3580005 0.172484,2.8610974 0.392168,4.2007214 0.248875,-0.839177 0.348466,-1.693489 0.588254,-2.5015532 1.028074,0.8901012 1.251834,2.2544372 1.715738,3.4455352 0.08118,-1.814112 1.504476,-2.893544 2.500075,-4.2007213 z" + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.509042;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + inkscape:label="Re-ink" + id="layer2" + inkscape:groupmode="layer"> + d="m 31.324776,3.8055155 c 0,0 1.628858,-3.7746833 2.315104,-2.93216171 2.908313,3.57061041 2.551339,5.04512691 2.551339,5.04512691" + style="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" /> + d="m 34.726562,20.939881 c 1.424506,0.409095 2.905615,0.519717 4.441219,0.519717 -0.631435,0.891699 -1.802841,1.33673 -2.83482,1.795387 0.679627,2.000634 1.918617,4.085351 2.55134,6.236607 -0.196308,-1.69902 -1.726382,-2.566552 -2.976563,-3.449033 -1.289202,1.845105 -2.41318,3.349976 -4.44122,4.110491 -0.02396,-1.807178 -0.561611,-3.490926 -2.102492,-4.464844 -1.266898,0.154353 -2.347681,0.239471 -2.62221,1.063059 -0.342642,1.027925 -0.123795,3.337174 2.207894,3.621326 m -8.822478,-0.314035 c 2.922238,-0.08554 0.344395,-5.168508 -2.315104,-4.346726 -1.654478,0.194645 -1.540993,1.586537 -1.417411,3.02381 -1.143466,-0.967549 -1.993973,-1.935805 -2.315104,-3.449033 -0.922523,0.41001 -1.163668,0.859591 -1.464658,1.937128 -0.205894,-1.750106 0.388371,-3.429513 1.228423,-4.960938 -0.815374,-0.582409 -1.342158,-1.351465 -2.078869,-2.078869 1.223677,0.71981 2.536848,1.181155 3.96875,1.181176" + 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" /> + d="M 12.756696,20.042186 C 18.41644,16.062161 25.705221,12.477728 32.978422,13.285862 32.369584,9.9866232 33.699225,7.6646882 36.19122,6.1988086 29.207102,0.4402425 18.893464,6.8361949 13.370907,11.25424 c -0.378768,2.73809 -0.978309,7.149508 -0.614211,8.787946 z" + style="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" /> + d="m 25.088169,19.569717 c 1.190156,-0.763595 2.367736,-0.865038 3.449032,0 -0.218392,0.862046 -0.809812,1.244368 -1.464656,1.653646 -0.887893,-0.606787 -1.473948,-1.058147 -1.984376,-1.653646 z" + style="fill:#ff99cc;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - - + - + d="M 23.765253,4.4979163 23.623512,2.4662944 26.836309,2.4190474 V 3.836458 Z" + style="fill:#6699cc;fill-opacity:1;stroke:#000000;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="M 12.757044,20.045314 C 8.5429472,14.783337 6.1354862,7.5554427 6.1354862,0.80142861 11.351958,1.2722088 15.093613,5.0085232 18.952931,7.8743621" + style="fill:none;stroke:#000000;stroke-width:1.18376;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> diff --git a/sprites/character_base_head.svg b/sprites/character_base_head.svg new file mode 100644 index 0000000..9908a7c --- /dev/null +++ b/sprites/character_base_head.svg @@ -0,0 +1,163 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sprites/character_base_head.svg.import b/sprites/character_base_head.svg.import new file mode 100644 index 0000000..77dc463 --- /dev/null +++ b/sprites/character_base_head.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="StreamTexture" +path.s3tc="res://.import/character_base_head.svg-676d46367d94a199498d7bd1637f2751.s3tc.stex" +path.etc2="res://.import/character_base_head.svg-676d46367d94a199498d7bd1637f2751.etc2.stex" +path.etc="res://.import/character_base_head.svg-676d46367d94a199498d7bd1637f2751.etc.stex" +metadata={ +"imported_formats": [ "s3tc", "etc2", "etc" ], +"vram_texture": true +} + +[deps] + +source_file="res://sprites/character_base_head.svg" +dest_files=[ "res://.import/character_base_head.svg-676d46367d94a199498d7bd1637f2751.s3tc.stex", "res://.import/character_base_head.svg-676d46367d94a199498d7bd1637f2751.etc2.stex", "res://.import/character_base_head.svg-676d46367d94a199498d7bd1637f2751.etc.stex" ] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=true +flags/filter=true +flags/mipmaps=true +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/character_base_legs.svg b/sprites/character_base_legs.svg new file mode 100644 index 0000000..dc7080c --- /dev/null +++ b/sprites/character_base_legs.svg @@ -0,0 +1,94 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/sprites/character_base_legs.svg.import b/sprites/character_base_legs.svg.import new file mode 100644 index 0000000..bd1dfd2 --- /dev/null +++ b/sprites/character_base_legs.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="StreamTexture" +path.s3tc="res://.import/character_base_legs.svg-4cf4e66a310067e682001fe7afdf827b.s3tc.stex" +path.etc2="res://.import/character_base_legs.svg-4cf4e66a310067e682001fe7afdf827b.etc2.stex" +path.etc="res://.import/character_base_legs.svg-4cf4e66a310067e682001fe7afdf827b.etc.stex" +metadata={ +"imported_formats": [ "s3tc", "etc2", "etc" ], +"vram_texture": true +} + +[deps] + +source_file="res://sprites/character_base_legs.svg" +dest_files=[ "res://.import/character_base_legs.svg-4cf4e66a310067e682001fe7afdf827b.s3tc.stex", "res://.import/character_base_legs.svg-4cf4e66a310067e682001fe7afdf827b.etc2.stex", "res://.import/character_base_legs.svg-4cf4e66a310067e682001fe7afdf827b.etc.stex" ] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=true +flags/filter=true +flags/mipmaps=true +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/character_base_top.svg b/sprites/character_base_top.svg new file mode 100644 index 0000000..cfc662f --- /dev/null +++ b/sprites/character_base_top.svg @@ -0,0 +1,128 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/sprites/character_base_top.svg.import b/sprites/character_base_top.svg.import new file mode 100644 index 0000000..5360e10 --- /dev/null +++ b/sprites/character_base_top.svg.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="StreamTexture" +path.s3tc="res://.import/character_base_top.svg-9f8e94d783c70eb7b043560add3bb9e3.s3tc.stex" +path.etc2="res://.import/character_base_top.svg-9f8e94d783c70eb7b043560add3bb9e3.etc2.stex" +path.etc="res://.import/character_base_top.svg-9f8e94d783c70eb7b043560add3bb9e3.etc.stex" +metadata={ +"imported_formats": [ "s3tc", "etc2", "etc" ], +"vram_texture": true +} + +[deps] + +source_file="res://sprites/character_base_top.svg" +dest_files=[ "res://.import/character_base_top.svg-9f8e94d783c70eb7b043560add3bb9e3.s3tc.stex", "res://.import/character_base_top.svg-9f8e94d783c70eb7b043560add3bb9e3.etc2.stex", "res://.import/character_base_top.svg-9f8e94d783c70eb7b043560add3bb9e3.etc.stex" ] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=true +flags/filter=true +flags/mipmaps=true +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.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.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 @@ - - + version="1.1" + viewBox="0 0 24.504625 30.060329" + height="30.060329mm" + width="24.504625mm"> + inkscape:window-x="-9" + inkscape:window-height="1001" + inkscape:window-width="1920" + fit-margin-bottom="0" + fit-margin-right="0" + fit-margin-left="0" + fit-margin-top="0" + inkscape:pagecheckerboard="true" + showgrid="false" + inkscape:current-layer="layer2" + inkscape:document-units="mm" + inkscape:cy="34.344389" + inkscape:cx="145.69655" + inkscape:zoom="3.959798" + inkscape:pageshadow="2" + inkscape:pageopacity="0.0" + borderopacity="1.0" + bordercolor="#666666" + pagecolor="#ffffff" + id="base" /> @@ -54,68 +53,117 @@ - + inkscape:label="Layer 1"> + id="path831-5" + d="m 350.69639,265.92482 c 1.63588,2.80736 3.43416,11.01975 2.18608,19.8132 -0.0375,2.61212 -0.94881,7.58867 -0.94881,8.24421 0,0 -3.89914,0.0999 -7.2295,0.0362 -3.33035,-0.0636 -4.79686,0.0674 -8.21641,0.0634 0.0295,-1.65765 -5.39763,-4.79092 -2.26786,-8.34382 0,-5.16744 -0.34224,-10.51911 0.47247,-15.44977 0.25453,-4.32698 4.8557,-2.93307 7.18155,-4.67746 3.8278,-0.36395 5.98366,0.0936 8.82248,0.31404 z" + style="display:inline;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="path847" + d="m 338.47213,272.36711 c 0.26042,-2.55677 3.98794,-6.62318 3.98794,-6.62318 0,0 -4.51113,-0.37829 -5.87993,1.06908 -4.36812,4.61883 -2.36025,18.92501 -2.36025,18.92501 0,0 -4.57957,2.61472 -4.15624,4.06017 0.59027,2.01547 5.98004,4.39989 6.4241,2.69615 0.44407,-1.70374 1.28661,-13.27669 1.98438,-20.12723 z" + style="display:inline;fill:#0276b1;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + id="path853" + d="m 349.6936,265.86682 c 0.39735,2.61717 0.69699,4.97725 0.63753,8.10669 -0.0787,4.14023 1.86626,13.48902 1.86626,13.48902 0.7398,0.17378 1.25204,-13.01655 1.25204,-13.01655 l -2.75304,-8.52116 c 0,0 -0.26235,-0.11435 -1.00279,-0.058 z" + style="display:inline;fill:#0276b1;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + + + + + + + + + + + + cx="121.36296" + cy="28.401752" + rx="0.95214766" + ry="0.96885204" /> + cx="121.26273" + cy="28.26812" + rx="2.358217" + ry="5.8494253" /> - + + cx="103.66148" + cy="-68.645317" + rx="2.3582172" + ry="5.8494253" + transform="rotate(46.575687)" /> 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/beat_up_jeans.svg b/sprites/clothes/beat_up_jeans.svg index 88d4402..11d9ae3 100644 --- a/sprites/clothes/beat_up_jeans.svg +++ b/sprites/clothes/beat_up_jeans.svg @@ -1,6 +1,4 @@ - - @@ -25,23 +23,24 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="7.9195959" - inkscape:cx="60.844989" - inkscape:cy="64.009018" + inkscape:zoom="5.6" + inkscape:cx="80.629541" + inkscape:cy="69.57743" inkscape:document-units="mm" - inkscape:current-layer="layer2" + 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="false" + showguides="true" inkscape:window-width="1920" inkscape:window-height="1001" inkscape:window-x="-9" inkscape:window-y="-9" - inkscape:window-maximized="1" /> + inkscape:window-maximized="1" + inkscape:document-rotation="0" /> @@ -50,64 +49,85 @@ image/svg+xml - + + transform="translate(-79.069227,-132.62721)"> + + + + + transform="translate(-0.10999844,1.3894499)"> + inkscape:label="Re-ink" + transform="translate(-0.10999844,1.3894499)"> 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/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/blue_camo_jeans.svg b/sprites/clothes/blue_camo_jeans.svg index 0835ead..70d6ae1 100644 --- a/sprites/clothes/blue_camo_jeans.svg +++ b/sprites/clothes/blue_camo_jeans.svg @@ -1,6 +1,4 @@ - - + version="1.1" + viewBox="0 0 29.433051 33.900688" + height="33.900688mm" + width="29.43305mm"> + inkscape:window-y="-9" + inkscape:window-x="-9" + inkscape:window-height="1001" + inkscape:window-width="1920" + showguides="false" + fit-margin-bottom="0" + fit-margin-right="0" + fit-margin-left="0" + fit-margin-top="0" + inkscape:pagecheckerboard="true" + showgrid="false" + inkscape:current-layer="layer2" + inkscape:document-units="mm" + inkscape:cy="89.706083" + inkscape:cx="44.629081" + inkscape:zoom="11.2" + inkscape:pageshadow="2" + inkscape:pageopacity="0.0" + borderopacity="1.0" + bordercolor="#666666" + pagecolor="#ffffff" + id="base" /> @@ -56,144 +55,175 @@ + + + + + + inkscape:label="Re-ink" + id="layer2" + inkscape:groupmode="layer"> + - - - - - - - - - - - + d="m 6.6696771,10.380127 c 0.555092,0.34611 -0.045033,1.435245 0.2650641,1.933682 0.3849519,0.618756 2.1553051,0.01525 2.5155576,0.594295 1.8137462,2.915341 -2.8020927,3.025838 -4.2752348,2.173941" + style="fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + id="path2614" + d="m 14.690229,15.159541 c -1.261278,0.690392 -2.454935,-0.238953 -3.691994,-0.04944 -1.0128301,0.155164 -0.0832,3.775604 1.738496,2.61356" + style="fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:0.162872px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + id="path2571" + d="m 16.757856,13.131431 c 0,0 1.224964,-2.018981 1.408762,-3.8408618 C 18.350416,7.4686881 17.945843,2.346381 17.945843,2.346381" + style="fill:none;stroke:#000000;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + + + d="m 4.3549494,16.7188 c 1.9063217,-0.2863 1.5090357,1.029299 2.489173,2.190433 0.4953766,0.586856 1.6589461,0.337648 2.0657263,0.750621 0.1188447,0.120654 0.062478,1.006279 -0.00884,1.16927 -1.1885021,2.716303 -4.2612352,0.731942 -5.9764509,-0.512891" + style="fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + + + + + + + + + d="m 1.8511145,22.951154 c 5.152952,2.306146 0.2634372,5.23501 -1.77201905,2.842573" + style="fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + d="M 0.11517487,25.625025 C 2.5661966,26.029741 4.5580555,25.821581 6.793171,25.244415" + style="fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + id="path2632" + d="m 24.788185,24.696638 c -4.969457,-3.085242 -5.170693,-1.438702 -6.013668,2.356414 2.280802,0.46697 5.657381,-0.284347 6.013668,-2.356414 z" + style="fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + d="m 17.182794,25.52973 c 2.40185,0.452026 4.693937,1.025831 6.781632,-0.442007" + style="fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + id="path2604" + inkscape:connector-curvature="0" /> + cx="17.472746" + cy="7.3664403" + rx="0.25056517" + ry="0.28397387" /> + id="path2606" + inkscape:connector-curvature="0" /> + cx="22.367119" + cy="6.3808842" + rx="0.25056517" + ry="0.28397387" /> diff --git a/sprites/clothes/blue_skirt.svg b/sprites/clothes/blue_skirt.svg index f9ecf46..08060bd 100644 --- a/sprites/clothes/blue_skirt.svg +++ b/sprites/clothes/blue_skirt.svg @@ -1,6 +1,4 @@ - - @@ -25,9 +23,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="7.9195959" - inkscape:cx="78.143852" - inkscape:cy="76.635925" + inkscape:zoom="3.959798" + inkscape:cx="109.73297" + inkscape:cy="72.645807" inkscape:document-units="mm" inkscape:current-layer="layer2" showgrid="false" @@ -39,9 +37,10 @@ showguides="false" inkscape:window-width="1920" inkscape:window-height="1001" - inkscape:window-x="1911" + inkscape:window-x="-9" inkscape:window-y="-9" - inkscape:window-maximized="1" /> + inkscape:window-maximized="1" + inkscape:document-rotation="0" /> @@ -50,53 +49,78 @@ image/svg+xml - + + transform="translate(-78.759156,-135.36182)"> + + + + + + + inkscape:label="Re-ink" + transform="translate(0.20007337,-1.345165)"> 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/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_dress_up_bg.png.import b/sprites/clothes/classic_dress_up_bg.png.import deleted file mode 100644 index 8bb3c85..0000000 --- a/sprites/clothes/classic_dress_up_bg.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/classic_dress_up_bg.png-594c00eaf14ad58cdedc1824d8f59a5c.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://sprites/clothes/classic_dress_up_bg.png" -dest_files=[ "res://.import/classic_dress_up_bg.png-594c00eaf14ad58cdedc1824d8f59a5c.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_dress_up_blurred_bg.png.import b/sprites/clothes/classic_dress_up_blurred_bg.png.import deleted file mode 100644 index dab810b..0000000 --- a/sprites/clothes/classic_dress_up_blurred_bg.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/classic_dress_up_blurred_bg.png-21899d83f42ae1cd02cd106046f74e05.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://sprites/clothes/classic_dress_up_blurred_bg.png" -dest_files=[ "res://.import/classic_dress_up_blurred_bg.png-21899d83f42ae1cd02cd106046f74e05.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.png.import b/sprites/clothes/dj_shorts.png.import deleted file mode 100644 index 6cdc150..0000000 --- a/sprites/clothes/dj_shorts.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/dj_shorts.png-577f070e856586307ddbbd955ca04f3a.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://sprites/clothes/dj_shorts.png" -dest_files=[ "res://.import/dj_shorts.png-577f070e856586307ddbbd955ca04f3a.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.svg b/sprites/clothes/dj_shorts.svg index 82c126f..bd84649 100644 --- a/sprites/clothes/dj_shorts.svg +++ b/sprites/clothes/dj_shorts.svg @@ -1,6 +1,4 @@ - - + inkscape:version="1.0 (4035a4fb49, 2020-05-01)"> @@ -24,7 +22,7 @@ image/svg+xml - + @@ -44,31 +42,65 @@ id="namedview817" showgrid="false" inkscape:zoom="10.202541" - inkscape:cx="63.855679" - inkscape:cy="78.557618" + inkscape:cx="98.573183" + inkscape:cy="50.799978" inkscape:window-x="-9" inkscape:window-y="-9" inkscape:window-maximized="1" - inkscape:current-layer="layer3" + inkscape:current-layer="layer2" inkscape:pagecheckerboard="true" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" - fit-margin-bottom="0" /> + fit-margin-bottom="0" + inkscape:document-rotation="0" /> + transform="translate(7.6590499,-5.4233452)" + style="display:inline"> + + + + + + + + inkscape:label="Color" + transform="translate(7.055088,-3.8985927)"> @@ -91,7 +123,7 @@ inkscape:connector-curvature="0" sodipodi:nodetypes="csscc" /> + style="display:inline" + transform="translate(7.055088,-3.8985927)"> - + diff --git a/sprites/clothes/dressup_blurred_wardrobe.png.import b/sprites/clothes/dressup_blurred_wardrobe.png.import deleted file mode 100644 index faa0a1c..0000000 --- a/sprites/clothes/dressup_blurred_wardrobe.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/dressup_blurred_wardrobe.png-8d6b33052b265436c0bddfa109913146.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://sprites/clothes/dressup_blurred_wardrobe.png" -dest_files=[ "res://.import/dressup_blurred_wardrobe.png-8d6b33052b265436c0bddfa109913146.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/dressup_panel.svg.import b/sprites/clothes/dressup_panel.svg.import deleted file mode 100644 index bb8d4b0..0000000 --- a/sprites/clothes/dressup_panel.svg.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/dressup_panel.svg-10ad40ebf590034174b6f525bb791368.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://sprites/clothes/dressup_panel.svg" -dest_files=[ "res://.import/dressup_panel.svg-10ad40ebf590034174b6f525bb791368.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/dressup_wardrobe.png.import b/sprites/clothes/dressup_wardrobe.png.import deleted file mode 100644 index fcb87ff..0000000 --- a/sprites/clothes/dressup_wardrobe.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/dressup_wardrobe.png-c4a59bdd169c023e961e92917f5fd969.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://sprites/clothes/dressup_wardrobe.png" -dest_files=[ "res://.import/dressup_wardrobe.png-c4a59bdd169c023e961e92917f5fd969.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/dressup_wardrobe.svg.import b/sprites/clothes/dressup_wardrobe.svg.import deleted file mode 100644 index e033072..0000000 --- a/sprites/clothes/dressup_wardrobe.svg.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/dressup_wardrobe.svg-469d705b19d4010c02c75ae841bf12a7.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://sprites/clothes/dressup_wardrobe.svg" -dest_files=[ "res://.import/dressup_wardrobe.svg-469d705b19d4010c02c75ae841bf12a7.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/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 @@ - - + version="1.1" + viewBox="0 0 29.356469 33.543056" + height="33.543056mm" + width="29.356468mm"> + inkscape:window-x="-9" + inkscape:window-height="1001" + inkscape:window-width="1920" + showguides="false" + fit-margin-bottom="0" + fit-margin-right="0" + fit-margin-left="0" + fit-margin-top="0" + inkscape:pagecheckerboard="true" + showgrid="false" + inkscape:current-layer="layer2" + inkscape:document-units="mm" + inkscape:cy="77.928918" + inkscape:cx="160.81686" + inkscape:zoom="2.8" + inkscape:pageshadow="2" + inkscape:pageopacity="0.0" + borderopacity="1.0" + bordercolor="#666666" + pagecolor="#ffffff" + id="base" /> @@ -55,19 +54,40 @@ - + inkscape:label="Layer 1"> + sodipodi:nodetypes="cccccccc" /> + + + + + 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 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/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 @@ - - + viewBox="0 0 110.95358 129.13097" + height="129.13097" + width="110.95358" + id="svg1568" + version="1.1"> @@ -31,72 +29,109 @@ + fit-margin-left="0" + fit-margin-top="0" + inkscape:current-layer="layer3" + inkscape:window-maximized="1" + inkscape:window-y="-9" + inkscape:window-x="-9" + inkscape:cy="21.411065" + inkscape:cx="78.237963" + inkscape:zoom="11.9198" + inkscape:pagecheckerboard="true" + showgrid="false" + id="namedview1570" + inkscape:window-height="1001" + inkscape:window-width="1920" + inkscape:pageshadow="2" + inkscape:pageopacity="0" + guidetolerance="10" + gridtolerance="10" + objecttolerance="10" + borderopacity="1" + bordercolor="#666666" + pagecolor="#ffffff" /> - + transform="translate(1.1973547,-7.5003284)" + sodipodi:insensitive="true" + inkscape:label="Base" + id="layer2" + inkscape:groupmode="layer"> + + + + + + + + + + + + + + id="layer3" + inkscape:groupmode="layer"> + d="m -162.51027,-90.450111 c 0,0 25.48378,3.852316 38.25568,3.104079 9.08292,-0.532119 26.762192,-5.369218 26.762192,-5.369218" + style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + - - - + d="m -131.38559,-64.610751 0.75505,8.808872 4.86585,-7.71825 -3.27186,2.013457 z" + style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> 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.svg b/sprites/clothes/jeans.svg index 5fc5bbd..b574abc 100644 --- a/sprites/clothes/jeans.svg +++ b/sprites/clothes/jeans.svg @@ -1,6 +1,4 @@ - - @@ -25,11 +23,11 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="7.9195959" - inkscape:cx="30.540413" - inkscape:cy="71.8377" + inkscape:zoom="2.8" + inkscape:cx="55.33311" + inkscape:cy="80.173641" inkscape:document-units="mm" - inkscape:current-layer="layer2" + inkscape:current-layer="layer1" showgrid="false" inkscape:pagecheckerboard="true" fit-margin-top="0" @@ -41,7 +39,8 @@ inkscape:window-height="1001" inkscape:window-x="-9" inkscape:window-y="-9" - inkscape:window-maximized="1" /> + inkscape:window-maximized="1" + inkscape:document-rotation="0" /> @@ -50,7 +49,7 @@ image/svg+xml - + @@ -58,45 +57,107 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-78.959229,-134.01666)" /> + transform="translate(-113.83015,-134.49517)"> + + + + + + + + + + + + + - - - - - - + inkscape:label="Re-ink" + transform="translate(-34.87092,-0.47851244)"> + + + + + + + + + + + diff --git a/sprites/clothes/modern_dress_up_bg.png.import b/sprites/clothes/modern_dress_up_bg.png.import deleted file mode 100644 index 8a54db2..0000000 --- a/sprites/clothes/modern_dress_up_bg.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/modern_dress_up_bg.png-2ec62cdd8ee1c5f60b5faa53f704458f.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://sprites/clothes/modern_dress_up_bg.png" -dest_files=[ "res://.import/modern_dress_up_bg.png-2ec62cdd8ee1c5f60b5faa53f704458f.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/modern_dress_up_blurred_bg.png.import b/sprites/clothes/modern_dress_up_blurred_bg.png.import deleted file mode 100644 index efdc40d..0000000 --- a/sprites/clothes/modern_dress_up_blurred_bg.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/modern_dress_up_blurred_bg.png-75dc54176153d3b2378312626047f013.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://sprites/clothes/modern_dress_up_blurred_bg.png" -dest_files=[ "res://.import/modern_dress_up_blurred_bg.png-75dc54176153d3b2378312626047f013.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.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 @@ - - + viewBox="0 0 97.262993 111.22054" + height="111.22054" + width="97.262993" + id="svg837" + version="1.1"> @@ -31,86 +29,125 @@ + inkscape:window-y="-9" + inkscape:window-x="-9" + inkscape:cy="57.353631" + inkscape:cx="42.848699" + inkscape:zoom="5.6568543" + fit-margin-bottom="0" + fit-margin-right="0" + fit-margin-left="0" + fit-margin-top="0" + inkscape:pagecheckerboard="true" + showgrid="false" + id="namedview839" + inkscape:window-height="1001" + inkscape:window-width="1920" + inkscape:pageshadow="2" + inkscape:pageopacity="0" + guidetolerance="10" + gridtolerance="10" + objecttolerance="10" + borderopacity="1" + bordercolor="#666666" + pagecolor="#ffffff" /> - + id="layer1" + inkscape:groupmode="layer"> + id="path831-5" + d="m 46.787194,-5.4495265 c 6.182844,10.610487 12.979515,41.6494335 8.262347,74.8845275 -0.141694,9.87259 -3.586061,28.68159 -3.586061,31.159209 0,0 -14.736886,0.37753 -27.324069,0.137 -12.58718,-0.24053 -18.1298988,0.25463 -31.0541598,0.23947 0.111458,-6.265139 -20.4005142,-18.107429 -8.5714282,-31.535699 0,-19.530488 -1.293517,-39.757261 1.785713,-58.392861 0.961996,-16.3539095 18.3522452,-11.0856075 27.142859,-17.6785775 14.467272,-1.375555 22.615393,0.353651 33.344799,1.186931 z" + style="display:inline;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" /> + id="path847" + d="M 0.58525123,18.899282 C 1.5695192,9.2359035 15.657788,-6.1332135 15.657788,-6.1332135 c 0,0 -17.0499178,-1.42975 -22.2233538,4.040614 -16.5094452,17.4569915 -8.9206112,71.5276005 -8.9206112,71.5276005 0,0 -17.308634,9.8824 -15.708654,15.34552 2.230942,7.61752 22.6017222,16.629519 24.2800822,10.19019 1.67836,-6.43932 4.862778,-50.17962 7.50000003,-76.071429 z" + style="display:inline;fill:#0276b1;fill-opacity:1;stroke:none;stroke-width:0.999999px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + + + + + + + + + + + + id="layer2" + inkscape:groupmode="layer"> - - + - + d="m 20.327327,28.719081 -3.700495,49.67203" + style="opacity:1;fill:none;stroke:#000000;stroke-width:3.77953;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 68.433762,35.835417 2.355182,53.812317" + style="opacity:1;fill:none;stroke:#000000;stroke-width:3.77953;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> 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 @@ - - + viewBox="0 0 106 112" + height="112" + width="106" + id="svg5861" + version="1.1"> @@ -24,68 +22,110 @@ image/svg+xml - + + inkscape:window-y="-9" + inkscape:window-x="-9" + inkscape:cy="53.430906" + inkscape:cx="124.95147" + inkscape:zoom="2.97995" + inkscape:pagecheckerboard="true" + fit-margin-bottom="0" + fit-margin-right="0" + fit-margin-left="0" + fit-margin-top="0" + showgrid="false" + id="namedview5863" + inkscape:window-height="1001" + inkscape:window-width="1920" + inkscape:pageshadow="2" + inkscape:pageopacity="0" + guidetolerance="10" + gridtolerance="10" + objecttolerance="10" + borderopacity="1" + bordercolor="#666666" + pagecolor="#ffffff" /> + sodipodi:insensitive="true" + inkscape:label="Base" + id="layer1" + inkscape:groupmode="layer"> + sodipodi:nodetypes="cccccccc" /> + + + + + + + + transform="translate(-5.7047937,-15.75862)" + id="g6791"> - - + style="fill:#000000;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 59.437605,65.304684 c -0.678597,3.381977 -5.604293,23.15058 -4.278595,27.09777 1.325698,3.94719 30.286204,2.637458 45.47056,2.768503 12.20372,0.105321 36.37387,3.074763 36.5778,-1.593987 0.28901,-6.616554 -1.90632,-19.361934 0.83894,-28.440074 1.29465,-4.281223 -23.6464,1.523975 -35.48718,1.593986 -14.38145,0.08503 -42.442928,-4.808175 -43.121525,-1.426198 z" + id="path6430" + inkscape:connector-curvature="0" + sodipodi:nodetypes="zzssssz" /> + + + + + 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 @@ - - @@ -26,8 +24,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="3.959798" - inkscape:cx="43.507239" - inkscape:cy="60.44025" + inkscape:cx="55.423097" + inkscape:cy="61.865623" inkscape:document-units="mm" inkscape:current-layer="layer2" showgrid="false" @@ -38,9 +36,10 @@ fit-margin-bottom="0" inkscape:window-width="1920" inkscape:window-height="1001" - inkscape:window-x="1911" + inkscape:window-x="-9" inkscape:window-y="-9" - inkscape:window-maximized="1" /> + inkscape:window-maximized="1" + inkscape:document-rotation="0" /> @@ -49,59 +48,123 @@ image/svg+xml - + + transform="translate(-329.74222,-265.111)" + style="display:inline"> + + + + + + + + + + + + + + + + sodipodi:nodetypes="csscczccc" /> diff --git a/sprites/clothes/retro_shirt.svg b/sprites/clothes/retro_shirt.svg index 345eaa2..4dcff76 100644 --- a/sprites/clothes/retro_shirt.svg +++ b/sprites/clothes/retro_shirt.svg @@ -1,6 +1,4 @@ - - @@ -25,11 +23,11 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="3.959798" - inkscape:cx="43.507239" - inkscape:cy="60.44025" + inkscape:zoom="11.2" + inkscape:cx="57.951723" + inkscape:cy="16.861876" inkscape:document-units="mm" - inkscape:current-layer="layer2" + inkscape:current-layer="layer1" showgrid="false" inkscape:pagecheckerboard="true" fit-margin-top="0" @@ -38,9 +36,10 @@ fit-margin-bottom="0" inkscape:window-width="1920" inkscape:window-height="1001" - inkscape:window-x="1911" + inkscape:window-x="-9" inkscape:window-y="-9" - inkscape:window-maximized="1" /> + inkscape:window-maximized="1" + inkscape:document-rotation="0" /> @@ -49,7 +48,7 @@ image/svg+xml - + @@ -57,73 +56,135 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-332.89496,-265.48813)" - style="display:inline" - sodipodi:insensitive="true" /> + transform="translate(-329.97283,-265.24728)" + style="display:inline"> + + + + + + + + + + + + + + + + sodipodi:nodetypes="sssszzascs" /> 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 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sprites/clothes/background.svg.import b/sprites/clothes/skate_shirt.svg.import similarity index 68% rename from sprites/clothes/background.svg.import rename to sprites/clothes/skate_shirt.svg.import index 9a35431..76634d6 100644 --- a/sprites/clothes/background.svg.import +++ b/sprites/clothes/skate_shirt.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/background.svg-53a5ac36b87b243d4a54ca15a9574f97.stex" +path="res://.import/skate_shirt.svg-f6dd325cc91a89a1f7a63cf7771a25ab.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/clothes/background.svg" -dest_files=[ "res://.import/background.svg-53a5ac36b87b243d4a54ca15a9574f97.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 @@ - - + version="1.1" + viewBox="0 0 29.435812 33.446296" + height="33.446297mm" + width="29.435812mm"> + inkscape:window-x="-9" + inkscape:window-height="1001" + inkscape:window-width="1920" + showguides="false" + fit-margin-bottom="0" + fit-margin-right="0" + fit-margin-left="0" + fit-margin-top="0" + inkscape:pagecheckerboard="true" + showgrid="false" + inkscape:current-layer="layer2" + inkscape:document-units="mm" + inkscape:cy="107.22418" + inkscape:cx="125.41245" + inkscape:zoom="2.8" + inkscape:pageshadow="2" + inkscape:pageopacity="0.0" + borderopacity="1.0" + bordercolor="#666666" + pagecolor="#ffffff" + id="base" /> @@ -50,24 +49,45 @@ image/svg+xml - + - + inkscape:label="Layer 1"> + sodipodi:nodetypes="cccccccc" /> + + + + + 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 @@ - - + inkscape:version="1.0 (4035a4fb49, 2020-05-01)"> @@ -48,78 +46,173 @@ fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" - inkscape:zoom="5.6568543" - inkscape:cx="61.06424" - inkscape:cy="71.518993" + inkscape:zoom="5.6568542" + inkscape:cx="36.923847" + inkscape:cy="49.691733" inkscape:window-x="-9" inkscape:window-y="-9" inkscape:window-maximized="1" - inkscape:current-layer="layer2" /> + inkscape:current-layer="layer2" + inkscape:document-rotation="0" /> + transform="translate(23.595688,10.035324)"> + + + + + + + + + + + + + + + + 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 @@ - - + inkscape:version="1.0 (4035a4fb49, 2020-05-01)"> @@ -48,73 +46,112 @@ fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" - inkscape:zoom="5.6568543" - inkscape:cx="57.175153" - inkscape:cy="57.852419" + inkscape:zoom="4" + inkscape:cx="137.96482" + inkscape:cy="55.756911" inkscape:window-x="-9" inkscape:window-y="-9" inkscape:window-maximized="1" - inkscape:current-layer="layer2" /> + inkscape:current-layer="layer3" + inkscape:document-rotation="0" /> + transform="translate(32.440117,9.2673536)"> + + + + + + + + + + + inkscape:label="Color" + transform="translate(14.847296,-1.4071514)"> + sodipodi:nodetypes="cccccccccccccc" /> + sodipodi:nodetypes="caaasccscccccc" /> + style="display:inline" + transform="translate(14.847296,-1.4071514)"> - - + sodipodi:nodetypes="zcsczcczsacsssz" /> diff --git a/sprites/clothes/z_briefs.png b/sprites/clothes/z_briefs.png deleted file mode 100644 index 8ebd82d..0000000 Binary files a/sprites/clothes/z_briefs.png and /dev/null differ diff --git a/sprites/clothes/z_briefs.png.import b/sprites/clothes/z_briefs.png.import deleted file mode 100644 index ee6f526..0000000 --- a/sprites/clothes/z_briefs.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/z_briefs.png-201f91b877a5ae4c563dbb9e92796cb0.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://sprites/clothes/z_briefs.png" -dest_files=[ "res://.import/z_briefs.png-201f91b877a5ae4c563dbb9e92796cb0.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/biker_jacket.png.import b/sprites/new_character_base.svg.import similarity index 67% rename from sprites/clothes/biker_jacket.png.import rename to sprites/new_character_base.svg.import index 3a14972..366423f 100644 --- a/sprites/clothes/biker_jacket.png.import +++ b/sprites/new_character_base.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/biker_jacket.png-49a94ec6ef89c92948186608cc0de2ea.stex" +path="res://.import/new_character_base.svg-e37d5232b11c88359270a1b5f7a925f8.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/clothes/biker_jacket.png" -dest_files=[ "res://.import/biker_jacket.png-49a94ec6ef89c92948186608cc0de2ea.stex" ] +source_file="res://sprites/new_character_base.svg" +dest_files=[ "res://.import/new_character_base.svg-e37d5232b11c88359270a1b5f7a925f8.stex" ] [params] diff --git a/sprites/world.blend b/sprites/world.blend new file mode 100644 index 0000000..8a67fb2 Binary files /dev/null and b/sprites/world.blend differ diff --git a/sprites/world.blend1 b/sprites/world.blend1 new file mode 100644 index 0000000..edd4a83 Binary files /dev/null and b/sprites/world.blend1 differ diff --git a/sprites/clothes/background.svg b/sprites/world/background.svg similarity index 100% rename from sprites/clothes/background.svg rename to sprites/world/background.svg diff --git a/sprites/clothes/jeans.png.import b/sprites/world/background.svg.import similarity index 69% rename from sprites/clothes/jeans.png.import rename to sprites/world/background.svg.import index d05ba53..5f369f8 100644 --- a/sprites/clothes/jeans.png.import +++ b/sprites/world/background.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/jeans.png-cb872dec1c87d219bb56d373215c361d.stex" +path="res://.import/background.svg-9a13379093158c4dd6765036ae620619.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/clothes/jeans.png" -dest_files=[ "res://.import/jeans.png-cb872dec1c87d219bb56d373215c361d.stex" ] +source_file="res://sprites/world/background.svg" +dest_files=[ "res://.import/background.svg-9a13379093158c4dd6765036ae620619.stex" ] [params] diff --git a/sprites/clothes/classic_dress_up_bg.png b/sprites/world/classic_dress_up_bg.png similarity index 100% rename from sprites/clothes/classic_dress_up_bg.png rename to sprites/world/classic_dress_up_bg.png diff --git a/sprites/world/classic_dress_up_bg.png.import b/sprites/world/classic_dress_up_bg.png.import new file mode 100644 index 0000000..aa2a372 --- /dev/null +++ b/sprites/world/classic_dress_up_bg.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/classic_dress_up_bg.png-91243fdfc1a4ed4c9d92cd705c19bfd4.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/world/classic_dress_up_bg.png" +dest_files=[ "res://.import/classic_dress_up_bg.png-91243fdfc1a4ed4c9d92cd705c19bfd4.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_dress_up_blurred_bg.png b/sprites/world/classic_dress_up_blurred_bg.png similarity index 100% rename from sprites/clothes/classic_dress_up_blurred_bg.png rename to sprites/world/classic_dress_up_blurred_bg.png diff --git a/sprites/world/classic_dress_up_blurred_bg.png.import b/sprites/world/classic_dress_up_blurred_bg.png.import new file mode 100644 index 0000000..bbc4b26 --- /dev/null +++ b/sprites/world/classic_dress_up_blurred_bg.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/classic_dress_up_blurred_bg.png-ce6fef332733ba210937c36735d40783.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/world/classic_dress_up_blurred_bg.png" +dest_files=[ "res://.import/classic_dress_up_blurred_bg.png-ce6fef332733ba210937c36735d40783.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/dressup_blurred_wardrobe.png b/sprites/world/dressup_blurred_wardrobe.png similarity index 100% rename from sprites/clothes/dressup_blurred_wardrobe.png rename to sprites/world/dressup_blurred_wardrobe.png diff --git a/sprites/world/dressup_blurred_wardrobe.png.import b/sprites/world/dressup_blurred_wardrobe.png.import new file mode 100644 index 0000000..b7e6d9c --- /dev/null +++ b/sprites/world/dressup_blurred_wardrobe.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/dressup_blurred_wardrobe.png-ccd2427a9b242dfea390fb0dba1cb8b6.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/world/dressup_blurred_wardrobe.png" +dest_files=[ "res://.import/dressup_blurred_wardrobe.png-ccd2427a9b242dfea390fb0dba1cb8b6.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/dressup_panel.svg b/sprites/world/dressup_panel.svg similarity index 100% rename from sprites/clothes/dressup_panel.svg rename to sprites/world/dressup_panel.svg diff --git a/sprites/clothes/briefs.png.import b/sprites/world/dressup_panel.svg.import similarity index 68% rename from sprites/clothes/briefs.png.import rename to sprites/world/dressup_panel.svg.import index 8e8d687..bd217e6 100644 --- a/sprites/clothes/briefs.png.import +++ b/sprites/world/dressup_panel.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/briefs.png-f2fba0226797db266d542131d9f44a11.stex" +path="res://.import/dressup_panel.svg-8a41151cb84a8483a6bad92f218a33e8.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/clothes/briefs.png" -dest_files=[ "res://.import/briefs.png-f2fba0226797db266d542131d9f44a11.stex" ] +source_file="res://sprites/world/dressup_panel.svg" +dest_files=[ "res://.import/dressup_panel.svg-8a41151cb84a8483a6bad92f218a33e8.stex" ] [params] diff --git a/sprites/clothes/dressup_wardrobe.png b/sprites/world/dressup_wardrobe.png similarity index 100% rename from sprites/clothes/dressup_wardrobe.png rename to sprites/world/dressup_wardrobe.png diff --git a/sprites/clothes/atomic_shirt.png.import b/sprites/world/dressup_wardrobe.png.import similarity index 67% rename from sprites/clothes/atomic_shirt.png.import rename to sprites/world/dressup_wardrobe.png.import index 5b2aab9..455f5ad 100644 --- a/sprites/clothes/atomic_shirt.png.import +++ b/sprites/world/dressup_wardrobe.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/atomic_shirt.png-e1562af2eed6677399909eaf790f9e4c.stex" +path="res://.import/dressup_wardrobe.png-3622bbe4ab99a88bf60cd058eb099f9f.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/clothes/atomic_shirt.png" -dest_files=[ "res://.import/atomic_shirt.png-e1562af2eed6677399909eaf790f9e4c.stex" ] +source_file="res://sprites/world/dressup_wardrobe.png" +dest_files=[ "res://.import/dressup_wardrobe.png-3622bbe4ab99a88bf60cd058eb099f9f.stex" ] [params] diff --git a/sprites/clothes/dressup_wardrobe.svg b/sprites/world/dressup_wardrobe.svg similarity index 100% rename from sprites/clothes/dressup_wardrobe.svg rename to sprites/world/dressup_wardrobe.svg diff --git a/sprites/world/dressup_wardrobe.svg.import b/sprites/world/dressup_wardrobe.svg.import new file mode 100644 index 0000000..05c4a30 --- /dev/null +++ b/sprites/world/dressup_wardrobe.svg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/dressup_wardrobe.svg-50694cf0e1b6e5ed9fafb867a0443a2e.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/world/dressup_wardrobe.svg" +dest_files=[ "res://.import/dressup_wardrobe.svg-50694cf0e1b6e5ed9fafb867a0443a2e.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/modern_dress_up_bg.png b/sprites/world/modern_dress_up_bg.png similarity index 100% rename from sprites/clothes/modern_dress_up_bg.png rename to sprites/world/modern_dress_up_bg.png diff --git a/sprites/world/modern_dress_up_bg.png.import b/sprites/world/modern_dress_up_bg.png.import new file mode 100644 index 0000000..62093ef --- /dev/null +++ b/sprites/world/modern_dress_up_bg.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/modern_dress_up_bg.png-27905358c41c27aeb52d5d89ce00ae1c.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/world/modern_dress_up_bg.png" +dest_files=[ "res://.import/modern_dress_up_bg.png-27905358c41c27aeb52d5d89ce00ae1c.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/modern_dress_up_blurred_bg.png b/sprites/world/modern_dress_up_blurred_bg.png similarity index 100% rename from sprites/clothes/modern_dress_up_blurred_bg.png rename to sprites/world/modern_dress_up_blurred_bg.png diff --git a/sprites/clothes/classic/z_briefs_classic.png.import b/sprites/world/modern_dress_up_blurred_bg.png.import similarity index 64% rename from sprites/clothes/classic/z_briefs_classic.png.import rename to sprites/world/modern_dress_up_blurred_bg.png.import index ac2e1c0..1820fc3 100644 --- a/sprites/clothes/classic/z_briefs_classic.png.import +++ b/sprites/world/modern_dress_up_blurred_bg.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/z_briefs_classic.png-10d3d58b4454e62be8efb64c0a2e448e.stex" +path="res://.import/modern_dress_up_blurred_bg.png-a91fc2889db09eed8864cdf2b9441122.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" ] +source_file="res://sprites/world/modern_dress_up_blurred_bg.png" +dest_files=[ "res://.import/modern_dress_up_blurred_bg.png-a91fc2889db09eed8864cdf2b9441122.stex" ] [params]