From 805cbe273868622978f9287e7a26a840ea032d39 Mon Sep 17 00:00:00 2001 From: Tony Bark Date: Thu, 7 Dec 2023 19:52:22 -0500 Subject: [PATCH] Renamed to Dress Up Zack - More clean up - Folder colors --- README.md | 16 +- project.godot | 14 +- scenes/character.tscn | 8 +- scenes/game.tscn | 55 +++--- scripts/clothing/clothing.gd | 2 +- scripts/{interface.gd => gui.gd} | 4 +- scripts/news_window.gd | 19 -- scripts/spinner.gd | 15 -- sprites/pawprint-logo.svg | 165 ------------------ sprites/world/stand.svg | 15 ++ .../stand.svg.import} | 8 +- 11 files changed, 72 insertions(+), 249 deletions(-) rename scripts/{interface.gd => gui.gd} (72%) delete mode 100644 scripts/news_window.gd delete mode 100644 scripts/spinner.gd delete mode 100644 sprites/pawprint-logo.svg create mode 100644 sprites/world/stand.svg rename sprites/{pawprint-logo.svg.import => world/stand.svg.import} (71%) diff --git a/README.md b/README.md index 1d62d06..28f5dd7 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ - -# Tony's Dress Up +# Dress Up Zack [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](CODE_OF_CONDUCT.md) @@ -9,20 +8,11 @@ Tony's Dress Up is a re-imagining of my first (and only) Flash game series, ZC's I've included the original Flash releases in the ``/archive`` directory. They can be played using [Ruffle](https://ruffle.rs/)'s demo page. ​ - ## Getting Started ### Prerequisites -- Godot Engine 3.2 LTS or later - -## Authors - -* **Tony Bark** - *Initial work* - [tonytins](https://github.com/tonytins) -* **Kenney** - *UI* - [kenny.nl](https://www.kenney.nl/) -* **Twemoji** - *Emojis* - [twemoji.twitter.com](https://twemoji.twitter.com/) -* **Font Awesome** - *Icons* - [FortAwesome](https://github.com/FortAwesome) - ​ +- Godot Engine 4 ## License @@ -32,4 +22,4 @@ The Flash games included are closed source, but considered abandonware. Feel fre ## Code of Conduct -Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms. \ No newline at end of file +Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms. diff --git a/project.godot b/project.godot index fc580d5..85a52f5 100644 --- a/project.godot +++ b/project.godot @@ -10,7 +10,7 @@ config_version=5 [application] -config/name="Zack's Dress Up" +config/name="Dress Up Zack" config/version="1.3.100a" run/main_scene="res://scenes/game.tscn" config/use_custom_user_dir=true @@ -37,6 +37,17 @@ window/energy_saving/keep_screen_on=false enabled=PackedStringArray("res://addons/SpritesheetGenerator/plugin.cfg", "res://addons/fontawesome/plugin.cfg") +[file_customization] + +folder_colors={ +"res://addons/": "blue", +"res://resources/": "orange", +"res://scenes/": "purple", +"res://scripts/": "green", +"res://sounds/": "pink", +"res://sprites/": "yellow" +} + [importer_defaults] texture={ @@ -79,6 +90,7 @@ translations=PackedStringArray("res://lang/local.en.translation", "res://lang/lo [rendering] +renderer/rendering_method="mobile" environment/defaults/default_environment="res://default_env.tres" quality/driver/driver_name="GLES2" quality/intended_usage/framebuffer_allocation=0 diff --git a/scenes/character.tscn b/scenes/character.tscn index 29fee6c..dc997f8 100644 --- a/scenes/character.tscn +++ b/scenes/character.tscn @@ -1,6 +1,5 @@ -[gd_scene load_steps=33 format=3 uid="uid://detf8uwimqp3v"] +[gd_scene load_steps=32 format=3 uid="uid://detf8uwimqp3v"] -[ext_resource type="Texture2D" uid="uid://dkch263ayirr7" path="res://sprites/character/shadow.svg" id="1"] [ext_resource type="Texture2D" uid="uid://cddou4chwo8h2" path="res://sprites/character/tail/tail0.svg" id="2"] [ext_resource type="Texture2D" uid="uid://cnd3v8cerplqq" path="res://sprites/character/tail/tail1.svg" id="3"] [ext_resource type="Texture2D" uid="uid://djv0p7rxujbd4" path="res://sprites/character/tail/tail2.svg" id="4"] @@ -126,11 +125,6 @@ position = Vector2(-19, -92) [node name="Click" type="AudioStreamPlayer" parent="."] stream = ExtResource("24") -[node name="Shadow" type="Sprite2D" parent="."] -position = Vector2(4.84271, 244.714) -texture = ExtResource("1") -metadata/_edit_lock_ = true - [node name="Body" type="Node2D" parent="."] [node name="Tail" type="AnimatedSprite2D" parent="Body"] diff --git a/scenes/game.tscn b/scenes/game.tscn index 424452e..2ef578d 100644 --- a/scenes/game.tscn +++ b/scenes/game.tscn @@ -1,29 +1,35 @@ -[gd_scene load_steps=7 format=3 uid="uid://cvr2aries2lhr"] +[gd_scene load_steps=8 format=3 uid="uid://cvr2aries2lhr"] [ext_resource type="Texture2D" uid="uid://33g80p0qnfw4" path="res://sprites/world/background.svg" id="1_uee2i"] [ext_resource type="Texture2D" uid="uid://bi7ayrxnn7hex" path="res://sprites/clothes/icrazy_frame.svg" id="2_n1kmf"] +[ext_resource type="Texture2D" uid="uid://cmv58t1dfgsov" path="res://sprites/world/stand.svg" id="2_q0w7j"] [ext_resource type="Texture2D" uid="uid://dteiup73cqn4o" path="res://sprites/clothes/lights.png" id="3_bbsyl"] -[ext_resource type="Script" path="res://scripts/interface.gd" id="4_pqv2p"] +[ext_resource type="Script" path="res://scripts/gui.gd" id="4_pqv2p"] [ext_resource type="PackedScene" uid="uid://crwoe1shep3qn" path="res://scenes/wardrobe.tscn" id="5_4le6a"] [ext_resource type="PackedScene" uid="uid://detf8uwimqp3v" path="res://scenes/character.tscn" id="6_tdil0"] [node name="Game" type="Node"] [node name="Background" type="Sprite2D" parent="."] -position = Vector2(504.046, 202.426) +position = Vector2(400, 240) texture = ExtResource("1_uee2i") metadata/_edit_lock_ = true +[node name="Stand" type="Sprite2D" parent="."] +position = Vector2(125, 461) +scale = Vector2(1.28991, 1.3328) +texture = ExtResource("2_q0w7j") + [node name="PictureFrame" type="Sprite2D" parent="."] -position = Vector2(127.602, 111.895) +position = Vector2(107.454, 127.574) texture = ExtResource("2_n1kmf") -metadata/_edit_lock_ = true [node name="Light3D" type="PointLight2D" parent="PictureFrame"] position = Vector2(35.118, -14.56) texture = ExtResource("3_bbsyl") +metadata/_edit_lock_ = true -[node name="Container" type="Control" parent="."] +[node name="GUI" type="Control" parent="."] layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 @@ -33,24 +39,31 @@ grow_vertical = 2 script = ExtResource("4_pqv2p") metadata/_edit_lock_ = true -[node name="Wardrobe" parent="Container" instance=ExtResource("5_4le6a")] -layout_mode = 0 -anchors_preset = 0 -anchor_left = 0.33875 -anchor_top = 0.054 -anchor_right = 1.05 -anchor_bottom = 0.9 -offset_right = 6.10352e-05 +[node name="Wardrobe" parent="GUI" instance=ExtResource("5_4le6a")] +layout_mode = 1 +anchors_preset = -1 +anchor_left = 0.30125 +anchor_top = 0.086 +anchor_right = 1.0125 +anchor_bottom = 0.932 +offset_right = 3.8147e-05 +offset_bottom = 1.19209e-05 grow_horizontal = 1 grow_vertical = 1 +metadata/_edit_use_anchors_ = true -[node name="VersionLbl" type="Label" parent="Container"] -layout_mode = 0 -anchor_left = 0.88125 -anchor_top = 0.944 -anchor_right = 0.9825 -anchor_bottom = 0.984 +[node name="VersionLbl" type="Label" parent="GUI"] +layout_mode = 1 +anchors_preset = -1 +anchor_left = 0.89 +anchor_top = 0.942 +anchor_right = 0.99125 +anchor_bottom = 0.994 +offset_left = -1.90735e-05 +offset_right = -1.33514e-05 +offset_bottom = -3.0 text = "0.0.0" +metadata/_edit_use_anchors_ = true [node name="Character" parent="." instance=ExtResource("6_tdil0")] -position = Vector2(120, 213) +position = Vector2(127, 218) diff --git a/scripts/clothing/clothing.gd b/scripts/clothing/clothing.gd index 4e3dccb..2bfe0df 100644 --- a/scripts/clothing/clothing.gd +++ b/scripts/clothing/clothing.gd @@ -1,4 +1,4 @@ -# This project is licensed under the Artistic-2.0 license. +# This project is licensed under the GPL-3.0 license. # See the LICENSE file in the project root for more information. extends TextureRect diff --git a/scripts/interface.gd b/scripts/gui.gd similarity index 72% rename from scripts/interface.gd rename to scripts/gui.gd index c8305f3..8b2784a 100644 --- a/scripts/interface.gd +++ b/scripts/gui.gd @@ -1,4 +1,4 @@ -# This project is licensed under the Artistic-2.0 license. +# This project is licensed under the GPL-3.0 license. # See the LICENSE file in the project root for more information. extends Control @@ -6,5 +6,3 @@ func _ready(): var version = ProjectSettings.get_setting("application/config/version") var verLabel = $VersionLbl verLabel.text = "v" + version - GameData.version = version - diff --git a/scripts/news_window.gd b/scripts/news_window.gd deleted file mode 100644 index 69707f1..0000000 --- a/scripts/news_window.gd +++ /dev/null @@ -1,19 +0,0 @@ -extends Window - -@onready var news_list = $News -@onready var http_request = $NewsBtns/HTTPRequest - -func _on_HTTPRequest_request_completed(result, response_code, headers, body): - var test_json_conv = JSON.new() - test_json_conv.parse(body.get_string_from_utf8()) - var api_request = test_json_conv.get_data() - - if api_request["feed"] != null: - var news_items = api_request["feed"] - - for news in news_items: - news_list.add_item(news) - -func _on_SyncBtn_pressed(): - news_list.clear() - http_request.request(GameData.NEWS_API) diff --git a/scripts/spinner.gd b/scripts/spinner.gd deleted file mode 100644 index 9665d8b..0000000 --- a/scripts/spinner.gd +++ /dev/null @@ -1,15 +0,0 @@ -# This project is licensed under the Artistic-2.0 license. -# See the LICENSE file in the project root for more information. -extends TextureRect - -@onready var timer = $Timer - -func _ready(): - GameEvents.connect("indicate",Callable(self,"_on_indicate")) - -func _on_indicate(): - show() - timer.start() - -func _on_Timer_timeout(): - hide() diff --git a/sprites/pawprint-logo.svg b/sprites/pawprint-logo.svg deleted file mode 100644 index 94024e5..0000000 --- a/sprites/pawprint-logo.svg +++ /dev/null @@ -1,165 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sprites/world/stand.svg b/sprites/world/stand.svg new file mode 100644 index 0000000..cdcbc45 --- /dev/null +++ b/sprites/world/stand.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/sprites/pawprint-logo.svg.import b/sprites/world/stand.svg.import similarity index 71% rename from sprites/pawprint-logo.svg.import rename to sprites/world/stand.svg.import index 6ee89fa..204f139 100644 --- a/sprites/pawprint-logo.svg.import +++ b/sprites/world/stand.svg.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://puxix2j7nxuo" -path="res://.godot/imported/pawprint-logo.svg-01cd6ea8ad71ffb3d0348f6c08c67cda.ctex" +uid="uid://cmv58t1dfgsov" +path="res://.godot/imported/stand.svg-0de4e9ed6224f150f86cc1ed49481da1.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/pawprint-logo.svg" -dest_files=["res://.godot/imported/pawprint-logo.svg-01cd6ea8ad71ffb3d0348f6c08c67cda.ctex"] +source_file="res://sprites/world/stand.svg" +dest_files=["res://.godot/imported/stand.svg-0de4e9ed6224f150f86cc1ed49481da1.ctex"] [params]