From 4c61f3b50e9b86764b441f4a01539360654ee153 Mon Sep 17 00:00:00 2001
From: Cold-Mint <cold_mint@qq.com>
Date: Wed, 5 Jun 2024 22:15:23 +0800
Subject: [PATCH] =?UTF-8?q?Remove=20unused=20source=20files.=20Fixed=20an?=
 =?UTF-8?q?=20issue=20where=20the=20health=20tank=20was=20empty=20after=20?=
 =?UTF-8?q?resurrection.=20=E7=A7=BB=E9=99=A4=E6=9C=AA=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E6=BA=90=E6=96=87=E4=BB=B6=E3=80=82=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=A4=8D=E6=B4=BB=E5=90=8E=E7=94=9F=E5=91=BD=E6=A7=BD=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=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

---
 scripts/character/CharacterTemplate.cs        |  2 +-
 scripts/character/Player.cs                   | 12 +++++
 scripts/loader/sceneLoader/GameSceneLoader.cs | 16 +++----
 .../SequenceLayoutParsingStrategy.cs          | 29 +++++++-----
 scripts/map/interfaces/IRoomHolder.cs         | 28 -----------
 scripts/map/interfaces/IRoomTemplate.cs       | 35 --------------
 .../map/layoutStrategy/TestLayoutStrategy.cs  |  6 +--
 scripts/map/room/RoomTemplate.cs              | 46 -------------------
 scripts/map/roomHolder/RoomHolder.cs          | 31 -------------
 .../PatchworkRoomPlacementStrategy.cs         |  2 +
 10 files changed, 42 insertions(+), 165 deletions(-)
 delete mode 100644 scripts/map/interfaces/IRoomHolder.cs
 delete mode 100644 scripts/map/interfaces/IRoomTemplate.cs
 delete mode 100644 scripts/map/room/RoomTemplate.cs
 delete mode 100644 scripts/map/roomHolder/RoomHolder.cs

diff --git a/scripts/character/CharacterTemplate.cs b/scripts/character/CharacterTemplate.cs
index 088413b..a9910a7 100644
--- a/scripts/character/CharacterTemplate.cs
+++ b/scripts/character/CharacterTemplate.cs
@@ -130,7 +130,7 @@ public partial class CharacterTemplate : CharacterBody2D
     ///<para>Sets the amount of Hp a character has after resurrection</para>
     ///<para>设置角色复活后拥有的Hp</para>
     /// </remarks>
-    public void Revive(int newHp)
+    public virtual void Revive(int newHp)
     {
         //If the new Hp is less than or equal to 0, there is no need to resurrect
         //如果新的Hp小于等于0，那么不需要复活
diff --git a/scripts/character/Player.cs b/scripts/character/Player.cs
index 2c754d9..a6c57fd 100644
--- a/scripts/character/Player.cs
+++ b/scripts/character/Player.cs
@@ -378,6 +378,18 @@ public partial class Player : CharacterTemplate
         }
     }
 
+    public override void Revive(int newHp)
+    {
+        base.Revive(newHp);
+        var healthBarUi = GameSceneNodeHolder.HealthBarUi;
+        if (healthBarUi!=null)
+        {
+            //The purpose of setting Hp to the current Hp is to cause the life bar to refresh.
+            //将Hp设置为当前Hp的目的是，使生命条刷新。
+            healthBarUi.CurrentHp = CurrentHp;
+        }
+    }
+
     protected override async Task OnDie(DamageTemplate damageTemplate)
     {
         Visible = false;
diff --git a/scripts/loader/sceneLoader/GameSceneLoader.cs b/scripts/loader/sceneLoader/GameSceneLoader.cs
index 0a7f7d6..eb550eb 100644
--- a/scripts/loader/sceneLoader/GameSceneLoader.cs
+++ b/scripts/loader/sceneLoader/GameSceneLoader.cs
@@ -9,6 +9,10 @@ using Godot;
 
 namespace ColdMint.scripts.loader.sceneLoader;
 
+/// <summary>
+/// <para>Game scene loader</para>
+/// <para>游戏场景加载器</para>
+/// </summary>
 public partial class GameSceneLoader : SceneLoaderTemplate
 {
     private Label? _seedLabel;
@@ -55,7 +59,7 @@ public partial class GameSceneLoader : SceneLoaderTemplate
         _seedLabel = GetNodeOrNull<Label>("CanvasLayer/Control/SeedLabel");
         if (_seedLabel != null)
         {
-            _seedLabel.Visible = Config.IsDebug();
+            _seedLabel.Visible = debugMode;
         }
 
         MapGenerator.MapRoot = GetNode<Node>("MapRoot");
@@ -77,16 +81,8 @@ public partial class GameSceneLoader : SceneLoaderTemplate
             //If you have a seedLabel, then set the seed to it.
             //如果有seedLabel，那么将种子设置上去。
             var seedInfo = TranslationServerUtils.TranslateWithFormat("seed_info", MapGenerator.Seed);
-            if (seedInfo == null)
-            {
-                _seedLabel.Text = $"Seed: {MapGenerator.Seed}";
-            }
-            else
-            {
-                _seedLabel.Text = seedInfo;
-            }
+            _seedLabel.Text = seedInfo ?? $"Seed: {MapGenerator.Seed}";
         }
-
         await MapGenerator.GenerateMap();
     }
 }
