tonytins/dressupzack
1
0
Fork 0
mirror of https://github.com/tonytins/dressupzack synced 2025-06-25 16:14:43 -04:00
Code Issues Releases Wiki Activity

Cleaned up code base

Browse source 
- Moved character variables and News API address to global GameData class
This commit is contained in:
Tony Bark 2021-06-04 11:25:35 -04:00
parent ec79a57f96
commit e90a500858
18 changed files with 153 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scenes/CharacterBase.tscn → scenes/Character.tscn
View file

@ -28,7 +28,7 @@
[ext_resource path="res://sprites/clothes/blank_top.png" type="Texture" id=26]
[ext_resource path="res://sprites/character/character_base_head.svg" type="Texture" id=27]
[ext_resource path="res://sprites/character/mouth/mouth11.png" type="Texture" id=28]
[ext_resource path="res://scripts/character_base.gd" type="Script" id=29]
[ext_resource path="res://scripts/character.gd" type="Script" id=29]
[sub_resource type="SpriteFrames" id=1]
animations = [ {
@ -54,7 +54,7 @@ animations = [ {
"speed": 2.0
} ]
[node name="CharacterBase" type="Node2D"]
[node name="Character" type="Node2D"]
position = Vector2( -19, -92 )
script = ExtResource( 29 )
@ -92,7 +92,7 @@ texture = ExtResource( 27 )
[node name="Eyes" type="AnimatedSprite" parent="Body/Head"]
position = Vector2( 17.6857, 4.22147 )
frames = SubResource( 2 )
frame = 2
frame = 1
playing = true
[node name="Mouth" type="AnimatedSprite" parent="Body/Head"]

1
scenes/NewsWin.tscn
View file

@ -5,7 +5,6 @@
[ext_resource path="res://scripts/news_window.gd" type="Script" id=3]
[node name="NewsWin" type="WindowDialog"]
visible = true
anchor_left = 0.15375
anchor_top = 0.144
anchor_right = 0.84625

3
scenes/clothing/base/tops_base.tscn
View file

@ -3,8 +3,7 @@
[ext_resource path="res://scenes/clothing/base/clothing_base.tscn" type="PackedScene" id=1]
[ext_resource path="res://scripts/clothing/tops_base.gd" type="Script" id=2]
[node name="topsBase" instance=ExtResource( 1 )]
script = ExtResource( 2 )
[connection signal="pressed" from="." to="." method="_on_tops_pressed"]

4
scenes/clothing/camera.tscn
View file

@ -3,10 +3,6 @@
[ext_resource path="res://scenes/clothing/base/accessory_base.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

26
scenes/game.tscn
View file

@ -1,45 +1,43 @@
[gd_scene load_steps=18 format=2]
[gd_scene load_steps=17 format=2]
[ext_resource path="res://scenes/CharacterBase.tscn" type="PackedScene" id=1]
[ext_resource path="res://scenes/Character.tscn" type="PackedScene" id=1]
[ext_resource path="res://sprites/world/background.svg" type="Texture" id=2]
[ext_resource path="res://sprites/symbols/trash.svg" type="Texture" id=3]
[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]
[ext_resource path="res://sprites/symbols/file-upload.svg" type="Texture" id=7]
[ext_resource path="res://scripts/ui.gd" type="Script" id=8]
[ext_resource path="res://scripts/interface.gd" type="Script" id=8]
[ext_resource path="res://sprites/symbols/file-download.svg" type="Texture" id=9]
[ext_resource path="res://sprites/symbols/file-upload-disabled.svg" type="Texture" id=10]
[ext_resource path="res://sprites/symbols/file-download-disabled.svg" type="Texture" id=11]
[ext_resource path="res://sprites/symbols/spinner.svg" type="Texture" id=12]
[ext_resource path="res://scripts/spinner.gd" type="Script" id=13]
[ext_resource path="res://scripts/game.gd" type="Script" id=14]
[ext_resource path="res://sprites/symbols/newspaper.svg" type="Texture" id=15]
[ext_resource path="res://scenes/NewsWin.tscn" type="PackedScene" id=16]
[ext_resource path="res://sprites/symbols/newspaper-disabled.svg" type="Texture" id=17]
[node name="game" type="Node2D"]
script = ExtResource( 14 )
[node name="Game" type="Node2D"]
[node name="Bg" type="Sprite" parent="."]
[node name="Background" type="Sprite" parent="."]
position = Vector2( 504.046, 202.426 )
texture = ExtResource( 2 )
__meta__ = {
"_edit_lock_": true
}
[node name="picFrame" type="Sprite" parent="."]
[node name="PictureFrame" type="Sprite" parent="."]
position = Vector2( 127.602, 111.895 )
texture = ExtResource( 5 )
__meta__ = {
"_edit_group_": true
}
[node name="light" type="Light2D" parent="picFrame"]
[node name="Light" type="Light2D" parent="PictureFrame"]
position = Vector2( 35.118, -14.56 )
texture = ExtResource( 6 )
[node name="characterBase" parent="." instance=ExtResource( 1 )]
[node name="Character" parent="." instance=ExtResource( 1 )]
position = Vector2( 141.307, 225.012 )
[node name="Controls" type="CanvasLayer" parent="."]
@ -130,7 +128,7 @@ margin_bottom = 32.0
hint_tooltip = "Clear"
texture_normal = ExtResource( 3 )
[node name="versionLbl" type="Label" parent="Controls/Container"]
[node name="VersionLbl" type="Label" parent="Controls/Container"]
anchor_left = 0.88125
anchor_top = 0.944
anchor_right = 0.9825
@ -147,6 +145,6 @@ visible = false
[connection signal="timeout" from="Controls/Container/Spinner/Timer" to="Controls/Container/Spinner" method="_on_Timer_timeout"]
[connection signal="pressed" from="Controls/Container/CenterBtns/ButtonCtr/NewsBtn" to="Controls/Container" method="_on_NewsBtn_pressed"]
[connection signal="pressed" from="Controls/Container/CenterBtns/ButtonCtr/ExportBtn" to="characterBase" method="_on_SaveBtn_pressed"]
[connection signal="pressed" from="Controls/Container/CenterBtns/ButtonCtr/ImportBtn" to="characterBase" method="_on_LoadBtn_pressed"]
[connection signal="pressed" from="Controls/Container/CenterBtns/ButtonCtr/ClearBtn" to="characterBase" method="_on_clearBtn_pressed"]
[connection signal="pressed" from="Controls/Container/CenterBtns/ButtonCtr/ExportBtn" to="Character" method="_on_SaveBtn_pressed"]
[connection signal="pressed" from="Controls/Container/CenterBtns/ButtonCtr/ImportBtn" to="Character" method="_on_LoadBtn_pressed"]
[connection signal="pressed" from="Controls/Container/CenterBtns/ButtonCtr/ClearBtn" to="Character" method="_on_clearBtn_pressed"]

24
scenes/wardrobe.tscn
View file

@ -108,10 +108,10 @@ margin_bottom = 258.0
visible = false
anchor_right = 1.0
anchor_bottom = 1.0
margin_left = 4.0
margin_top = 38.0
margin_right = -4.0
margin_bottom = -4.0
margin_left = 5.0
margin_top = 40.0
margin_right = -5.0
margin_bottom = -10.0
[node name="ShirtsScroll" type="ScrollContainer" parent="Shirts"]
anchor_right = 1.0
@ -120,8 +120,8 @@ margin_left = 10.0
margin_top = 10.0
[node name="ShirtsGrid" type="GridContainer" parent="Shirts/ShirtsScroll"]
margin_right = 782.0
margin_bottom = 448.0
margin_right = 780.0
margin_bottom = 440.0
size_flags_horizontal = 3
size_flags_vertical = 3
columns = 4
@ -181,10 +181,10 @@ texture_normal = ExtResource( 2 )
visible = false
anchor_right = 1.0
anchor_bottom = 1.0
margin_left = 4.0
margin_top = 38.0
margin_right = -4.0
margin_bottom = -4.0
margin_left = 5.0
margin_top = 40.0
margin_right = -5.0
margin_bottom = -10.0
[node name="AccsScroll" type="ScrollContainer" parent="Accessoires"]
anchor_right = 1.0
@ -194,8 +194,8 @@ __meta__ = {
}
[node name="AccsGrid" type="GridContainer" parent="Accessoires/AccsScroll"]
margin_right = 792.0
margin_bottom = 458.0
margin_right = 790.0
margin_bottom = 450.0
size_flags_horizontal = 3
size_flags_vertical = 3
columns = 3