From e307a5829959f71d9457f1a9d76a3d953f6ca968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9C=A7=E9=9B=A8=E7=83=A8?= <Web_13234@outlook.com>
Date: Thu, 13 Jun 2024 11:04:51 +0800
Subject: [PATCH] Make packsack new interface, too.

---
 ColdMint.Traveler.csproj              |   3 ++
 locals/Item.en.translation            | Bin 570 -> 570 bytes
 locals/Item.ja.translation            | Bin 693 -> 693 bytes
 locals/Item.zh.translation            | Bin 609 -> 609 bytes
 prefab/packsacks/packsack.tscn        |   1 +
 scripts/character/Player.cs           |   1 +
 scripts/inventory/Packsack.cs         |  46 ++++++++++++++++++--------
 scripts/item/ItemTypeManager.cs       |   9 ++++-
 scripts/item/weapon/WeaponTemplate.cs |   2 +-
 9 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/ColdMint.Traveler.csproj b/ColdMint.Traveler.csproj
index c893429..ec53ff3 100644
--- a/ColdMint.Traveler.csproj
+++ b/ColdMint.Traveler.csproj
@@ -8,4 +8,7 @@
     <Nullable>enable</Nullable>
     <LangVersion>12</LangVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/locals/Item.en.translation b/locals/Item.en.translation
index 1c8ae5245b84c7d6c4aac1b1b6a586822361efa6..f16d6d9617920b6cb1672fab2900d03969731584 100644
GIT binary patch
delta 149
zcmdnRvWsPdG$X57T5)FnWCcdE`u{+{00eA6%mc)%K&$}7VnECY#nB?~1A$Bi0U#EH
zih<<vj-6&T0@9pN%mkJDxoe>zNUahOTLN+1bgdiKKw1WfRe=~}mpl-MGcZiP%9siO
DS85fr

delta 149
zcmdnRvWsPdG$U)CQJO`@WCcdEdIlh117ZOn{tpDKKw1Ha#ekR*isMghyAG090%A)b
zW`c@)Jlp)s2*~DyVg(7=$JRi$3=pdVF-*TC-v>1y7i@<hkOtW&55(aN43n=irUC$M
CxfM+S

diff --git a/locals/Item.ja.translation b/locals/Item.ja.translation
index 27c8bbc7fcd0853a842b3a53225e0cf7c530b857..29758ae5c50e924e98294b6a5473a00c4dbda3b8 100644
GIT binary patch
delta 149
zcmdnWx|MZ<G$X5lX?}UxWCcdo`u{+{00eA6%mc)%K&$}7VnECY#nB?~1A$Bic_@a7
x=N&uES_l+lhhiom4U+r0YoQ@XZ4ea4P1m|n0c3kZF~}~E{6PkW$xj$B0swre7q<Wa

delta 149
zcmdnWx|MZ<G$U(nc6n*#WCcdodIlh117ZOn{tpDKKw1Ha#ekR*isMghyDkr82SG6t
xRNUj)=3j+CHaiq6NXR~}0J1%y7^Yv6?}Hjphyi2<2!rec(FYkACO=`k2mlag7!Cjc

diff --git a/locals/Item.zh.translation b/locals/Item.zh.translation
index b775a9f5a2d4d7a5c258f6fbf87ca4d576bfc3f1..013e7caa307ff17f79b9a377f980157f3824fb6c 100644
GIT binary patch
delta 148
zcmaFJ@{nbNG$Tv4d2+>Mc}BPT|3JV11Z+Ue1H`OAtN_GfK+Fim(IW2yflLNoD29pW
w9XrkH0u*D1VkRIBlKZ)9p&>}EITXiD*Sg^iWUE3k$S!#xE?{7o{DiR<09J7p6#xJL

