feat: 支持解析 Node 类型的修饰符

Author: textGamex

Moder.Core/Helper/ModifierHelper.cs

@@ -0,0 +1,28 @@
+using Moder.Core.Models.Modifiers;
+using ParadoxPower.Process;
+
+namespace Moder.Core.Helper;
+
+public static class ModifierHelper
+{
+    public static ModifierCollection ParseModifier(Node modifierNode)
+    {
+        var list = new List<IModifier>(modifierNode.AllArray.Length);
+        foreach (var child in modifierNode.AllArray)
+        {
+            if (child.IsLeafChild)
+            {
+                var modifier = Modifier.FromLeaf(child.leaf);
+                list.Add(modifier);
+            }
+            else if (child.IsNodeChild)
+            {
+                var node = child.node;
+                var modifier = new NodeModifier(node.Key, node.Leaves.Select(Modifier.FromLeaf));
+                list.Add(modifier);
+            }
+        }
+
+        return new ModifierCollection(modifierNode.Key, list);
+    }
+}

Moder.Core/Models/Character/SkillModifier.cs

@@ -1,4 +1,5 @@
-using ParadoxPower.Process;
+using Moder.Core.Models.Modifiers;
+using ParadoxPower.Process;
 
 namespace Moder.Core.Models.Character;
 
@@ -10,6 +11,6 @@ public sealed class SkillModifier
     public SkillModifier(ushort level, IEnumerable<Leaf> modifiers)
     {
         Level = level;
-        Modifiers = modifiers.Select(m => new Modifier(m)).ToArray();
+        Modifiers = modifiers.Select(Modifier.FromLeaf).ToArray();
     }
 }

Moder.Core/Models/Character/Trait.cs

@@ -1,4 +1,7 @@
-namespace Moder.Core.Models.Character;
+using Moder.Core.Models.Modifiers;
+using ParadoxPower.Process;
+
+namespace Moder.Core.Models.Character;
 
 /// <summary>
 /// 人物特质
@@ -7,10 +10,12 @@ public sealed class Trait
 {
     public string Name { get; }
     public TraitType Type { get; }
+    public IReadOnlyCollection<ModifierCollection> Modifiers { get; }
 
-    public Trait(string name, TraitType type)
+    public Trait(string name, TraitType type, IEnumerable<ModifierCollection> modifiers)
     {
         Name = name;
         Type = type;
+        Modifiers = modifiers.ToArray();
     }
-}
+}

Moder.Core/Models/Modifier.cs

@@ -0,0 +1,7 @@
+namespace Moder.Core.Models.Modifiers;
+
+public interface IModifier
+{
+    public string Name { get; }
+    public ModifierType Type { get; }
+}

Moder.Core/Models/Modifiers/IModifier.cs

@@ -0,0 +1,24 @@
+using Moder.Core.Extensions;
+using ParadoxPower.Process;
+
+namespace Moder.Core.Models.Modifiers;
+
+public sealed class Modifier : IModifier
+{
+    public string Name { get; }
+    public string Value { get; }
+    public GameValueType ValueType { get; }
+    public ModifierType Type => ModifierType.Leaf;
+
+    private Modifier(Leaf leaf)
+        : this(leaf.Key, leaf.ValueText, leaf.Value.ToLocalValueType()) { }
+
+    public static Modifier FromLeaf(Leaf leaf) => new(leaf);
+
+    public Modifier(string name, string value, GameValueType valueType)
+    {
+        Name = name;
+        Value = value;
+        ValueType = valueType;
+    }
+}

Moder.Core/Models/Modifiers/Modifier.cs

@@ -0,0 +1,19 @@
+namespace Moder.Core.Models.Modifiers;
+
+/// <summary>
+/// Modifier 集合, 只有需要 Modifier 节点的 Key 时才会使用到这个类
+/// </summary>
+public sealed class ModifierCollection
+{
+    /// <summary>
+    /// 容纳 Modifier 的 Key
+    /// </summary>
+    public string Key { get; }
+    public IEnumerable<IModifier> Modifiers { get; }
+
+    public ModifierCollection(string key, IEnumerable<IModifier> modifiers)
+    {
+        Key = key;
+        Modifiers = modifiers;
+    }
+}

Moder.Core/Models/Modifiers/ModifierCollection.cs

@@ -1,6 +1,6 @@
-namespace Moder.Core.Models;
+namespace Moder.Core.Models.Modifiers;
 
-public enum ModifierType : byte
+public enum ModifierEffectType : byte
 {
     Unknown,
     /// <summary>

Moder.Core/Models/ModifierType.cs …e/Models/Modifiers/ModifierEffectType.csModer.Core/Models/ModifierType.cs renamed to Moder.Core/Models/Modifiers/ModifierEffectType.cs Moder.Core/Models/ModifierType.cs renamed to Moder.Core/Models/Modifiers/ModifierEffectType.cs

@@ -0,0 +1,7 @@
+namespace Moder.Core.Models.Modifiers;
+
+public enum ModifierType : byte
+{
+    Leaf,
+    Node
+}

Moder.Core/Models/Modifiers/ModifierType.cs

@@ -0,0 +1,14 @@
+namespace Moder.Core.Models.Modifiers;
+
+public sealed class NodeModifier : IModifier
+{
+    public string Name { get; }
+    public IReadOnlyCollection<Modifier> Modifiers { get; }
+    public ModifierType Type => ModifierType.Node;
+
+    public NodeModifier(string name, IEnumerable<Modifier> modifiers)
+    {
+        Name = name;
+        Modifiers = modifiers.ToArray();
+    }
+}