Handle items specifying named variants and not groups

Allow item variants to specify group+name to handle duplicates Allow castable restrictions to define message & allow in/not in inventory, equipped/not equipped to be expressed Add test for elemental belt handling
hybrasyl · Aug 17, 2023 · 75aa33b · 75aa33b
1 parent 347aeef
commit 75aa33b
Show file tree

Hide file tree

Showing 207 changed files with 414 additions and 215 deletions.
diff --git a/src/Extensions/Item.cs b/src/Extensions/Item.cs
@@ -37,6 +37,10 @@ public partial class Item : ICategorizable, ILoadOnStart<Item>, IPostProcessable
     [XmlIgnore] public Guid ParentGuid { get; set; }
     [XmlIgnore] public Guid Variant { get; set; }
 
+    [XmlIgnore]
+    public bool HasVariants => Properties.Variants != null &&
+                               (Properties.Variants.Group?.Count > 0 || Properties.Variants.Name?.Count > 0);
+
     [XmlIgnore]
     [Obsolete("Use ParentGuid instead")]
     public Item ParentItem { get; set; }
@@ -94,7 +98,7 @@ public static void ProcessAll(IWorldDataManager manager)
     {
         var ret = new XmlProcessResult();
         foreach (var item in manager
-                     .Find<Item>(condition: x => x.Properties.Variants != null && x.Properties.Variants.Group.Count > 0)
+                     .Find<Item>(condition: x => x.HasVariants)
                      .ToList())
         {
             foreach (var group in item.Properties.Variants.Group)
@@ -126,6 +130,41 @@ public static void ProcessAll(IWorldDataManager manager)
                 }
             }
 
+            foreach (var name in item.Properties.Variants.Name)
+            {
+                item.Variants ??= new Dictionary<string, List<Item>>();
+                if (!manager.TryGetValue<VariantGroup>(name.Group, out var group))
+                {
+                    manager.FlagAsError(item, XmlError.ProcessingError, $"Variant group {name.Group} does not exist");
+                    ret.Errors[item.Guid] = $"Variant group {name.Group} does not exist";
+                    continue;
+                }
+
+                if (!item.Variants.ContainsKey(name.Group))
+                    item.Variants[name.Group] = new List<Item>();
+
+                var toApply = group.Variant.FirstOrDefault(x => x.Name == name.Value);
+
+                if (toApply == null)
+                {
+                    manager.FlagAsError(item, XmlError.ProcessingError, $"Variant group {name.Group}: variant {name.Value} does not exist");
+                    ret.Errors[item.Guid] = "Variant group {name.Group}: variant {name.Value} does not exist";
+                    continue;
+                }
+
+                try
+                {
+                    var variant = toApply.ResolveVariant(item);
+                    item.Variants[name.Group].Add(variant);
+                    manager.Add(variant);
+                    ret.AdditionalCount++;
+                }
+                catch (Exception ex)
+                {
+                    ret.Errors[item.Guid] = $"{item.Name}: failed to apply variant {toApply.Name}: {ex}";
+                }
+            }
+
             ret.TotalProcessed++;
         }
 

diff --git a/src/Extensions/Variant.cs b/src/Extensions/Variant.cs
@@ -22,6 +22,8 @@ namespace Hybrasyl.Xml.Objects;
 
 public partial class Variant
 {
+    public override string PrimaryKey => Name;
+
     public Item ResolveVariant(Item originalItem)
     {
         var variantItem = originalItem.Clone<Item>(true);

diff --git a/src/Extensions/VariantGroup.cs b/src/Extensions/VariantGroup.cs
@@ -18,16 +18,22 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Hybrasyl.Xml.Interfaces;
 
 namespace Hybrasyl.Xml.Objects;
 
 public partial class VariantGroup : ILoadOnStart<VariantGroup>
 {
     public override string PrimaryKey => Name;
-
-    public new static void LoadAll(IWorldDataManager manager, string path) =>
+
+    public new static void LoadAll(IWorldDataManager manager, string path)
+    {
         HybrasylEntity<VariantGroup>.LoadAll(manager, path);
+        foreach (var group in manager.Values<VariantGroup>())
+            foreach (var variant in group.Variant)
+                manager.Add(variant, $"{group.Name}-{variant.Name}");
+    }
 
     public Variant RandomVariant() => Variant.PickRandom();
 
@@ -49,4 +55,5 @@ public List<Item> ResolveVariants(Item originalItem)
 
         return ret;
     }
+
 }
diff --git a/src/Objects/Access.cs b/src/Objects/Access.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/AddStatus.cs b/src/Objects/AddStatus.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/Animation.cs b/src/Objects/Animation.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/AnimationGroup.cs b/src/Objects/AnimationGroup.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/ApiEndpoints.cs b/src/Objects/ApiEndpoints.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/Appearance.cs b/src/Objects/Appearance.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/BoardEffects.cs b/src/Objects/BoardEffects.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/BoardType.cs b/src/Objects/BoardType.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [XmlTypeAttribute(Namespace="http://www.hybrasyl.com/XML/Hybrasyl/2020-02")]
 public enum BoardType

diff --git a/src/Objects/Book.cs b/src/Objects/Book.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [XmlTypeAttribute(Namespace="http://www.hybrasyl.com/XML/Hybrasyl/2020-02")]
 public enum Book

diff --git a/src/Objects/CastCost.cs b/src/Objects/CastCost.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/CastModifier.cs b/src/Objects/CastModifier.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/CastModifierAdd.cs b/src/Objects/CastModifierAdd.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/CastModifierReplace.cs b/src/Objects/CastModifierReplace.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/CastModifierSubtract.cs b/src/Objects/CastModifierSubtract.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/CastRestriction.cs b/src/Objects/CastRestriction.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/Castable.cs b/src/Objects/Castable.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/CastableConeIntent.cs b/src/Objects/CastableConeIntent.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/CastableCrossIntent.cs b/src/Objects/CastableCrossIntent.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/CastableDamage.cs b/src/Objects/CastableDamage.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/CastableEffects.cs b/src/Objects/CastableEffects.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/CastableEffectsSound.cs b/src/Objects/CastableEffectsSound.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/CastableHeal.cs b/src/Objects/CastableHeal.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/CastableIntent.cs b/src/Objects/CastableIntent.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/CastableLineIntent.cs b/src/Objects/CastableLineIntent.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/CastableMastery.cs b/src/Objects/CastableMastery.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/CastableMotion.cs b/src/Objects/CastableMotion.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/CastableReactor.cs b/src/Objects/CastableReactor.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/CastableSquareIntent.cs b/src/Objects/CastableSquareIntent.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/CastableTileIntent.cs b/src/Objects/CastableTileIntent.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/Category.cs b/src/Objects/Category.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/Chat.cs b/src/Objects/Chat.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]

diff --git a/src/Objects/Class.cs b/src/Objects/Class.cs
@@ -19,7 +19,7 @@ namespace Hybrasyl.Xml.Objects
 using System.ComponentModel.DataAnnotations;
 using System.Collections.Generic;
 
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [XmlTypeAttribute(Namespace="http://www.hybrasyl.com/XML/Hybrasyl/2020-02")]
 public enum Class

diff --git a/src/Objects/ClassCastCost.cs b/src/Objects/ClassCastCost.cs
@@ -20,7 +20,7 @@ namespace Hybrasyl.Xml.Objects
 using System.Collections.Generic;
 
 [XmlInclude(typeof(CastCost))]
-[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9037.0")]
+[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
 [Serializable]
 [DebuggerStepThrough]
 [DesignerCategoryAttribute("code")]