tonytins/dressupzack
1
0
Fork 0
mirror of https://github.com/tonytins/dressupzack synced 2025-05-05 21:34:49 -04:00
Code Issues Releases Wiki Activity

TextureButton is now the root scene

Browse source 
- Due to resize issues with the grid container, TextureButton is now the root for all wardrobe items
- Brought back underwear, with the exception of the owo censor (for now)
- Remove clothing buttons are tied to wardrobe
- Game scene now properly references the wardrobe again
This commit is contained in:
Anthony Foxclaw 2020-06-27 12:06:53 -04:00
parent c7cf3c7986
commit d3b5f1fc1c
14 changed files with 74 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scenes/clothing/accessoryBase.tscn
View file

@ -5,4 +5,4 @@
[node name="accessoryBase" instance=ExtResource( 1 )]
script = ExtResource( 2 )
[connection signal="pressed" from="clothing" to="." method="_on_accessory_pressed"]
[connection signal="pressed" from="." to="." method="_on_accessory_pressed"]

13
scenes/clothing/baseClothing.tscn
View file

@ -2,14 +2,13 @@
[ext_resource path="res://scripts/clothing/baseClothing.gd" type="Script" id=1]
[node name="baseClothing" type="Control"]
[node name="baseClothing" type="TextureButton"]
anchor_right = 1.0
anchor_bottom = 1.0
margin_right = -694.0
margin_bottom = -488.0
rect_min_size = Vector2( 106, 112 )
script = ExtResource( 1 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="clothing" type="TextureButton" parent="."]
rect_min_size = Vector2( 106, 112 )
__meta__ = {
"_edit_use_anchors_": false
}

7
scenes/clothing/briefs.tscn Normal file
View file

@ -0,0 +1,7 @@
[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]
[node name="briefs" instance=ExtResource( 2 )]
texture_normal = ExtResource( 1 )

7
scenes/clothing/camera.tscn
View file

@ -4,6 +4,9 @@
[ext_resource path="res://sprites/clothes/camera.png" type="Texture" id=2]
[node name="camera" instance=ExtResource( 1 )]
[node name="clothing" parent="." index="0"]
anchor_right = 0.0
anchor_bottom = 0.0
margin_right = 0.0
margin_bottom = 0.0
rect_min_size = Vector2( 0, 0 )
texture_normal = ExtResource( 2 )

12
scenes/clothing/fundosi.tscn Normal file
View file

