diff --git a/scenes/clothing/base/accessoryBase.tscn b/scenes/clothing/base/accessoryBase.tscn index 759f6f8..9cd8bfb 100644 --- a/scenes/clothing/base/accessoryBase.tscn +++ b/scenes/clothing/base/accessoryBase.tscn @@ -1,7 +1,10 @@ [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/baseClothing.tscn" type="PackedScene" id=2] +[ext_resource path="res://scenes/clothing/base/baseClothing.tscn" type="PackedScene" id=2] + + + [node name="accessoryBase" instance=ExtResource( 2 )] script = ExtResource( 1 ) diff --git a/scenes/clothing/baseClothing.tscn b/scenes/clothing/base/baseClothing.tscn similarity index 100% rename from scenes/clothing/baseClothing.tscn rename to scenes/clothing/base/baseClothing.tscn diff --git a/scenes/clothing/base/bottomsBase.tscn b/scenes/clothing/base/bottomsBase.tscn index 8583ca3..661e10b 100644 --- a/scenes/clothing/base/bottomsBase.tscn +++ b/scenes/clothing/base/bottomsBase.tscn @@ -1,8 +1,11 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://scenes/clothing/baseClothing.tscn" type="PackedScene" id=1] +[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 ) [connection signal="pressed" from="." to="." method="_on_bottoms_pressed"] diff --git a/scenes/clothing/base/topsBase.tscn b/scenes/clothing/base/topsBase.tscn index 23dfa8a..3ad95b0 100644 --- a/scenes/clothing/base/topsBase.tscn +++ b/scenes/clothing/base/topsBase.tscn @@ -1,8 +1,11 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://scenes/clothing/baseClothing.tscn" type="PackedScene" id=1] +[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 ) [connection signal="pressed" from="." to="." method="_on_tops_pressed"] diff --git a/scenes/clothing/base/undiesBase.tscn b/scenes/clothing/base/undiesBase.tscn index bd21309..df1ae8d 100644 --- a/scenes/clothing/base/undiesBase.tscn +++ b/scenes/clothing/base/undiesBase.tscn @@ -1,7 +1,10 @@ [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/baseClothing.tscn" type="PackedScene" id=2] +[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 53fb92e..0209b39 100644 --- a/scenes/clothing/camera.tscn +++ b/scenes/clothing/camera.tscn @@ -4,6 +4,8 @@ [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/beatUpJeans.tscn b/scenes/clothing/pants/beatUpJeans.tscn similarity index 80% rename from scenes/clothing/beatUpJeans.tscn rename to scenes/clothing/pants/beatUpJeans.tscn index 0ec6c45..2ed835b 100644 --- a/scenes/clothing/beatUpJeans.tscn +++ b/scenes/clothing/pants/beatUpJeans.tscn @@ -1,9 +1,12 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://scenes/clothing/baseClothing.tscn" type="PackedScene" id=1] +[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/camoJeans.tscn b/scenes/clothing/pants/camoJeans.tscn similarity index 80% rename from scenes/clothing/camoJeans.tscn rename to scenes/clothing/pants/camoJeans.tscn index 45efb84..38e32bf 100644 --- a/scenes/clothing/camoJeans.tscn +++ b/scenes/clothing/pants/camoJeans.tscn @@ -1,9 +1,12 @@ [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/baseClothing.tscn" type="PackedScene" id=2] +[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 ) diff --git a/scenes/clothing/djShorts.tscn b/scenes/clothing/pants/djShorts.tscn similarity index 80% rename from scenes/clothing/djShorts.tscn rename to scenes/clothing/pants/djShorts.tscn index 3d2e6b2..1b2d46d 100644 --- a/scenes/clothing/djShorts.tscn +++ b/scenes/clothing/pants/djShorts.tscn @@ -1,9 +1,12 @@ [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/baseClothing.tscn" type="PackedScene" id=2] +[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 ) diff --git a/scenes/clothing/formalSkirt.tscn b/scenes/clothing/pants/formalSkirt.tscn similarity index 80% rename from scenes/clothing/formalSkirt.tscn rename to scenes/clothing/pants/formalSkirt.tscn index 6aa2511..0f7d544 100644 --- a/scenes/clothing/formalSkirt.tscn +++ b/scenes/clothing/pants/formalSkirt.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://scenes/clothing/baseClothing.tscn" type="PackedScene" id=1] +[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/jeans.tscn b/scenes/clothing/pants/jeans.tscn similarity index 80% rename from scenes/clothing/jeans.tscn rename to scenes/clothing/pants/jeans.tscn index 8fb056b..8cc5610 100644 --- a/scenes/clothing/jeans.tscn +++ b/scenes/clothing/pants/jeans.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://scenes/clothing/baseClothing.tscn" type="PackedScene" id=1] +[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/skirt.tscn b/scenes/clothing/pants/skirt.tscn similarity index 80% rename from scenes/clothing/skirt.tscn rename to scenes/clothing/pants/skirt.tscn index adb14a0..a8f64ab 100644 --- a/scenes/clothing/skirt.tscn +++ b/scenes/clothing/pants/skirt.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://scenes/clothing/baseClothing.tscn" type="PackedScene" id=1] +[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/briefs.tscn b/scenes/clothing/undies/briefs.tscn similarity index 99% rename from scenes/clothing/briefs.tscn rename to scenes/clothing/undies/briefs.tscn index 47efaff..fde30e2 100644 --- a/scenes/clothing/briefs.tscn +++ b/scenes/clothing/undies/briefs.tscn @@ -4,5 +4,7 @@ [ext_resource path="res://scenes/clothing/base/undiesBase.tscn" type="PackedScene" id=2] + + [node name="briefs" instance=ExtResource( 2 )] texture_normal = ExtResource( 1 ) diff --git a/scenes/clothing/fundosi.tscn b/scenes/clothing/undies/fundosi.tscn similarity index 99% rename from scenes/clothing/fundosi.tscn rename to scenes/clothing/undies/fundosi.tscn index e4f77fd..5a0ac93 100644 --- a/scenes/clothing/fundosi.tscn +++ b/scenes/clothing/undies/fundosi.tscn @@ -4,6 +4,8 @@ [ext_resource path="res://scenes/clothing/base/undiesBase.tscn" type="PackedScene" id=2] + + [node name="fundosi" instance=ExtResource( 2 )] anchor_right = 0.0 anchor_bottom = 0.0 diff --git a/scenes/clothing/zBriefs.tscn b/scenes/clothing/undies/zBriefs.tscn similarity index 99% rename from scenes/clothing/zBriefs.tscn rename to scenes/clothing/undies/zBriefs.tscn index a78a148..2e8d6af 100644 --- a/scenes/clothing/zBriefs.tscn +++ b/scenes/clothing/undies/zBriefs.tscn @@ -4,5 +4,7 @@ [ext_resource path="res://scenes/clothing/base/undiesBase.tscn" type="PackedScene" id=2] + + [node name="zBriefs" instance=ExtResource( 2 )] texture_normal = ExtResource( 1 ) diff --git a/scenes/wardrobe.tscn b/scenes/wardrobe.tscn index 14c15c6..52fefda 100644 --- a/scenes/wardrobe.tscn +++ b/scenes/wardrobe.tscn @@ -1,17 +1,19 @@ [gd_scene load_steps=13 format=2] [ext_resource path="res://scenes/clothing/camera.tscn" type="PackedScene" id=1] -[ext_resource path="res://scenes/clothing/zBriefs.tscn" type="PackedScene" id=2] -[ext_resource path="res://scenes/clothing/beatUpJeans.tscn" type="PackedScene" id=3] -[ext_resource path="res://scenes/clothing/jeans.tscn" type="PackedScene" id=4] -[ext_resource path="res://scenes/clothing/skirt.tscn" type="PackedScene" id=5] -[ext_resource path="res://scenes/clothing/formalSkirt.tscn" type="PackedScene" id=6] -[ext_resource path="res://scenes/clothing/camoJeans.tscn" type="PackedScene" id=7] -[ext_resource path="res://scenes/clothing/djShorts.tscn" type="PackedScene" id=8] +[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/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/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/briefs.tscn" type="PackedScene" id=20] +[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/fundosi.tscn" type="PackedScene" id=22] +[ext_resource path="res://scenes/clothing/undies/fundosi.tscn" type="PackedScene" id=22] + + [node name="Wordrobe" type="TabContainer"] anchor_right = 1.0