1
0
Fork 0
mirror of https://github.com/tonytins/dressupzack synced 2025-05-06 13:44:49 -04:00

Decoupled accessory button works!

- Moved clothing scripts to their own directory
This commit is contained in:
Anthony Foxclaw 2020-06-27 11:31:47 -04:00
parent 721e2ab858
commit f29257dcc2
9 changed files with 20 additions and 10 deletions

View file

@ -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://scenes/clothing/camera.tscn" type="PackedScene" id=1]
[ext_resource path="res://sprites/clothes/jeans.svg" type="Texture" id=3] [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/z_briefs.svg" type="Texture" id=22]
[ext_resource path="res://sprites/clothes/fundosi.svg" type="Texture" id=23] [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"] [node name="Wordrobe" type="TabContainer"]
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
@ -259,3 +269,4 @@ size_flags_horizontal = 3
columns = 3 columns = 3
[node name="accessoryBase" parent="Accessoires/AccsScroll/AccsGrid" instance=ExtResource( 1 )] [node name="accessoryBase" parent="Accessoires/AccsScroll/AccsGrid" instance=ExtResource( 1 )]
script = SubResource( 1 )

View file

@ -59,7 +59,7 @@ script = ExtResource( 1 )
[node name="Tail" type="AnimatedSprite" parent="Base"] [node name="Tail" type="AnimatedSprite" parent="Base"]
position = Vector2( 54.4027, 184.439 ) position = Vector2( 54.4027, 184.439 )
frames = SubResource( 1 ) frames = SubResource( 1 )
frame = 3 frame = 8
playing = true playing = true
[node name="Tony" type="Sprite" parent="Base"] [node name="Tony" type="Sprite" parent="Base"]
@ -69,13 +69,13 @@ texture = ExtResource( 5 )
[node name="Eyes" type="AnimatedSprite" parent="Base"] [node name="Eyes" type="AnimatedSprite" parent="Base"]
position = Vector2( 114.227, 63.9224 ) position = Vector2( 114.227, 63.9224 )
frames = SubResource( 2 ) frames = SubResource( 2 )
frame = 18 frame = 11
playing = true playing = true
[node name="Mouth" type="AnimatedSprite" parent="Base"] [node name="Mouth" type="AnimatedSprite" parent="Base"]
position = Vector2( 131.024, 67.4964 ) position = Vector2( 131.024, 67.4964 )
frames = SubResource( 3 ) frames = SubResource( 3 )
frame = 7 frame = 3
playing = true playing = true
[node name="Undies" type="Sprite" parent="."] [node name="Undies" type="Sprite" parent="."]

View file

@ -1,7 +1,7 @@
[gd_scene load_steps=3 format=2] [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/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 )] [node name="accessoryBase" instance=ExtResource( 1 )]
script = ExtResource( 2 ) script = ExtResource( 2 )

View file

@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=2] [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"] [node name="baseClothing" type="Control"]
script = ExtResource( 1 ) script = ExtResource( 1 )

View file

@ -6,5 +6,4 @@
[node name="accessoryBase" instance=ExtResource( 1 )] [node name="accessoryBase" instance=ExtResource( 1 )]
[node name="clothing" parent="." index="0"] [node name="clothing" parent="." index="0"]
rect_min_size = Vector2( 106, 112 )
texture_normal = ExtResource( 2 ) texture_normal = ExtResource( 2 )

View file

@ -1,7 +1,7 @@
[gd_scene load_steps=3 format=2] [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/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 )] [node name="baseClothing" instance=ExtResource( 1 )]
script = ExtResource( 2 ) script = ExtResource( 2 )

View file

@ -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 character = preload("res://resources/character.tres")
onready var clothing = $clothing onready var clothing = $clothing

View file

@ -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 character = preload("res://resources/character.tres")
onready var clothing = $clothing onready var clothing = $clothing