From 2dd5525adff660bd5d4c25fc7033e59103652f31 Mon Sep 17 00:00:00 2001
From: Cold-Mint <cold_mint@qq.com>
Date: Wed, 26 Jun 2024 23:18:50 +0800
Subject: [PATCH] =?UTF-8?q?Fixed=20an=20issue=20where=20Hotbar=20did=20not?=
 =?UTF-8?q?=20select=20item=20A=20by=20default,=20from=20slot=201=20to=20s?=
 =?UTF-8?q?lot=202,=20and=20then=20from=20slot=202.=20=E8=A7=A3=E5=86=B3Ho?=
 =?UTF-8?q?tbar=E6=B2=A1=E6=9C=89=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=EF=BC=8C=E5=B0=86=E7=89=A9=E5=93=81A=E4=BB=8E=E6=A7=BD1?=
 =?UTF-8?q?=E6=94=BE=E5=88=B0=E6=A7=BD2=EF=BC=8C=E5=86=8D=E4=BB=8E?=
 =?UTF-8?q?=E6=A7=BD2=E5=8F=96=E5=87=BA=E6=97=B6=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/itemRegs/weapons.yaml        |  4 +++
 locals/{slogan.csv => Slogan.csv} |  0
 locals/slogan.csv.import          |  6 ++--
 scripts/inventory/ItemSlotNode.cs | 58 +++++++++++++++++++++----------
 4 files changed, 46 insertions(+), 22 deletions(-)
 rename locals/{slogan.csv => Slogan.csv} (100%)

diff --git a/data/itemRegs/weapons.yaml b/data/itemRegs/weapons.yaml
index a72d0f1..cae795e 100644
--- a/data/itemRegs/weapons.yaml
+++ b/data/itemRegs/weapons.yaml
@@ -2,6 +2,10 @@
   scene_path: res://prefab/weapons/staffOfTheUndead.tscn
   icon_path: res://sprites/weapon/staffOfTheUndead_icon.png
   max_stack_value: 1
+  custom_args:
+    - name: UniqueName
+      type: string
+      value: 爱你！
 
 - id: degraded_staff_of_the_undead
   scene_path: res://prefab/weapons/staffOfTheUndead.tscn
diff --git a/locals/slogan.csv b/locals/Slogan.csv
similarity index 100%
rename from locals/slogan.csv
rename to locals/Slogan.csv
diff --git a/locals/slogan.csv.import b/locals/slogan.csv.import
index bd9f9fb..b4b32ef 100644
--- a/locals/slogan.csv.import
+++ b/locals/slogan.csv.import
@@ -6,10 +6,10 @@ uid="uid://dl2r1rydlm7pa"
 
 [deps]
 
-files=["res://locals/slogan.zh.translation", "res://locals/slogan.en.translation", "res://locals/slogan.ja.translation"]
+files=["res://locals/Slogan.zh.translation", "res://locals/Slogan.en.translation", "res://locals/Slogan.ja.translation"]
 
-source_file="res://locals/slogan.csv"
-dest_files=["res://locals/slogan.zh.translation", "res://locals/slogan.en.translation", "res://locals/slogan.ja.translation"]
+source_file="res://locals/Slogan.csv"
+dest_files=["res://locals/Slogan.zh.translation", "res://locals/Slogan.en.translation", "res://locals/Slogan.ja.translation"]
 
 [params]
 
diff --git a/scripts/inventory/ItemSlotNode.cs b/scripts/inventory/ItemSlotNode.cs
index e527273..7dbd69c 100644
--- a/scripts/inventory/ItemSlotNode.cs
+++ b/scripts/inventory/ItemSlotNode.cs
@@ -40,6 +40,7 @@ public partial class ItemSlotNode : MarginContainer
         _quantityLabel = GetNode<Label>("Control/QuantityLabel");
         _control = GetNode<Control>("Control");
         _quantityLabel.Hide();
+        UpdateBackground(_isSelect);
     }
 
     public override Variant _GetDragData(Vector2 atPosition)
@@ -106,8 +107,8 @@ public partial class ItemSlotNode : MarginContainer
     /// <para>创建物品槽内的物品实例</para>
     /// </summary>
     /// <param name="number">
-    ///<para>number</para>
-    ///<para>数量</para>
+    ///<para>Quantity (pass in a value less than 0 to create an instance using all the quantities of built-in items)</para>
+    ///<para>数量（传入小于0的值，使用内置物品的所有数量创建实例）</para>
     /// </param>
     /// <returns>
     ///<para>Newly created item</para>
@@ -115,6 +116,11 @@ public partial class ItemSlotNode : MarginContainer
     /// </returns>
     public IItem? CreateItemInstance(int number)
     {
+        if (number == 0)
+        {
+            return null;
+        }
+
         if (_item is not Node2D node2D)
         {
             return null;
@@ -132,30 +138,38 @@ public partial class ItemSlotNode : MarginContainer
             return null;
         }
 
-        if (number > _item.Quantity)
+        if (number < 0)
         {
-            //The number of item instances created exceeds the current number of items
-            //创建的物品实例数量，超过了当前物品的数量
-            duplicate.QueueFree();
-            return null;
+            newItem.Quantity = _item.Quantity;
+        }
+        else
+        {
+            newItem.Quantity = number >= _item.Quantity ? _item.Quantity : number;
         }
 
-        newItem.Quantity = number;
         return newItem;
     }
 
     /// <summary>
-    /// <para>Empty the inventory</para>
-    /// <para>清空物品栏内的物品</para>
+    /// <para>Clean out the items in the item slot</para>
+    /// <para>清理物品槽内的物品</para>
     /// </summary>
-    public void ClearItem()
+    /// <param name="queueFree">
+    ///<para>Whether to release a node</para>
+    ///<para>是否释放节点</para>
+    /// </param>
+    /// <remarks>
+    ///<para>Clean up item object references in item slots.</para>
+    ///<para>清理物品槽内的物品对象引用。</para>
+    /// </remarks>
+    public void ClearItem(bool queueFree = true)
     {
         if (_item == null)
         {
             return;
         }
 
-        if (_item is Node node)
+        if (queueFree && _item is Node node)
         {
             node.QueueFree();
         }
@@ -180,7 +194,7 @@ public partial class ItemSlotNode : MarginContainer
         }
 
         var itemSlotNode = data.As<ItemSlotNode>();
-        var item = itemSlotNode._item;
+        var item = itemSlotNode.GetItem();
         if (item == null)
         {
             //Return null when trying to get the source item.
@@ -188,7 +202,7 @@ public partial class ItemSlotNode : MarginContainer
             return;
         }
 
-        itemSlotNode.ClearItem();
+        itemSlotNode.ClearItem(false);
         AddItem(item);
     }
 
@@ -203,15 +217,21 @@ public partial class ItemSlotNode : MarginContainer
         get => _isSelect;
         set
         {
-            if (_backgroundTextureRect != null)
-            {
-                _backgroundTextureRect.Texture = value ? _backgroundTextureWhenSelect : _backgroundTexture;
-            }
-
+            UpdateBackground(value);
             _isSelect = value;
         }
     }
 
+    private void UpdateBackground(bool isSelect)
+    {
+        if (_backgroundTextureRect == null)
+        {
+            return;
+        }
+
+        _backgroundTextureRect.Texture = isSelect ? _backgroundTextureWhenSelect : _backgroundTexture;
+    }
+
     public TextureRect? BackgroundTextureRect => _backgroundTextureRect;
 
     /// <summary>