From bdc3bdf61df13a049c37c74556da7d904d9f979d Mon Sep 17 00:00:00 2001 From: Zenny Date: Sat, 28 Jun 2025 14:23:52 -0700 Subject: [PATCH] Move inventory screen to UI folder --- Zennysoft.Game.Ma/project.godot | 4 ++-- Zennysoft.Game.Ma/src/data_viewer/DataViewer.tscn | 2 +- .../enemy_types/01. sproingy/SproingyModelView.tscn | 4 +++- Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.tscn | 2 +- .../EquippedInventoryLabelSettings.tres | 0 .../InventoryDialogueSelectionStyle.tres | 0 .../inventory_menu/InventoryLabelSettings.tres | 0 .../src/{ => ui}/inventory_menu/InventoryMenu.cs | 0 .../{ => ui}/inventory_menu/InventoryMenu.cs.uid | 0 .../{ => ui}/inventory_menu/InventoryMenu.gdshader | 0 .../inventory_menu/InventoryMenu.gdshader.uid | 0 .../src/{ => ui}/inventory_menu/InventoryMenu.tscn | 6 +++--- .../src/{ => ui}/inventory_menu/ItemLabel.cs | 0 .../src/{ => ui}/inventory_menu/ItemLabel.cs.uid | 0 .../src/{ => ui}/inventory_menu/ItemSlot.cs | 0 .../src/{ => ui}/inventory_menu/ItemSlot.cs.uid | 0 .../src/{ => ui}/inventory_menu/ItemSlot.tscn | 6 +++--- .../src/{ => ui}/inventory_menu/cursor.png | Bin .../src/{ => ui}/inventory_menu/cursor.png.import | 6 +++--- 19 files changed, 16 insertions(+), 14 deletions(-) rename Zennysoft.Game.Ma/src/{ => ui}/inventory_menu/EquippedInventoryLabelSettings.tres (100%) rename Zennysoft.Game.Ma/src/{ => ui}/inventory_menu/InventoryDialogueSelectionStyle.tres (100%) rename Zennysoft.Game.Ma/src/{ => ui}/inventory_menu/InventoryLabelSettings.tres (100%) rename Zennysoft.Game.Ma/src/{ => ui}/inventory_menu/InventoryMenu.cs (100%) rename Zennysoft.Game.Ma/src/{ => ui}/inventory_menu/InventoryMenu.cs.uid (100%) rename Zennysoft.Game.Ma/src/{ => ui}/inventory_menu/InventoryMenu.gdshader (100%) rename Zennysoft.Game.Ma/src/{ => ui}/inventory_menu/InventoryMenu.gdshader.uid (100%) rename Zennysoft.Game.Ma/src/{ => ui}/inventory_menu/InventoryMenu.tscn (99%) rename Zennysoft.Game.Ma/src/{ => ui}/inventory_menu/ItemLabel.cs (100%) rename Zennysoft.Game.Ma/src/{ => ui}/inventory_menu/ItemLabel.cs.uid (100%) rename Zennysoft.Game.Ma/src/{ => ui}/inventory_menu/ItemSlot.cs (100%) rename Zennysoft.Game.Ma/src/{ => ui}/inventory_menu/ItemSlot.cs.uid (100%) rename Zennysoft.Game.Ma/src/{ => ui}/inventory_menu/ItemSlot.tscn (90%) rename Zennysoft.Game.Ma/src/{ => ui}/inventory_menu/cursor.png (100%) rename Zennysoft.Game.Ma/src/{ => ui}/inventory_menu/cursor.png.import (71%) diff --git a/Zennysoft.Game.Ma/project.godot b/Zennysoft.Game.Ma/project.godot index b1962f62..a6011191 100644 --- a/Zennysoft.Game.Ma/project.godot +++ b/Zennysoft.Game.Ma/project.godot @@ -47,10 +47,10 @@ folder_colors={ "res://src/dialog/": "purple", "res://src/enemy/": "red", "res://src/game/": "orange", -"res://src/inventory_menu/": "green", "res://src/items/": "teal", "res://src/map/": "gray", -"res://src/player/": "blue" +"res://src/player/": "blue", +"res://src/ui/inventory_menu/": "green" } [importer_defaults] diff --git a/Zennysoft.Game.Ma/src/data_viewer/DataViewer.tscn b/Zennysoft.Game.Ma/src/data_viewer/DataViewer.tscn index 09aaf8fc..5af7ab64 100644 --- a/Zennysoft.Game.Ma/src/data_viewer/DataViewer.tscn +++ b/Zennysoft.Game.Ma/src/data_viewer/DataViewer.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=21 format=3 uid="uid://c7wjbgbrdivol"] [ext_resource type="Script" uid="uid://bgaflnnur26vk" path="res://src/data_viewer/DataViewer.cs" id="1_1qako"] -[ext_resource type="Theme" uid="uid://daxuhpmyxwxck" path="res://src/inventory_menu/InventoryDialogueSelectionStyle.tres" id="2_bef6s"] +[ext_resource type="Theme" uid="uid://daxuhpmyxwxck" path="res://src/ui/inventory_menu/InventoryDialogueSelectionStyle.tres" id="2_bef6s"] [ext_resource type="PackedScene" uid="uid://c16i1gmg6yu5a" path="res://src/data_viewer/DataViewerRepository.tscn" id="3_ejdn0"] [ext_resource type="Texture2D" uid="uid://bh0crf4qonrh5" path="res://src/map/dungeon/models/Set A/03. Antechamber A/ANTECHAMBER_TYPE1_VER2_8311.png" id="3_hpkd1"] [ext_resource type="PackedScene" uid="uid://bjg8wyvp8q6oc" path="res://src/enemy/enemy_types/02. michael/MichaelModelView.tscn" id="4_bef6s"] diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/SproingyModelView.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/SproingyModelView.tscn index c8276afa..83675575 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/SproingyModelView.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/SproingyModelView.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=171 format=3 uid="uid://bimjnsu52y3xi"] +[gd_scene load_steps=172 format=3 uid="uid://bimjnsu52y3xi"] [ext_resource type="Script" uid="uid://cvr1qimxpignl" path="res://src/enemy/EnemyModelView2D.cs" id="1_oh25a"] [ext_resource type="Texture2D" uid="uid://dd0ia6isdqg61" path="res://src/enemy/enemy_types/01. sproingy/animations/ATTACK/Layer 1.png" id="1_pbx41"] [ext_resource type="Texture2D" uid="uid://bs4ico5ouo5d3" path="res://src/enemy/enemy_types/01. sproingy/animations/ATTACK/Layer 2.png" id="2_0vbio"] [ext_resource type="Script" uid="uid://dlsgyx4i1jmp3" path="res://src/enemy/EnemyLoreInfo.cs" id="2_7hf3j"] +[ext_resource type="Material" uid="uid://x2bv1q51mcjq" path="res://src/enemy/PixelMelt.tres" id="3_ivy74"] [ext_resource type="Texture2D" uid="uid://85ki5mc4h0vs" path="res://src/enemy/enemy_types/01. sproingy/animations/ATTACK/Layer 3.png" id="3_lae8t"] [ext_resource type="Texture2D" uid="uid://bwt1m2frb3r0e" path="res://src/enemy/enemy_types/01. sproingy/animations/ATTACK/Layer 4.png" id="4_53wuj"] [ext_resource type="Texture2D" uid="uid://ckssl1np6vnlu" path="res://src/enemy/enemy_types/01. sproingy/animations/ATTACK/Layer 5.png" id="5_d5bmw"] @@ -1112,6 +1113,7 @@ render_target_update_mode = 4 [node name="AnimatedSprite" type="AnimatedSprite2D" parent="Sprite3D/SubViewportContainer/SubViewport"] unique_name_in_owner = true texture_filter = 1 +material = ExtResource("3_ivy74") position = Vector2(100, 100) sprite_frames = SubResource("SpriteFrames_6drt6") animation = &"idle_left_walk" diff --git a/Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.tscn b/Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.tscn index d92ac925..d63896f1 100644 --- a/Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.tscn +++ b/Zennysoft.Game.Ma/src/ui/in_game_ui/InGameUI.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" uid="uid://dlq2mkhl4pe7a" path="res://src/ui/in_game_ui/InGameUI.cs" id="1_sc13i"] [ext_resource type="PackedScene" uid="uid://bwbofurcvf3yh" path="res://src/minimap/Minimap.tscn" id="2_6sfje"] -[ext_resource type="PackedScene" uid="uid://dlj8qdg1c5048" path="res://src/inventory_menu/InventoryMenu.tscn" id="3_4vcdl"] +[ext_resource type="PackedScene" uid="uid://dlj8qdg1c5048" path="res://src/ui/inventory_menu/InventoryMenu.tscn" id="3_4vcdl"] [ext_resource type="PackedScene" uid="uid://dxl8il8f13c2x" path="res://src/ui/player_ui/PlayerInfoUI.tscn" id="4_46s5l"] [ext_resource type="PackedScene" uid="uid://bea2waybmgd6u" path="res://src/ui/teleport_prompt/UseTeleportPrompt.tscn" id="5_h1hgq"] [ext_resource type="Script" uid="uid://dj6oqler47dqf" path="res://src/utils/FpsCounter.cs" id="7_c6o8j"] diff --git a/Zennysoft.Game.Ma/src/inventory_menu/EquippedInventoryLabelSettings.tres b/Zennysoft.Game.Ma/src/ui/inventory_menu/EquippedInventoryLabelSettings.tres similarity index 100% rename from Zennysoft.Game.Ma/src/inventory_menu/EquippedInventoryLabelSettings.tres rename to Zennysoft.Game.Ma/src/ui/inventory_menu/EquippedInventoryLabelSettings.tres diff --git a/Zennysoft.Game.Ma/src/inventory_menu/InventoryDialogueSelectionStyle.tres b/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryDialogueSelectionStyle.tres similarity index 100% rename from Zennysoft.Game.Ma/src/inventory_menu/InventoryDialogueSelectionStyle.tres rename to Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryDialogueSelectionStyle.tres diff --git a/Zennysoft.Game.Ma/src/inventory_menu/InventoryLabelSettings.tres b/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryLabelSettings.tres similarity index 100% rename from Zennysoft.Game.Ma/src/inventory_menu/InventoryLabelSettings.tres rename to Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryLabelSettings.tres diff --git a/Zennysoft.Game.Ma/src/inventory_menu/InventoryMenu.cs b/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.cs similarity index 100% rename from Zennysoft.Game.Ma/src/inventory_menu/InventoryMenu.cs rename to Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.cs diff --git a/Zennysoft.Game.Ma/src/inventory_menu/InventoryMenu.cs.uid b/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.cs.uid similarity index 100% rename from Zennysoft.Game.Ma/src/inventory_menu/InventoryMenu.cs.uid rename to Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.cs.uid diff --git a/Zennysoft.Game.Ma/src/inventory_menu/InventoryMenu.gdshader b/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.gdshader similarity index 100% rename from Zennysoft.Game.Ma/src/inventory_menu/InventoryMenu.gdshader rename to Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.gdshader diff --git a/Zennysoft.Game.Ma/src/inventory_menu/InventoryMenu.gdshader.uid b/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.gdshader.uid similarity index 100% rename from Zennysoft.Game.Ma/src/inventory_menu/InventoryMenu.gdshader.uid rename to Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.gdshader.uid diff --git a/Zennysoft.Game.Ma/src/inventory_menu/InventoryMenu.tscn b/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.tscn similarity index 99% rename from Zennysoft.Game.Ma/src/inventory_menu/InventoryMenu.tscn rename to Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.tscn index 4566739f..6acd4db5 100644 --- a/Zennysoft.Game.Ma/src/inventory_menu/InventoryMenu.tscn +++ b/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.tscn @@ -1,13 +1,13 @@ [gd_scene load_steps=35 format=3 uid="uid://dlj8qdg1c5048"] -[ext_resource type="Script" uid="uid://cmtet15hi5oiy" path="res://src/inventory_menu/InventoryMenu.cs" id="1_l64wl"] -[ext_resource type="Shader" uid="uid://cnphwvmr05hp1" path="res://src/inventory_menu/InventoryMenu.gdshader" id="2_0fvsh"] +[ext_resource type="Script" uid="uid://cmtet15hi5oiy" path="res://src/ui/inventory_menu/InventoryMenu.cs" id="1_l64wl"] +[ext_resource type="Shader" uid="uid://cnphwvmr05hp1" path="res://src/ui/inventory_menu/InventoryMenu.gdshader" id="2_0fvsh"] [ext_resource type="FontFile" uid="uid://cm8j5vcdop5x0" path="res://src/ui/fonts/Mrs-Eaves-OT-Roman_31443.ttf" id="3_lm4o1"] [ext_resource type="FontFile" uid="uid://cb41qqmxqurj8" path="res://src/ui/fonts/FT88-Bold.ttf" id="4_rg5yb"] [ext_resource type="FontFile" uid="uid://dit3vylt7hmmx" path="res://src/ui/fonts/FT88-Regular.ttf" id="5_2qnnx"] [ext_resource type="LabelSettings" uid="uid://ca1q6yu8blwxf" path="res://src/ui/label_settings/InventoryMainTextBold.tres" id="6_tmdno"] [ext_resource type="LabelSettings" uid="uid://cuuo43x72xcsc" path="res://src/ui/label_settings/MainTextBold.tres" id="7_vyrxm"] -[ext_resource type="Theme" uid="uid://daxuhpmyxwxck" path="res://src/inventory_menu/InventoryDialogueSelectionStyle.tres" id="8_khyvo"] +[ext_resource type="Theme" uid="uid://daxuhpmyxwxck" path="res://src/ui/inventory_menu/InventoryDialogueSelectionStyle.tres" id="8_khyvo"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_i55tv"] shader = ExtResource("2_0fvsh") diff --git a/Zennysoft.Game.Ma/src/inventory_menu/ItemLabel.cs b/Zennysoft.Game.Ma/src/ui/inventory_menu/ItemLabel.cs similarity index 100% rename from Zennysoft.Game.Ma/src/inventory_menu/ItemLabel.cs rename to Zennysoft.Game.Ma/src/ui/inventory_menu/ItemLabel.cs diff --git a/Zennysoft.Game.Ma/src/inventory_menu/ItemLabel.cs.uid b/Zennysoft.Game.Ma/src/ui/inventory_menu/ItemLabel.cs.uid similarity index 100% rename from Zennysoft.Game.Ma/src/inventory_menu/ItemLabel.cs.uid rename to Zennysoft.Game.Ma/src/ui/inventory_menu/ItemLabel.cs.uid diff --git a/Zennysoft.Game.Ma/src/inventory_menu/ItemSlot.cs b/Zennysoft.Game.Ma/src/ui/inventory_menu/ItemSlot.cs similarity index 100% rename from Zennysoft.Game.Ma/src/inventory_menu/ItemSlot.cs rename to Zennysoft.Game.Ma/src/ui/inventory_menu/ItemSlot.cs diff --git a/Zennysoft.Game.Ma/src/inventory_menu/ItemSlot.cs.uid b/Zennysoft.Game.Ma/src/ui/inventory_menu/ItemSlot.cs.uid similarity index 100% rename from Zennysoft.Game.Ma/src/inventory_menu/ItemSlot.cs.uid rename to Zennysoft.Game.Ma/src/ui/inventory_menu/ItemSlot.cs.uid diff --git a/Zennysoft.Game.Ma/src/inventory_menu/ItemSlot.tscn b/Zennysoft.Game.Ma/src/ui/inventory_menu/ItemSlot.tscn similarity index 90% rename from Zennysoft.Game.Ma/src/inventory_menu/ItemSlot.tscn rename to Zennysoft.Game.Ma/src/ui/inventory_menu/ItemSlot.tscn index b4a4714c..dfc8b2ca 100644 --- a/Zennysoft.Game.Ma/src/inventory_menu/ItemSlot.tscn +++ b/Zennysoft.Game.Ma/src/ui/inventory_menu/ItemSlot.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=7 format=3 uid="uid://c005nd0m2eim"] -[ext_resource type="Script" uid="uid://cglxk7v8hpesn" path="res://src/inventory_menu/ItemSlot.cs" id="1_yttxt"] +[ext_resource type="Script" uid="uid://cglxk7v8hpesn" path="res://src/ui/inventory_menu/ItemSlot.cs" id="1_yttxt"] [ext_resource type="Texture2D" uid="uid://0r1dws4ajhdx" path="res://src/items/accessory/textures/MASK 01.PNG" id="2_7kdbd"] -[ext_resource type="Script" uid="uid://b0rrpkpsfdga8" path="res://src/inventory_menu/ItemLabel.cs" id="3_xlgl0"] +[ext_resource type="Script" uid="uid://b0rrpkpsfdga8" path="res://src/ui/inventory_menu/ItemLabel.cs" id="3_xlgl0"] [ext_resource type="FontFile" uid="uid://bohbd123672ea" path="res://src/ui/fonts/FT88-Italic.ttf" id="4_vcxwm"] -[ext_resource type="LabelSettings" uid="uid://bl5xpqyq8vjtv" path="res://src/inventory_menu/InventoryLabelSettings.tres" id="5_a7hko"] +[ext_resource type="LabelSettings" uid="uid://bl5xpqyq8vjtv" path="res://src/ui/inventory_menu/InventoryLabelSettings.tres" id="5_a7hko"] [sub_resource type="LabelSettings" id="LabelSettings_lgjx0"] font = ExtResource("4_vcxwm") diff --git a/Zennysoft.Game.Ma/src/inventory_menu/cursor.png b/Zennysoft.Game.Ma/src/ui/inventory_menu/cursor.png similarity index 100% rename from Zennysoft.Game.Ma/src/inventory_menu/cursor.png rename to Zennysoft.Game.Ma/src/ui/inventory_menu/cursor.png diff --git a/Zennysoft.Game.Ma/src/inventory_menu/cursor.png.import b/Zennysoft.Game.Ma/src/ui/inventory_menu/cursor.png.import similarity index 71% rename from Zennysoft.Game.Ma/src/inventory_menu/cursor.png.import rename to Zennysoft.Game.Ma/src/ui/inventory_menu/cursor.png.import index f52e682d..ea42cead 100644 --- a/Zennysoft.Game.Ma/src/inventory_menu/cursor.png.import +++ b/Zennysoft.Game.Ma/src/ui/inventory_menu/cursor.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://dr8mjn3wahdvp" -path.s3tc="res://.godot/imported/cursor.png-0fec02edb5cdc5cc9912cb19d5a7e260.s3tc.ctex" +path.s3tc="res://.godot/imported/cursor.png-bf4d36c1fce83964cd2e2be02acb4fc6.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://src/inventory_menu/cursor.png" -dest_files=["res://.godot/imported/cursor.png-0fec02edb5cdc5cc9912cb19d5a7e260.s3tc.ctex"] +source_file="res://src/ui/inventory_menu/cursor.png" +dest_files=["res://.godot/imported/cursor.png-bf4d36c1fce83964cd2e2be02acb4fc6.s3tc.ctex"] [params]