diff --git a/scenes/characterBase.tscn b/scenes/characterBase.tscn index c6dc118..5497eb7 100644 --- a/scenes/characterBase.tscn +++ b/scenes/characterBase.tscn @@ -24,8 +24,8 @@ [ext_resource path="res://sprites/character/mouth/mouth10.png" type="Texture" id=22] [ext_resource path="res://sprites/character/mouth/mouth12.png" type="Texture" id=23] [ext_resource path="res://sprites/clothes/briefs.svg" type="Texture" id=24] -[ext_resource path="res://sprites/clothes/bottoms_placeholder.png" type="Texture" id=25] -[ext_resource path="res://sprites/clothes/tops_placeholder.png" type="Texture" id=26] +[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] [sub_resource type="SpriteFrames" id=1] animations = [ { @@ -59,7 +59,7 @@ script = ExtResource( 1 ) [node name="Tail" type="AnimatedSprite" parent="Base"] position = Vector2( 54.4027, 184.439 ) frames = SubResource( 1 ) -frame = 8 +frame = 6 playing = true [node name="Tony" type="Sprite" parent="Base"] @@ -69,13 +69,13 @@ texture = ExtResource( 5 ) [node name="Eyes" type="AnimatedSprite" parent="Base"] position = Vector2( 114.227, 63.9224 ) frames = SubResource( 2 ) -frame = 11 +frame = 15 playing = true [node name="Mouth" type="AnimatedSprite" parent="Base"] position = Vector2( 131.024, 67.4964 ) frames = SubResource( 3 ) -frame = 3 +frame = 19 playing = true [node name="Undies" type="Sprite" parent="."] diff --git a/scenes/clothing/accessoryBase.tscn b/scenes/clothing/base/accessoryBase.tscn similarity index 66% rename from scenes/clothing/accessoryBase.tscn rename to scenes/clothing/base/accessoryBase.tscn index 16e4e2c..759f6f8 100644 --- a/scenes/clothing/accessoryBase.tscn +++ b/scenes/clothing/base/accessoryBase.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://scenes/clothing/baseClothing.tscn" type="PackedScene" id=1] -[ext_resource path="res://scripts/clothing/accessoryBase.gd" type="Script" id=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] -[node name="accessoryBase" instance=ExtResource( 1 )] -script = ExtResource( 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/bottomsBase.tscn b/scenes/clothing/base/bottomsBase.tscn new file mode 100644 index 0000000..8583ca3 --- /dev/null +++ b/scenes/clothing/base/bottomsBase.tscn @@ -0,0 +1,8 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://scenes/clothing/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 new file mode 100644 index 0000000..23dfa8a --- /dev/null +++ b/scenes/clothing/base/topsBase.tscn @@ -0,0 +1,8 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://scenes/clothing/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/undiesBase.tscn b/scenes/clothing/base/undiesBase.tscn similarity index 67% rename from scenes/clothing/undiesBase.tscn rename to scenes/clothing/base/undiesBase.tscn index b8128e4..bd21309 100644 --- a/scenes/clothing/undiesBase.tscn +++ b/scenes/clothing/base/undiesBase.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://scenes/clothing/baseClothing.tscn" type="PackedScene" id=1] -[ext_resource path="res://scripts/clothing/undiesBase.gd" type="Script" id=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] -[node name="baseClothing" instance=ExtResource( 1 )] -script = ExtResource( 2 ) +[node name="baseClothing" instance=ExtResource( 2 )] +script = ExtResource( 1 ) [connection signal="pressed" from="." to="." method="_on_undies_pressed"] diff --git a/scenes/clothing/beatUpJeans.tscn b/scenes/clothing/beatUpJeans.tscn new file mode 100644 index 0000000..0ec6c45 --- /dev/null +++ b/scenes/clothing/beatUpJeans.tscn @@ -0,0 +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://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 ) +[connection signal="pressed" from="." to="." method="_on_bottoms_pressed"] diff --git a/scenes/clothing/briefs.tscn b/scenes/clothing/briefs.tscn index 295a54a..47efaff 100644 --- a/scenes/clothing/briefs.tscn +++ b/scenes/clothing/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/undiesBase.tscn" type="PackedScene" id=2] +[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/camera.tscn b/scenes/clothing/camera.tscn index f90e665..53fb92e 100644 --- a/scenes/clothing/camera.tscn +++ b/scenes/clothing/camera.tscn @@ -1,8 +1,9 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://scenes/clothing/accessoryBase.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/camoJeans.tscn b/scenes/clothing/camoJeans.tscn new file mode 100644 index 0000000..45efb84 --- /dev/null +++ b/scenes/clothing/camoJeans.tscn @@ -0,0 +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/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/djShorts.tscn b/scenes/clothing/djShorts.tscn new file mode 100644 index 0000000..3d2e6b2 --- /dev/null +++ b/scenes/clothing/djShorts.tscn @@ -0,0 +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/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/formalSkirt.tscn b/scenes/clothing/formalSkirt.tscn new file mode 100644 index 0000000..6aa2511 --- /dev/null +++ b/scenes/clothing/formalSkirt.tscn @@ -0,0 +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://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 ) +[connection signal="pressed" from="." to="." method="_on_bottoms_pressed"] diff --git a/scenes/clothing/fundosi.tscn b/scenes/clothing/fundosi.tscn index 19f3523..e4f77fd 100644 --- a/scenes/clothing/fundosi.tscn +++ b/scenes/clothing/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/undiesBase.tscn" type="PackedScene" id=2] +[ext_resource path="res://scenes/clothing/base/undiesBase.tscn" type="PackedScene" id=2] + [node name="fundosi" instance=ExtResource( 2 )] anchor_right = 0.0 diff --git a/scenes/clothing/jeans.tscn b/scenes/clothing/jeans.tscn new file mode 100644 index 0000000..8fb056b --- /dev/null +++ b/scenes/clothing/jeans.tscn @@ -0,0 +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://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 ) +[connection signal="pressed" from="." to="." method="_on_bottoms_pressed"] diff --git a/scenes/clothing/skirt.tscn b/scenes/clothing/skirt.tscn new file mode 100644 index 0000000..adb14a0 --- /dev/null +++ b/scenes/clothing/skirt.tscn @@ -0,0 +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://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 ) +[connection signal="pressed" from="." to="." method="_on_bottoms_pressed"] diff --git a/scenes/clothing/zBriefs.tscn b/scenes/clothing/zBriefs.tscn index 9739ffa..a78a148 100644 --- a/scenes/clothing/zBriefs.tscn +++ b/scenes/clothing/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/undiesBase.tscn" type="PackedScene" id=2] +[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 96ea405..14c15c6 100644 --- a/scenes/wardrobe.tscn +++ b/scenes/wardrobe.tscn @@ -1,24 +1,14 @@ -[gd_scene load_steps=23 format=2] +[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://sprites/clothes/jeans.svg" type="Texture" id=3] -[ext_resource path="res://sprites/clothes/blue_skirt.svg" type="Texture" id=4] -[ext_resource path="res://sprites/clothes/sweat_pants.svg" type="Texture" id=5] -[ext_resource path="res://sprites/clothes/blue_camo_jeans.svg" type="Texture" id=6] -[ext_resource path="res://sprites/clothes/beat_up_jeans.svg" type="Texture" id=7] -[ext_resource path="res://sprites/clothes/formal_skirt.svg" type="Texture" id=8] +[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://sprites/ui/x_button.svg" type="Texture" id=9] -[ext_resource path="res://sprites/clothes/old_sweatshirt.svg" type="Texture" id=10] -[ext_resource path="res://sprites/clothes/raw_shirt.svg" type="Texture" id=11] -[ext_resource path="res://sprites/clothes/retro_shirt.svg" type="Texture" id=12] -[ext_resource path="res://sprites/clothes/atomic_shirt.svg" type="Texture" id=13] -[ext_resource path="res://sprites/clothes/z_shirt.png" type="Texture" id=14] -[ext_resource path="res://sprites/clothes/biker_jacket.svg" type="Texture" id=15] -[ext_resource path="res://sprites/clothes/nl_jacket.png" type="Texture" id=16] -[ext_resource path="res://sprites/clothes/train_hoodie.svg" type="Texture" id=17] -[ext_resource path="res://sprites/clothes/korm_shirt.png" type="Texture" id=18] -[ext_resource path="res://sprites/clothes/whatsnew_shirt.svg" type="Texture" id=19] [ext_resource path="res://scenes/clothing/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] @@ -44,7 +34,6 @@ margin_bottom = -4.0 custom_constants/hseparation = 0 [node name="PantsScroll" type="ScrollContainer" parent="Pants"] -visible = false anchor_right = 1.0 anchor_bottom = 1.0 __meta__ = { @@ -57,43 +46,49 @@ margin_bottom = 228.0 size_flags_horizontal = 3 columns = 4 -[node name="Jeans" type="TextureButton" parent="Pants/PantsScroll/PantsGrid"] +[node name="beatUpJeans" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 3 )] +anchor_right = 0.0 +anchor_bottom = 0.0 margin_right = 106.0 margin_bottom = 112.0 -texture_normal = ExtResource( 3 ) -[node name="BlueSkirt" type="TextureButton" parent="Pants/PantsScroll/PantsGrid"] +[node name="jeans" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 4 )] +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 110.0 margin_right = 216.0 margin_bottom = 112.0 -texture_normal = ExtResource( 4 ) -[node name="Sweats" type="TextureButton" parent="Pants/PantsScroll/PantsGrid"] +[node name="camoJeans" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 7 )] +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 220.0 margin_right = 326.0 margin_bottom = 112.0 -texture_normal = ExtResource( 5 ) -[node name="BlueCamoJeans" type="TextureButton" parent="Pants/PantsScroll/PantsGrid"] +[node name="camoJeans2" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 8 )] +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 330.0 margin_right = 436.0 margin_bottom = 112.0 -texture_normal = ExtResource( 6 ) -[node name="BeatUpJeans" type="TextureButton" parent="Pants/PantsScroll/PantsGrid"] +[node name="formalSkirt" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 6 )] +anchor_right = 0.0 +anchor_bottom = 0.0 margin_top = 116.0 margin_right = 106.0 margin_bottom = 228.0 -texture_normal = ExtResource( 7 ) -[node name="FormalSkirt" type="TextureButton" parent="Pants/PantsScroll/PantsGrid"] +[node name="skirt" parent="Pants/PantsScroll/PantsGrid" instance=ExtResource( 5 )] +anchor_right = 0.0 +anchor_bottom = 0.0 margin_left = 110.0 margin_top = 116.0 margin_right = 216.0 margin_bottom = 228.0 -texture_normal = ExtResource( 8 ) -[node name="RemovePants" type="TextureButton" parent="Pants/PantsScroll/PantsGrid"] +[node name="removePants" type="TextureButton" parent="Pants/PantsScroll/PantsGrid"] margin_left = 220.0 margin_top = 116.0 margin_right = 326.0 @@ -118,85 +113,17 @@ margin_top = 10.0 [node name="ShirtsGrid" type="GridContainer" parent="Shirts/ShirtsScroll"] margin_right = 782.0 -margin_bottom = 356.0 +margin_bottom = 112.0 size_flags_horizontal = 3 columns = 4 -[node name="Sweatshirt" type="TextureButton" parent="Shirts/ShirtsScroll/ShirtsGrid"] -margin_right = 85.0 -margin_bottom = 115.0 -texture_normal = ExtResource( 10 ) - -[node name="Raw" type="TextureButton" parent="Shirts/ShirtsScroll/ShirtsGrid"] -margin_left = 89.0 -margin_right = 207.0 -margin_bottom = 115.0 -texture_normal = ExtResource( 11 ) - -[node name="Retro" type="TextureButton" parent="Shirts/ShirtsScroll/ShirtsGrid"] -margin_left = 211.0 -margin_right = 296.0 -margin_bottom = 115.0 -texture_normal = ExtResource( 12 ) - -[node name="Atomic" type="TextureButton" parent="Shirts/ShirtsScroll/ShirtsGrid"] -margin_top = 119.0 -margin_right = 85.0 -margin_bottom = 234.0 -texture_normal = ExtResource( 13 ) - -[node name="ZShirt" type="TextureButton" parent="Shirts/ShirtsScroll/ShirtsGrid"] -margin_left = 89.0 -margin_top = 119.0 -margin_right = 207.0 -margin_bottom = 234.0 -texture_normal = ExtResource( 14 ) - -[node name="BikerJacket" type="TextureButton" parent="Shirts/ShirtsScroll/ShirtsGrid"] -margin_left = 211.0 -margin_top = 119.0 -margin_right = 296.0 -margin_bottom = 234.0 -texture_normal = ExtResource( 15 ) - -[node name="NLJacket" type="TextureButton" parent="Shirts/ShirtsScroll/ShirtsGrid"] +[node name="removeShirt" type="TextureButton" parent="Shirts/ShirtsScroll/ShirtsGrid"] +margin_left = 178.0 margin_top = 238.0 -margin_right = 85.0 +margin_right = 284.0 margin_bottom = 353.0 -texture_normal = ExtResource( 16 ) - -[node name="TrainHoodie" type="TextureButton" parent="Shirts/ShirtsScroll/ShirtsGrid"] -margin_left = 89.0 -margin_top = 238.0 -margin_right = 207.0 -margin_bottom = 353.0 -texture_normal = ExtResource( 17 ) - -[node name="KormShirt" type="TextureButton" parent="Shirts/ShirtsScroll/ShirtsGrid"] -margin_left = 211.0 -margin_top = 238.0 -margin_right = 296.0 -margin_bottom = 353.0 -texture_normal = ExtResource( 18 ) - -[node name="WhatsNewShirt" type="TextureButton" parent="Shirts/ShirtsScroll/ShirtsGrid"] -margin_top = 357.0 -margin_right = 85.0 -margin_bottom = 475.0 -texture_normal = ExtResource( 19 ) - -[node name="RemoveShirt" type="Button" parent="Shirts/ShirtsScroll/ShirtsGrid"] -margin_left = 89.0 -margin_top = 357.0 -margin_right = 207.0 -margin_bottom = 475.0 rect_min_size = Vector2( 0, 112 ) -custom_colors/font_color_disabled = Color( 0, 0, 0, 1 ) -custom_colors/font_color = Color( 0, 0, 0, 1 ) -custom_colors/font_color_hover = Color( 0, 0, 0, 1 ) -custom_colors/font_color_pressed = Color( 0, 0, 0, 1 ) -icon = ExtResource( 9 ) -flat = true +texture_normal = ExtResource( 9 ) [node name="Underwear" type="Tabs" parent="."] visible = false @@ -261,4 +188,6 @@ margin_left = 89.0 margin_right = 195.0 margin_bottom = 112.0 texture_normal = ExtResource( 9 ) +[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"] [connection signal="pressed" from="Accessoires/AccsScroll/AccsGrid/removeAccessory" to="." method="_on_removeAccessory_pressed"] diff --git a/scripts/characterBase.gd b/scripts/characterBase.gd index f09cd42..11cd684 100644 --- a/scripts/characterBase.gd +++ b/scripts/characterBase.gd @@ -5,6 +5,8 @@ extends Node2D onready var character = preload("res://resources/character.tres") onready var accessory = $Accessory onready var underwear = $Undies +onready var bottom = $Bottom +onready var top = $Top func _process(delta): if character.accessory != null: @@ -12,3 +14,9 @@ func _process(delta): if character.underwear != null: underwear.texture = character.underwear + + if character.bottom != null: + bottom.texture = character.bottom + + if character.top != null: + top.texture = character.top diff --git a/scripts/clothing/bottomsBase.gd b/scripts/clothing/bottomsBase.gd new file mode 100644 index 0000000..5f20d50 --- /dev/null +++ b/scripts/clothing/bottomsBase.gd @@ -0,0 +1,6 @@ +extends "res://scripts/clothing/baseClothing.gd" + +onready var character = preload("res://resources/character.tres") + +func _on_bottoms_pressed(): + character.bottom = texture_normal diff --git a/scripts/clothing/topsBase.gd b/scripts/clothing/topsBase.gd new file mode 100644 index 0000000..f1842fd --- /dev/null +++ b/scripts/clothing/topsBase.gd @@ -0,0 +1,6 @@ +extends "res://scripts/clothing/baseClothing.gd" + +onready var character = preload("res://resources/character.tres") + +func _on_tops_pressed(): + character.top = texture_normal diff --git a/scripts/wardrobe.gd b/scripts/wardrobe.gd index afae7b9..bdd51cb 100644 --- a/scripts/wardrobe.gd +++ b/scripts/wardrobe.gd @@ -1,7 +1,14 @@ extends TabContainer onready var character = preload("res://resources/character.tres") -onready var blank_top = preload("res://sprites/clothes/tops_placeholder.png") +onready var blank_top = preload("res://sprites/clothes/blank_top.png") +onready var blank_bottom = preload("res://sprites/clothes/blank_bottom.png") func _on_removeAccessory_pressed(): character.accessory = blank_top + +func _on_removePants_pressed(): + character.bottom = blank_bottom + +func _on_removeShirt_pressed(): + character.top = blank_top diff --git a/sprites/clothes/bottoms_placeholder.png b/sprites/clothes/blank_bottom.png similarity index 100% rename from sprites/clothes/bottoms_placeholder.png rename to sprites/clothes/blank_bottom.png diff --git a/sprites/clothes/tops_placeholder.png.import b/sprites/clothes/blank_bottom.png.import similarity index 67% rename from sprites/clothes/tops_placeholder.png.import rename to sprites/clothes/blank_bottom.png.import index ebd27d1..686ad0f 100644 --- a/sprites/clothes/tops_placeholder.png.import +++ b/sprites/clothes/blank_bottom.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/tops_placeholder.png-f5a04655f1fc6c8a24a963628d2d193a.stex" +path="res://.import/blank_bottom.png-920e015ef605c266d02e19063b5738b4.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/clothes/tops_placeholder.png" -dest_files=[ "res://.import/tops_placeholder.png-f5a04655f1fc6c8a24a963628d2d193a.stex" ] +source_file="res://sprites/clothes/blank_bottom.png" +dest_files=[ "res://.import/blank_bottom.png-920e015ef605c266d02e19063b5738b4.stex" ] [params] diff --git a/sprites/clothes/tops_placeholder.png b/sprites/clothes/blank_top.png similarity index 100% rename from sprites/clothes/tops_placeholder.png rename to sprites/clothes/blank_top.png diff --git a/sprites/clothes/bottoms_placeholder.png.import b/sprites/clothes/blank_top.png.import similarity index 66% rename from sprites/clothes/bottoms_placeholder.png.import rename to sprites/clothes/blank_top.png.import index 93e2cfe..011dc2e 100644 --- a/sprites/clothes/bottoms_placeholder.png.import +++ b/sprites/clothes/blank_top.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/bottoms_placeholder.png-57674ec9f26757b6fa01589150ad74c7.stex" +path="res://.import/blank_top.png-e145e75e3bc30a0f4722046da43ef638.stex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/clothes/bottoms_placeholder.png" -dest_files=[ "res://.import/bottoms_placeholder.png-57674ec9f26757b6fa01589150ad74c7.stex" ] +source_file="res://sprites/clothes/blank_top.png" +dest_files=[ "res://.import/blank_top.png-e145e75e3bc30a0f4722046da43ef638.stex" ] [params]