diff --git a/README.md b/README.md index 73c316b..6c988ed 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,6 @@ ​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 @@ -13,12 +12,10 @@ ## Authors -* **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 +- **Anthony Wilcox** - *Initial work* - [tonytins](https://github.com/tonytins) +- **Kenney** - *UI assets* - [kenny.nl](https://www.kenney.nl/) +​ +## 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 e85e42e..4bcd87a 100644 --- a/project.godot +++ b/project.godot @@ -34,9 +34,8 @@ 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="2d" +window/stretch/mode="viewport" window/stretch/aspect="keep" [gui] diff --git a/scenes/character_base.tscn b/scenes/characterBase.tscn similarity index 59% rename from scenes/character_base.tscn rename to scenes/characterBase.tscn index 8168930..1d473c9 100644 --- a/scenes/character_base.tscn +++ b/scenes/characterBase.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=32 format=2] -[ext_resource path="res://sprites/character/shadow.svg" type="Texture" id=1] +[ext_resource path="res://scripts/characterBase.gd" type="Script" id=1] [ext_resource path="res://sprites/character/tail/tail0.svg" type="Texture" id=2] [ext_resource path="res://sprites/character/tail/tail1.svg" type="Texture" id=3] [ext_resource path="res://sprites/character/tail/tail2.svg" type="Texture" id=4] -[ext_resource path="res://sprites/clothes/owo_censor.svg" type="Texture" id=5] +[ext_resource path="res://sprites/character_base.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,40 +23,13 @@ [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/character_base_top.svg" type="Texture" id=25] +[ext_resource path="res://sprites/clothes/briefs.svg" type="Texture" id=24] +[ext_resource path="res://sprites/clothes/blank_bottom.png" type="Texture" id=25] [ext_resource path="res://sprites/clothes/blank_top.png" type="Texture" id=26] -[ext_resource path="res://sprites/character_base_head.svg" type="Texture" id=27] +[ext_resource path="res://sprites/character/shadow.svg" type="Texture" id=27] [ext_resource path="res://sprites/character/mouth/mouth11.png" type="Texture" id=28] -[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] +[sub_resource type="SpriteFrames" id=1] animations = [ { "frames": [ ExtResource( 2 ), ExtResource( 3 ), ExtResource( 4 ) ], "loop": true, @@ -81,52 +54,48 @@ animations = [ { } ] [node name="characterBase" type="Node2D"] -position = Vector2( -19, -92 ) -script = SubResource( 1 ) +script = ExtResource( 1 ) -[node name="shadow" type="Sprite" parent="."] -position = Vector2( 4.84271, 244.714 ) -texture = ExtResource( 1 ) +[node name="base" type="Node2D" parent="."] +position = Vector2( -103.897, -160.477 ) -[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 ) +[node name="Tail" type="AnimatedSprite" parent="base"] +position = Vector2( 55.0701, 172.425 ) +frames = SubResource( 1 ) frame = 2 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 ) +[node name="shadow" type="Sprite" parent="base"] +position = Vector2( 91.524, 317.295 ) texture = ExtResource( 27 ) -[node name="eyes" type="AnimatedSprite" parent="body/head"] -position = Vector2( 17.6857, 4.22147 ) +[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 ) -frame = 1 playing = true -[node name="mouth" type="AnimatedSprite" parent="body/head"] -position = Vector2( 38.1195, 8.68453 ) +[node name="Mouth" type="AnimatedSprite" parent="base"] +position = Vector2( 148.505, 68.0261 ) frames = SubResource( 3 ) -frame = 4 +frame = 7 playing = true -[node name="accessory" type="Sprite" parent="body"] -position = Vector2( 9.54095, 73.0832 ) +[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 ) texture = ExtResource( 26 ) -__meta__ = { -"_edit_lock_": true -} diff --git a/scenes/clothing/base/accessoryBase.tscn b/scenes/clothing/base/accessoryBase.tscn new file mode 100644 index 0000000..d7e3746 --- /dev/null +++ b/scenes/clothing/base/accessoryBase.tscn @@ -0,0 +1,8 @@ +[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 deleted file mode 100644 index 4ad8233..0000000 --- a/scenes/clothing/base/accessory_base.tscn +++ /dev/null @@ -1,9 +0,0 @@ -[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/clothing_base.tscn b/scenes/clothing/base/baseClothing.tscn similarity index 84% rename from scenes/clothing/base/clothing_base.tscn rename to scenes/clothing/base/baseClothing.tscn index 8f28ed7..d199229 100644 --- a/scenes/clothing/base/clothing_base.tscn +++ b/scenes/clothing/base/baseClothing.tscn @@ -1,8 +1,9 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://scripts/clothing/clothing_base.gd" type="Script" id=1] +[ext_resource path="res://scripts/clothing/baseClothing.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/bottoms_base.tscn b/scenes/clothing/base/bottomsBase.tscn similarity index 51% rename from scenes/clothing/base/bottoms_base.tscn rename to scenes/clothing/base/bottomsBase.tscn index ea9c653..317ba4c 100644 --- a/scenes/clothing/base/bottoms_base.tscn +++ b/scenes/clothing/base/bottomsBase.tscn @@ -1,9 +1,7 @@ [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/bottoms_base.gd" type="Script" id=2] - - +[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=2] [node name="bottomsBase" instance=ExtResource( 1 )] script = ExtResource( 2 ) diff --git a/scenes/clothing/base/tops_base.tscn b/scenes/clothing/base/topsBase.tscn similarity index 51% rename from scenes/clothing/base/tops_base.tscn rename to scenes/clothing/base/topsBase.tscn index 36d3053..10d750c 100644 --- a/scenes/clothing/base/tops_base.tscn +++ b/scenes/clothing/base/topsBase.tscn @@ -1,9 +1,7 @@ [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/tops_base.gd" type="Script" id=2] - - +[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/clothing/topsBase.gd" type="Script" id=2] [node name="topsBase" instance=ExtResource( 1 )] script = ExtResource( 2 ) diff --git a/scenes/clothing/base/undies_base.tscn b/scenes/clothing/base/undiesBase.tscn similarity index 52% rename from scenes/clothing/base/undies_base.tscn rename to scenes/clothing/base/undiesBase.tscn index 74bba12..569e1b8 100644 --- a/scenes/clothing/base/undies_base.tscn +++ b/scenes/clothing/base/undiesBase.tscn @@ -1,9 +1,7 @@ [gd_scene load_steps=3 format=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] - - +[ext_resource path="res://scripts/clothing/undiesBase.gd" type="Script" id=1] +[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=2] [node name="baseClothing" instance=ExtResource( 2 )] script = ExtResource( 1 ) diff --git a/scenes/clothing/camera.tscn b/scenes/clothing/camera.tscn index 104d91d..0209b39 100644 --- a/scenes/clothing/camera.tscn +++ b/scenes/clothing/camera.tscn @@ -1,12 +1,11 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://scenes/clothing/base/accessory_base.tscn" type="PackedScene" id=1] +[ext_resource path="res://scenes/clothing/base/accessoryBase.tscn" type="PackedScene" id=1] [ext_resource path="res://sprites/clothes/camera.png" type="Texture" id=2] - [node name="camera" instance=ExtResource( 1 )] anchor_right = 0.0 anchor_bottom = 0.0 diff --git a/scenes/clothing/pants/beat_Jeans.tscn b/scenes/clothing/pants/beatUpJeans.tscn similarity index 63% rename from scenes/clothing/pants/beat_Jeans.tscn rename to scenes/clothing/pants/beatUpJeans.tscn index 01a233c..2ed835b 100644 --- a/scenes/clothing/pants/beat_Jeans.tscn +++ b/scenes/clothing/pants/beatUpJeans.tscn @@ -1,9 +1,12 @@ [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://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=2] [ext_resource path="res://sprites/clothes/beat_up_jeans.svg" type="Texture" id=3] + + + [node name="beatUpJeans" instance=ExtResource( 1 )] texture_normal = ExtResource( 3 ) script = ExtResource( 2 ) diff --git a/scenes/clothing/pants/camoJeans.tscn b/scenes/clothing/pants/camoJeans.tscn index 6b529b3..38e32bf 100644 --- a/scenes/clothing/pants/camoJeans.tscn +++ b/scenes/clothing/pants/camoJeans.tscn @@ -1,10 +1,8 @@ [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/clothing_base.tscn" type="PackedScene" id=2] -[ext_resource path="res://scripts/clothing/bottoms_base.gd" type="Script" id=3] - - +[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=2] +[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=3] diff --git a/scenes/clothing/pants/djShorts.tscn b/scenes/clothing/pants/djShorts.tscn new file mode 100644 index 0000000..1b2d46d --- /dev/null +++ b/scenes/clothing/pants/djShorts.tscn @@ -0,0 +1,13 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://sprites/clothes/dj_shorts.svg" type="Texture" id=1] +[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=2] +[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=3] + + + + +[node name="camoJeans" instance=ExtResource( 2 )] +texture_normal = ExtResource( 1 ) +script = ExtResource( 3 ) +[connection signal="pressed" from="." to="." method="_on_bottoms_pressed"] diff --git a/scenes/clothing/pants/dj_shorts.tscn b/scenes/clothing/pants/dj_shorts.tscn deleted file mode 100644 index 24a40bb..0000000 --- a/scenes/clothing/pants/dj_shorts.tscn +++ /dev/null @@ -1,10 +0,0 @@ -[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/formal_skirt.tscn b/scenes/clothing/pants/formalSkirt.tscn similarity index 63% rename from scenes/clothing/pants/formal_skirt.tscn rename to scenes/clothing/pants/formalSkirt.tscn index ceaeaac..0f7d544 100644 --- a/scenes/clothing/pants/formal_skirt.tscn +++ b/scenes/clothing/pants/formalSkirt.tscn @@ -1,9 +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://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=2] [ext_resource path="res://sprites/clothes/formal_skirt.svg" type="Texture" id=3] + [node name="formalSkirt" instance=ExtResource( 1 )] texture_normal = ExtResource( 3 ) script = ExtResource( 2 ) diff --git a/scenes/clothing/pants/jeans.tscn b/scenes/clothing/pants/jeans.tscn index 74866cc..8cc5610 100644 --- a/scenes/clothing/pants/jeans.tscn +++ b/scenes/clothing/pants/jeans.tscn @@ -1,12 +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://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=2] [ext_resource path="res://sprites/clothes/jeans.svg" type="Texture" id=3] - - [node name="jeans" instance=ExtResource( 1 )] texture_normal = ExtResource( 3 ) script = ExtResource( 2 ) diff --git a/scenes/clothing/pants/skirt.tscn b/scenes/clothing/pants/skirt.tscn index d2c3d1d..a8f64ab 100644 --- a/scenes/clothing/pants/skirt.tscn +++ b/scenes/clothing/pants/skirt.tscn @@ -1,12 +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://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=2] [ext_resource path="res://sprites/clothes/blue_skirt.svg" type="Texture" id=3] - - [node name="skirt" instance=ExtResource( 1 )] texture_normal = ExtResource( 3 ) script = ExtResource( 2 ) diff --git a/scenes/clothing/pants/sweatPants.tscn b/scenes/clothing/pants/sweatPants.tscn index d75ef84..1801a6c 100644 --- a/scenes/clothing/pants/sweatPants.tscn +++ b/scenes/clothing/pants/sweatPants.tscn @@ -1,10 +1,8 @@ [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/clothing_base.tscn" type="PackedScene" id=2] -[ext_resource path="res://scripts/clothing/bottoms_base.gd" type="Script" id=3] - - +[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=2] +[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=3] [node name="sweatPants" instance=ExtResource( 2 )] texture_normal = ExtResource( 1 ) diff --git a/scenes/clothing/tops/atomic_shirt.tscn b/scenes/clothing/tops/atomicShirt.tscn similarity index 63% rename from scenes/clothing/tops/atomic_shirt.tscn rename to scenes/clothing/tops/atomicShirt.tscn index 041c664..4c0e92d 100644 --- a/scenes/clothing/tops/atomic_shirt.tscn +++ b/scenes/clothing/tops/atomicShirt.tscn @@ -1,7 +1,7 @@ [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://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/clothing/topsBase.gd" type="Script" id=2] [ext_resource path="res://sprites/clothes/atomic_shirt.svg" type="Texture" id=3] [node name="atomicShirt" instance=ExtResource( 1 )] diff --git a/scenes/clothing/tops/dj_shirt.tscn b/scenes/clothing/tops/djShirt.tscn similarity index 63% rename from scenes/clothing/tops/dj_shirt.tscn rename to scenes/clothing/tops/djShirt.tscn index ed902ba..bbe311d 100644 --- a/scenes/clothing/tops/dj_shirt.tscn +++ b/scenes/clothing/tops/djShirt.tscn @@ -1,7 +1,7 @@ [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://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/clothing/topsBase.gd" type="Script" id=2] [ext_resource path="res://sprites/clothes/dj_shirt.png" type="Texture" id=3] [node name="djShirt" instance=ExtResource( 1 )] diff --git a/scenes/clothing/tops/fullsnack_shirt.tscn b/scenes/clothing/tops/fullsnack_shirt.tscn deleted file mode 100644 index 4f2fc8e..0000000 --- a/scenes/clothing/tops/fullsnack_shirt.tscn +++ /dev/null @@ -1,10 +0,0 @@ -[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/korm_shirt.tscn b/scenes/clothing/tops/kormShirt.tscn similarity index 63% rename from scenes/clothing/tops/korm_shirt.tscn rename to scenes/clothing/tops/kormShirt.tscn index 1f232c7..cf6fd0a 100644 --- a/scenes/clothing/tops/korm_shirt.tscn +++ b/scenes/clothing/tops/kormShirt.tscn @@ -1,7 +1,7 @@ [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://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/clothing/topsBase.gd" type="Script" id=2] [ext_resource path="res://sprites/clothes/korm_shirt.png" type="Texture" id=3] [node name="kormShirt" instance=ExtResource( 1 )] diff --git a/scenes/clothing/tops/nl_shirt.tscn b/scenes/clothing/tops/nlShirt.tscn similarity index 63% rename from scenes/clothing/tops/nl_shirt.tscn rename to scenes/clothing/tops/nlShirt.tscn index de1dcaf..01173bd 100644 --- a/scenes/clothing/tops/nl_shirt.tscn +++ b/scenes/clothing/tops/nlShirt.tscn @@ -1,7 +1,7 @@ [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://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/clothing/topsBase.gd" type="Script" id=2] [ext_resource path="res://sprites/clothes/nl_jacket.png" type="Texture" id=3] [node name="nlShirt" instance=ExtResource( 1 )] diff --git a/scenes/clothing/tops/rawShirt.tscn b/scenes/clothing/tops/rawShirt.tscn index 97b5837..c976520 100644 --- a/scenes/clothing/tops/rawShirt.tscn +++ b/scenes/clothing/tops/rawShirt.tscn @@ -1,11 +1,9 @@ [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://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/clothing/topsBase.gd" type="Script" id=2] [ext_resource path="res://sprites/clothes/raw_shirt.svg" type="Texture" id=3] - - [node name="rawShirt" instance=ExtResource( 1 )] texture_normal = ExtResource( 3 ) script = ExtResource( 2 ) diff --git a/scenes/clothing/tops/retro_shirt.tscn b/scenes/clothing/tops/retro_shirt.tscn deleted file mode 100644 index de1dcaf..0000000 --- a/scenes/clothing/tops/retro_shirt.tscn +++ /dev/null @@ -1,10 +0,0 @@ -[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 deleted file mode 100644 index f88c40f..0000000 --- a/scenes/clothing/tops/skate_shirt.tscn +++ /dev/null @@ -1,10 +0,0 @@ -[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 deleted file mode 100644 index f36fe22..0000000 --- a/scenes/clothing/tops/train_hoodie.tscn +++ /dev/null @@ -1,10 +0,0 @@ -[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/whatsnew_shirt.tscn b/scenes/clothing/tops/whatsNewShirt.tscn similarity index 64% rename from scenes/clothing/tops/whatsnew_shirt.tscn rename to scenes/clothing/tops/whatsNewShirt.tscn index 2f23ea2..4545551 100644 --- a/scenes/clothing/tops/whatsnew_shirt.tscn +++ b/scenes/clothing/tops/whatsNewShirt.tscn @@ -1,7 +1,7 @@ [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://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/clothing/topsBase.gd" type="Script" id=2] [ext_resource path="res://sprites/clothes/whatsnew_shirt.svg" type="Texture" id=3] [node name="whatsNewShirt" instance=ExtResource( 1 )] diff --git a/scenes/clothing/tops/z_shirt.tscn b/scenes/clothing/tops/zShirt.tscn similarity index 63% rename from scenes/clothing/tops/z_shirt.tscn rename to scenes/clothing/tops/zShirt.tscn index 8266145..3a1a23f 100644 --- a/scenes/clothing/tops/z_shirt.tscn +++ b/scenes/clothing/tops/zShirt.tscn @@ -1,7 +1,7 @@ [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://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/clothing/topsBase.gd" type="Script" id=2] [ext_resource path="res://sprites/clothes/z_shirt.png" type="Texture" id=3] [node name="zShirt" instance=ExtResource( 1 )] diff --git a/scenes/clothing/undies/briefs.tscn b/scenes/clothing/undies/briefs.tscn index 7e96b28..fde30e2 100644 --- a/scenes/clothing/undies/briefs.tscn +++ b/scenes/clothing/undies/briefs.tscn @@ -1,8 +1,7 @@ [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/undies_base.tscn" type="PackedScene" id=2] - +[ext_resource path="res://scenes/clothing/base/undiesBase.tscn" type="PackedScene" id=2] diff --git a/scenes/clothing/undies/fundosi.tscn b/scenes/clothing/undies/fundosi.tscn index e2cec05..5a0ac93 100644 --- a/scenes/clothing/undies/fundosi.tscn +++ b/scenes/clothing/undies/fundosi.tscn @@ -1,8 +1,7 @@ [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/undies_base.tscn" type="PackedScene" id=2] - +[ext_resource path="res://scenes/clothing/base/undiesBase.tscn" type="PackedScene" id=2] diff --git a/scenes/clothing/undies/z_briefs.tscn b/scenes/clothing/undies/zBriefs.tscn similarity index 68% rename from scenes/clothing/undies/z_briefs.tscn rename to scenes/clothing/undies/zBriefs.tscn index 2419428..2e8d6af 100644 --- a/scenes/clothing/undies/z_briefs.tscn +++ b/scenes/clothing/undies/zBriefs.tscn @@ -1,8 +1,7 @@ [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/undies_base.tscn" type="PackedScene" id=2] - +[ext_resource path="res://scenes/clothing/base/undiesBase.tscn" type="PackedScene" id=2] diff --git a/scenes/game.tscn b/scenes/game.tscn index 99bfbed..90967cf 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/character_base.tscn" type="PackedScene" id=1] -[ext_resource path="res://sprites/world/background.svg" type="Texture" id=2] +[ext_resource path="res://scenes/characterBase.tscn" type="PackedScene" id=1] +[ext_resource path="res://sprites/clothes/background.svg" type="Texture" id=2] [ext_resource path="res://sprites/ui/blue_boxCross.png" type="Texture" id=3] [ext_resource path="res://scenes/wardrobe.tscn" type="PackedScene" id=4] [ext_resource path="res://sprites/clothes/icrazy_frame.svg" type="Texture" id=5] @@ -28,7 +28,7 @@ position = Vector2( 35.118, -14.56 ) texture = ExtResource( 6 ) [node name="characterBase" parent="." instance=ExtResource( 1 )] -position = Vector2( 145.146, 205.536 ) +position = Vector2( 126.596, 319.219 ) [node name="ui" type="CanvasLayer" parent="."] @@ -40,17 +40,16 @@ __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 = -5.0 -margin_top = -20.0 -margin_right = 60.0 -margin_bottom = 109.0 +margin_left = -4.69434 +margin_top = -19.9716 +margin_right = 60.3057 +margin_bottom = 75.0284 [node name="clearBtn" type="TextureButton" parent="ui/base"] margin_left = 752.0 @@ -68,18 +67,4 @@ __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 b42c813..64503e0 100644 --- a/scenes/wardrobe.tscn +++ b/scenes/wardrobe.tscn @@ -1,21 +1,25 @@ -[gd_scene load_steps=17 format=2] +[gd_scene load_steps=21 format=2] [ext_resource path="res://scenes/clothing/camera.tscn" type="PackedScene" id=1] -[ext_resource path="res://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/undies/zBriefs.tscn" type="PackedScene" id=2] +[ext_resource path="res://scenes/clothing/pants/beatUpJeans.tscn" type="PackedScene" id=3] +[ext_resource path="res://scenes/clothing/pants/jeans.tscn" type="PackedScene" id=4] [ext_resource path="res://scenes/clothing/pants/skirt.tscn" type="PackedScene" id=5] -[ext_resource path="res://scenes/clothing/pants/formal_skirt.tscn" type="PackedScene" id=6] +[ext_resource path="res://scenes/clothing/pants/formalSkirt.tscn" type="PackedScene" id=6] [ext_resource path="res://scenes/clothing/pants/camoJeans.tscn" type="PackedScene" id=7] -[ext_resource path="res://scenes/clothing/pants/dj_shorts.tscn" type="PackedScene" id=8] +[ext_resource path="res://scenes/clothing/pants/djShorts.tscn" type="PackedScene" id=8] [ext_resource path="res://sprites/ui/x_button.svg" type="Texture" id=9] -[ext_resource path="res://scenes/clothing/tops/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/whatsNewShirt.tscn" type="PackedScene" id=10] +[ext_resource path="res://scenes/clothing/tops/zShirt.tscn" type="PackedScene" id=11] [ext_resource path="res://scenes/clothing/tops/rawShirt.tscn" type="PackedScene" id=12] -[ext_resource path="res://scenes/clothing/tops/atomic_shirt.tscn" type="PackedScene" id=15] +[ext_resource path="res://scenes/clothing/tops/kormShirt.tscn" type="PackedScene" id=13] +[ext_resource path="res://scenes/clothing/tops/djShirt.tscn" type="PackedScene" id=14] +[ext_resource path="res://scenes/clothing/tops/atomicShirt.tscn" type="PackedScene" id=15] +[ext_resource path="res://scenes/clothing/tops/nlShirt.tscn" type="PackedScene" id=16] [ext_resource path="res://scenes/clothing/pants/sweatPants.tscn" type="PackedScene" id=17] -[ext_resource path="res://scenes/clothing/tops/retro_shirt.tscn" type="PackedScene" id=18] +[ext_resource path="res://scenes/clothing/undies/briefs.tscn" type="PackedScene" id=20] [ext_resource path="res://scripts/wardrobe.gd" type="Script" id=21] +[ext_resource path="res://scenes/clothing/undies/fundosi.tscn" type="PackedScene" id=22] [node name="Wordrobe" type="TabContainer"] anchor_right = 1.0 @@ -53,54 +57,62 @@ size_flags_vertical = 3 columns = 4 [node name="removePants" type="TextureButton" parent="Pants/PantsScroll/PantsGrid"] -margin_right = 113.0 -margin_bottom = 128.0 +margin_right = 106.0 +margin_bottom = 112.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 = 117.0 -margin_right = 227.0 -margin_bottom = 128.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 [node name="camoJeans" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 7 )] anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 231.0 -margin_right = 342.0 -margin_bottom = 128.0 +margin_left = 330.0 +margin_right = 436.0 +margin_bottom = 112.0 [node name="sweatPants" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 17 )] anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 346.0 -margin_right = 457.0 -margin_bottom = 128.0 +margin_top = 116.0 +margin_right = 106.0 +margin_bottom = 228.0 [node name="camoJeans2" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 8 )] anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 132.0 -margin_right = 113.0 -margin_bottom = 258.0 +margin_left = 110.0 +margin_top = 116.0 +margin_right = 216.0 +margin_bottom = 228.0 [node name="formalSkirt" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 6 )] anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 117.0 -margin_top = 132.0 -margin_right = 227.0 -margin_bottom = 258.0 +margin_left = 220.0 +margin_top = 116.0 +margin_right = 326.0 +margin_bottom = 228.0 [node name="skirt" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 5 )] anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 231.0 -margin_top = 132.0 -margin_right = 342.0 -margin_bottom = 258.0 +margin_left = 330.0 +margin_top = 116.0 +margin_right = 436.0 +margin_bottom = 228.0 [node name="Shirts" type="Tabs" parent="."] visible = false @@ -125,55 +137,84 @@ size_flags_vertical = 3 columns = 4 [node name="removeShirt" type="TextureButton" parent="Shirts/ShirtsScroll/ShirtsGrid"] -margin_right = 106.0 -margin_bottom = 113.0 +margin_left = 110.0 +margin_top = 119.0 +margin_right = 216.0 +margin_bottom = 234.0 rect_min_size = Vector2( 0, 112 ) texture_normal = ExtResource( 9 ) -[node name="atomicShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 15 )] +[node name="djShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 14 )] +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_right = 106.0 +margin_bottom = 115.0 + +[node name="kormShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 13 )] anchor_right = 0.0 anchor_bottom = 0.0 margin_left = 110.0 margin_right = 216.0 -margin_bottom = 113.0 +margin_bottom = 115.0 -[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 = 113.0 +[node name="atomicShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 15 )] -[node name="fullsnackShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 11 )] -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_left = 330.0 -margin_right = 436.0 -margin_bottom = 113.0 +[node name="nlShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 16 )] [node name="rawShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 12 )] anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 117.0 -margin_right = 106.0 -margin_bottom = 229.0 +margin_left = 220.0 +margin_right = 326.0 +margin_bottom = 115.0 + +[node name="zShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 11 )] +anchor_right = 0.0 +anchor_bottom = 0.0 +margin_left = 330.0 +margin_right = 436.0 +margin_bottom = 115.0 [node name="whatsNewShirt" parent="Shirts/ShirtsScroll/ShirtsGrid" instance=ExtResource( 10 )] anchor_right = 0.0 anchor_bottom = 0.0 -margin_left = 220.0 -margin_top = 117.0 -margin_right = 326.0 -margin_bottom = 229.0 +margin_top = 119.0 +margin_right = 106.0 +margin_bottom = 234.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="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_right = 326.0 +margin_bottom = 112.0 [node name="Accessoires" type="Tabs" parent="."] visible = false @@ -198,13 +239,13 @@ size_flags_vertical = 3 columns = 3 [node name="removeAccessory" type="TextureButton" parent="Accessoires/AccsScroll/AccsGrid"] -margin_right = 106.0 +margin_left = 89.0 +margin_right = 195.0 margin_bottom = 112.0 texture_normal = ExtResource( 9 ) [node name="camera" parent="Accessoires/AccsScroll/AccsGrid" instance=ExtResource( 1 )] -margin_left = 110.0 -margin_right = 195.0 +margin_right = 85.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/character_base.gd b/scripts/characterBase.gd similarity index 100% rename from scripts/character_base.gd rename to scripts/characterBase.gd diff --git a/scripts/clothing/accessory_base.gd b/scripts/clothing/accessoryBase.gd similarity index 62% rename from scripts/clothing/accessory_base.gd rename to scripts/clothing/accessoryBase.gd index d2102c7..043eb9a 100644 --- a/scripts/clothing/accessory_base.gd +++ b/scripts/clothing/accessoryBase.gd @@ -1,4 +1,4 @@ -extends "res://scripts/clothing/clothing_base.gd" +extends "res://scripts/clothing/baseClothing.gd" func _on_accessory_pressed(): character.accessory = texture_normal diff --git a/scripts/clothing/clothing_base.gd b/scripts/clothing/baseClothing.gd similarity index 100% rename from scripts/clothing/clothing_base.gd rename to scripts/clothing/baseClothing.gd diff --git a/scripts/clothing/bottoms_base.gd b/scripts/clothing/bottomsBase.gd similarity index 61% rename from scripts/clothing/bottoms_base.gd rename to scripts/clothing/bottomsBase.gd index db36aca..35d7929 100644 --- a/scripts/clothing/bottoms_base.gd +++ b/scripts/clothing/bottomsBase.gd @@ -1,4 +1,4 @@ -extends "res://scripts/clothing/clothing_base.gd" +extends "res://scripts/clothing/baseClothing.gd" func _on_bottoms_pressed(): character.bottom = texture_normal diff --git a/scripts/clothing/tops_base.gd b/scripts/clothing/topsBase.gd similarity index 59% rename from scripts/clothing/tops_base.gd rename to scripts/clothing/topsBase.gd index 88bcff2..3500f76 100644 --- a/scripts/clothing/tops_base.gd +++ b/scripts/clothing/topsBase.gd @@ -1,4 +1,4 @@ -extends "res://scripts/clothing/clothing_base.gd" +extends "res://scripts/clothing/baseClothing.gd" func _on_tops_pressed(): character.top = texture_normal diff --git a/scripts/clothing/undies_base.gd b/scripts/clothing/undiesBase.gd similarity index 62% rename from scripts/clothing/undies_base.gd rename to scripts/clothing/undiesBase.gd index 4f96176..66a174e 100644 --- a/scripts/clothing/undies_base.gd +++ b/scripts/clothing/undiesBase.gd @@ -1,4 +1,4 @@ -extends "res://scripts/clothing/clothing_base.gd" +extends "res://scripts/clothing/baseClothing.gd" func _on_undies_pressed(): character.underwear = texture_normal diff --git a/scripts/game_info.gd b/scripts/game_info.gd deleted file mode 100644 index 1eccaec..0000000 --- a/scripts/game_info.gd +++ /dev/null @@ -1,16 +0,0 @@ -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 5867720..f9d17e1 100644 --- a/scripts/ui.gd +++ b/scripts/ui.gd @@ -1,18 +1,12 @@ +tool extends Control -export var version: String = "1.0.0" - onready var character = preload("res://resources/character.tres") -onready var blank_accessory = preload("res://sprites/clothes/blank_top.png") -onready var base_top = preload("res://sprites/character_base_top.svg") -onready var base_bottom = preload("res://sprites/character_base_legs.svg") - -func _ready(): - var verLabel = $versionLbl - verLabel.text = "v" + version +onready var blank_top = preload("res://sprites/clothes/blank_top.png") +onready var blank_bottom = preload("res://sprites/clothes/blank_bottom.png") func _on_clearBtn_pressed(): $clear.play() - character.accessory = blank_accessory - character.bottom = base_bottom - character.top = base_top + character.accessory = blank_top + character.bottom = blank_bottom + character.top = blank_top diff --git a/scripts/wardrobe.gd b/scripts/wardrobe.gd index 831b06e..4741a96 100644 --- a/scripts/wardrobe.gd +++ b/scripts/wardrobe.gd @@ -1,13 +1,12 @@ extends TabContainer onready var character = preload("res://resources/character.tres") -onready var blank_accessory = preload("res://sprites/clothes/blank_top.png") -onready var base_top = preload("res://sprites/character_base_top.svg") -onready var base_bottom = preload("res://sprites/clothes/owo_censor.svg") +onready var blank_top = preload("res://sprites/clothes/blank_top.png") +onready var blank_bottom = preload("res://sprites/clothes/blank_bottom.png") 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): @@ -45,8 +44,10 @@ 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 @@ -61,16 +62,22 @@ 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("emojidlc.pck") +# check_for_dlc("testdlc.pck") pass func _on_removeAccessory_pressed(): - character.accessory = blank_accessory + character.accessory = blank_top func _on_removePants_pressed(): - character.bottom = base_bottom + character.bottom = blank_bottom func _on_removeShirt_pressed(): - character.top = base_top + character.top = blank_top diff --git a/sprites/character_base.svg b/sprites/character_base.svg index 8de1b63..925e51f 100644 --- a/sprites/character_base.svg +++ b/sprites/character_base.svg @@ -1,4 +1,6 @@ + + + id="svg8" + inkscape:version="0.92.3 (2405546, 2018-03-11)" + sodipodi:docname="character_base.svg"> + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="2.8" + inkscape:cx="86.349322" + inkscape:cy="146.4697" + inkscape:document-units="mm" + inkscape:current-layer="layer3" + showgrid="false" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + inkscape:pagecheckerboard="true" + showguides="true" + inkscape:window-width="958" + inkscape:window-height="991" + inkscape:window-x="-8" + inkscape:window-y="0" + inkscape:window-maximized="0" + inkscape:lockguides="false" /> @@ -50,115 +51,149 @@ image/svg+xml - + + id="layer1" + transform="translate(-76.57798,-103.3061)" + style="display:inline" /> + inkscape:label="Color"> - + - + - + + id="path845" + inkscape:connector-curvature="0" /> + id="path833-7" + inkscape:connector-curvature="0" /> + + + + + id="path5043" + inkscape:connector-curvature="0" /> + id="path5045" + inkscape:connector-curvature="0" /> - + + id="path5059" + inkscape:connector-curvature="0" /> + inkscape:label="Re-ink" + style="display:inline" + sodipodi:insensitive="true"> - + - + + id="path833" + inkscape:connector-curvature="0" /> + id="path852" + inkscape:connector-curvature="0" /> + + - + + id="path870" + inkscape:connector-curvature="0" /> + id="path5047" + inkscape:connector-curvature="0" /> diff --git a/sprites/character_base_head.svg b/sprites/character_base_head.svg deleted file mode 100644 index 9908a7c..0000000 --- a/sprites/character_base_head.svg +++ /dev/null @@ -1,163 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sprites/character_base_head.svg.import b/sprites/character_base_head.svg.import deleted file mode 100644 index 77dc463..0000000 --- a/sprites/character_base_head.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[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 deleted file mode 100644 index dc7080c..0000000 --- a/sprites/character_base_legs.svg +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff --git a/sprites/character_base_legs.svg.import b/sprites/character_base_legs.svg.import deleted file mode 100644 index bd1dfd2..0000000 --- a/sprites/character_base_legs.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[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 deleted file mode 100644 index cfc662f..0000000 --- a/sprites/character_base_top.svg +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff --git a/sprites/character_base_top.svg.import b/sprites/character_base_top.svg.import deleted file mode 100644 index 5360e10..0000000 --- a/sprites/character_base_top.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[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 new file mode 100644 index 0000000..97f66c5 Binary files /dev/null and b/sprites/clothes/atomic_shirt.png differ diff --git a/sprites/world/dressup_panel.svg.import b/sprites/clothes/atomic_shirt.png.import similarity index 68% rename from sprites/world/dressup_panel.svg.import rename to sprites/clothes/atomic_shirt.png.import index bd217e6..5b2aab9 100644 --- a/sprites/world/dressup_panel.svg.import +++ b/sprites/clothes/atomic_shirt.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/dressup_panel.svg-8a41151cb84a8483a6bad92f218a33e8.stex" +path="res://.import/atomic_shirt.png-e1562af2eed6677399909eaf790f9e4c.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/world/dressup_panel.svg" -dest_files=[ "res://.import/dressup_panel.svg-8a41151cb84a8483a6bad92f218a33e8.stex" ] +source_file="res://sprites/clothes/atomic_shirt.png" +dest_files=[ "res://.import/atomic_shirt.png-e1562af2eed6677399909eaf790f9e4c.stex" ] [params] diff --git a/sprites/clothes/atomic_shirt.svg b/sprites/clothes/atomic_shirt.svg index 17d0688..1c218f6 100644 --- a/sprites/clothes/atomic_shirt.svg +++ b/sprites/clothes/atomic_shirt.svg @@ -1,4 +1,6 @@ + + + id="svg8" + inkscape:version="0.92.3 (2405546, 2018-03-11)" + sodipodi:docname="atomic_shirt.svg"> + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="7.9195959" + inkscape:cx="66.109402" + inkscape:cy="50.591263" + inkscape:document-units="mm" + inkscape:current-layer="layer2" + showgrid="false" + inkscape:pagecheckerboard="true" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + inkscape:window-width="1920" + inkscape:window-height="1001" + inkscape:window-x="-9" + inkscape:window-y="-9" + inkscape:window-maximized="1" /> @@ -53,117 +54,68 @@ - - - - - - - - - - - + + inkscape:label="Re-ink" + transform="translate(-108.95163,-14.177885)" + style="display:inline"> - + - + + inkscape:connector-curvature="0" + sodipodi:nodetypes="czc" /> + cy="28.401752" + cx="121.36296" + id="path848" + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.14999999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + cy="28.26812" + cx="121.26273" + id="path850" + style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + cx="69.600197" + id="path850-0" + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + rx="2.3582172" + cy="-68.645317" + cx="103.66148" + id="path850-0-1" + style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> diff --git a/sprites/world/background.svg b/sprites/clothes/background.svg similarity index 100% rename from sprites/world/background.svg rename to sprites/clothes/background.svg diff --git a/sprites/clothes/skate_shirt.svg.import b/sprites/clothes/background.svg.import similarity index 68% rename from sprites/clothes/skate_shirt.svg.import rename to sprites/clothes/background.svg.import index 76634d6..9a35431 100644 --- a/sprites/clothes/skate_shirt.svg.import +++ b/sprites/clothes/background.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/skate_shirt.svg-f6dd325cc91a89a1f7a63cf7771a25ab.stex" +path="res://.import/background.svg-53a5ac36b87b243d4a54ca15a9574f97.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/clothes/skate_shirt.svg" -dest_files=[ "res://.import/skate_shirt.svg-f6dd325cc91a89a1f7a63cf7771a25ab.stex" ] +source_file="res://sprites/clothes/background.svg" +dest_files=[ "res://.import/background.svg-53a5ac36b87b243d4a54ca15a9574f97.stex" ] [params] diff --git a/sprites/clothes/beat_up_jeans.png b/sprites/clothes/beat_up_jeans.png new file mode 100644 index 0000000..050a638 Binary files /dev/null and b/sprites/clothes/beat_up_jeans.png differ diff --git a/sprites/clothes/fullsnack_shirt.svg.import b/sprites/clothes/beat_up_jeans.png.import similarity index 67% rename from sprites/clothes/fullsnack_shirt.svg.import rename to sprites/clothes/beat_up_jeans.png.import index 573a377..91eb022 100644 --- a/sprites/clothes/fullsnack_shirt.svg.import +++ b/sprites/clothes/beat_up_jeans.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/fullsnack_shirt.svg-fe727b0ca40952cd32596f7250f1aa9d.stex" +path="res://.import/beat_up_jeans.png-563d36a45fd402c2c8bee9ed9bcd86ff.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/clothes/fullsnack_shirt.svg" -dest_files=[ "res://.import/fullsnack_shirt.svg-fe727b0ca40952cd32596f7250f1aa9d.stex" ] +source_file="res://sprites/clothes/beat_up_jeans.png" +dest_files=[ "res://.import/beat_up_jeans.png-563d36a45fd402c2c8bee9ed9bcd86ff.stex" ] [params] diff --git a/sprites/clothes/beat_up_jeans.svg b/sprites/clothes/beat_up_jeans.svg index 11d9ae3..88d4402 100644 --- a/sprites/clothes/beat_up_jeans.svg +++ b/sprites/clothes/beat_up_jeans.svg @@ -1,4 +1,6 @@ + + @@ -23,24 +25,23 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="5.6" - inkscape:cx="80.629541" - inkscape:cy="69.57743" + inkscape:zoom="7.9195959" + inkscape:cx="60.844989" + inkscape:cy="64.009018" inkscape:document-units="mm" - inkscape:current-layer="layer3" + inkscape:current-layer="layer2" showgrid="false" inkscape:pagecheckerboard="true" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" - showguides="true" + showguides="false" inkscape:window-width="1920" inkscape:window-height="1001" inkscape:window-x="-9" inkscape:window-y="-9" - inkscape:window-maximized="1" - inkscape:document-rotation="0" /> + inkscape:window-maximized="1" /> @@ -49,85 +50,64 @@ image/svg+xml - + - - - - + transform="translate(-78.959229,-134.01666)" /> + sodipodi:insensitive="true"> + inkscape:label="Re-ink"> diff --git a/sprites/clothes/biker_jacket.png b/sprites/clothes/biker_jacket.png new file mode 100644 index 0000000..de582e0 Binary files /dev/null and b/sprites/clothes/biker_jacket.png differ diff --git a/sprites/clothes/biker_jacket.png.import b/sprites/clothes/biker_jacket.png.import new file mode 100644 index 0000000..3a14972 --- /dev/null +++ b/sprites/clothes/biker_jacket.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/biker_jacket.png-49a94ec6ef89c92948186608cc0de2ea.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/clothes/biker_jacket.png" +dest_files=[ "res://.import/biker_jacket.png-49a94ec6ef89c92948186608cc0de2ea.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/sprites/clothes/blue_camo_jeans.png b/sprites/clothes/blue_camo_jeans.png new file mode 100644 index 0000000..404d7c8 Binary files /dev/null and b/sprites/clothes/blue_camo_jeans.png differ diff --git a/sprites/clothes/blue_camo_jeans.png.import b/sprites/clothes/blue_camo_jeans.png.import new file mode 100644 index 0000000..71206a9 --- /dev/null +++ b/sprites/clothes/blue_camo_jeans.png.import @@ -0,0 +1,34 @@ +[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 70d6ae1..0835ead 100644 --- a/sprites/clothes/blue_camo_jeans.svg +++ b/sprites/clothes/blue_camo_jeans.svg @@ -1,4 +1,6 @@ + + + id="svg2007" + inkscape:version="0.92.3 (2405546, 2018-03-11)" + sodipodi:docname="blue_camo_jeans.svg"> + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="5.6" + inkscape:cx="67.738265" + inkscape:cy="72.758833" + inkscape:document-units="mm" + inkscape:current-layer="layer2" + showgrid="false" + inkscape:pagecheckerboard="true" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + showguides="false" + inkscape:window-width="1920" + inkscape:window-height="1001" + inkscape:window-x="-9" + inkscape:window-y="-9" + inkscape:window-maximized="1" + inkscape:lockguides="true" /> @@ -55,175 +56,144 @@ - - - - - + inkscape:label="Re-ink" + style="display:inline" + sodipodi:insensitive="true"> - + sodipodi:nodetypes="ssssscss" /> + inkscape:connector-curvature="0" /> - + - + + inkscape:connector-curvature="0" /> - - + + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + - + - + + - + + inkscape:connector-curvature="0" /> - + + inkscape:connector-curvature="0" /> + d="m 18.999166,3.2834423 c -0.04805,1.5545165 -0.562287,2.9032809 -1.459603,4.0997026" + style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + cy="7.3664403" + cx="17.472746" + id="path2634" + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.31317234;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="m 20.501823,2.9925195 c 0.561916,1.1250721 1.083725,2.4049651 1.848591,3.3883647" + style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + cy="6.3808842" + cx="22.367119" + id="path2634-8" + style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.31317234;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> diff --git a/sprites/clothes/blue_skirt.svg b/sprites/clothes/blue_skirt.svg index 08060bd..f9ecf46 100644 --- a/sprites/clothes/blue_skirt.svg +++ b/sprites/clothes/blue_skirt.svg @@ -1,4 +1,6 @@ + + @@ -23,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="3.959798" - inkscape:cx="109.73297" - inkscape:cy="72.645807" + inkscape:zoom="7.9195959" + inkscape:cx="78.143852" + inkscape:cy="76.635925" inkscape:document-units="mm" inkscape:current-layer="layer2" showgrid="false" @@ -37,10 +39,9 @@ showguides="false" inkscape:window-width="1920" inkscape:window-height="1001" - inkscape:window-x="-9" + inkscape:window-x="1911" inkscape:window-y="-9" - inkscape:window-maximized="1" - inkscape:document-rotation="0" /> + inkscape:window-maximized="1" /> @@ -49,78 +50,53 @@ image/svg+xml - + - - - - - - + transform="translate(-78.959229,-134.01666)" /> + inkscape:label="Re-ink"> diff --git a/sprites/clothes/briefs.png b/sprites/clothes/briefs.png new file mode 100644 index 0000000..a768800 Binary files /dev/null and b/sprites/clothes/briefs.png differ diff --git a/sprites/world/background.svg.import b/sprites/clothes/briefs.png.import similarity index 69% rename from sprites/world/background.svg.import rename to sprites/clothes/briefs.png.import index 5f369f8..8e8d687 100644 --- a/sprites/world/background.svg.import +++ b/sprites/clothes/briefs.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/background.svg-9a13379093158c4dd6765036ae620619.stex" +path="res://.import/briefs.png-f2fba0226797db266d542131d9f44a11.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/world/background.svg" -dest_files=[ "res://.import/background.svg-9a13379093158c4dd6765036ae620619.stex" ] +source_file="res://sprites/clothes/briefs.png" +dest_files=[ "res://.import/briefs.png-f2fba0226797db266d542131d9f44a11.stex" ] [params] diff --git a/sprites/clothes/classic/briefs_classic.png b/sprites/clothes/classic/briefs_classic.png new file mode 100644 index 0000000..9536ca1 Binary files /dev/null and b/sprites/clothes/classic/briefs_classic.png differ diff --git a/sprites/new_character_base.svg.import b/sprites/clothes/classic/briefs_classic.png.import similarity index 67% rename from sprites/new_character_base.svg.import rename to sprites/clothes/classic/briefs_classic.png.import index 366423f..7121c87 100644 --- a/sprites/new_character_base.svg.import +++ b/sprites/clothes/classic/briefs_classic.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/new_character_base.svg-e37d5232b11c88359270a1b5f7a925f8.stex" +path="res://.import/briefs_classic.png-2ce669e823e59b371b99b2a937ab4263.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/new_character_base.svg" -dest_files=[ "res://.import/new_character_base.svg-e37d5232b11c88359270a1b5f7a925f8.stex" ] +source_file="res://sprites/clothes/classic/briefs_classic.png" +dest_files=[ "res://.import/briefs_classic.png-2ce669e823e59b371b99b2a937ab4263.stex" ] [params] diff --git a/sprites/clothes/classic/camera_classic.png b/sprites/clothes/classic/camera_classic.png new file mode 100644 index 0000000..9c38c7f Binary files /dev/null and b/sprites/clothes/classic/camera_classic.png differ diff --git a/sprites/clothes/classic/camera_classic.png.import b/sprites/clothes/classic/camera_classic.png.import new file mode 100644 index 0000000..64c5f40 --- /dev/null +++ b/sprites/clothes/classic/camera_classic.png.import @@ -0,0 +1,34 @@ +[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 new file mode 100644 index 0000000..60b2ab6 Binary files /dev/null and b/sprites/clothes/classic/fundosi_classic.png differ diff --git a/sprites/clothes/classic/fundosi_classic.png.import b/sprites/clothes/classic/fundosi_classic.png.import new file mode 100644 index 0000000..5d8405d --- /dev/null +++ b/sprites/clothes/classic/fundosi_classic.png.import @@ -0,0 +1,34 @@ +[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 new file mode 100644 index 0000000..532644a Binary files /dev/null and b/sprites/clothes/classic/owo_censor_classic.png differ diff --git a/sprites/clothes/classic/owo_censor_classic.png.import b/sprites/clothes/classic/owo_censor_classic.png.import new file mode 100644 index 0000000..8f897d4 --- /dev/null +++ b/sprites/clothes/classic/owo_censor_classic.png.import @@ -0,0 +1,34 @@ +[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 new file mode 100644 index 0000000..404a411 Binary files /dev/null and b/sprites/clothes/classic/z_briefs_classic.png differ diff --git a/sprites/clothes/classic/z_briefs_classic.png.import b/sprites/clothes/classic/z_briefs_classic.png.import new file mode 100644 index 0000000..ac2e1c0 --- /dev/null +++ b/sprites/clothes/classic/z_briefs_classic.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/z_briefs_classic.png-10d3d58b4454e62be8efb64c0a2e448e.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/clothes/classic/z_briefs_classic.png" +dest_files=[ "res://.import/z_briefs_classic.png-10d3d58b4454e62be8efb64c0a2e448e.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/sprites/world/classic_dress_up_bg.png b/sprites/clothes/classic_dress_up_bg.png similarity index 100% rename from sprites/world/classic_dress_up_bg.png rename to sprites/clothes/classic_dress_up_bg.png diff --git a/sprites/world/classic_dress_up_bg.png.import b/sprites/clothes/classic_dress_up_bg.png.import similarity index 66% rename from sprites/world/classic_dress_up_bg.png.import rename to sprites/clothes/classic_dress_up_bg.png.import index aa2a372..8bb3c85 100644 --- a/sprites/world/classic_dress_up_bg.png.import +++ b/sprites/clothes/classic_dress_up_bg.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/classic_dress_up_bg.png-91243fdfc1a4ed4c9d92cd705c19bfd4.stex" +path="res://.import/classic_dress_up_bg.png-594c00eaf14ad58cdedc1824d8f59a5c.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" ] +source_file="res://sprites/clothes/classic_dress_up_bg.png" +dest_files=[ "res://.import/classic_dress_up_bg.png-594c00eaf14ad58cdedc1824d8f59a5c.stex" ] [params] diff --git a/sprites/world/classic_dress_up_blurred_bg.png b/sprites/clothes/classic_dress_up_blurred_bg.png similarity index 100% rename from sprites/world/classic_dress_up_blurred_bg.png rename to sprites/clothes/classic_dress_up_blurred_bg.png diff --git a/sprites/world/classic_dress_up_blurred_bg.png.import b/sprites/clothes/classic_dress_up_blurred_bg.png.import similarity index 64% rename from sprites/world/classic_dress_up_blurred_bg.png.import rename to sprites/clothes/classic_dress_up_blurred_bg.png.import index bbc4b26..dab810b 100644 --- a/sprites/world/classic_dress_up_blurred_bg.png.import +++ b/sprites/clothes/classic_dress_up_blurred_bg.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/classic_dress_up_blurred_bg.png-ce6fef332733ba210937c36735d40783.stex" +path="res://.import/classic_dress_up_blurred_bg.png-21899d83f42ae1cd02cd106046f74e05.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" ] +source_file="res://sprites/clothes/classic_dress_up_blurred_bg.png" +dest_files=[ "res://.import/classic_dress_up_blurred_bg.png-21899d83f42ae1cd02cd106046f74e05.stex" ] [params] diff --git a/sprites/clothes/dj_shorts.png b/sprites/clothes/dj_shorts.png new file mode 100644 index 0000000..2873015 Binary files /dev/null and b/sprites/clothes/dj_shorts.png differ diff --git a/sprites/clothes/dj_shorts.png.import b/sprites/clothes/dj_shorts.png.import new file mode 100644 index 0000000..6cdc150 --- /dev/null +++ b/sprites/clothes/dj_shorts.png.import @@ -0,0 +1,34 @@ +[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 bd84649..82c126f 100644 --- a/sprites/clothes/dj_shorts.svg +++ b/sprites/clothes/dj_shorts.svg @@ -1,4 +1,6 @@ + + + inkscape:version="0.92.3 (2405546, 2018-03-11)"> @@ -22,7 +24,7 @@ image/svg+xml - + @@ -42,65 +44,31 @@ id="namedview817" showgrid="false" inkscape:zoom="10.202541" - inkscape:cx="98.573183" - inkscape:cy="50.799978" + inkscape:cx="63.855679" + inkscape:cy="78.557618" inkscape:window-x="-9" inkscape:window-y="-9" inkscape:window-maximized="1" - inkscape:current-layer="layer2" + inkscape:current-layer="layer3" inkscape:pagecheckerboard="true" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" - fit-margin-bottom="0" - inkscape:document-rotation="0" /> + fit-margin-bottom="0" /> - - - - - - - + transform="translate(0.60396188,-1.5247525)" + style="display:inline" + sodipodi:insensitive="true" /> + inkscape:label="Color"> @@ -123,7 +91,7 @@ inkscape:connector-curvature="0" sodipodi:nodetypes="csscc" /> + style="display:inline"> + - diff --git a/sprites/world/dressup_blurred_wardrobe.png b/sprites/clothes/dressup_blurred_wardrobe.png similarity index 100% rename from sprites/world/dressup_blurred_wardrobe.png rename to sprites/clothes/dressup_blurred_wardrobe.png diff --git a/sprites/world/dressup_blurred_wardrobe.png.import b/sprites/clothes/dressup_blurred_wardrobe.png.import similarity index 65% rename from sprites/world/dressup_blurred_wardrobe.png.import rename to sprites/clothes/dressup_blurred_wardrobe.png.import index b7e6d9c..faa0a1c 100644 --- a/sprites/world/dressup_blurred_wardrobe.png.import +++ b/sprites/clothes/dressup_blurred_wardrobe.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/dressup_blurred_wardrobe.png-ccd2427a9b242dfea390fb0dba1cb8b6.stex" +path="res://.import/dressup_blurred_wardrobe.png-8d6b33052b265436c0bddfa109913146.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" ] +source_file="res://sprites/clothes/dressup_blurred_wardrobe.png" +dest_files=[ "res://.import/dressup_blurred_wardrobe.png-8d6b33052b265436c0bddfa109913146.stex" ] [params] diff --git a/sprites/world/dressup_panel.svg b/sprites/clothes/dressup_panel.svg similarity index 100% rename from sprites/world/dressup_panel.svg rename to sprites/clothes/dressup_panel.svg diff --git a/sprites/clothes/dressup_panel.svg.import b/sprites/clothes/dressup_panel.svg.import new file mode 100644 index 0000000..bb8d4b0 --- /dev/null +++ b/sprites/clothes/dressup_panel.svg.import @@ -0,0 +1,34 @@ +[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/world/dressup_wardrobe.png b/sprites/clothes/dressup_wardrobe.png similarity index 100% rename from sprites/world/dressup_wardrobe.png rename to sprites/clothes/dressup_wardrobe.png diff --git a/sprites/world/dressup_wardrobe.png.import b/sprites/clothes/dressup_wardrobe.png.import similarity index 67% rename from sprites/world/dressup_wardrobe.png.import rename to sprites/clothes/dressup_wardrobe.png.import index 455f5ad..fcb87ff 100644 --- a/sprites/world/dressup_wardrobe.png.import +++ b/sprites/clothes/dressup_wardrobe.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/dressup_wardrobe.png-3622bbe4ab99a88bf60cd058eb099f9f.stex" +path="res://.import/dressup_wardrobe.png-c4a59bdd169c023e961e92917f5fd969.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/world/dressup_wardrobe.png" -dest_files=[ "res://.import/dressup_wardrobe.png-3622bbe4ab99a88bf60cd058eb099f9f.stex" ] +source_file="res://sprites/clothes/dressup_wardrobe.png" +dest_files=[ "res://.import/dressup_wardrobe.png-c4a59bdd169c023e961e92917f5fd969.stex" ] [params] diff --git a/sprites/world/dressup_wardrobe.svg b/sprites/clothes/dressup_wardrobe.svg similarity index 100% rename from sprites/world/dressup_wardrobe.svg rename to sprites/clothes/dressup_wardrobe.svg diff --git a/sprites/world/dressup_wardrobe.svg.import b/sprites/clothes/dressup_wardrobe.svg.import similarity index 67% rename from sprites/world/dressup_wardrobe.svg.import rename to sprites/clothes/dressup_wardrobe.svg.import index 05c4a30..e033072 100644 --- a/sprites/world/dressup_wardrobe.svg.import +++ b/sprites/clothes/dressup_wardrobe.svg.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/dressup_wardrobe.svg-50694cf0e1b6e5ed9fafb867a0443a2e.stex" +path="res://.import/dressup_wardrobe.svg-469d705b19d4010c02c75ae841bf12a7.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/world/dressup_wardrobe.svg" -dest_files=[ "res://.import/dressup_wardrobe.svg-50694cf0e1b6e5ed9fafb867a0443a2e.stex" ] +source_file="res://sprites/clothes/dressup_wardrobe.svg" +dest_files=[ "res://.import/dressup_wardrobe.svg-469d705b19d4010c02c75ae841bf12a7.stex" ] [params] diff --git a/sprites/clothes/formal_skirt.svg b/sprites/clothes/formal_skirt.svg index 9efb523..cd0b278 100644 --- a/sprites/clothes/formal_skirt.svg +++ b/sprites/clothes/formal_skirt.svg @@ -1,4 +1,6 @@ + + + id="svg2007" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)" + sodipodi:docname="formal_skirt.svg"> + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="7.9195959" + inkscape:cx="78.143852" + inkscape:cy="66.534399" + inkscape:document-units="mm" + inkscape:current-layer="layer2" + showgrid="false" + inkscape:pagecheckerboard="true" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + showguides="false" + inkscape:window-width="1920" + inkscape:window-height="1001" + inkscape:window-x="1911" + inkscape:window-y="-9" + inkscape:window-maximized="1" /> @@ -54,40 +55,19 @@ - - - - + id="layer1" + transform="translate(-78.959229,-134.01666)" /> + inkscape:label="Re-ink"> + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccc" /> diff --git a/sprites/clothes/fullsnack_shirt.svg b/sprites/clothes/fullsnack_shirt.svg deleted file mode 100644 index 0d66500..0000000 --- a/sprites/clothes/fullsnack_shirt.svg +++ /dev/null @@ -1,261 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sprites/clothes/fundosi.png b/sprites/clothes/fundosi.png new file mode 100644 index 0000000..98b1e33 Binary files /dev/null and b/sprites/clothes/fundosi.png differ diff --git a/sprites/clothes/fundosi.png.import b/sprites/clothes/fundosi.png.import new file mode 100644 index 0000000..9cc7aab --- /dev/null +++ b/sprites/clothes/fundosi.png.import @@ -0,0 +1,34 @@ +[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 2ceb7c7..6b6e07a 100644 --- a/sprites/clothes/fundosi.svg +++ b/sprites/clothes/fundosi.svg @@ -1,4 +1,6 @@ + + + width="106" + height="112" + viewBox="0 0 106 112" + sodipodi:docname="fundosi.svg" + inkscape:version="0.92.3 (2405546, 2018-03-11)"> @@ -29,109 +31,72 @@ + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1001" + id="namedview1570" + showgrid="false" + inkscape:pagecheckerboard="true" + inkscape:zoom="11.9198" + inkscape:cx="77.040608" + inkscape:cy="75.892047" + inkscape:window-x="-9" + inkscape:window-y="-9" + inkscape:window-maximized="1" + inkscape:current-layer="layer3" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" /> - - - - - - - - - - - - + inkscape:label="Color" + sodipodi:insensitive="true"> + inkscape:connector-curvature="0" /> + inkscape:label="Re-ink" + transform="translate(197.74576,104.88136)"> - + - + + + + id="path2145" + inkscape:connector-curvature="0" /> diff --git a/sprites/clothes/icrazy_frame.png b/sprites/clothes/icrazy_frame.png new file mode 100644 index 0000000..ed3fd55 Binary files /dev/null and b/sprites/clothes/icrazy_frame.png differ diff --git a/sprites/clothes/icrazy_frame.png.import b/sprites/clothes/icrazy_frame.png.import new file mode 100644 index 0000000..bdce86f --- /dev/null +++ b/sprites/clothes/icrazy_frame.png.import @@ -0,0 +1,34 @@ +[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 new file mode 100644 index 0000000..35b7b6f Binary files /dev/null and b/sprites/clothes/jeans.png differ diff --git a/sprites/clothes/jeans.png.import b/sprites/clothes/jeans.png.import new file mode 100644 index 0000000..d05ba53 --- /dev/null +++ b/sprites/clothes/jeans.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/jeans.png-cb872dec1c87d219bb56d373215c361d.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/clothes/jeans.png" +dest_files=[ "res://.import/jeans.png-cb872dec1c87d219bb56d373215c361d.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/sprites/clothes/jeans.svg b/sprites/clothes/jeans.svg index b574abc..5fc5bbd 100644 --- a/sprites/clothes/jeans.svg +++ b/sprites/clothes/jeans.svg @@ -1,4 +1,6 @@ + + @@ -23,11 +25,11 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="2.8" - inkscape:cx="55.33311" - inkscape:cy="80.173641" + inkscape:zoom="7.9195959" + inkscape:cx="30.540413" + inkscape:cy="71.8377" inkscape:document-units="mm" - inkscape:current-layer="layer1" + inkscape:current-layer="layer2" showgrid="false" inkscape:pagecheckerboard="true" fit-margin-top="0" @@ -39,8 +41,7 @@ inkscape:window-height="1001" inkscape:window-x="-9" inkscape:window-y="-9" - inkscape:window-maximized="1" - inkscape:document-rotation="0" /> + inkscape:window-maximized="1" /> @@ -49,7 +50,7 @@ image/svg+xml - + @@ -57,107 +58,45 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-113.83015,-134.49517)"> - - - - - - - - - - - - - + transform="translate(-78.959229,-134.01666)" /> - - - - - - - - - - - + inkscape:label="Re-ink"> + + + + + + diff --git a/sprites/world/modern_dress_up_bg.png b/sprites/clothes/modern_dress_up_bg.png similarity index 100% rename from sprites/world/modern_dress_up_bg.png rename to sprites/clothes/modern_dress_up_bg.png diff --git a/sprites/world/modern_dress_up_bg.png.import b/sprites/clothes/modern_dress_up_bg.png.import similarity index 66% rename from sprites/world/modern_dress_up_bg.png.import rename to sprites/clothes/modern_dress_up_bg.png.import index 62093ef..8a54db2 100644 --- a/sprites/world/modern_dress_up_bg.png.import +++ b/sprites/clothes/modern_dress_up_bg.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/modern_dress_up_bg.png-27905358c41c27aeb52d5d89ce00ae1c.stex" +path="res://.import/modern_dress_up_bg.png-2ec62cdd8ee1c5f60b5faa53f704458f.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" ] +source_file="res://sprites/clothes/modern_dress_up_bg.png" +dest_files=[ "res://.import/modern_dress_up_bg.png-2ec62cdd8ee1c5f60b5faa53f704458f.stex" ] [params] diff --git a/sprites/world/modern_dress_up_blurred_bg.png b/sprites/clothes/modern_dress_up_blurred_bg.png similarity index 100% rename from sprites/world/modern_dress_up_blurred_bg.png rename to sprites/clothes/modern_dress_up_blurred_bg.png diff --git a/sprites/world/modern_dress_up_blurred_bg.png.import b/sprites/clothes/modern_dress_up_blurred_bg.png.import similarity index 64% rename from sprites/world/modern_dress_up_blurred_bg.png.import rename to sprites/clothes/modern_dress_up_blurred_bg.png.import index 1820fc3..efdc40d 100644 --- a/sprites/world/modern_dress_up_blurred_bg.png.import +++ b/sprites/clothes/modern_dress_up_blurred_bg.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/modern_dress_up_blurred_bg.png-a91fc2889db09eed8864cdf2b9441122.stex" +path="res://.import/modern_dress_up_blurred_bg.png-75dc54176153d3b2378312626047f013.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/world/modern_dress_up_blurred_bg.png" -dest_files=[ "res://.import/modern_dress_up_blurred_bg.png-a91fc2889db09eed8864cdf2b9441122.stex" ] +source_file="res://sprites/clothes/modern_dress_up_blurred_bg.png" +dest_files=[ "res://.import/modern_dress_up_blurred_bg.png-75dc54176153d3b2378312626047f013.stex" ] [params] diff --git a/sprites/clothes/old_sweatshirt.png b/sprites/clothes/old_sweatshirt.png new file mode 100644 index 0000000..e4114b5 Binary files /dev/null and b/sprites/clothes/old_sweatshirt.png differ diff --git a/sprites/clothes/old_sweatshirt.png.import b/sprites/clothes/old_sweatshirt.png.import new file mode 100644 index 0000000..46dcf83 --- /dev/null +++ b/sprites/clothes/old_sweatshirt.png.import @@ -0,0 +1,34 @@ +[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 acdc82a..26907ca 100644 --- a/sprites/clothes/old_sweatshirt.svg +++ b/sprites/clothes/old_sweatshirt.svg @@ -1,4 +1,6 @@ + + + width="85" + height="115" + viewBox="0 0 85 115" + sodipodi:docname="old_sweatshirt.svg" + inkscape:version="0.92.3 (2405546, 2018-03-11)"> @@ -29,125 +31,86 @@ + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1001" + id="namedview839" + showgrid="false" + inkscape:pagecheckerboard="true" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + inkscape:zoom="5.6568543" + inkscape:cx="27.653445" + inkscape:cy="57.852419" + inkscape:window-x="-9" + inkscape:window-y="-9" + inkscape:window-maximized="1" + inkscape:current-layer="layer2" /> - - - - - - - - - - + inkscape:label="Original" + transform="translate(17.592821,10.674505)" + sodipodi:insensitive="true" /> + inkscape:label="Color" + sodipodi:insensitive="true"> - + + inkscape:connector-curvature="0" + sodipodi:nodetypes="czscac" /> + inkscape:label="Re-Ink" + style="display:inline"> + + - + + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> diff --git a/sprites/clothes/owo_censor.png b/sprites/clothes/owo_censor.png new file mode 100644 index 0000000..03f0764 Binary files /dev/null and b/sprites/clothes/owo_censor.png differ diff --git a/sprites/clothes/owo_censor.png.import b/sprites/clothes/owo_censor.png.import new file mode 100644 index 0000000..d9380be --- /dev/null +++ b/sprites/clothes/owo_censor.png.import @@ -0,0 +1,34 @@ +[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 db03273..31fcae8 100644 --- a/sprites/clothes/owo_censor.svg +++ b/sprites/clothes/owo_censor.svg @@ -1,4 +1,6 @@ + + + inkscape:version="0.92.3 (2405546, 2018-03-11)"> @@ -46,87 +48,44 @@ fit-margin-right="0" fit-margin-bottom="0" inkscape:pagecheckerboard="true" - inkscape:zoom="2.97995" - inkscape:cx="135.79663" - inkscape:cy="54.802368" + inkscape:zoom="11.9198" + inkscape:cx="59.544802" + inkscape:cy="77.188526" inkscape:window-x="-9" inkscape:window-y="-9" inkscape:window-maximized="1" - inkscape:current-layer="layer5" - inkscape:document-rotation="0" /> - - - - - - - - + inkscape:current-layer="layer5" /> + transform="translate(-32.423729,-45.084747)"> + + aria-label="OwO" + style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" + id="text6445" + transform="matrix(0.38088161,0,0,0.39176487,47.846968,54.981177)"> - - - - - + d="m 96.914116,83.107109 q -5.507813,0 -9.335938,-3.300781 -4.0625,-3.515625 -4.0625,-9.0625 0,-6.757813 4.003907,-12.285156 4.472656,-6.132813 11.152343,-6.132813 6.425782,0 9.550782,2.890625 3.26172,3.007813 3.26172,9.492188 0,6.757812 -3.67188,12.1875 -4.21875,6.210937 -10.898434,6.210937 z m 1.757812,-26.777344 q -4.785156,0 -8.105468,4.765625 -3.066407,4.375 -3.066407,9.648438 0,3.769531 2.792969,6.132812 2.675781,2.226563 6.621094,2.226563 4.746094,0 7.832034,-4.785156 2.7539,-4.277344 2.7539,-9.609375 0,-4.667969 -2.08984,-6.5625 -1.99219,-1.816407 -6.738282,-1.816407 z" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Comic Sans MS';-inkscape-font-specification:'Comic Sans MS';fill:#ffffff" + id="path6447" + inkscape:connector-curvature="0" /> + + diff --git a/sprites/clothes/raw_shirt.png b/sprites/clothes/raw_shirt.png new file mode 100644 index 0000000..3e32bd7 Binary files /dev/null and b/sprites/clothes/raw_shirt.png differ diff --git a/sprites/clothes/raw_shirt.png.import b/sprites/clothes/raw_shirt.png.import new file mode 100644 index 0000000..903751c --- /dev/null +++ b/sprites/clothes/raw_shirt.png.import @@ -0,0 +1,34 @@ +[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 e1ac227..618fe67 100644 --- a/sprites/clothes/raw_shirt.svg +++ b/sprites/clothes/raw_shirt.svg @@ -1,4 +1,6 @@ + + @@ -24,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="3.959798" - inkscape:cx="55.423097" - inkscape:cy="61.865623" + inkscape:cx="43.507239" + inkscape:cy="60.44025" inkscape:document-units="mm" inkscape:current-layer="layer2" showgrid="false" @@ -36,10 +38,9 @@ fit-margin-bottom="0" inkscape:window-width="1920" inkscape:window-height="1001" - inkscape:window-x="-9" + inkscape:window-x="1911" inkscape:window-y="-9" - inkscape:window-maximized="1" - inkscape:document-rotation="0" /> + inkscape:window-maximized="1" /> @@ -48,123 +49,59 @@ image/svg+xml - + - - - - - - - - - - - - - - - + transform="translate(-332.89496,-265.48813)" + style="display:inline" + sodipodi:insensitive="true" /> + sodipodi:nodetypes="csssszzcsc" /> diff --git a/sprites/clothes/retro_shirt.svg b/sprites/clothes/retro_shirt.svg index 4dcff76..345eaa2 100644 --- a/sprites/clothes/retro_shirt.svg +++ b/sprites/clothes/retro_shirt.svg @@ -1,4 +1,6 @@ + + @@ -23,11 +25,11 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="11.2" - inkscape:cx="57.951723" - inkscape:cy="16.861876" + inkscape:zoom="3.959798" + inkscape:cx="43.507239" + inkscape:cy="60.44025" inkscape:document-units="mm" - inkscape:current-layer="layer1" + inkscape:current-layer="layer2" showgrid="false" inkscape:pagecheckerboard="true" fit-margin-top="0" @@ -36,10 +38,9 @@ fit-margin-bottom="0" inkscape:window-width="1920" inkscape:window-height="1001" - inkscape:window-x="-9" + inkscape:window-x="1911" inkscape:window-y="-9" - inkscape:window-maximized="1" - inkscape:document-rotation="0" /> + inkscape:window-maximized="1" /> @@ -48,7 +49,7 @@ image/svg+xml - + @@ -56,135 +57,73 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(-329.97283,-265.24728)" - style="display:inline"> - - - - - - - - - - - - - - - + transform="translate(-332.89496,-265.48813)" + style="display:inline" + sodipodi:insensitive="true" /> + sodipodi:nodetypes="csssszzcsc" /> diff --git a/sprites/clothes/skate_shirt.svg b/sprites/clothes/skate_shirt.svg deleted file mode 100644 index b8731b9..0000000 --- a/sprites/clothes/skate_shirt.svg +++ /dev/null @@ -1,274 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sprites/clothes/sweat_pants.png b/sprites/clothes/sweat_pants.png new file mode 100644 index 0000000..daea1bf Binary files /dev/null and b/sprites/clothes/sweat_pants.png differ diff --git a/sprites/clothes/sweat_pants.png.import b/sprites/clothes/sweat_pants.png.import new file mode 100644 index 0000000..d1cb99f --- /dev/null +++ b/sprites/clothes/sweat_pants.png.import @@ -0,0 +1,34 @@ +[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 1257ce8..2d5dcc5 100644 --- a/sprites/clothes/sweat_pants.svg +++ b/sprites/clothes/sweat_pants.svg @@ -1,4 +1,6 @@ + + + id="svg2007" + inkscape:version="0.92.3 (2405546, 2018-03-11)" + sodipodi:docname="sweat_pants.svg"> + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="7.9195959" + inkscape:cx="30.540413" + inkscape:cy="76.888462" + inkscape:document-units="mm" + inkscape:current-layer="layer2" + showgrid="false" + inkscape:pagecheckerboard="true" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + showguides="false" + inkscape:window-width="1920" + inkscape:window-height="1001" + inkscape:window-x="-9" + inkscape:window-y="-9" + inkscape:window-maximized="1" /> @@ -49,45 +50,24 @@ image/svg+xml - + - - - - + id="layer1" + transform="translate(-78.959229,-134.01666)" /> + inkscape:label="Re-ink"> + inkscape:connector-curvature="0" + sodipodi:nodetypes="ssssscss" /> diff --git a/sprites/clothes/train_hoodie.png b/sprites/clothes/train_hoodie.png new file mode 100644 index 0000000..d42ebc0 Binary files /dev/null and b/sprites/clothes/train_hoodie.png differ diff --git a/sprites/clothes/train_hoodie.png.import b/sprites/clothes/train_hoodie.png.import new file mode 100644 index 0000000..ee97aca --- /dev/null +++ b/sprites/clothes/train_hoodie.png.import @@ -0,0 +1,34 @@ +[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 0bc7b9c..3d8fa6d 100644 --- a/sprites/clothes/train_hoodie.svg +++ b/sprites/clothes/train_hoodie.svg @@ -1,4 +1,6 @@ + + + inkscape:version="0.92.3 (2405546, 2018-03-11)"> @@ -46,173 +48,78 @@ fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" - inkscape:zoom="5.6568542" - inkscape:cx="36.923847" - inkscape:cy="49.691733" + inkscape:zoom="5.6568543" + inkscape:cx="61.06424" + inkscape:cy="71.518993" inkscape:window-x="-9" inkscape:window-y="-9" inkscape:window-maximized="1" - inkscape:current-layer="layer2" - inkscape:document-rotation="0" /> + inkscape:current-layer="layer2" /> - - - - - - - - - - - - - - - + transform="translate(17.592821,10.674505)" + sodipodi:insensitive="true" /> + style="display:inline"> + + + sodipodi:nodetypes="zczzzzzzzzsacsssz" /> - + id="g888" + transform="translate(-0.17677669,-5.8336309)"> + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path876" + d="m 56.75,49.9375 2.5625,-4.78125" + style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path878" + d="m 63.59375,45.15625 2.21875,4.8125" + style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path880" + d="m 58.34375,46.46875 6,0.03125" + style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> - - - - - - + inkscape:connector-curvature="0" + id="path882" + d="m 57.3125,48.8125 8.0625,0.21875" + style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> - diff --git a/sprites/clothes/whatsnew_shirt.png b/sprites/clothes/whatsnew_shirt.png new file mode 100644 index 0000000..5b1c58d Binary files /dev/null and b/sprites/clothes/whatsnew_shirt.png differ diff --git a/sprites/clothes/whatsnew_shirt.png.import b/sprites/clothes/whatsnew_shirt.png.import new file mode 100644 index 0000000..33c9815 --- /dev/null +++ b/sprites/clothes/whatsnew_shirt.png.import @@ -0,0 +1,34 @@ +[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 2b47130..30fb38a 100644 --- a/sprites/clothes/whatsnew_shirt.svg +++ b/sprites/clothes/whatsnew_shirt.svg @@ -1,4 +1,6 @@ + + + inkscape:version="0.92.3 (2405546, 2018-03-11)"> @@ -46,112 +48,73 @@ fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" - inkscape:zoom="4" - inkscape:cx="137.96482" - inkscape:cy="55.756911" + inkscape:zoom="5.6568543" + inkscape:cx="57.175153" + inkscape:cy="57.852419" inkscape:window-x="-9" inkscape:window-y="-9" inkscape:window-maximized="1" - inkscape:current-layer="layer3" - inkscape:document-rotation="0" /> + inkscape:current-layer="layer2" /> - - - - - - - - - - + transform="translate(17.592821,10.674505)" + sodipodi:insensitive="true" /> + inkscape:label="Color"> + sodipodi:nodetypes="cccccccccccccccccc" /> + sodipodi:nodetypes="caaascccccccccc" /> + style="display:inline"> + + + sodipodi:nodetypes="zczzzzaazzsacsssz" /> diff --git a/sprites/clothes/z_briefs.png b/sprites/clothes/z_briefs.png new file mode 100644 index 0000000..8ebd82d Binary files /dev/null and b/sprites/clothes/z_briefs.png differ diff --git a/sprites/clothes/z_briefs.png.import b/sprites/clothes/z_briefs.png.import new file mode 100644 index 0000000..ee6f526 --- /dev/null +++ b/sprites/clothes/z_briefs.png.import @@ -0,0 +1,34 @@ +[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/world.blend b/sprites/world.blend deleted file mode 100644 index 8a67fb2..0000000 Binary files a/sprites/world.blend and /dev/null differ diff --git a/sprites/world.blend1 b/sprites/world.blend1 deleted file mode 100644 index edd4a83..0000000 Binary files a/sprites/world.blend1 and /dev/null differ