diff --git a/scenes/Clothes.tscn b/scenes/Clothes.tscn index e5f7a6b..bbecbb1 100644 --- a/scenes/Clothes.tscn +++ b/scenes/Clothes.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=23 format=2] +[gd_scene load_steps=24 format=2] [ext_resource path="res://scenes/clothing/camera.tscn" type="PackedScene" id=1] [ext_resource path="res://sprites/clothes/jeans.svg" type="Texture" id=3] @@ -23,6 +23,16 @@ [ext_resource path="res://sprites/clothes/z_briefs.svg" type="Texture" id=22] [ext_resource path="res://sprites/clothes/fundosi.svg" type="Texture" id=23] +[sub_resource type="GDScript" id=1] +script/source = "extends \"res://scripts/clothing/baseClothing.gd\" + +onready var character = preload(\"res://resources/character.tres\") +onready var clothing = $clothing + +func _on_accessory_pressed(): + character.accessory = clothing.texture_normal +" + [node name="Wordrobe" type="TabContainer"] anchor_right = 1.0 anchor_bottom = 1.0 @@ -259,3 +269,4 @@ size_flags_horizontal = 3 columns = 3 [node name="accessoryBase" parent="Accessoires/AccsScroll/AccsGrid" instance=ExtResource( 1 )] +script = SubResource( 1 ) diff --git a/scenes/characterBase.tscn b/scenes/characterBase.tscn index bcdb1b2..c6dc118 100644 --- a/scenes/characterBase.tscn +++ b/scenes/characterBase.tscn @@ -59,7 +59,7 @@ script = ExtResource( 1 ) [node name="Tail" type="AnimatedSprite" parent="Base"] position = Vector2( 54.4027, 184.439 ) frames = SubResource( 1 ) -frame = 3 +frame = 8 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 = 18 +frame = 11 playing = true [node name="Mouth" type="AnimatedSprite" parent="Base"] position = Vector2( 131.024, 67.4964 ) frames = SubResource( 3 ) -frame = 7 +frame = 3 playing = true [node name="Undies" type="Sprite" parent="."] diff --git a/scenes/clothing/accessoryBase.tscn b/scenes/clothing/accessoryBase.tscn index 1989cbe..d84ffc9 100644 --- a/scenes/clothing/accessoryBase.tscn +++ b/scenes/clothing/accessoryBase.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://scenes/clothing/baseClothing.tscn" type="PackedScene" id=1] -[ext_resource path="res://scripts/accessoryBase.gd" type="Script" id=2] +[ext_resource path="res://scripts/clothing/accessoryBase.gd" type="Script" id=2] [node name="accessoryBase" instance=ExtResource( 1 )] script = ExtResource( 2 ) diff --git a/scenes/clothing/baseClothing.tscn b/scenes/clothing/baseClothing.tscn index ae05ca9..1aa40e6 100644 --- a/scenes/clothing/baseClothing.tscn +++ b/scenes/clothing/baseClothing.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://scripts/baseClothing.gd" type="Script" id=1] +[ext_resource path="res://scripts/clothing/baseClothing.gd" type="Script" id=1] [node name="baseClothing" type="Control"] script = ExtResource( 1 ) diff --git a/scenes/clothing/camera.tscn b/scenes/clothing/camera.tscn index 8231507..4e1ec83 100644 --- a/scenes/clothing/camera.tscn +++ b/scenes/clothing/camera.tscn @@ -6,5 +6,4 @@ [node name="accessoryBase" instance=ExtResource( 1 )] [node name="clothing" parent="." index="0"] -rect_min_size = Vector2( 106, 112 ) texture_normal = ExtResource( 2 ) diff --git a/scenes/clothing/undiesBase.tscn b/scenes/clothing/undiesBase.tscn index a378b51..4a53669 100644 --- a/scenes/clothing/undiesBase.tscn +++ b/scenes/clothing/undiesBase.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://scenes/clothing/baseClothing.tscn" type="PackedScene" id=1] -[ext_resource path="res://scripts/undiesBase.gd" type="Script" id=2] +[ext_resource path="res://scripts/clothing/undiesBase.gd" type="Script" id=2] [node name="baseClothing" instance=ExtResource( 1 )] script = ExtResource( 2 ) diff --git a/scripts/accessoryBase.gd b/scripts/clothing/accessoryBase.gd similarity index 78% rename from scripts/accessoryBase.gd rename to scripts/clothing/accessoryBase.gd index be95970..3ef80cb 100644 --- a/scripts/accessoryBase.gd +++ b/scripts/clothing/accessoryBase.gd @@ -1,4 +1,4 @@ -extends "res://scripts/baseClothing.gd" +extends "res://scripts/clothing/baseClothing.gd" onready var character = preload("res://resources/character.tres") onready var clothing = $clothing diff --git a/scripts/baseClothing.gd b/scripts/clothing/baseClothing.gd similarity index 100% rename from scripts/baseClothing.gd rename to scripts/clothing/baseClothing.gd diff --git a/scripts/undiesBase.gd b/scripts/clothing/undiesBase.gd similarity index 78% rename from scripts/undiesBase.gd rename to scripts/clothing/undiesBase.gd index 5358a38..a80b4cc 100644 --- a/scripts/undiesBase.gd +++ b/scripts/clothing/undiesBase.gd @@ -1,4 +1,4 @@ -extends "res://scripts/baseClothing.gd" +extends "res://scripts/clothing/baseClothing.gd" onready var character = preload("res://resources/character.tres") onready var clothing = $clothing