diff --git a/scenes/characterBase.tscn b/scenes/character_base.tscn
similarity index 97%
rename from scenes/characterBase.tscn
rename to scenes/character_base.tscn
index d09de71..4971703 100644
--- a/scenes/characterBase.tscn
+++ b/scenes/character_base.tscn
@@ -115,13 +115,13 @@ texture = ExtResource( 27 )
[node name="eyes" type="AnimatedSprite" parent="body/head"]
position = Vector2( 17.6857, 4.22147 )
frames = SubResource( 3 )
-frame = 6
+frame = 2
playing = true
[node name="mouth" type="AnimatedSprite" parent="body/head"]
position = Vector2( 38.1195, 8.68453 )
frames = SubResource( 4 )
-frame = 6
+frame = 9
playing = true
[node name="accessory" type="Sprite" parent="body"]
@@ -130,9 +130,3 @@ texture = ExtResource( 26 )
__meta__ = {
"_edit_lock_": true
}
-
-[node name="emote" type="Node2D" parent="body"]
-position = Vector2( 51.7305, -20.2165 )
-__meta__ = {
-"_edit_lock_": true
-}
diff --git a/scenes/clothing/base/accessoryBase.tscn b/scenes/clothing/base/accessoryBase.tscn
deleted file mode 100644
index d7e3746..0000000
--- a/scenes/clothing/base/accessoryBase.tscn
+++ /dev/null
@@ -1,8 +0,0 @@
-[gd_scene load_steps=3 format=2]
-
-[ext_resource path="res://scripts/clothing/accessoryBase.gd" type="Script" id=1]
-[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=2]
-
-[node name="accessoryBase" instance=ExtResource( 2 )]
-script = ExtResource( 1 )
-[connection signal="pressed" from="." to="." method="_on_accessory_pressed"]
diff --git a/scenes/clothing/base/accessory_base.tscn b/scenes/clothing/base/accessory_base.tscn
new file mode 100644
index 0000000..4ad8233
--- /dev/null
+++ b/scenes/clothing/base/accessory_base.tscn
@@ -0,0 +1,9 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://scenes/clothing/base/clothing_base.tscn" type="PackedScene" id=1]
+[ext_resource path="res://scripts/clothing/accessory_base.gd" type="Script" id=2]
+
+
+[node name="accessoryBase" instance=ExtResource( 1 )]
+script = ExtResource( 2 )
+[connection signal="pressed" from="." to="." method="_on_accessory_pressed"]
diff --git a/scenes/clothing/base/bottomsBase.tscn b/scenes/clothing/base/bottomsBase.tscn
index 317ba4c..ea9c653 100644
--- a/scenes/clothing/base/bottomsBase.tscn
+++ b/scenes/clothing/base/bottomsBase.tscn
@@ -1,7 +1,9 @@
[gd_scene load_steps=3 format=2]
-[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1]
-[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=2]
+[ext_resource path="res://scenes/clothing/base/clothing_base.tscn" type="PackedScene" id=1]
+[ext_resource path="res://scripts/clothing/bottoms_base.gd" type="Script" id=2]
+
+
[node name="bottomsBase" instance=ExtResource( 1 )]
script = ExtResource( 2 )
diff --git a/scenes/clothing/base/baseClothing.tscn b/scenes/clothing/base/clothing_base.tscn
similarity index 84%
rename from scenes/clothing/base/baseClothing.tscn
rename to scenes/clothing/base/clothing_base.tscn
index d199229..8f28ed7 100644
--- a/scenes/clothing/base/baseClothing.tscn
+++ b/scenes/clothing/base/clothing_base.tscn
@@ -1,9 +1,8 @@
[gd_scene load_steps=3 format=2]
-[ext_resource path="res://scripts/clothing/baseClothing.gd" type="Script" id=1]
+[ext_resource path="res://scripts/clothing/clothing_base.gd" type="Script" id=1]
[ext_resource path="res://sounds/select_001.ogg" type="AudioStream" id=2]
-
[node name="baseClothing" type="TextureButton"]
anchor_right = 1.0
anchor_bottom = 1.0
diff --git a/scenes/clothing/base/topsBase.tscn b/scenes/clothing/base/tops_base.tscn
similarity index 51%
rename from scenes/clothing/base/topsBase.tscn
rename to scenes/clothing/base/tops_base.tscn
index 10d750c..36d3053 100644
--- a/scenes/clothing/base/topsBase.tscn
+++ b/scenes/clothing/base/tops_base.tscn
@@ -1,7 +1,9 @@
[gd_scene load_steps=3 format=2]
-[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1]
-[ext_resource path="res://scripts/clothing/topsBase.gd" type="Script" id=2]
+[ext_resource path="res://scenes/clothing/base/clothing_base.tscn" type="PackedScene" id=1]
+[ext_resource path="res://scripts/clothing/tops_base.gd" type="Script" id=2]
+
+
[node name="topsBase" instance=ExtResource( 1 )]
script = ExtResource( 2 )
diff --git a/scenes/clothing/base/undiesBase.tscn b/scenes/clothing/base/undies_base.tscn
similarity index 52%
rename from scenes/clothing/base/undiesBase.tscn
rename to scenes/clothing/base/undies_base.tscn
index 569e1b8..74bba12 100644
--- a/scenes/clothing/base/undiesBase.tscn
+++ b/scenes/clothing/base/undies_base.tscn
@@ -1,7 +1,9 @@
[gd_scene load_steps=3 format=2]
-[ext_resource path="res://scripts/clothing/undiesBase.gd" type="Script" id=1]
-[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=2]
+[ext_resource path="res://scripts/clothing/undies_base.gd" type="Script" id=1]
+[ext_resource path="res://scenes/clothing/base/clothing_base.tscn" type="PackedScene" id=2]
+
+
[node name="baseClothing" instance=ExtResource( 2 )]
script = ExtResource( 1 )
diff --git a/scenes/clothing/camera.tscn b/scenes/clothing/camera.tscn
index 0209b39..104d91d 100644
--- a/scenes/clothing/camera.tscn
+++ b/scenes/clothing/camera.tscn
@@ -1,11 +1,12 @@
[gd_scene load_steps=3 format=2]
-[ext_resource path="res://scenes/clothing/base/accessoryBase.tscn" type="PackedScene" id=1]
+[ext_resource path="res://scenes/clothing/base/accessory_base.tscn" type="PackedScene" id=1]
[ext_resource path="res://sprites/clothes/camera.png" type="Texture" id=2]
+
[node name="camera" instance=ExtResource( 1 )]
anchor_right = 0.0
anchor_bottom = 0.0
diff --git a/scenes/clothing/pants/beatUpJeans.tscn b/scenes/clothing/pants/beatUpJeans.tscn
index 2ed835b..7547fb2 100644
--- a/scenes/clothing/pants/beatUpJeans.tscn
+++ b/scenes/clothing/pants/beatUpJeans.tscn
@@ -1,12 +1,14 @@
[gd_scene load_steps=4 format=2]
-[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1]
-[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=2]
+[ext_resource path="res://scenes/clothing/base/clothing_base.tscn" type="PackedScene" id=1]
+[ext_resource path="res://scripts/clothing/bottoms_base.gd" type="Script" id=2]
[ext_resource path="res://sprites/clothes/beat_up_jeans.svg" type="Texture" id=3]
+
+
[node name="beatUpJeans" instance=ExtResource( 1 )]
texture_normal = ExtResource( 3 )
script = ExtResource( 2 )
diff --git a/scenes/clothing/pants/camoJeans.tscn b/scenes/clothing/pants/camoJeans.tscn
index 38e32bf..6b529b3 100644
--- a/scenes/clothing/pants/camoJeans.tscn
+++ b/scenes/clothing/pants/camoJeans.tscn
@@ -1,8 +1,10 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://sprites/clothes/blue_camo_jeans.svg" type="Texture" id=1]
-[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=2]
-[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=3]
+[ext_resource path="res://scenes/clothing/base/clothing_base.tscn" type="PackedScene" id=2]
+[ext_resource path="res://scripts/clothing/bottoms_base.gd" type="Script" id=3]
+
+
diff --git a/scenes/clothing/pants/djShorts.tscn b/scenes/clothing/pants/djShorts.tscn
index 1b2d46d..bb58543 100644
--- a/scenes/clothing/pants/djShorts.tscn
+++ b/scenes/clothing/pants/djShorts.tscn
@@ -1,8 +1,10 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://sprites/clothes/dj_shorts.svg" type="Texture" id=1]
-[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=2]
-[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=3]
+[ext_resource path="res://scenes/clothing/base/clothing_base.tscn" type="PackedScene" id=2]
+[ext_resource path="res://scripts/clothing/bottoms_base.gd" type="Script" id=3]
+
+
diff --git a/scenes/clothing/pants/formalSkirt.tscn b/scenes/clothing/pants/formalSkirt.tscn
index 0f7d544..3b65d93 100644
--- a/scenes/clothing/pants/formalSkirt.tscn
+++ b/scenes/clothing/pants/formalSkirt.tscn
@@ -1,10 +1,12 @@
[gd_scene load_steps=4 format=2]
-[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1]
-[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=2]
+[ext_resource path="res://scenes/clothing/base/clothing_base.tscn" type="PackedScene" id=1]
+[ext_resource path="res://scripts/clothing/bottoms_base.gd" type="Script" id=2]
[ext_resource path="res://sprites/clothes/formal_skirt.svg" type="Texture" id=3]
+
+
[node name="formalSkirt" instance=ExtResource( 1 )]
texture_normal = ExtResource( 3 )
script = ExtResource( 2 )
diff --git a/scenes/clothing/pants/jeans.tscn b/scenes/clothing/pants/jeans.tscn
index 8cc5610..74866cc 100644
--- a/scenes/clothing/pants/jeans.tscn
+++ b/scenes/clothing/pants/jeans.tscn
@@ -1,10 +1,12 @@
[gd_scene load_steps=4 format=2]
-[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1]
-[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=2]
+[ext_resource path="res://scenes/clothing/base/clothing_base.tscn" type="PackedScene" id=1]
+[ext_resource path="res://scripts/clothing/bottoms_base.gd" type="Script" id=2]
[ext_resource path="res://sprites/clothes/jeans.svg" type="Texture" id=3]
+
+
[node name="jeans" instance=ExtResource( 1 )]
texture_normal = ExtResource( 3 )
script = ExtResource( 2 )
diff --git a/scenes/clothing/pants/skirt.tscn b/scenes/clothing/pants/skirt.tscn
index a8f64ab..d2c3d1d 100644
--- a/scenes/clothing/pants/skirt.tscn
+++ b/scenes/clothing/pants/skirt.tscn
@@ -1,10 +1,12 @@
[gd_scene load_steps=4 format=2]
-[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1]
-[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=2]
+[ext_resource path="res://scenes/clothing/base/clothing_base.tscn" type="PackedScene" id=1]
+[ext_resource path="res://scripts/clothing/bottoms_base.gd" type="Script" id=2]
[ext_resource path="res://sprites/clothes/blue_skirt.svg" type="Texture" id=3]
+
+
[node name="skirt" instance=ExtResource( 1 )]
texture_normal = ExtResource( 3 )
script = ExtResource( 2 )
diff --git a/scenes/clothing/pants/sweatPants.tscn b/scenes/clothing/pants/sweatPants.tscn
index 1801a6c..d75ef84 100644
--- a/scenes/clothing/pants/sweatPants.tscn
+++ b/scenes/clothing/pants/sweatPants.tscn
@@ -1,8 +1,10 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://sprites/clothes/sweat_pants.svg" type="Texture" id=1]
-[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=2]
-[ext_resource path="res://scripts/clothing/bottomsBase.gd" type="Script" id=3]
+[ext_resource path="res://scenes/clothing/base/clothing_base.tscn" type="PackedScene" id=2]
+[ext_resource path="res://scripts/clothing/bottoms_base.gd" type="Script" id=3]
+
+
[node name="sweatPants" instance=ExtResource( 2 )]
texture_normal = ExtResource( 1 )
diff --git a/scenes/clothing/tops/atomicShirt.tscn b/scenes/clothing/tops/atomic_shirt.tscn
similarity index 63%
rename from scenes/clothing/tops/atomicShirt.tscn
rename to scenes/clothing/tops/atomic_shirt.tscn
index 4c0e92d..041c664 100644
--- a/scenes/clothing/tops/atomicShirt.tscn
+++ b/scenes/clothing/tops/atomic_shirt.tscn
@@ -1,7 +1,7 @@
[gd_scene load_steps=4 format=2]
-[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1]
-[ext_resource path="res://scripts/clothing/topsBase.gd" type="Script" id=2]
+[ext_resource path="res://scenes/clothing/base/clothing_base.tscn" type="PackedScene" id=1]
+[ext_resource path="res://scripts/clothing/tops_base.gd" type="Script" id=2]
[ext_resource path="res://sprites/clothes/atomic_shirt.svg" type="Texture" id=3]
[node name="atomicShirt" instance=ExtResource( 1 )]
diff --git a/scenes/clothing/tops/djShirt.tscn b/scenes/clothing/tops/dj_shirt.tscn
similarity index 63%
rename from scenes/clothing/tops/djShirt.tscn
rename to scenes/clothing/tops/dj_shirt.tscn
index bbe311d..ed902ba 100644
--- a/scenes/clothing/tops/djShirt.tscn
+++ b/scenes/clothing/tops/dj_shirt.tscn
@@ -1,7 +1,7 @@
[gd_scene load_steps=4 format=2]
-[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1]
-[ext_resource path="res://scripts/clothing/topsBase.gd" type="Script" id=2]
+[ext_resource path="res://scenes/clothing/base/clothing_base.tscn" type="PackedScene" id=1]
+[ext_resource path="res://scripts/clothing/tops_base.gd" type="Script" id=2]
[ext_resource path="res://sprites/clothes/dj_shirt.png" type="Texture" id=3]
[node name="djShirt" instance=ExtResource( 1 )]
diff --git a/scenes/clothing/tops/kormShirt.tscn b/scenes/clothing/tops/korm_shirt.tscn
similarity index 63%
rename from scenes/clothing/tops/kormShirt.tscn
rename to scenes/clothing/tops/korm_shirt.tscn
index cf6fd0a..1f232c7 100644
--- a/scenes/clothing/tops/kormShirt.tscn
+++ b/scenes/clothing/tops/korm_shirt.tscn
@@ -1,7 +1,7 @@
[gd_scene load_steps=4 format=2]
-[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1]
-[ext_resource path="res://scripts/clothing/topsBase.gd" type="Script" id=2]
+[ext_resource path="res://scenes/clothing/base/clothing_base.tscn" type="PackedScene" id=1]
+[ext_resource path="res://scripts/clothing/tops_base.gd" type="Script" id=2]
[ext_resource path="res://sprites/clothes/korm_shirt.png" type="Texture" id=3]
[node name="kormShirt" instance=ExtResource( 1 )]
diff --git a/scenes/clothing/tops/retroShirt.tscn b/scenes/clothing/tops/nl_shirt.tscn
similarity index 63%
rename from scenes/clothing/tops/retroShirt.tscn
rename to scenes/clothing/tops/nl_shirt.tscn
index 01173bd..de1dcaf 100644
--- a/scenes/clothing/tops/retroShirt.tscn
+++ b/scenes/clothing/tops/nl_shirt.tscn
@@ -1,7 +1,7 @@
[gd_scene load_steps=4 format=2]
-[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1]
-[ext_resource path="res://scripts/clothing/topsBase.gd" type="Script" id=2]
+[ext_resource path="res://scenes/clothing/base/clothing_base.tscn" type="PackedScene" id=1]
+[ext_resource path="res://scripts/clothing/tops_base.gd" type="Script" id=2]
[ext_resource path="res://sprites/clothes/nl_jacket.png" type="Texture" id=3]
[node name="nlShirt" instance=ExtResource( 1 )]
diff --git a/scenes/clothing/tops/rawShirt.tscn b/scenes/clothing/tops/rawShirt.tscn
index c976520..97b5837 100644
--- a/scenes/clothing/tops/rawShirt.tscn
+++ b/scenes/clothing/tops/rawShirt.tscn
@@ -1,9 +1,11 @@
[gd_scene load_steps=4 format=2]
-[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1]
-[ext_resource path="res://scripts/clothing/topsBase.gd" type="Script" id=2]
+[ext_resource path="res://scenes/clothing/base/clothing_base.tscn" type="PackedScene" id=1]
+[ext_resource path="res://scripts/clothing/tops_base.gd" type="Script" id=2]
[ext_resource path="res://sprites/clothes/raw_shirt.svg" type="Texture" id=3]
+
+
[node name="rawShirt" instance=ExtResource( 1 )]
texture_normal = ExtResource( 3 )
script = ExtResource( 2 )
diff --git a/scenes/clothing/tops/nlShirt.tscn b/scenes/clothing/tops/retro_shirt.tscn
similarity index 63%
rename from scenes/clothing/tops/nlShirt.tscn
rename to scenes/clothing/tops/retro_shirt.tscn
index 01173bd..de1dcaf 100644
--- a/scenes/clothing/tops/nlShirt.tscn
+++ b/scenes/clothing/tops/retro_shirt.tscn
@@ -1,7 +1,7 @@
[gd_scene load_steps=4 format=2]
-[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1]
-[ext_resource path="res://scripts/clothing/topsBase.gd" type="Script" id=2]
+[ext_resource path="res://scenes/clothing/base/clothing_base.tscn" type="PackedScene" id=1]
+[ext_resource path="res://scripts/clothing/tops_base.gd" type="Script" id=2]
[ext_resource path="res://sprites/clothes/nl_jacket.png" type="Texture" id=3]
[node name="nlShirt" instance=ExtResource( 1 )]
diff --git a/scenes/clothing/tops/whatsNewShirt.tscn b/scenes/clothing/tops/whatsnew_shirt.tscn
similarity index 64%
rename from scenes/clothing/tops/whatsNewShirt.tscn
rename to scenes/clothing/tops/whatsnew_shirt.tscn
index 4545551..2f23ea2 100644
--- a/scenes/clothing/tops/whatsNewShirt.tscn
+++ b/scenes/clothing/tops/whatsnew_shirt.tscn
@@ -1,7 +1,7 @@
[gd_scene load_steps=4 format=2]
-[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1]
-[ext_resource path="res://scripts/clothing/topsBase.gd" type="Script" id=2]
+[ext_resource path="res://scenes/clothing/base/clothing_base.tscn" type="PackedScene" id=1]
+[ext_resource path="res://scripts/clothing/tops_base.gd" type="Script" id=2]
[ext_resource path="res://sprites/clothes/whatsnew_shirt.svg" type="Texture" id=3]
[node name="whatsNewShirt" instance=ExtResource( 1 )]
diff --git a/scenes/clothing/tops/zShirt.tscn b/scenes/clothing/tops/z_shirt.tscn
similarity index 63%
rename from scenes/clothing/tops/zShirt.tscn
rename to scenes/clothing/tops/z_shirt.tscn
index 3a1a23f..8266145 100644
--- a/scenes/clothing/tops/zShirt.tscn
+++ b/scenes/clothing/tops/z_shirt.tscn
@@ -1,7 +1,7 @@
[gd_scene load_steps=4 format=2]
-[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=1]
-[ext_resource path="res://scripts/clothing/topsBase.gd" type="Script" id=2]
+[ext_resource path="res://scenes/clothing/base/clothing_base.tscn" type="PackedScene" id=1]
+[ext_resource path="res://scripts/clothing/tops_base.gd" type="Script" id=2]
[ext_resource path="res://sprites/clothes/z_shirt.png" type="Texture" id=3]
[node name="zShirt" instance=ExtResource( 1 )]
diff --git a/scenes/clothing/undies/briefs.tscn b/scenes/clothing/undies/briefs.tscn
index fde30e2..7e96b28 100644
--- a/scenes/clothing/undies/briefs.tscn
+++ b/scenes/clothing/undies/briefs.tscn
@@ -1,7 +1,8 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://sprites/clothes/briefs.svg" type="Texture" id=1]
-[ext_resource path="res://scenes/clothing/base/undiesBase.tscn" type="PackedScene" id=2]
+[ext_resource path="res://scenes/clothing/base/undies_base.tscn" type="PackedScene" id=2]
+
diff --git a/scenes/clothing/undies/fundosi.tscn b/scenes/clothing/undies/fundosi.tscn
index 5a0ac93..e2cec05 100644
--- a/scenes/clothing/undies/fundosi.tscn
+++ b/scenes/clothing/undies/fundosi.tscn
@@ -1,7 +1,8 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://sprites/clothes/fundosi.svg" type="Texture" id=1]
-[ext_resource path="res://scenes/clothing/base/undiesBase.tscn" type="PackedScene" id=2]
+[ext_resource path="res://scenes/clothing/base/undies_base.tscn" type="PackedScene" id=2]
+
diff --git a/scenes/clothing/undies/zBriefs.tscn b/scenes/clothing/undies/zBriefs.tscn
index 2e8d6af..2419428 100644
--- a/scenes/clothing/undies/zBriefs.tscn
+++ b/scenes/clothing/undies/zBriefs.tscn
@@ -1,7 +1,8 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://sprites/clothes/z_briefs.svg" type="Texture" id=1]
-[ext_resource path="res://scenes/clothing/base/undiesBase.tscn" type="PackedScene" id=2]
+[ext_resource path="res://scenes/clothing/base/undies_base.tscn" type="PackedScene" id=2]
+
diff --git a/scenes/game.tscn b/scenes/game.tscn
index 7ad68ca..f510c09 100644
--- a/scenes/game.tscn
+++ b/scenes/game.tscn
@@ -1,6 +1,6 @@
[gd_scene load_steps=10 format=2]
-[ext_resource path="res://scenes/characterBase.tscn" type="PackedScene" id=1]
+[ext_resource path="res://scenes/character_base.tscn" type="PackedScene" id=1]
[ext_resource path="res://sprites/world/background.svg" type="Texture" id=2]
[ext_resource path="res://sprites/ui/blue_boxCross.png" type="Texture" id=3]
[ext_resource path="res://scenes/wardrobe.tscn" type="PackedScene" id=4]
diff --git a/scenes/wardrobe.tscn b/scenes/wardrobe.tscn
index 6f61331..008697c 100644
--- a/scenes/wardrobe.tscn
+++ b/scenes/wardrobe.tscn
@@ -9,17 +9,22 @@
[ext_resource path="res://scenes/clothing/pants/camoJeans.tscn" type="PackedScene" id=7]
[ext_resource path="res://scenes/clothing/pants/djShorts.tscn" type="PackedScene" id=8]
[ext_resource path="res://sprites/ui/x_button.svg" type="Texture" id=9]
-[ext_resource path="res://scenes/clothing/tops/whatsNewShirt.tscn" type="PackedScene" id=10]
-[ext_resource path="res://scenes/clothing/tops/zShirt.tscn" type="PackedScene" id=11]
+[ext_resource path="res://scenes/clothing/tops/whatsnew_shirt.tscn" type="PackedScene" id=10]
+[ext_resource path="res://scenes/clothing/tops/z_shirt.tscn" type="PackedScene" id=11]
[ext_resource path="res://scenes/clothing/tops/rawShirt.tscn" type="PackedScene" id=12]
-[ext_resource path="res://scenes/clothing/tops/kormShirt.tscn" type="PackedScene" id=13]
+[ext_resource path="res://scenes/clothing/tops/korm_shirt.tscn" type="PackedScene" id=13]
[ext_resource path="res://scenes/clothing/tops/djShirt.tscn" type="PackedScene" id=14]
-[ext_resource path="res://scenes/clothing/tops/atomicShirt.tscn" type="PackedScene" id=15]
-[ext_resource path="res://scenes/clothing/tops/nlShirt.tscn" type="PackedScene" id=16]
+[ext_resource path="res://scenes/clothing/tops/atomic_shirt.tscn" type="PackedScene" id=15]
+[ext_resource path="res://scenes/clothing/tops/nl_shirt.tscn" type="PackedScene" id=16]
[ext_resource path="res://scenes/clothing/pants/sweatPants.tscn" type="PackedScene" id=17]
-[ext_resource path="res://scenes/clothing/tops/retroShirt.tscn" type="PackedScene" id=18]
+[ext_resource path="res://scenes/clothing/tops/retro_shirt.tscn" type="PackedScene" id=18]
[ext_resource path="res://scripts/wardrobe.gd" type="Script" id=21]
+
+
+
+
+
[node name="Wordrobe" type="TabContainer"]
anchor_right = 1.0
anchor_bottom = 1.0
@@ -33,7 +38,6 @@ __meta__ = {
}
[node name="Pants" type="Tabs" parent="."]
-visible = false
anchor_right = 1.0
anchor_bottom = 1.0
margin_left = 5.0
@@ -115,6 +119,7 @@ margin_right = 451.0
margin_bottom = 270.0
[node name="Shirts" type="Tabs" parent="."]
+visible = false
anchor_right = 1.0
anchor_bottom = 1.0
margin_left = 5.0
diff --git a/scripts/characterBase.gd b/scripts/character_base.gd
similarity index 100%
rename from scripts/characterBase.gd
rename to scripts/character_base.gd
diff --git a/scripts/clothing/accessoryBase.gd b/scripts/clothing/accessory_base.gd
similarity index 62%
rename from scripts/clothing/accessoryBase.gd
rename to scripts/clothing/accessory_base.gd
index 043eb9a..d2102c7 100644
--- a/scripts/clothing/accessoryBase.gd
+++ b/scripts/clothing/accessory_base.gd
@@ -1,4 +1,4 @@
-extends "res://scripts/clothing/baseClothing.gd"
+extends "res://scripts/clothing/clothing_base.gd"
func _on_accessory_pressed():
character.accessory = texture_normal
diff --git a/scripts/clothing/bottomsBase.gd b/scripts/clothing/bottoms_base.gd
similarity index 61%
rename from scripts/clothing/bottomsBase.gd
rename to scripts/clothing/bottoms_base.gd
index 35d7929..db36aca 100644
--- a/scripts/clothing/bottomsBase.gd
+++ b/scripts/clothing/bottoms_base.gd
@@ -1,4 +1,4 @@
-extends "res://scripts/clothing/baseClothing.gd"
+extends "res://scripts/clothing/clothing_base.gd"
func _on_bottoms_pressed():
character.bottom = texture_normal
diff --git a/scripts/clothing/baseClothing.gd b/scripts/clothing/clothing_base.gd
similarity index 100%
rename from scripts/clothing/baseClothing.gd
rename to scripts/clothing/clothing_base.gd
diff --git a/scripts/clothing/topsBase.gd b/scripts/clothing/tops_base.gd
similarity index 59%
rename from scripts/clothing/topsBase.gd
rename to scripts/clothing/tops_base.gd
index 3500f76..88bcff2 100644
--- a/scripts/clothing/topsBase.gd
+++ b/scripts/clothing/tops_base.gd
@@ -1,4 +1,4 @@
-extends "res://scripts/clothing/baseClothing.gd"
+extends "res://scripts/clothing/clothing_base.gd"
func _on_tops_pressed():
character.top = texture_normal
diff --git a/scripts/clothing/undiesBase.gd b/scripts/clothing/undies_base.gd
similarity index 62%
rename from scripts/clothing/undiesBase.gd
rename to scripts/clothing/undies_base.gd
index 66a174e..4f96176 100644
--- a/scripts/clothing/undiesBase.gd
+++ b/scripts/clothing/undies_base.gd
@@ -1,4 +1,4 @@
-extends "res://scripts/clothing/baseClothing.gd"
+extends "res://scripts/clothing/clothing_base.gd"
func _on_undies_pressed():
character.underwear = texture_normal
diff --git a/scripts/game_info.gd b/scripts/game_info.gd
new file mode 100644
index 0000000..1eccaec
--- /dev/null
+++ b/scripts/game_info.gd
@@ -0,0 +1,16 @@
+extends Node
+
+
+# Declare member variables here. Examples:
+# var a = 2
+# var b = "text"
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready():
+ pass # Replace with function body.
+
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+#func _process(delta):
+# pass
diff --git a/sprites/character_base_legs.svg b/sprites/character_base_legs.svg
index 46b4bca..dc7080c 100644
--- a/sprites/character_base_legs.svg
+++ b/sprites/character_base_legs.svg
@@ -33,7 +33,7 @@
showgrid="false"
inkscape:current-layer="layer3"
inkscape:document-units="mm"
- inkscape:cy="-10.536605"
+ inkscape:cy="-7.1041414"
inkscape:cx="188.27602"
inkscape:zoom="2.8"
inkscape:pageshadow="2"
diff --git a/sprites/clothes/blue_camo_jeans.svg b/sprites/clothes/blue_camo_jeans.svg
index f96342d..70d6ae1 100644
--- a/sprites/clothes/blue_camo_jeans.svg
+++ b/sprites/clothes/blue_camo_jeans.svg
@@ -11,9 +11,9 @@
inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
id="svg2007"
version="1.1"
- viewBox="0 0 29.356467 34.312774"
- height="34.312775mm"
- width="29.356466mm">
+ viewBox="0 0 29.433051 33.900688"
+ height="33.900688mm"
+ width="29.43305mm">
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ transform="rotate(3.0465628,32.059698,-17.875049)"
+ id="g2657">
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/sprites/clothes/dj_shorts.svg b/sprites/clothes/dj_shorts.svg
index 804619d..239008b 100644
--- a/sprites/clothes/dj_shorts.svg
+++ b/sprites/clothes/dj_shorts.svg
@@ -9,9 +9,9 @@
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
sodipodi:docname="dj_shorts.svg"
- viewBox="0 0 112.67261 129.13097"
- height="129.13097"
- width="112.67261"
+ viewBox="0 0 113.25831 125.01931"
+ height="125.01931"
+ width="113.25831"
id="svg815"
version="1.1">
-
-
-
-
-
-
-
-
-
-
+
+
+