@ -0,0 +1,12 @@
[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]
[node name="fundosi" instance=ExtResource( 2 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_right = 0.0
margin_bottom = 0.0
rect_min_size = Vector2( 0, 0 )
texture_normal = ExtResource( 1 )

2
scenes/clothing/undiesBase.tscn
View file

@ -5,4 +5,4 @@
[node name="baseClothing" instance=ExtResource( 1 )]
script = ExtResource( 2 )
[connection signal="pressed" from="clothing" to="." method="_on_undies_pressed"]
[connection signal="pressed" from="." to="." method="_on_undies_pressed"]

7
scenes/clothing/zBriefs.tscn Normal file
View file

@ -0,0 +1,7 @@
[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]
[node name="zBriefs" instance=ExtResource( 2 )]
texture_normal = ExtResource( 1 )

2
scenes/game.tscn
View file

@ -2,7 +2,7 @@
[ext_resource path="res://scenes/characterBase.tscn" type="PackedScene" id=1]
[ext_resource path="res://scenes/pause.tscn" type="PackedScene" id=2]
[ext_resource path="res://scenes/clothes.tscn" type="PackedScene" id=4]
[ext_resource path="res://scenes/wardrobe.tscn" type="PackedScene" id=4]
[ext_resource path="res://sprites/clothes/icrazy_frame.svg" type="Texture" id=5]
[ext_resource path="res://sprites/clothes/lights.png" type="Texture" id=6]

37
scenes/wordrobe.tscn → scenes/wardrobe.tscn
View file

@ -1,6 +1,7 @@
[gd_scene load_steps=23 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]
@ -18,10 +19,9 @@
[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://sprites/clothes/owo_censor.svg" type="Texture" id=20]
[ext_resource path="res://sprites/clothes/briefs.svg" type="Texture" id=21]
[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://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]
[node name="Wordrobe" type="TabContainer"]
anchor_right = 1.0
@ -29,6 +29,7 @@ anchor_bottom = 1.0
custom_colors/font_color_disabled = Color( 0, 0, 0, 1 )
custom_colors/font_color_bg = Color( 0.921569, 0.921569, 0.921569, 1 )
custom_colors/font_color_fg = Color( 1, 1, 1, 1 )
script = ExtResource( 21 )
__meta__ = {
"_edit_use_anchors_": false
}
@ -43,6 +44,7 @@ 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__ = {
@ -211,32 +213,23 @@ anchor_bottom = 1.0
[node name="UndiesGrid" type="GridContainer" parent="Underwear/UndiesScroll"]
margin_right = 792.0
margin_bottom = 228.0
margin_bottom = 112.0
size_flags_horizontal = 3
columns = 3
[node name="OwOCensor" type="TextureButton" parent="Underwear/UndiesScroll/UndiesGrid"]
[node name="fundosi" parent="Underwear/UndiesScroll/UndiesGrid" instance=ExtResource( 22 )]
margin_right = 106.0
margin_bottom = 112.0
texture_normal = ExtResource( 20 )
[node name="Briefs" type="TextureButton" parent="Underwear/UndiesScroll/UndiesGrid"]
[node name="zBriefs" parent="Underwear/UndiesScroll/UndiesGrid" instance=ExtResource( 2 )]
margin_left = 110.0
margin_right = 216.0
margin_bottom = 112.0
texture_normal = ExtResource( 21 )
[node name="ZBriefs" type="TextureButton" parent="Underwear/UndiesScroll/UndiesGrid"]
[node name="briefs" parent="Underwear/UndiesScroll/UndiesGrid" instance=ExtResource( 20 )]
margin_left = 220.0
margin_right = 326.0
margin_bottom = 112.0
texture_normal = ExtResource( 22 )
[node name="Fundosi" type="TextureButton" parent="Underwear/UndiesScroll/UndiesGrid"]
margin_top = 116.0
margin_right = 106.0
margin_bottom = 228.0
texture_normal = ExtResource( 23 )
[node name="Accessoires" type="Tabs" parent="."]
visible = false
@ -255,7 +248,17 @@ margin_bottom = 494.0
[node name="AccsGrid" type="GridContainer" parent="Accessoires/AccsScroll"]
margin_right = 350.0
margin_bottom = 112.0
size_flags_horizontal = 3
columns = 3
[node name="camera" parent="Accessoires/AccsScroll/AccsGrid" instance=ExtResource( 1 )]
margin_right = 85.0
margin_bottom = 112.0
[node name="removeAccessory" type="TextureButton" parent="Accessoires/AccsScroll/AccsGrid"]
margin_left = 89.0
margin_right = 195.0
margin_bottom = 112.0
texture_normal = ExtResource( 9 )
[connection signal="pressed" from="Accessoires/AccsScroll/AccsGrid/removeAccessory" to="." method="_on_removeAccessory_pressed"]

4
scripts/characterBase.gd
View file

@ -4,7 +4,11 @@ extends Node2D
onready var character = preload("res://resources/character.tres")
onready var accessory = $Accessory
onready var underwear = $Undies
func _process(delta):
if character.accessory != null:
accessory.texture = character.accessory
if character.underwear != null:
underwear.texture = character.underwear

3
scripts/clothing/accessoryBase.gd
View file

@ -1,7 +1,6 @@
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
character.accessory = texture_normal

2
scripts/clothing/baseClothing.gd
View file

@ -1,2 +1,2 @@
extends Control
extends TextureButton

3
scripts/clothing/undiesBase.gd
View file

@ -1,7 +1,6 @@
extends "res://scripts/clothing/baseClothing.gd"
onready var character = preload("res://resources/character.tres")
onready var clothing = $clothing
func _on_undies_pressed():
character.underwear = clothing.texture_normal
character.underwear = texture_normal

7
scripts/wardrobe.gd Normal file
View file

@ -0,0 +1,7 @@
extends TabContainer
onready var character = preload("res://resources/character.tres")
onready var blank_top = preload("res://sprites/clothes/tops_placeholder.png")
func _on_removeAccessory_pressed():
character.accessory = blank_top