delta 148
zcmaFJ@{nbNG$Tu)Sz_X3c}BN-1|VPqVgVrj4+N}0S^<c~fS3`A<4<k7&I@FlLopLn
w+~e8iUoJp4I}|HO$UgQ4vQ?oNreBipgBnnX0b~XUgY1(B;sOSS$xj$-0gM6_+yDRo

diff --git a/prefab/packsacks/packsack.tscn b/prefab/packsacks/packsack.tscn
index 3599009..9520244 100644
--- a/prefab/packsacks/packsack.tscn
+++ b/prefab/packsacks/packsack.tscn
@@ -10,6 +10,7 @@ size = Vector2(41, 57)
 collision_layer = 8
 collision_mask = 38
 script = ExtResource("1_8ehup")
+Id = "packsack"
 metadata/Id = "Packsack"
 metadata/MaxStackQuantity = 1
 metadata/Icon = ExtResource("2_e1ale")
diff --git a/scripts/character/Player.cs b/scripts/character/Player.cs
index 66a2fae..cc8b4b9 100644
--- a/scripts/character/Player.cs
+++ b/scripts/character/Player.cs
@@ -6,6 +6,7 @@ using ColdMint.scripts.damage;
 using ColdMint.scripts.deathInfo;
 using ColdMint.scripts.debug;
 using ColdMint.scripts.inventory;
+using ColdMint.scripts.item;
 using ColdMint.scripts.map.events;
 using ColdMint.scripts.utils;
 using ColdMint.scripts.item.weapon;
diff --git a/scripts/inventory/Packsack.cs b/scripts/inventory/Packsack.cs
index 31dcbc8..bd517da 100644
--- a/scripts/inventory/Packsack.cs
+++ b/scripts/inventory/Packsack.cs
@@ -1,5 +1,8 @@
 using System;
+
 using ColdMint.scripts.debug;
+using ColdMint.scripts.item;
+
 using Godot;
 
 namespace ColdMint.scripts.inventory;
@@ -10,26 +13,41 @@ namespace ColdMint.scripts.inventory;
 /// </summary>
 public partial class Packsack : RigidBody2D, IItem
 {
-    public string? Id { get; set; }
-    public int Quantity { get; set; }
-    public int MaxStackQuantity { get; set; }
-    public Texture2D? Icon { get; set; }
-    public new string? Name { get; set; }
-    public string? Description { get; set; }
-    public Action<IItem>? OnUse { get; set; }
-    public Func<IItem, Node>? OnInstantiation { get; set; }
+    [Export] public string Id { get; protected set; } = "place_holder_id";
+
+    protected Texture2D? UniqueIcon { get; set; }
+    public Texture2D Icon => UniqueIcon ?? ItemTypeManager.DefaultIconOf(Id);
+
+    protected string? UniqueName { get; set; }
+    public new string Name => UniqueName ?? ItemTypeManager.DefaultNameOf(Id);
+
+    protected string? UniqueDescription { get; set; }
+    public string? Description => UniqueDescription ?? ItemTypeManager.DefaultDescriptionOf(Id);
+
+    public void Use(Node2D? owner, Vector2 targetGlobalPosition) { }
+
+    public void Destroy()
+    {
+        if (_itemContainer == null) return;
+        foreach (var itemSlot in _itemContainer)
+        {
+            itemSlot.ClearSlot();
+        }
+
+        QueueFree();
+    }
 
     private IItemContainer? _itemContainer;
 
     public override void _Ready()
     {
         base._Ready();
-        Id = GetMeta("ID", "1").AsString();
-        Quantity = GetMeta("Quantity", "1").AsInt32();
-        MaxStackQuantity = GetMeta("MaxStackQuantity", Config.MaxStackQuantity).AsInt32();
-        Icon = GetMeta("Icon", "").As<Texture2D>();
-        Name = GetMeta("Name", "").AsString();
-        Description = GetMeta("Description", "").AsString();
+        // Id = GetMeta("ID",                             "1").AsString();
+        // Quantity = GetMeta("Quantity",                 "1").AsInt32();
+        // MaxStackQuantity = GetMeta("MaxStackQuantity", Config.MaxStackQuantity).AsInt32();
+        // Icon = GetMeta("Icon",                         "").As<Texture2D>();
+        // Name = GetMeta("Name",                         "").AsString();
+        // Description = GetMeta("Description",           "").AsString();
         _itemContainer = new UniversalItemContainer();
     }
 
diff --git a/scripts/item/ItemTypeManager.cs b/scripts/item/ItemTypeManager.cs
index 663d736..c2e116d 100644
--- a/scripts/item/ItemTypeManager.cs
+++ b/scripts/item/ItemTypeManager.cs
@@ -12,8 +12,15 @@ public static class ItemTypeManager
     public static void StaticRegister()
     {
         var staffOfTheUndeadScene = ResourceLoader.Load<PackedScene>("res://prefab/weapons/staffOfTheUndead.tscn");
-        var staffOfTheUndead = new ItemType("staff_of_the_undead", () => staffOfTheUndeadScene.Instantiate<IItem>(), null, 1);
+        var staffOfTheUndeadIcon = ResourceLoader.Load<Texture2D>("res://sprites/weapon/staffOfTheUndead.png");
+        var staffOfTheUndead =
+            new ItemType("staff_of_the_undead", () => staffOfTheUndeadScene.Instantiate<IItem>(), staffOfTheUndeadIcon, 1);
         Register(staffOfTheUndead);
+
+        var packsackScene = ResourceLoader.Load<PackedScene>("res://prefab/packsacks/packsack.tscn");
+        var packsackIcon = ResourceLoader.Load<Texture2D>("res://sprites/Player.png");
+        var packsack = new ItemType("packsack", () => packsackScene.Instantiate<IItem>(), packsackIcon, 1);
+        Register(packsack);
     }
 
     private static Dictionary<string, ItemType> Registry { get; } = [];
diff --git a/scripts/item/weapon/WeaponTemplate.cs b/scripts/item/weapon/WeaponTemplate.cs
index e8bd693..b4be423 100644
--- a/scripts/item/weapon/WeaponTemplate.cs
+++ b/scripts/item/weapon/WeaponTemplate.cs
@@ -20,7 +20,7 @@ public abstract partial class WeaponTemplate : RigidBody2D, IItem
     //Implements IItem
     [Export] public virtual string Id { get; private set; } = "ID";
 
-    protected virtual Texture2D? UniqueIcon { get; set; }
+    protected Texture2D? UniqueIcon { get; set; }
     public Texture2D Icon => UniqueIcon ?? ItemTypeManager.DefaultIconOf(Id);
 
     protected string? UniqueName { get; set; }