\ No newline at end of file
diff --git a/scripts/map/LayoutParsingStrategy/SequenceLayoutParsingStrategy.cs b/scripts/map/LayoutParsingStrategy/SequenceLayoutParsingStrategy.cs
index 2c51fe3..4e67f35 100644
--- a/scripts/map/LayoutParsingStrategy/SequenceLayoutParsingStrategy.cs
+++ b/scripts/map/LayoutParsingStrategy/SequenceLayoutParsingStrategy.cs
@@ -19,30 +19,37 @@ namespace ColdMint.scripts.map.LayoutParsingStrategy;
 public class SequenceLayoutParsingStrategy : ILayoutParsingStrategy
 {
     private LevelGraphEditorSaveData? _levelGraphEditorSaveData;
-
-    //Check whether data Settings are valid
-    //设置数据时，是否检查合法了
+    
+    /// <summary>
+    /// <para>Check whether data Settings are valid</para>
+    /// <para>设置数据时，是否检查合法了</para>
+    /// </summary>
     private bool _checkLegality;
 
 
-    //The connection index of the query
-    //查询的连接索引
+    /// <summary>
+    /// <para>The connection index of the query</para>
+    /// <para>查询的连接索引</para>
+    /// </summary>
     private int _index;
     private int _maxIndex;
-    private Dictionary<string, RoomNodeData> _roomNodeDataDictionary = new Dictionary<string, RoomNodeData>();
+    /// <summary>
+    /// <para>Room ID Indicates the dictionary of room node data</para>
+    /// <para>房间ID对应房间节点数据的字典</para>
+    /// </summary>
+    private readonly Dictionary<string, RoomNodeData> _roomNodeDataDictionary = new();
 
     public void SetLevelGraph(LevelGraphEditorSaveData levelGraphEditorSaveData)
     {
-        _checkLegality = false;
-        _index = -1;
-        _levelGraphEditorSaveData = levelGraphEditorSaveData;
-        if (_levelGraphEditorSaveData.RoomNodeDataList == null || _levelGraphEditorSaveData.RoomNodeDataList.Count == 0)
+        if (levelGraphEditorSaveData.RoomNodeDataList == null || levelGraphEditorSaveData.RoomNodeDataList.Count == 0)
         {
             //No room data, unable to parse.
             //没有房间数据，无法解析。
             return;
         }
-
+        _checkLegality = false;
+        _index = -1;
+        _levelGraphEditorSaveData = levelGraphEditorSaveData;
         if (_levelGraphEditorSaveData.ConnectionDataList == null ||
             _levelGraphEditorSaveData.ConnectionDataList.Count == 0)
         {
diff --git a/scripts/map/interfaces/IRoomHolder.cs b/scripts/map/interfaces/IRoomHolder.cs
deleted file mode 100644
index d0e86a1..0000000
--- a/scripts/map/interfaces/IRoomHolder.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using ColdMint.scripts.map.room;
-
-namespace ColdMint.scripts.map.interfaces;
-
-/// <summary>
-/// <para>Room holder</para>
-/// <para>房间持有者</para>
-/// </summary>
-/// <remarks>
-///<para>This class holds all generated and placed rooms.</para>
-///<para>该类保存所有已生成且已放置的房间。</para>
-/// </remarks>
-public interface IRoomHolder
-{
-    bool AddRoom(Room room);
-    
-    /// <summary>
-    /// <para>LastRoom</para>
-    /// <para>最后添加的房间</para>
-    /// </summary>
-    Room? LastRoom { get; }
-    
-    /// <summary>
-    /// <para>Number of rooms that have been placed</para>
-    /// <para>已放置的房间数量</para>
-    /// </summary>
-    int PlacedRoomNumber { get; }
-}
\ No newline at end of file
diff --git a/scripts/map/interfaces/IRoomTemplate.cs b/scripts/map/interfaces/IRoomTemplate.cs
deleted file mode 100644
index c823b91..0000000
--- a/scripts/map/interfaces/IRoomTemplate.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-namespace ColdMint.scripts.map.interfaces;
-
-public interface IRoomTemplate
-{
-    /// <summary>
-    /// <para>The asset path of the room must be available</para>
-    /// <para>必须可获得房间的资产路径</para>
-    /// </summary>
-    string RoomResPath { get; }
-
-    /// <summary>
-    /// <para>Whether this room template can still be used</para>
-    /// <para>这个房间模板是否还能使用</para>
-    /// </summary>
-    bool CanUse { get; }
-
-    /// <summary>
-    /// <para>The maximum number of times a room template is used</para>
-    /// <para>房间模板的最大使用次数</para>
-    /// </summary>
-    int MaxNumber { get; set; }
-    
-    
-    /// <summary>
-    /// <para>AddUsedNumber</para>
-    /// <para>添加使用次数</para>
-    /// </summary>
-    void AddUsedNumber();
-    
-    /// <summary>
-    /// <para>Times used</para>
-    /// <para>已使用次数</para>
-    /// </summary>
-    int UsedNumber { get; }
-}
\ No newline at end of file
diff --git a/scripts/map/layoutStrategy/TestLayoutStrategy.cs b/scripts/map/layoutStrategy/TestLayoutStrategy.cs
index dad919e..8326104 100644
--- a/scripts/map/layoutStrategy/TestLayoutStrategy.cs
+++ b/scripts/map/layoutStrategy/TestLayoutStrategy.cs
@@ -11,17 +11,17 @@ namespace ColdMint.scripts.map.layoutStrategy;
 /// </summary>
 public class TestLayoutStrategy : ILayoutStrategy
 {
-    private string _path = "res://data/levelGraphs/test.json";
+    private const string Path = "res://data/levelGraphs/test.json";
 
     public Task<LevelGraphEditorSaveData?> GetLayout()
     {
-        var exists = FileAccess.FileExists(_path);
+        var exists = FileAccess.FileExists(Path);
         if (!exists)
         {
             return Task.FromResult<LevelGraphEditorSaveData?>(null);
         }
 
-        var json = FileAccess.GetFileAsString(_path);
+        var json = FileAccess.GetFileAsString(Path);
         if (json == null)
         {
             return Task.FromResult<LevelGraphEditorSaveData?>(null);
diff --git a/scripts/map/room/RoomTemplate.cs b/scripts/map/room/RoomTemplate.cs
deleted file mode 100644
index 4b1647d..0000000
--- a/scripts/map/room/RoomTemplate.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using ColdMint.scripts.map.interfaces;
-
-namespace ColdMint.scripts.map.room;
-
-public class RoomTemplate : IRoomTemplate
-{
-    /// <summary>
-    /// <para>Unlimited use</para>
-    /// <para>无限次使用</para>
-    /// </summary>
-    public const int Infinite = -1;
-
-    private int _usedNumber;
-
-    public RoomTemplate(string roomResPath)
-    {
-        RoomResPath = roomResPath;
-        MaxNumber = Infinite;
-        _usedNumber = 0;
-    }
-
-    public string RoomResPath { get; }
-
-    public bool CanUse
-    {
-        get
-        {
-            if (MaxNumber == Infinite)
-            {
-                return true;
-            }
-
-            return _usedNumber < MaxNumber;
-        }
-    }
-
-    public int MaxNumber { get; set; }
-
-
-    public void AddUsedNumber()
-    {
-        _usedNumber++;
-    }
-
-    public int UsedNumber => _usedNumber;
-}
\ No newline at end of file
diff --git a/scripts/map/roomHolder/RoomHolder.cs b/scripts/map/roomHolder/RoomHolder.cs
deleted file mode 100644
index aba133e..0000000
--- a/scripts/map/roomHolder/RoomHolder.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System.Collections.Generic;
-using ColdMint.scripts.map.interfaces;
-using ColdMint.scripts.map.room;
-
-namespace ColdMint.scripts.map.roomHolder;
-
-public class RoomHolder : IRoomHolder
-{
-    private readonly List<Room> _rooms = new List<Room>();
-
-    public bool AddRoom(Room room)
-    {
-        _rooms.Add(room);
-        return true;
-    }
-
-    public Room? LastRoom
-    {
-        get
-        {
-            if (_rooms.Count > 0)
-            {
-                return _rooms[_rooms.Count - 1];
-            }
-
-            return null;
-        }
-    }
-
-    public int PlacedRoomNumber => _rooms.Count;
-}
\ No newline at end of file
diff --git a/scripts/map/roomPlacer/PatchworkRoomPlacementStrategy.cs b/scripts/map/roomPlacer/PatchworkRoomPlacementStrategy.cs
index d1c41e3..d6e138c 100644
--- a/scripts/map/roomPlacer/PatchworkRoomPlacementStrategy.cs
+++ b/scripts/map/roomPlacer/PatchworkRoomPlacementStrategy.cs
@@ -263,6 +263,7 @@ public class PatchworkRoomPlacementStrategy : IRoomPlacementStrategy
         {
             if (mainRoomSlot == null || mainRoomSlot.Matched)
             {
+                //If it's already a match, it's no longer a match
                 //如果已经匹配过了，就不再匹配
                 continue;
             }
@@ -276,6 +277,7 @@ public class PatchworkRoomPlacementStrategy : IRoomPlacementStrategy
 
                 if (newRoomSlot.Matched)
                 {
+                    //If it's already a match, it's no longer a match
                     //如果已经匹配过了，就不再匹配
                     continue;
                 }