formatting etc

hybrasyl · May 20, 2024 · 638534e · 638534e
1 parent 5ff881d
commit 638534e
Show file tree

Hide file tree

Showing 18 changed files with 37 additions and 69 deletions.
diff --git a/src/Extensions/Creature.cs b/src/Extensions/Creature.cs
@@ -17,6 +17,7 @@
 // For contributors and individual authors please refer to CONTRIBUTORS.MD.
 
 using System;
+using System.Linq;
 using System.Xml.Serialization;
 using Hybrasyl.Xml.Interfaces;
 using Hybrasyl.Xml.Manager;

diff --git a/src/Extensions/HybrasylEntity.cs b/src/Extensions/HybrasylEntity.cs
@@ -16,30 +16,17 @@
 // 
 // For contributors and individual authors please refer to CONTRIBUTORS.MD.
 
-/* Unmerged change from project 'Hybrasyl.Xml (net7.0)'
-Before:
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Hybrasyl.Xml.Enums;
-After:
-using Hybrasyl.Xml.Enums;
-using Hybrasyl.Collections.Interfaces;
-using System.Xml.Manager;
+using Hybrasyl.Xml.Interfaces;
+using Hybrasyl.Xml.Manager;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Bson;
-using Hybrasyl.NET;
-*/
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Hybrasyl.Xml.Enums;
-using Hybrasyl.Xml.Interfaces;
+using Pluralize.NET;
 
 namespace Hybrasyl.Xml.Objects;
 

diff --git a/src/Extensions/Variant.cs b/src/Extensions/Variant.cs
@@ -48,7 +48,7 @@ public Item ResolveVariant(Item originalItem)
         // ensure boot hiding is carried to variants
         variantItem.Properties.Appearance.HideBoots = originalItem.Properties.Appearance.HideBoots;
         if (Properties.Restrictions?.Level != null)
-            variantItem.Properties.Restrictions.Level.Min = (byte) Math.Min(99,
+            variantItem.Properties.Restrictions.Level.Min = (byte)Math.Min(99,
                 variantItem.Properties.Restrictions.Level.Min + Properties.Restrictions.Level.Min);
 
         if (Properties.Appearance != null)
@@ -60,13 +60,13 @@ public Item ResolveVariant(Item originalItem)
         if (originalItem.Properties.Equipment.Slot == EquipmentSlot.Weapon && Properties.Damage != null)
         {
             variantItem.Properties.Damage.LargeMin =
-                (ushort) (originalItem.Properties.Damage.LargeMin * Properties.Damage.LargeMin);
+                (ushort)(originalItem.Properties.Damage.LargeMin * Properties.Damage.LargeMin);
             variantItem.Properties.Damage.LargeMax =
-                (ushort) (originalItem.Properties.Damage.LargeMax * Properties.Damage.LargeMax);
+                (ushort)(originalItem.Properties.Damage.LargeMax * Properties.Damage.LargeMax);
             variantItem.Properties.Damage.SmallMin =
-                (ushort) (originalItem.Properties.Damage.SmallMin * Properties.Damage.SmallMin);
+                (ushort)(originalItem.Properties.Damage.SmallMin * Properties.Damage.SmallMin);
             variantItem.Properties.Damage.SmallMin =
-                (ushort) (originalItem.Properties.Damage.SmallMin * Properties.Damage.SmallMin);
+                (ushort)(originalItem.Properties.Damage.SmallMin * Properties.Damage.SmallMin);
         }
 
         if (Properties.StatModifiers?.BaseDefensiveElement != null)
@@ -83,6 +83,7 @@ public Item ResolveVariant(Item originalItem)
             variantItem.Properties.StatModifiers.BaseDefensiveElement =
                 Properties.StatModifiers?.BaseOffensiveElement ?? ElementType.None;
 
+        variantItem.Properties.Tags.AddRange(Properties.Tags);
         return variantItem;
     }
 }
diff --git a/src/Interfaces/IWorldDataManager.cs b/src/Interfaces/IWorldDataManager.cs
@@ -17,17 +17,11 @@
 // For contributors and individual authors please refer to CONTRIBUTORS.MD.
 
 using System;
+using System.Collections.Generic;
 using Hybrasyl.Xml.Enums;
 using Hybrasyl.Xml.Manager;
 using Hybrasyl.Xml.Objects;
-
-/* Unmerged change from project 'Hybrasyl.Xml (net7.0)'
-Before:
-using System;
-After:
-using System.Collections.Generic;
-*/
-
+using Serilog;
 
 namespace Hybrasyl.Xml.Interfaces;
 

diff --git a/src/Manager/XmlManager.cs b/src/Manager/XmlManager.cs
@@ -27,31 +27,8 @@
 using Hybrasyl.Xml.Enums;
 using Hybrasyl.Xml.Interfaces;
 using Hybrasyl.Xml.Objects;
-
-/* Unmerged change from project 'Hybrasyl.Xml (net7.0)'
-Before:
-using System.Linq;
-using System.Reflection;
-using System.Security.Cryptography;
-using System.Text;
-using System.Threading.Tasks;
-using Hybrasyl.Xml.Enums;
-using Hybrasyl.Xml.Interfaces;
-using Hybrasyl.Xml.Objects;
 using Pluralize.NET;
 using Serilog;
-After:
-using Pluralize.NET;
-using Serilog;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Hybrasyl.Xml.Reflection;
-using System.Security.Cryptography;
-using System.Text;
-using System.Threading.Tasks;
-*/
 
 namespace Hybrasyl.Xml.Manager;
 

diff --git a/src/Objects/Creature.cs b/src/Objects/Creature.cs
@@ -38,7 +38,7 @@ public partial class Creature : HybrasylEntity<Creature>
     private string _behaviorSet;
     private int _minDmg;
     private int _maxDmg;
