From c7cf3c7986b5e6c729af957851c02688c3e51339 Mon Sep 17 00:00:00 2001 From: Anthony Foxclaw Date: Sat, 27 Jun 2020 11:36:39 -0400 Subject: [PATCH] Minor renaming --- scenes/clothing/camera.tscn | 2 +- scenes/{Clothes.tscn => wordrobe.tscn} | 15 ++------------- 2 files changed, 3 insertions(+), 14 deletions(-) rename scenes/{Clothes.tscn => wordrobe.tscn} (94%) diff --git a/scenes/clothing/camera.tscn b/scenes/clothing/camera.tscn index 4e1ec83..88ba8aa 100644 --- a/scenes/clothing/camera.tscn +++ b/scenes/clothing/camera.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://scenes/clothing/accessoryBase.tscn" type="PackedScene" id=1] [ext_resource path="res://sprites/clothes/camera.png" type="Texture" id=2] -[node name="accessoryBase" instance=ExtResource( 1 )] +[node name="camera" instance=ExtResource( 1 )] [node name="clothing" parent="." index="0"] texture_normal = ExtResource( 2 ) diff --git a/scenes/Clothes.tscn b/scenes/wordrobe.tscn similarity index 94% rename from scenes/Clothes.tscn rename to scenes/wordrobe.tscn index bbecbb1..f395306 100644 --- a/scenes/Clothes.tscn +++ b/scenes/wordrobe.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=24 format=2] +[gd_scene load_steps=23 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,16 +23,6 @@ [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 @@ -268,5 +258,4 @@ margin_right = 350.0 size_flags_horizontal = 3 columns = 3 -[node name="accessoryBase" parent="Accessoires/AccsScroll/AccsGrid" instance=ExtResource( 1 )] -script = SubResource( 1 ) +[node name="camera" parent="Accessoires/AccsScroll/AccsGrid" instance=ExtResource( 1 )]