Rewrite and simplify Inventory Menu, various fixes for item effects

2025-11-04 01:12:16 -08:00
parent 7b7fc910bd
commit a5846e08dc
49 changed files with 1070 additions and 826 deletions
--- a/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.tscn
+++ b/Zennysoft.Game.Ma/src/ui/inventory_menu/InventoryMenu.tscn
@@ -1,14 +1,14 @@
-[gd_scene load_steps=30 format=3 uid="uid://dlj8qdg1c5048"]
+[gd_scene load_steps=27 format=3 uid="uid://dlj8qdg1c5048"]

-[ext_resource type="Script" uid="uid://cmtet15hi5oiy" path="res://src/ui/inventory_menu/InventoryMenu.cs" id="1_l64wl"]
+[ext_resource type="Script" uid="uid://bi1xopts68paw" path="res://src/ui/inventory_menu/InventoryMenu.cs" id="1_b6rkr"]
 [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="PackedScene" uid="uid://c005nd0m2eim" path="res://src/ui/inventory_menu/ItemSlot.tscn" id="4_aiji3"]
 [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/ui/inventory_menu/InventoryDialogueSelectionStyle.tres" id="8_khyvo"]
-[ext_resource type="Shortcut" uid="uid://dumkrjur22k2a" path="res://src/ui/ButtonShortcut.tres" id="9_b6rkr"]

 [sub_resource type="ShaderMaterial" id="ShaderMaterial_i55tv"]
 shader = ExtResource("2_0fvsh")
@@ -72,67 +72,6 @@ font_color = Color(0.737255, 0.705882, 0.690196, 1)

 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_ct6ql"]

-[sub_resource type="Animation" id="Animation_dg155"]
-length = 0.001
-tracks/0/type = "value"
-tracks/0/imported = false
-tracks/0/enabled = true
-tracks/0/path = NodePath("InventoryInfo/HBoxContainer/PlayerInfo/HBoxContainer/VBoxContainer/ItemEffectLabel:visible")
-tracks/0/interp = 1
-tracks/0/loop_wrap = true
-tracks/0/keys = {
-"times": PackedFloat32Array(0),
-"transitions": PackedFloat32Array(1),
-"update": 1,
-"values": [true]
-}
-tracks/1/type = "value"
-tracks/1/imported = false
-tracks/1/enabled = true
-tracks/1/path = NodePath("InventoryInfo/HBoxContainer/PlayerInfo/HBoxContainer/VBoxContainer/ItemEffectLabel:text")
-tracks/1/interp = 1
-tracks/1/loop_wrap = true
-tracks/1/keys = {
-"times": PackedFloat32Array(0),
-"transitions": PackedFloat32Array(1),
-"update": 1,
-"values": [""]
-}
-
-[sub_resource type="Animation" id="Animation_7by7u"]
-resource_name = "status_up"
-length = 2.5
-tracks/0/type = "value"
-tracks/0/imported = false
-tracks/0/enabled = true
-tracks/0/path = NodePath("InventoryInfo/HBoxContainer/PlayerInfo/HBoxContainer/VBoxContainer/ItemEffectLabel:visible")
-tracks/0/interp = 1
-tracks/0/loop_wrap = true
-tracks/0/keys = {
-"times": PackedFloat32Array(0, 2.5),
-"transitions": PackedFloat32Array(1, 1),
-"update": 1,
-"values": [true, false]
-}
-tracks/1/type = "value"
-tracks/1/imported = false
-tracks/1/enabled = true
-tracks/1/path = NodePath("InventoryInfo/HBoxContainer/PlayerInfo/HBoxContainer/VBoxContainer/ItemEffectLabel:text")
-tracks/1/interp = 1
-tracks/1/loop_wrap = true
-tracks/1/keys = {
-"times": PackedFloat32Array(2.5),
-"transitions": PackedFloat32Array(1),
-"update": 1,
-"values": [""]
-}
-
-[sub_resource type="AnimationLibrary" id="AnimationLibrary_eivo2"]
-_data = {
-&"RESET": SubResource("Animation_dg155"),
-&"status_up": SubResource("Animation_7by7u")
-}
-
 [node name="InventoryMenu" type="Control"]
 custom_minimum_size = Vector2(1440, 1080)
 layout_mode = 3
@@ -141,7 +80,8 @@ offset_right = 1440.0
 offset_bottom = 1080.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
-script = ExtResource("1_l64wl")
+mouse_filter = 2
+script = ExtResource("1_b6rkr")

 [node name="BG" type="TextureRect" parent="."]
 material = SubResource("ShaderMaterial_i55tv")
@@ -151,6 +91,7 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
+mouse_filter = 2
 texture = SubResource("PlaceholderTexture2D_3ynpe")
 expand_mode = 2

@@ -206,7 +147,6 @@ horizontal_alignment = 2
 [node name="ItemsPage" type="VBoxContainer" parent="InventoryInfo/HBoxContainer/ItemInfo"]
 unique_name_in_owner = true
 layout_mode = 2
-size_flags_vertical = 0
 theme_override_constants/separation = 15
 alignment = 1

@@ -214,8 +154,59 @@ alignment = 1
 custom_minimum_size = Vector2(0, 14)
 layout_mode = 2

+[node name="ItemSlot1" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="ItemSlot2" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="ItemSlot3" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="ItemSlot4" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="ItemSlot5" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="ItemSlot6" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="ItemSlot7" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="ItemSlot8" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="ItemSlot9" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
+[node name="ItemSlot10" parent="InventoryInfo/HBoxContainer/ItemInfo/ItemsPage" instance=ExtResource("4_aiji3")]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+
 [node name="PlayerInfo" type="VBoxContainer" parent="InventoryInfo/HBoxContainer"]
 layout_mode = 2
+mouse_filter = 2
 theme_override_constants/separation = 20

 [node name="VTBox" type="HBoxContainer" parent="InventoryInfo/HBoxContainer/PlayerInfo"]
@@ -382,7 +373,6 @@ theme_override_styles/disabled = SubResource("StyleBoxEmpty_fu7o2")
 theme_override_styles/pressed = SubResource("StyleBoxEmpty_nkvce")
 theme_override_styles/normal = SubResource("StyleBoxEmpty_545ij")
 button_mask = 0
-shortcut = ExtResource("9_b6rkr")
 text = "Use"
 alignment = 0

@@ -407,7 +397,6 @@ theme_override_styles/disabled = SubResource("StyleBoxEmpty_ascpt")
 theme_override_styles/pressed = SubResource("StyleBoxEmpty_abpb1")
 theme_override_styles/normal = SubResource("StyleBoxEmpty_545ij")
 button_mask = 0
-shortcut = ExtResource("9_b6rkr")
 text = "Throw"
 alignment = 0

@@ -432,12 +421,5 @@ theme_override_styles/disabled = SubResource("StyleBoxEmpty_uerb4")
 theme_override_styles/pressed = SubResource("StyleBoxEmpty_lvcf8")
 theme_override_styles/normal = SubResource("StyleBoxEmpty_ct6ql")
 button_mask = 0
-shortcut = ExtResource("9_b6rkr")
 text = "Drop"
 alignment = 0
-
-[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
-unique_name_in_owner = true
-libraries = {
-&"": SubResource("AnimationLibrary_eivo2")
-}