-    private sbyte _assailSound;
+    private byte _assailSound;
     #endregion
 
     public Creature()
@@ -178,7 +178,7 @@ public int MaxDmg
     }
 
     [XmlAttribute]
-    public sbyte AssailSound
+    public byte AssailSound
     {
         get
         {

diff --git a/src/Objects/ElementTableSourceElement.cs b/src/Objects/ElementTableSourceElement.cs
@@ -28,12 +28,11 @@ public partial class ElementTableSourceElement : HybrasylEntity<ElementTableSour
 {
     #region Private fields
     private List<ElementTableTargetElement> _target;
-    private List<ElementType> _element;
+    private ElementType _element;
     #endregion
 
     public ElementTableSourceElement()
     {
-        _element = new List<ElementType>();
         _target = new List<ElementTableTargetElement>();
     }
 
@@ -51,7 +50,7 @@ public List<ElementTableTargetElement> Target
     }
 
     [XmlAttribute]
-    public List<ElementType> Element
+    public ElementType Element
     {
         get
         {

diff --git a/src/Objects/ElementTableTargetElement.cs b/src/Objects/ElementTableTargetElement.cs
@@ -27,17 +27,13 @@ namespace Hybrasyl.Xml.Objects
 public partial class ElementTableTargetElement : HybrasylEntity<ElementTableTargetElement>
 {
     #region Private fields
-    private List<ElementType> _element;
+    private ElementType _element;
     private double _multiplier;
     #endregion
 
-    public ElementTableTargetElement()
-    {
-        _element = new List<ElementType>();
-    }
 
     [XmlAttribute]
-    public List<ElementType> Element
+    public ElementType Element
     {
         get
         {

diff --git a/src/Objects/EquipmentRestriction.cs b/src/Objects/EquipmentRestriction.cs
@@ -27,20 +27,17 @@ namespace Hybrasyl.Xml.Objects
 public partial class EquipmentRestriction : HybrasylEntity<EquipmentRestriction>
 {
     #region Private fields
-    private List<WeaponType> _weaponType;
+
+    private WeaponType _weaponType = WeaponType.None;
     private EquipmentSlot _slot;
     private RestrictionType _restrictionType;
     private string _message;
     private string _value;
     #endregion
 
-    public EquipmentRestriction()
-    {
-        _weaponType = new List<WeaponType>();
-    }
 
     [XmlAttribute]
-    public List<WeaponType> WeaponType
+    public WeaponType WeaponType
     {
         get
         {

diff --git a/tests/Entities.cs b/tests/Entities.cs
@@ -17,6 +17,7 @@
 // For contributors and individual authors please refer to CONTRIBUTORS.MD.
 
 using Hybrasyl.Xml.Objects;
+using Xunit;
 
 namespace Hybrasyl.XmlTests;
 

diff --git a/tests/Immunities.cs b/tests/Immunities.cs
@@ -17,6 +17,8 @@
 // For contributors and individual authors please refer to CONTRIBUTORS.MD.
 
 using Hybrasyl.Xml.Objects;
+using Xunit;
+using Xunit.Abstractions;
 
 namespace Hybrasyl.XmlTests;
 

diff --git a/tests/Localization.cs b/tests/Localization.cs
@@ -17,6 +17,7 @@
 // For contributors and individual authors please refer to CONTRIBUTORS.MD.
 
 using Hybrasyl.Xml.Objects;
+using Xunit;
 
 namespace Hybrasyl.XmlTests;
 

diff --git a/tests/Settings.cs b/tests/Settings.cs
@@ -16,6 +16,9 @@
 // 
 // For contributors and individual authors please refer to CONTRIBUTORS.MD.
 
+using Newtonsoft.Json;
+using Serilog;
+
 namespace Hybrasyl.XmlTests;
 
 public class Settings

diff --git a/tests/StoreKey.cs b/tests/StoreKey.cs
@@ -17,6 +17,7 @@
 // For contributors and individual authors please refer to CONTRIBUTORS.MD.
 
 using Hybrasyl.Xml.Manager;
+using Xunit;
 
 namespace Hybrasyl.XmlTests;
 

diff --git a/tests/XmlEntities.cs b/tests/XmlEntities.cs
@@ -17,6 +17,8 @@
 // For contributors and individual authors please refer to CONTRIBUTORS.MD.
 
 using Hybrasyl.Xml.Objects;
+using Xunit;
+using Xunit.Abstractions;
 
 namespace Hybrasyl.XmlTests;
 

diff --git a/tests/XmlManager.cs b/tests/XmlManager.cs
@@ -19,6 +19,10 @@
 using Hybrasyl.Xml.Enums;
 using Hybrasyl.Xml.Manager;
 using Hybrasyl.Xml.Objects;
+using Serilog;
+using Serilog.Sinks.TestCorrelator;
+using Xunit;
+using Xunit.Abstractions;
 
 [assembly: CollectionBehavior(DisableTestParallelization = true)]
 

diff --git a/tests/XmlManagerFixture.cs b/tests/XmlManagerFixture.cs
@@ -18,6 +18,7 @@
 
 using System.Diagnostics;
 using Hybrasyl.Xml.Manager;
+using Serilog;
 
 namespace Hybrasyl.XmlTests;
 

diff --git a/tests/XmlStore.cs b/tests/XmlStore.cs
@@ -19,6 +19,7 @@
 using Hybrasyl.Xml.Enums;
 using Hybrasyl.Xml.Manager;
 using Hybrasyl.Xml.Objects;
+using Xunit;
 
 namespace Hybrasyl.XmlTests;