From 0b25953cd7a42ac2bbb88444cd593638ec39cd00 Mon Sep 17 00:00:00 2001 From: Tony Bark Date: Sun, 27 Apr 2025 13:48:45 -0400 Subject: [PATCH] Major refactor --- README.md | 4 +- STATUS.md | 37 ++ addons/fontawesome/All.gd.uid | 1 + addons/fontawesome/FontAwesome.gd.uid | 1 + .../fonts/fa-brands-400.woff2.import | 1 + .../fonts/fa-regular-400.woff2.import | 1 + .../fonts/fa-solid-900.woff2.import | 1 + addons/fontawesome/plugin.gd.uid | 1 + project.godot | 4 +- src/fonts/kenny_bold.ttf.import | 1 + src/fonts/kenny_pixel.ttf.import | 1 + .../Montserrat-ExtraBold.otf.import | 1 + src/fonts/roboto/Roboto-Light.ttf.import | 1 + src/fonts/roboto/Roboto-Medium.ttf.import | 1 + src/fonts/roboto/Roboto-Thin.ttf.import | 1 + src/resources/character.tres | 6 +- src/resources/legal.tres | 4 + src/scenes/character.tscn | 2 +- src/scenes/game.tscn | 273 ++++----- src/scenes/items.tres | 14 +- src/scenes/legal.tscn | 564 ++++++++++++++++++ src/scripts/character.gd.uid | 1 + src/scripts/config.gd | 79 ++- src/scripts/config.gd.uid | 1 + src/scripts/game.gd | 14 +- src/scripts/game.gd.uid | 1 + src/scripts/legal.gd | 21 + src/scripts/legal.gd.uid | 1 + 28 files changed, 865 insertions(+), 173 deletions(-) create mode 100644 STATUS.md create mode 100644 addons/fontawesome/All.gd.uid create mode 100644 addons/fontawesome/FontAwesome.gd.uid create mode 100644 addons/fontawesome/plugin.gd.uid create mode 100644 src/resources/legal.tres create mode 100644 src/scenes/legal.tscn create mode 100644 src/scripts/character.gd.uid create mode 100644 src/scripts/config.gd.uid create mode 100644 src/scripts/game.gd.uid create mode 100644 src/scripts/legal.gd create mode 100644 src/scripts/legal.gd.uid diff --git a/README.md b/README.md index dcf831a..2b29b5a 100644 --- a/README.md +++ b/README.md @@ -22,8 +22,8 @@ Dress Up Zack is a port of my first (and only) Flash game series, ZC's Dress Up ## 🛡️ Support -* [ ] Active Support -* [x] Limited Support (Security patches only) +* [x] Active Support +* [ ] Limited Support (Security patches only) * [ ] Maintenance Mode (Dependency-only updates) * [ ] Archived (No active work planned) diff --git a/STATUS.md b/STATUS.md new file mode 100644 index 0000000..d9b118e --- /dev/null +++ b/STATUS.md @@ -0,0 +1,37 @@ +# 📈 Project Status + +This document tracks the current support phase of the project. This is a WIP and subject to change. + +## 🛠️ Current Status + +- **Project Version:** v3.2.101 +- **Engine Baseline:** Godot 4.4 +- **Last Updated:** April 27, 2025 + +## ✅ Support Phase Checklist + +### Launch Phase (0-6 months) + +- [x] Initial Release +- [x] First Hotfix Patch Released +- [ ] Stability Patch Scheduled +- [ ] Community Feedback Incorporated + +### Expansion Phase (6-18 months) + +- [ ] Major Content Update Planned +- [ ] Optional DLC Development +- [ ] Major Patch/Balance Update +- [ ] Engine Upgrade Assessment + +### Support Phase (18-36 months) + +- [ ] Minor Bugfixes Scheduled +- [ ] Compatibility Maintenance (Engine/Platforms) +- [ ] Begin Reducing Update Frequency + +### Legacy Phase (36+ months) + +- [ ] Project Archived +- [ ] Final Security/Platform Patch (if needed) +- [ ] Legacy Build Made Available diff --git a/addons/fontawesome/All.gd.uid b/addons/fontawesome/All.gd.uid new file mode 100644 index 0000000..dfd638a --- /dev/null +++ b/addons/fontawesome/All.gd.uid @@ -0,0 +1 @@ +uid://tb6tpnyl2dg1 diff --git a/addons/fontawesome/FontAwesome.gd.uid b/addons/fontawesome/FontAwesome.gd.uid new file mode 100644 index 0000000..7a85b45 --- /dev/null +++ b/addons/fontawesome/FontAwesome.gd.uid @@ -0,0 +1 @@ +uid://d1fm7eankbax5 diff --git a/addons/fontawesome/fonts/fa-brands-400.woff2.import b/addons/fontawesome/fonts/fa-brands-400.woff2.import index 8e74fbf..d81a0c4 100644 --- a/addons/fontawesome/fonts/fa-brands-400.woff2.import +++ b/addons/fontawesome/fonts/fa-brands-400.woff2.import @@ -23,6 +23,7 @@ allow_system_fallback=true force_autohinter=false hinting=1 subpixel_positioning=1 +keep_rounding_remainders=true oversampling=0.0 Fallbacks=null fallbacks=[] diff --git a/addons/fontawesome/fonts/fa-regular-400.woff2.import b/addons/fontawesome/fonts/fa-regular-400.woff2.import index 98d5a7f..cc3fef9 100644 --- a/addons/fontawesome/fonts/fa-regular-400.woff2.import +++ b/addons/fontawesome/fonts/fa-regular-400.woff2.import @@ -23,6 +23,7 @@ allow_system_fallback=true force_autohinter=false hinting=1 subpixel_positioning=1 +keep_rounding_remainders=true oversampling=0.0 Fallbacks=null fallbacks=[] diff --git a/addons/fontawesome/fonts/fa-solid-900.woff2.import b/addons/fontawesome/fonts/fa-solid-900.woff2.import index a28e057..cb3d350 100644 --- a/addons/fontawesome/fonts/fa-solid-900.woff2.import +++ b/addons/fontawesome/fonts/fa-solid-900.woff2.import @@ -23,6 +23,7 @@ allow_system_fallback=true force_autohinter=false hinting=1 subpixel_positioning=1 +keep_rounding_remainders=true oversampling=0.0 Fallbacks=null fallbacks=[] diff --git a/addons/fontawesome/plugin.gd.uid b/addons/fontawesome/plugin.gd.uid new file mode 100644 index 0000000..4508fa8 --- /dev/null +++ b/addons/fontawesome/plugin.gd.uid @@ -0,0 +1 @@ +uid://dyl3ehatfkaqr diff --git a/project.godot b/project.godot index 58418a9..9731c85 100644 --- a/project.godot +++ b/project.godot @@ -11,10 +11,10 @@ config_version=5 [application] config/name="Z's Dress Up 3E" -config/version="3.1.105" +config/version="3.2.101" run/main_scene="res://src/scenes/game.tscn" config/use_custom_user_dir=true -config/features=PackedStringArray("4.3") +config/features=PackedStringArray("4.4") boot_splash/bg_color=Color(0.8, 0.8, 0.4, 1) boot_splash/image="res://src/sprites/logo.png" config/icon="res://icon.png" diff --git a/src/fonts/kenny_bold.ttf.import b/src/fonts/kenny_bold.ttf.import index 69443de..bf1900b 100644 --- a/src/fonts/kenny_bold.ttf.import +++ b/src/fonts/kenny_bold.ttf.import @@ -23,6 +23,7 @@ allow_system_fallback=true force_autohinter=false hinting=1 subpixel_positioning=1 +keep_rounding_remainders=true oversampling=0.0 Fallbacks=null fallbacks=[] diff --git a/src/fonts/kenny_pixel.ttf.import b/src/fonts/kenny_pixel.ttf.import index acdd91b..68a065d 100644 --- a/src/fonts/kenny_pixel.ttf.import +++ b/src/fonts/kenny_pixel.ttf.import @@ -23,6 +23,7 @@ allow_system_fallback=true force_autohinter=false hinting=1 subpixel_positioning=1 +keep_rounding_remainders=true oversampling=0.0 Fallbacks=null fallbacks=[] diff --git a/src/fonts/montserrat/Montserrat-ExtraBold.otf.import b/src/fonts/montserrat/Montserrat-ExtraBold.otf.import index 38f1bf5..5e78aee 100644 --- a/src/fonts/montserrat/Montserrat-ExtraBold.otf.import +++ b/src/fonts/montserrat/Montserrat-ExtraBold.otf.import @@ -23,6 +23,7 @@ allow_system_fallback=true force_autohinter=false hinting=1 subpixel_positioning=1 +keep_rounding_remainders=true oversampling=0.0 Fallbacks=null fallbacks=[] diff --git a/src/fonts/roboto/Roboto-Light.ttf.import b/src/fonts/roboto/Roboto-Light.ttf.import index 69f34a8..0a3054a 100644 --- a/src/fonts/roboto/Roboto-Light.ttf.import +++ b/src/fonts/roboto/Roboto-Light.ttf.import @@ -23,6 +23,7 @@ allow_system_fallback=true force_autohinter=false hinting=1 subpixel_positioning=1 +keep_rounding_remainders=true oversampling=0.0 Fallbacks=null fallbacks=[] diff --git a/src/fonts/roboto/Roboto-Medium.ttf.import b/src/fonts/roboto/Roboto-Medium.ttf.import index ae3027a..7ab0ab2 100644 --- a/src/fonts/roboto/Roboto-Medium.ttf.import +++ b/src/fonts/roboto/Roboto-Medium.ttf.import @@ -23,6 +23,7 @@ allow_system_fallback=true force_autohinter=false hinting=1 subpixel_positioning=1 +keep_rounding_remainders=true oversampling=0.0 Fallbacks=null fallbacks=[] diff --git a/src/fonts/roboto/Roboto-Thin.ttf.import b/src/fonts/roboto/Roboto-Thin.ttf.import index 26734c2..3811bb6 100644 --- a/src/fonts/roboto/Roboto-Thin.ttf.import +++ b/src/fonts/roboto/Roboto-Thin.ttf.import @@ -23,6 +23,7 @@ allow_system_fallback=true force_autohinter=false hinting=1 subpixel_positioning=1 +keep_rounding_remainders=true oversampling=0.0 Fallbacks=null fallbacks=[] diff --git a/src/resources/character.tres b/src/resources/character.tres index eacf7d1..dc3c000 100644 --- a/src/resources/character.tres +++ b/src/resources/character.tres @@ -1,6 +1,6 @@ -[gd_resource type="Resource" load_steps=2 format=3] +[gd_resource type="Resource" load_steps=2 format=3 uid="uid://cefvfw52g10fy"] -[ext_resource type="Script" path="res://src/scripts/character.gd" id="1"] +[ext_resource type="Script" uid="uid://bfmqkkkn6050b" path="res://src/scripts/character.gd" id="1"] [resource] -script = ExtResource( 1 ) +script = ExtResource("1") diff --git a/src/resources/legal.tres b/src/resources/legal.tres new file mode 100644 index 0000000..a64cca3 --- /dev/null +++ b/src/resources/legal.tres @@ -0,0 +1,4 @@ +[gd_resource type="Theme" format=3 uid="uid://48ge7bf0pgwq"] + +[resource] +RichTextLabel/colors/default_color = Color(0, 0, 0, 1) diff --git a/src/scenes/character.tscn b/src/scenes/character.tscn index 4de1f1b..a069af3 100644 --- a/src/scenes/character.tscn +++ b/src/scenes/character.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=28 format=3 uid="uid://detf8uwimqp3v"] -[ext_resource type="Script" path="res://src/scripts/character.gd" id="1_k1mtq"] +[ext_resource type="Script" uid="uid://bfmqkkkn6050b" path="res://src/scripts/character.gd" id="1_k1mtq"] [ext_resource type="Texture2D" uid="uid://cddou4chwo8h2" path="res://src/sprites/character/tail/tail0.svg" id="2"] [ext_resource type="Texture2D" uid="uid://cnd3v8cerplqq" path="res://src/sprites/character/tail/tail1.svg" id="3"] [ext_resource type="Texture2D" uid="uid://djv0p7rxujbd4" path="res://src/sprites/character/tail/tail2.svg" id="4"] diff --git a/src/scenes/game.tscn b/src/scenes/game.tscn index fd61975..d6bc3e0 100644 --- a/src/scenes/game.tscn +++ b/src/scenes/game.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=36 format=3 uid="uid://cvr2aries2lhr"] -[ext_resource type="Script" path="res://src/scripts/game.gd" id="1_qt3fe"] +[ext_resource type="Script" uid="uid://3fbqf4q3sdqv" path="res://src/scripts/game.gd" id="1_qt3fe"] [ext_resource type="Texture2D" uid="uid://33g80p0qnfw4" path="res://src/sprites/world/background.svg" id="1_uee2i"] [ext_resource type="AudioStream" uid="uid://b01v3d3npeyt1" path="res://src/sounds/kenny_ui_sounds/click_001.wav" id="2_0ca4n"] [ext_resource type="Texture2D" uid="uid://bi7ayrxnn7hex" path="res://src/sprites/world/icrazy_frame.svg" id="2_n1kmf"] @@ -18,7 +18,7 @@ [ext_resource type="Texture2D" uid="uid://dsoqliiokqp1y" path="res://src/sprites/world/fan/fan0004.png" id="11_ratsw"] [ext_resource type="SystemFont" uid="uid://dfre5a3mywuhy" path="res://src/sprites/ui/comic_sans.tres" id="12_0f8fj"] [ext_resource type="Texture2D" uid="uid://dxisbko0rxsrf" path="res://src/sprites/world/fan/fan0005.png" id="12_kxytt"] -[ext_resource type="Script" path="res://addons/fontawesome/FontAwesome.gd" id="12_o3hu5"] +[ext_resource type="Script" uid="uid://d1fm7eankbax5" path="res://addons/fontawesome/FontAwesome.gd" id="12_o3hu5"] [ext_resource type="Texture2D" uid="uid://bt1q6qfwvc33g" path="res://src/sprites/world/fan/fan0006.png" id="13_01553"] [ext_resource type="Texture2D" uid="uid://bnbaa26jdgq86" path="res://src/sprites/world/fan/fan0007.png" id="14_mfsqc"] [ext_resource type="Texture2D" uid="uid://clakkue2mohs4" path="res://src/sprites/ui/greenBtn.png" id="14_yk2bu"] @@ -110,21 +110,21 @@ texture = ExtResource("1_uee2i") metadata/_edit_lock_ = true [node name="BoxersOfAmericaFrame" type="Sprite2D" parent="World"] -position = Vector2(75.4884, 245.569) +position = Vector2(75.4884, 267.569) texture = ExtResource("4_327cy") [node name="iCrazyFrame" type="Sprite2D" parent="World"] -position = Vector2(74.389, 113.776) +position = Vector2(74.389, 122.776) scale = Vector2(0.700948, 0.7129) texture = ExtResource("2_n1kmf") [node name="Fan" type="AnimatedSprite2D" parent="World"] -position = Vector2(523.641, 120.505) +position = Vector2(523.641, 132.505) sprite_frames = SubResource("SpriteFrames_wfogq") -frame_progress = 0.631716 +frame_progress = 0.622214 [node name="Shelf" type="Sprite2D" parent="World"] -position = Vector2(522.056, 189.082) +position = Vector2(522.056, 201.082) texture = ExtResource("22_kss16") [node name="Character" parent="." instance=ExtResource("6_tdil0")] @@ -141,7 +141,7 @@ sprite_frames = ExtResource("7_3ykci") animation = &"bottoms" [node name="Tops" type="AnimatedSprite2D" parent="Character/Seperate"] -position = Vector2(310.934, 206.309) +position = Vector2(311.934, 206.311) sprite_frames = ExtResource("7_3ykci") animation = &"tops" @@ -163,107 +163,17 @@ grow_vertical = 2 metadata/_edit_use_anchors_ = true metadata/_edit_lock_ = true -[node name="DressUpCtrls" type="Control" parent="Canvas/UI"] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -metadata/_edit_use_anchors_ = true -metadata/_edit_lock_ = true - -[node name="TopsFwdBtn" type="TextureButton" parent="Canvas/UI/DressUpCtrls"] +[node name="SettingsBtns" type="HBoxContainer" parent="Canvas/UI"] layout_mode = 1 anchors_preset = -1 -anchor_left = 0.655 -anchor_top = 0.3775 -anchor_right = 0.726667 -anchor_bottom = 0.535 -offset_bottom = -1.04904e-05 -texture_normal = ExtResource("14_yk2bu") +anchor_left = 0.731667 +anchor_top = 0.02 +anchor_right = 0.986667 +anchor_bottom = 0.0925 +grow_horizontal = 0 metadata/_edit_use_anchors_ = true -[node name="TopsBckBtn" type="TextureButton" parent="Canvas/UI/DressUpCtrls"] -layout_mode = 1 -anchors_preset = -1 -anchor_left = 0.256667 -anchor_top = 0.345 -anchor_right = 0.328334 -anchor_bottom = 0.5025 -texture_normal = ExtResource("15_g5gd1") -metadata/_edit_use_anchors_ = true - -[node name="BottomsBckBtn" type="TextureButton" parent="Canvas/UI/DressUpCtrls"] -layout_mode = 1 -anchors_preset = -1 -anchor_left = 0.245 -anchor_top = 0.535 -anchor_right = 0.316667 -anchor_bottom = 0.6925 -offset_top = -1.04904e-05 -texture_normal = ExtResource("15_g5gd1") -metadata/_edit_use_anchors_ = true - -[node name="BottomsFwdBtn" type="TextureButton" parent="Canvas/UI/DressUpCtrls"] -layout_mode = 1 -anchors_preset = -1 -anchor_left = 0.658334 -anchor_top = 0.5725 -anchor_right = 0.73 -anchor_bottom = 0.73 -texture_normal = ExtResource("14_yk2bu") -metadata/_edit_use_anchors_ = true - -[node name="SettingsCtrls" type="HBoxContainer" parent="Canvas/UI"] -layout_mode = 1 -anchors_preset = -1 -anchor_top = 0.015 -anchor_right = 1.0 -anchor_bottom = 0.0875 -grow_horizontal = 2 -theme_override_constants/separation = 13 -alignment = 1 -metadata/_edit_use_anchors_ = true - -[node name="ShirtIcon" type="Label" parent="Canvas/UI/SettingsCtrls"] -auto_translate_mode = 2 -layout_mode = 2 -localize_numeral_system = false -theme_override_colors/font_color = Color(0, 0.290196, 1, 1) -theme_override_fonts/font = ExtResource("11_e3r4r") -theme_override_font_sizes/font_size = 16 -text = "" -horizontal_alignment = 1 -vertical_alignment = 1 -script = ExtResource("12_o3hu5") -icon_name = "shirt" - -[node name="FullbodyBtn" type="Button" parent="Canvas/UI/SettingsCtrls"] -layout_mode = 2 -theme_type_variation = &"FlatButton" -theme_override_fonts/font = ExtResource("12_0f8fj") -theme_override_styles/focus = ExtResource("11_a038t") -theme_override_styles/disabled = ExtResource("15_0xxs0") -theme_override_styles/hover = ExtResource("11_a038t") -theme_override_styles/pressed = ExtResource("11_a038t") -theme_override_styles/normal = ExtResource("11_a038t") -text = "Outfits" -metadata/_edit_use_anchors_ = true - -[node name="SeparateBtn" type="Button" parent="Canvas/UI/SettingsCtrls"] -layout_mode = 2 -theme_type_variation = &"FlatButton" -theme_override_fonts/font = ExtResource("12_0f8fj") -theme_override_styles/focus = ExtResource("11_a038t") -theme_override_styles/disabled = ExtResource("15_0xxs0") -theme_override_styles/hover = ExtResource("11_a038t") -theme_override_styles/pressed = ExtResource("11_a038t") -theme_override_styles/normal = ExtResource("11_a038t") -text = "Seperate" -metadata/_edit_use_anchors_ = true - -[node name="FontAwesome" type="Label" parent="Canvas/UI/SettingsCtrls"] +[node name="GearIcon" type="Label" parent="Canvas/UI/SettingsBtns"] auto_translate_mode = 2 layout_mode = 2 localize_numeral_system = false @@ -276,9 +186,8 @@ vertical_alignment = 1 script = ExtResource("12_o3hu5") icon_name = "gear" -[node name="SaveBtn" type="Button" parent="Canvas/UI/SettingsCtrls"] +[node name="SaveBtn" type="Button" parent="Canvas/UI/SettingsBtns"] layout_mode = 2 -theme_type_variation = &"FlatButton" theme_override_fonts/font = ExtResource("12_0f8fj") theme_override_styles/focus = ExtResource("11_a038t") theme_override_styles/disabled = ExtResource("15_0xxs0") @@ -287,7 +196,17 @@ theme_override_styles/pressed = ExtResource("11_a038t") theme_override_styles/normal = ExtResource("11_a038t") text = "Save" -[node name="ExitBtn" type="Button" parent="Canvas/UI/SettingsCtrls"] +[node name="LegalBtn" type="Button" parent="Canvas/UI/SettingsBtns"] +layout_mode = 2 +theme_override_fonts/font = ExtResource("12_0f8fj") +theme_override_styles/focus = ExtResource("11_a038t") +theme_override_styles/disabled = ExtResource("15_0xxs0") +theme_override_styles/hover = ExtResource("11_a038t") +theme_override_styles/pressed = ExtResource("11_a038t") +theme_override_styles/normal = ExtResource("11_a038t") +text = "Legal" + +[node name="ExitBtn" type="Button" parent="Canvas/UI/SettingsBtns"] layout_mode = 2 theme_override_fonts/font = ExtResource("12_0f8fj") theme_override_styles/focus = ExtResource("11_a038t") @@ -297,6 +216,106 @@ theme_override_styles/pressed = ExtResource("11_a038t") theme_override_styles/normal = ExtResource("11_a038t") text = "Exit" +[node name="OutfitBtns" type="HBoxContainer" parent="Canvas/UI"] +layout_mode = 1 +anchors_preset = -1 +anchor_left = 0.015 +anchor_top = 0.02 +anchor_right = 0.323333 +anchor_bottom = 0.0925 +theme_override_constants/separation = 13 +alignment = 1 +metadata/_edit_use_anchors_ = true + +[node name="FullbodyBtn" type="Button" parent="Canvas/UI/OutfitBtns"] +layout_mode = 2 +theme_type_variation = &"FlatButton" +theme_override_fonts/font = ExtResource("12_0f8fj") +theme_override_styles/focus = ExtResource("11_a038t") +theme_override_styles/disabled = ExtResource("15_0xxs0") +theme_override_styles/hover = ExtResource("11_a038t") +theme_override_styles/pressed = ExtResource("11_a038t") +theme_override_styles/normal = ExtResource("11_a038t") +text = "Outfits" +metadata/_edit_use_anchors_ = true + +[node name="SeparateBtn" type="Button" parent="Canvas/UI/OutfitBtns"] +layout_mode = 2 +theme_type_variation = &"FlatButton" +theme_override_fonts/font = ExtResource("12_0f8fj") +theme_override_styles/focus = ExtResource("11_a038t") +theme_override_styles/disabled = ExtResource("15_0xxs0") +theme_override_styles/hover = ExtResource("11_a038t") +theme_override_styles/pressed = ExtResource("11_a038t") +theme_override_styles/normal = ExtResource("11_a038t") +text = "Seperate" +metadata/_edit_use_anchors_ = true + +[node name="ShirtIcon" type="Label" parent="Canvas/UI/OutfitBtns"] +auto_translate_mode = 2 +layout_mode = 2 +localize_numeral_system = false +theme_override_colors/font_color = Color(0, 0.290196, 1, 1) +theme_override_fonts/font = ExtResource("11_e3r4r") +theme_override_font_sizes/font_size = 16 +text = "" +horizontal_alignment = 1 +vertical_alignment = 1 +script = ExtResource("12_o3hu5") +icon_name = "shirt" + +[node name="DressUpBtns" type="Control" parent="Canvas/UI"] +layout_mode = 1 +anchor_top = 0.0025 +anchor_right = 1.0 +anchor_bottom = 1.0025 +grow_horizontal = 2 +grow_vertical = 2 +metadata/_edit_use_anchors_ = true +metadata/_edit_lock_ = true + +[node name="TopsFwdBtn" type="TextureButton" parent="Canvas/UI/DressUpBtns"] +layout_mode = 1 +anchors_preset = -1 +anchor_left = 0.655 +anchor_top = 0.4925 +anchor_right = 0.726667 +anchor_bottom = 0.65 +offset_bottom = -1.04904e-05 +texture_normal = ExtResource("14_yk2bu") +metadata/_edit_use_anchors_ = true + +[node name="TopsBckBtn" type="TextureButton" parent="Canvas/UI/DressUpBtns"] +layout_mode = 1 +anchors_preset = -1 +anchor_left = 0.256667 +anchor_top = 0.46 +anchor_right = 0.328334 +anchor_bottom = 0.6175 +texture_normal = ExtResource("15_g5gd1") +metadata/_edit_use_anchors_ = true + +[node name="BottomsBckBtn" type="TextureButton" parent="Canvas/UI/DressUpBtns"] +layout_mode = 1 +anchors_preset = -1 +anchor_left = 0.245 +anchor_top = 0.65 +anchor_right = 0.316667 +anchor_bottom = 0.8075 +offset_top = -1.04904e-05 +texture_normal = ExtResource("15_g5gd1") +metadata/_edit_use_anchors_ = true + +[node name="BottomsFwdBtn" type="TextureButton" parent="Canvas/UI/DressUpBtns"] +layout_mode = 1 +anchors_preset = -1 +anchor_left = 0.658334 +anchor_top = 0.6875 +anchor_right = 0.730001 +anchor_bottom = 0.845 +texture_normal = ExtResource("14_yk2bu") +metadata/_edit_use_anchors_ = true + [node name="Social" type="HBoxContainer" parent="Canvas/UI"] layout_mode = 0 offset_left = 401.0 @@ -306,49 +325,37 @@ offset_bottom = 396.0 alignment = 2 metadata/_edit_lock_ = true -[node name="CC" type="Label" parent="Canvas/UI/Social"] -auto_translate_mode = 2 -layout_mode = 2 -localize_numeral_system = false -theme_override_fonts/font = ExtResource("18_px6h4") -theme_override_font_sizes/font_size = 16 -text = "" -horizontal_alignment = 1 -vertical_alignment = 1 -script = ExtResource("12_o3hu5") -icon_type = "brands" -icon_name = "creative-commons" - [node name="Zero" type="Label" parent="Canvas/UI/Social"] auto_translate_mode = 2 layout_mode = 2 localize_numeral_system = false theme_override_fonts/font = ExtResource("18_px6h4") theme_override_font_sizes/font_size = 16 -text = "" +text = "" horizontal_alignment = 1 vertical_alignment = 1 script = ExtResource("12_o3hu5") icon_type = "brands" -icon_name = "creative-commons-zero" +icon_name = "creative-commons-pd" [node name="FanBtn" type="TextureButton" parent="Canvas/UI"] layout_mode = 1 anchors_preset = -1 anchor_left = 0.866667 -anchor_top = 0.408333 +anchor_top = 0.438333 anchor_right = 0.88 -anchor_bottom = 0.423333 +anchor_bottom = 0.453333 toggle_mode = true texture_normal = ExtResource("33_oenpt") metadata/_edit_use_anchors_ = true -[connection signal="pressed" from="Canvas/UI/DressUpCtrls/TopsFwdBtn" to="." method="_on_tops_fwd_btn_pressed"] -[connection signal="pressed" from="Canvas/UI/DressUpCtrls/TopsBckBtn" to="." method="_on_tops_bck_btn_pressed"] -[connection signal="pressed" from="Canvas/UI/DressUpCtrls/BottomsBckBtn" to="." method="_on_bottoms_bck_btn_pressed"] -[connection signal="pressed" from="Canvas/UI/DressUpCtrls/BottomsFwdBtn" to="." method="_on_bottoms_fwd_btn_pressed"] -[connection signal="pressed" from="Canvas/UI/SettingsCtrls/FullbodyBtn" to="." method="_on_fullbody_btn_pressed"] -[connection signal="pressed" from="Canvas/UI/SettingsCtrls/SeparateBtn" to="." method="_on_separate_btn_pressed"] -[connection signal="pressed" from="Canvas/UI/SettingsCtrls/SaveBtn" to="." method="_on_save_btn_pressed"] -[connection signal="pressed" from="Canvas/UI/SettingsCtrls/ExitBtn" to="." method="_on_exit_btn_pressed"] +[connection signal="pressed" from="Canvas/UI/SettingsBtns/SaveBtn" to="." method="_on_save_btn_pressed"] +[connection signal="pressed" from="Canvas/UI/SettingsBtns/LegalBtn" to="." method="_on_legal_btn_pressed"] +[connection signal="pressed" from="Canvas/UI/SettingsBtns/ExitBtn" to="." method="_on_exit_btn_pressed"] +[connection signal="pressed" from="Canvas/UI/OutfitBtns/FullbodyBtn" to="." method="_on_fullbody_btn_pressed"] +[connection signal="pressed" from="Canvas/UI/OutfitBtns/SeparateBtn" to="." method="_on_separate_btn_pressed"] +[connection signal="pressed" from="Canvas/UI/DressUpBtns/TopsFwdBtn" to="." method="_on_tops_fwd_btn_pressed"] +[connection signal="pressed" from="Canvas/UI/DressUpBtns/TopsBckBtn" to="." method="_on_tops_bck_btn_pressed"] +[connection signal="pressed" from="Canvas/UI/DressUpBtns/BottomsBckBtn" to="." method="_on_bottoms_bck_btn_pressed"] +[connection signal="pressed" from="Canvas/UI/DressUpBtns/BottomsFwdBtn" to="." method="_on_bottoms_fwd_btn_pressed"] [connection signal="toggled" from="Canvas/UI/FanBtn" to="." method="_on_fan_btn_toggled"] diff --git a/src/scenes/items.tres b/src/scenes/items.tres index eb866e9..6ca0451 100644 --- a/src/scenes/items.tres +++ b/src/scenes/items.tres @@ -1,4 +1,4 @@ -[gd_resource type="SpriteFrames" load_steps=26 format=3 uid="uid://bhyon1s1op8ly"] +[gd_resource type="SpriteFrames" load_steps=29 format=3 uid="uid://bhyon1s1op8ly"] [ext_resource type="Texture2D" uid="uid://4f7dfxy24fey" path="res://src/sprites/clothes/sequences/bottoms/bottoms0001.png" id="1_i4r3c"] [ext_resource type="Texture2D" uid="uid://bs6nkpurxgr3p" path="res://src/sprites/clothes/sequences/bottoms/bottoms0002.png" id="2_pkmjm"] @@ -17,14 +17,17 @@ [ext_resource type="Texture2D" uid="uid://tqeyv6mvy6x0" path="res://src/sprites/clothes/sequences/outfits/outfits0007.png" id="16_fogca"] [ext_resource type="Texture2D" uid="uid://3gxc6wknllcq" path="res://src/sprites/clothes/sequences/tops/tops0001.png" id="18_edhqb"] [ext_resource type="Texture2D" uid="uid://dhjg5vo1cs62m" path="res://src/sprites/clothes/sequences/tops/tops0002.png" id="19_57y8n"] +[ext_resource type="Texture2D" uid="uid://bhgvidynd582a" path="res://src/sprites/clothes/retro_shirt.svg" id="20_0oxdi"] [ext_resource type="Texture2D" uid="uid://b3f3sxfsteowe" path="res://src/sprites/clothes/sequences/tops/tops0003.png" id="20_s7eb7"] [ext_resource type="Texture2D" uid="uid://bnodv0bh1ip2b" path="res://src/sprites/clothes/sequences/tops/tops0004.png" id="21_0lmkq"] [ext_resource type="Texture2D" uid="uid://dcv7irbuiox3d" path="res://src/sprites/clothes/sequences/tops/tops0005.png" id="22_pjfly"] +[ext_resource type="Texture2D" uid="uid://djvbjw5yl8ulb" path="res://src/sprites/clothes/whatsnew_shirt.svg" id="23_c1mis"] [ext_resource type="Texture2D" uid="uid://dkvhb002aro4p" path="res://src/sprites/clothes/sequences/tops/tops0006.png" id="23_jn0qm"] [ext_resource type="Texture2D" uid="uid://bwe0euhljg53h" path="res://src/sprites/clothes/sequences/tops/tops0007.png" id="24_oio7r"] [ext_resource type="Texture2D" uid="uid://otnfhqaxqmjj" path="res://src/sprites/clothes/sequences/tops/tops0008.png" id="25_4dkw3"] [ext_resource type="Texture2D" uid="uid://bcrrnh1ad5dju" path="res://src/sprites/clothes/sequences/tops/tops0009.png" id="26_vslpa"] [ext_resource type="Texture2D" uid="uid://c7y01k8sutd05" path="res://src/sprites/clothes/sequences/tops/tops0010.png" id="27_e8tji"] +[ext_resource type="Texture2D" uid="uid://tlkdx2el5e3p" path="res://src/sprites/clothes/train_hoodie.svg" id="28_i272g"] [resource] animations = [{ @@ -94,12 +97,18 @@ animations = [{ "texture": ExtResource("20_s7eb7") }, { "duration": 1.0, +"texture": ExtResource("20_0oxdi") +}, { +"duration": 1.0, "texture": ExtResource("21_0lmkq") }, { "duration": 1.0, "texture": ExtResource("22_pjfly") }, { "duration": 1.0, +"texture": ExtResource("23_c1mis") +}, { +"duration": 1.0, "texture": ExtResource("23_jn0qm") }, { "duration": 1.0, @@ -113,6 +122,9 @@ animations = [{ }, { "duration": 1.0, "texture": ExtResource("27_e8tji") +}, { +"duration": 1.0, +"texture": ExtResource("28_i272g") }], "loop": true, "name": &"tops", diff --git a/src/scenes/legal.tscn b/src/scenes/legal.tscn new file mode 100644 index 0000000..4291415 --- /dev/null +++ b/src/scenes/legal.tscn @@ -0,0 +1,564 @@ +[gd_scene load_steps=9 format=3 uid="uid://ddwsyvcrgefig"] + +[ext_resource type="Script" uid="uid://by5o7cdq5gocv" path="res://src/scripts/legal.gd" id="1_15342"] +[ext_resource type="Theme" uid="uid://48ge7bf0pgwq" path="res://src/resources/legal.tres" id="3_52jku"] +[ext_resource type="Texture2D" uid="uid://33g80p0qnfw4" path="res://src/sprites/world/background.svg" id="6_da2ew"] +[ext_resource type="FontFile" uid="uid://cnddkn05b5fj" path="res://addons/fontawesome/fonts/fa-solid-900.woff2" id="28_1dici"] +[ext_resource type="Script" uid="uid://d1fm7eankbax5" path="res://addons/fontawesome/FontAwesome.gd" id="29_ivrm4"] +[ext_resource type="SystemFont" uid="uid://dfre5a3mywuhy" path="res://src/sprites/ui/comic_sans.tres" id="30_nsmq1"] +[ext_resource type="StyleBox" uid="uid://by6foat5q5d8b" path="res://src/sprites/ui/button_style.tres" id="31_wqtdm"] +[ext_resource type="StyleBox" uid="uid://cdlprci8cx4tb" path="res://src/sprites/ui/disable_button_style.tres" id="32_j25kn"] + +[node name="Legal" type="Node"] +script = ExtResource("1_15342") + +[node name="World" type="Node2D" parent="."] +metadata/_edit_lock_ = true + +[node name="Background" type="Sprite2D" parent="World"] +position = Vector2(306.682, 194.039) +scale = Vector2(0.618038, 0.725217) +texture = ExtResource("6_da2ew") +metadata/_edit_lock_ = true + +[node name="Canvas" type="CanvasLayer" parent="."] + +[node name="UI" type="Control" parent="Canvas"] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +metadata/_edit_use_anchors_ = true +metadata/_edit_lock_ = true + +[node name="RichTextLabel" type="RichTextLabel" parent="Canvas/UI"] +layout_mode = 2 +anchor_top = 0.13 +anchor_right = 0.51 +anchor_bottom = 0.865 +theme = ExtResource("3_52jku") +text = "Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN \"AS-IS\" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an \"owner\") of an original work of +authorship and/or a database (each, a \"Work\"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works (\"Commons\") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the \"Affirmer\"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights (\"Copyright and +Related Rights\"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the \"Waiver\"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +\"License\"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. +" +metadata/_edit_use_anchors_ = true + +[node name="RichTextLabel2" type="RichTextLabel" parent="Canvas/UI"] +layout_mode = 2 +anchor_left = 0.536667 +anchor_top = 0.13 +anchor_right = 1.0 +anchor_bottom = 0.865 +theme = ExtResource("3_52jku") +text = " GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The \"Program\", below, +refers to any such program or work, and a \"work based on the Program\" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term \"modification\".) Each licensee is addressed as \"you\". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and \"any +later version\", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the \"copyright\" line and a pointer to where the full notice is found. + + + Copyright (C) 2023 Tony Bark + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a \"copyright disclaimer\" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. +" +metadata/_edit_use_anchors_ = true + +[node name="SettingsCtrls" type="HBoxContainer" parent="Canvas/UI"] +layout_mode = 1 +anchors_preset = -1 +anchor_left = 0.783333 +anchor_top = 0.015 +anchor_right = 0.986667 +anchor_bottom = 0.0875 +offset_top = 2.0 +offset_bottom = 2.0 +grow_horizontal = 0 +theme_override_constants/separation = 13 +alignment = 1 +metadata/_edit_use_anchors_ = true + +[node name="GearIcon" type="Label" parent="Canvas/UI/SettingsCtrls"] +auto_translate_mode = 2 +layout_mode = 2 +localize_numeral_system = false +theme_override_colors/font_color = Color(0, 0.290196, 1, 1) +theme_override_fonts/font = ExtResource("28_1dici") +theme_override_font_sizes/font_size = 16 +text = "" +horizontal_alignment = 1 +vertical_alignment = 1 +script = ExtResource("29_ivrm4") +icon_name = "gear" + +[node name="BackBtn" type="Button" parent="Canvas/UI/SettingsCtrls"] +layout_mode = 2 +theme_type_variation = &"FlatButton" +theme_override_fonts/font = ExtResource("30_nsmq1") +theme_override_styles/focus = ExtResource("31_wqtdm") +theme_override_styles/disabled = ExtResource("32_j25kn") +theme_override_styles/hover = ExtResource("31_wqtdm") +theme_override_styles/pressed = ExtResource("31_wqtdm") +theme_override_styles/normal = ExtResource("31_wqtdm") +text = "Back" + +[node name="ExitBtn" type="Button" parent="Canvas/UI/SettingsCtrls"] +layout_mode = 2 +theme_override_fonts/font = ExtResource("30_nsmq1") +theme_override_styles/focus = ExtResource("31_wqtdm") +theme_override_styles/disabled = ExtResource("32_j25kn") +theme_override_styles/hover = ExtResource("31_wqtdm") +theme_override_styles/pressed = ExtResource("31_wqtdm") +theme_override_styles/normal = ExtResource("31_wqtdm") +text = "Exit" + +[connection signal="pressed" from="Canvas/UI/SettingsCtrls/BackBtn" to="." method="_on_back_btn_pressed"] +[connection signal="pressed" from="Canvas/UI/SettingsCtrls/ExitBtn" to="." method="_on_exit_btn_pressed"] diff --git a/src/scripts/character.gd.uid b/src/scripts/character.gd.uid new file mode 100644 index 0000000..8462c94 --- /dev/null +++ b/src/scripts/character.gd.uid @@ -0,0 +1 @@ +uid://bfmqkkkn6050b diff --git a/src/scripts/config.gd b/src/scripts/config.gd index 676484b..a0781df 100644 --- a/src/scripts/config.gd +++ b/src/scripts/config.gd @@ -1,22 +1,42 @@ extends Node -func config_file(config_file = "user://config.cfg"): +var player_data: Dictionary = { + "outfit": 0, + "top": 0, + "bottom": 0 +} + +func config_file(read_cfg = "user://config.cfg"): # If the game is in if OS.is_debug_build(): - print_debug("Loading local config file") return "res://config.cfg" else: - return config_file - -func save_file(save_file = "user://save.cfg"): - # If the game is in - if OS.is_debug_build(): - print_debug("Loading local save file") - return "res://save.cfg" - else: - return save_file + return read_cfg -func save_config(config_file = "user://config.cfg"): +func _json_tools(get_json: String): + var json = JSON.new() + var err = json.parse(get_json) + if err == OK: + var json_data = json.data + return json_data + else: + print_debug("Unable to read data") + pass + +func save_file(save_json = "user://save.cfg", new_format = false): + match new_format: + true: + pass + false: + # If the game is in + if OS.is_debug_build(): + return "res://save.cfg" + else: + return save_json + +func save_config(save_cfg = "user://config.cfg"): + + # Create new ConfigFile object. var config = ConfigFile.new() @@ -35,27 +55,32 @@ func save_config(config_file = "user://config.cfg"): config.set_value("window", "height", default_height) # Save it to a file (overwrite if already exists) - if !FileAccess.file_exists(config_file): - config.save(config_file) + if !FileAccess.file_exists(save_cfg): + config.save(save_cfg) -func save_game(tops = 0, bottoms = 0, outfits = 0, save_file = "user://save.cfg", overwrite = false): - # Create new ConfigFile object. - var config = ConfigFile.new() - - # Store some values. - config.set_value("clothes", "tops", tops) - config.set_value("clothes", "bottoms", bottoms) - config.set_value("clothes", "outfits", outfits) +func save_game(tops = 0, bottoms = 0, outfits = 0, json_file = "user://save.cfg", overwrite = false, new_format = false): + match new_format: + true: + pass + false: + print_debug("Saving .cfg format.") + # Create new ConfigFile object. + var config = ConfigFile.new() + + # Store some values. + config.set_value("clothes", "tops", tops) + config.set_value("clothes", "bottoms", bottoms) + config.set_value("clothes", "outfits", outfits) - # Save it to a file (overwrite if already exists) - if !FileAccess.file_exists(save_file) || overwrite == true: - config.save(save_file) + # Save it to a file (overwrite if already exists) + if !FileAccess.file_exists(json_file) || overwrite == true: + config.save(json_file) -func load_config(section, value, config_file = "user://config.cfg"): +func load_config(section, value, load_cfg = "user://config.cfg"): var config = ConfigFile.new() # Load data from a file. - var err = config.load(config_file) + var err = config.load(load_cfg) # If the file didn't load, ignore it. if err != OK: diff --git a/src/scripts/config.gd.uid b/src/scripts/config.gd.uid new file mode 100644 index 0000000..b3e4de3 --- /dev/null +++ b/src/scripts/config.gd.uid @@ -0,0 +1 @@ +uid://dbeftr8ika62g diff --git a/src/scripts/game.gd b/src/scripts/game.gd index 4156185..ea21894 100644 --- a/src/scripts/game.gd +++ b/src/scripts/game.gd @@ -3,13 +3,13 @@ extends Node @onready var tops = $Character/Seperate/Tops @onready var bottoms = $Character/Seperate/Bottoms @onready var seperate_items = $Character/Seperate -@onready var bottoms_bck = $Canvas/UI/DressUpCtrls/BottomsBckBtn -@onready var bottoms_fwd = $Canvas/UI/DressUpCtrls/BottomsFwdBtn +@onready var bottoms_bck = $Canvas/UI/DressUpBtns/BottomsBckBtn +@onready var bottoms_fwd = $Canvas/UI/DressUpBtns/BottomsFwdBtn @onready var outfits = $Character/Outfits @onready var fan = $World/Fan @onready var forward_click = $ForwardClick -@onready var exit_btn = $Canvas/UI/SettingsCtrls/ExitBtn -@onready var save_btn = $Canvas/UI/SettingsCtrls/SaveBtn +@onready var exit_btn = $Canvas/UI/SettingsBtns/ExitBtn +@onready var save_btn = $Canvas/UI/SettingsBtns/SaveBtn @onready var back_click = $BackClick @onready var fan_click = $FanClick @onready var fan_asmr = $FanAsmr @@ -130,3 +130,9 @@ func _on_fullbody_btn_pressed() -> void: outfits.show() is_seperate = false is_outfits = true + +func _on_legal_btn_pressed() -> void: + save_all() + var legal_scene = "res://src/scenes/legal.tscn"; + ResourceLoader.load_threaded_request(legal_scene) + get_tree().change_scene_to_file(legal_scene) diff --git a/src/scripts/game.gd.uid b/src/scripts/game.gd.uid new file mode 100644 index 0000000..93d9f45 --- /dev/null +++ b/src/scripts/game.gd.uid @@ -0,0 +1 @@ +uid://3fbqf4q3sdqv diff --git a/src/scripts/legal.gd b/src/scripts/legal.gd new file mode 100644 index 0000000..f10b9e9 --- /dev/null +++ b/src/scripts/legal.gd @@ -0,0 +1,21 @@ +extends Node + +func _ready() -> void: + var config_file = Config.config_file() + + if FileAccess.file_exists(config_file): + var window_section = "window" + var window_height = Config.load_config(window_section, "height", config_file) + var window_width = Config.load_config(window_section, "width", config_file) + var viewport = get_viewport(); + + # Set window size + DisplayServer.window_set_size(Vector2i(window_width, window_height)) + +func _on_exit_btn_pressed() -> void: + get_tree().quit() + +func _on_back_btn_pressed() -> void: + var game_scene = "res://src/scenes/game.tscn"; + ResourceLoader.load_threaded_request(game_scene) + get_tree().change_scene_to_file(game_scene) diff --git a/src/scripts/legal.gd.uid b/src/scripts/legal.gd.uid new file mode 100644 index 0000000..f664f28 --- /dev/null +++ b/src/scripts/legal.gd.uid @@ -0,0 +1 @@ +uid://by5o7cdq5gocv