Merge branch 'development' into masterIntoDev

AscensionGameDev · Apr 6, 2020 · 8a36b82 · 8a36b82
2 parents 3ff3d7d + 3641c1f
commit 8a36b82
Show file tree

Hide file tree

Showing 45 changed files with 640 additions and 249 deletions.
diff --git a/Intersect (Core)/Config/Options.cs b/Intersect (Core)/Config/Options.cs
@@ -50,6 +50,8 @@ public class Options
 
         [JsonProperty("Player")] public PlayerOptions PlayerOpts = new PlayerOptions();
 
+        [JsonProperty("Party")] public PartyOptions PartyOpts = new PartyOptions();
+
         [JsonProperty("Security")] public SecurityOptions SecurityOpts = new SecurityOptions();
 
         public SmtpSettings SmtpSettings = new SmtpSettings();
@@ -79,9 +81,13 @@ public class Options
 
         public static int RequestTimeout => Instance.PlayerOpts.RequestTimeout;
 
-        public static int TradeRange => Instance.PlayerOpts.TradeRange;
+        public static int PartyInviteRange => Instance.PartyOpts.InviteRange;
+
+        public static int PartySharedXpRange => Instance.PartyOpts.SharedXpRange;
 
-        public static int PartyRange => Instance.PlayerOpts.PartyRange;
+        public static int PartyStartCommonEventRange => Instance.PartyOpts.NpcDeathCommonEventStartRange;
+
+        public static int TradeRange => Instance.PlayerOpts.TradeRange;
 
         public static int WeaponIndex => Instance.EquipmentOpts.WeaponSlot;
 

diff --git a/Intersect (Core)/Config/PartyOptions.cs b/Intersect (Core)/Config/PartyOptions.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Intersect.Config
+{
+    public class PartyOptions
+    {
+
+        public int InviteRange = 40;
+
+        public int SharedXpRange = 40;
+
+        public int NpcDeathCommonEventStartRange = 0;
+
+    }
+}
diff --git a/Intersect (Core)/Config/PlayerOptions.cs b/Intersect (Core)/Config/PlayerOptions.cs
@@ -18,8 +18,6 @@ public class PlayerOptions
 
         public int MaxStat = 255;
 
-        public int PartyRange = 80;
-
         public int RequestTimeout = 300000;
 
         public int TradeRange = 6;

diff --git a/Intersect (Core)/Crypto/RsaUtils.cs b/Intersect (Core)/Crypto/RsaUtils.cs
diff --git a/Intersect (Core)/Enums/SwitchVariableTypes.cs b/Intersect (Core)/Enums/SwitchVariableTypes.cs
@@ -23,6 +23,8 @@ public enum VariableTypes
 
     }
 
+    //Should properly seperate static value, player & global vars into a seperate enum.
+    //But technical debt :/
     public enum VariableMods
     {
 
@@ -50,6 +52,29 @@ public enum VariableMods
 
         Replace,
 
+        Multiply,
+
+        MultiplyPlayerVar,
+
+        MultiplyGlobalVar,
+
+        Divide,
+
+        DividePlayerVar,
+
+        DivideGlobalVar,
+
+        LeftShift,
+
+        LeftShiftPlayerVar,
+
+        LeftShiftGlobalVar,
+
+        RightShift,
+
+        RightShiftPlayerVar,
+
+        RightShiftGlobalVar
     }
 
     public enum VariableComparators

diff --git a/Intersect (Core)/GameObjects/Events/EventMoveRoute.cs b/Intersect (Core)/GameObjects/Events/EventMoveRoute.cs
@@ -8,11 +8,6 @@ namespace Intersect.GameObjects.Events
 
     public class EventMoveRoute
     {
-
-        public EventMoveRoute()
-        {
-        }
-
         public List<MoveRouteAction> Actions { get; set; } = new List<MoveRouteAction>();
 
         public bool IgnoreIfBlocked { get; set; }

diff --git a/Intersect (Core)/GameObjects/Maps/MapAttribute.cs b/Intersect (Core)/GameObjects/Maps/MapAttribute.cs
@@ -9,11 +9,6 @@ namespace Intersect.GameObjects.Maps
 
     public abstract class MapAttribute
     {
-
-        public MapAttribute()
-        {
-        }
-
         public abstract MapAttributes Type { get; }
 
         public static MapAttribute CreateAttribute(MapAttributes type)

diff --git a/Intersect (Core)/Intersect (Core).csproj b/Intersect (Core)/Intersect (Core).csproj
@@ -192,6 +192,7 @@
     <Compile Include="Configuration\ConfigurationHelper.cs" />
     <Compile Include="Config\ChatOptions.cs" />
     <Compile Include="Config\PacketOptions.cs" />
+    <Compile Include="Config\PartyOptions.cs" />
     <Compile Include="Config\SecurityOptions.cs" />
     <Compile Include="Core\ApplicationContext.cs" />
     <Compile Include="Core\ExperimentalFeatures\CommonExperiments.Core.cs" />
@@ -219,7 +220,6 @@
     <Compile Include="Config\Passability.cs" />
     <Compile Include="Console.cs" />
     <Compile Include="Config\SmtpSettings.cs" />
-    <Compile Include="Crypto\RsaUtils.cs" />
     <Compile Include="CustomColors.cs" />
     <Compile Include="ErrorHandling\ExceptionInfo.cs" />
     <Compile Include="Extensions\ArrayExtensions.cs" />

diff --git a/Intersect (Core)/Logging/Formatting/DefaultFormatter.cs b/Intersect (Core)/Logging/Formatting/DefaultFormatter.cs
@@ -120,7 +120,6 @@ private string FormatPrefix([NotNull] LogConfiguration configuration, LogLevel l
             }
 
             var innerException = exception;
-            ;
             while ((innerException = innerException.InnerException) != null)
             {
                 builder.AppendLine(@"Caused By");

diff --git a/Intersect (Core)/Network/CerasPacket.cs b/Intersect (Core)/Network/CerasPacket.cs
@@ -10,13 +10,8 @@ namespace Intersect.Network
 
     public abstract class CerasPacket : IPacket
     {
-
         [NotNull] private static readonly Ceras sCerasInstance = new Ceras(true);
 
-        protected CerasPacket()
-        {
-        }
-
         /// <inheritdoc />
         public virtual void Dispose()
         {

diff --git a/Intersect (Core)/Network/NetworkStatus.cs b/Intersect (Core)/Network/NetworkStatus.cs
@@ -16,7 +16,7 @@ public enum NetworkStatus
         VersionMismatch,
 
         ServerFull,
-
+        
         HandshakeFailure,
 
         Quitting,

diff --git a/Intersect (Core)/Properties/AssemblyInfo.cs b/Intersect (Core)/Properties/AssemblyInfo.cs
@@ -38,5 +38,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("0.6.1.0")]
-[assembly: AssemblyFileVersion("0.6.1.0")]
+[assembly: AssemblyVersion("0.6.2.0")]
+[assembly: AssemblyFileVersion("0.6.2.0")]
diff --git a/Intersect.Client.Framework/File Management/GameContentManager.cs b/Intersect.Client.Framework/File Management/GameContentManager.cs
@@ -5,6 +5,7 @@
 
 using Intersect.Client.Framework.Audio;
 using Intersect.Client.Framework.Graphics;
+using Intersect.Logging;
 
 namespace Intersect.Client.Framework.File_Management
 {
@@ -400,8 +401,9 @@ public virtual void SaveUIJson(UI stage, string name, string json, string resolu
                     {
                         File.WriteAllText(path, json);
                     }
-                    catch (Exception)
+                    catch (Exception exception)
                     {
+                        Log.Debug(exception);
                     }
 
                     return;
@@ -413,8 +415,9 @@ public virtual void SaveUIJson(UI stage, string name, string json, string resolu
             {
                 File.WriteAllText(path, json);
             }
-            catch (Exception)
+            catch (Exception exception)
             {
+                Log.Debug(exception);
             }
         }
 

diff --git a/Intersect.Client.Framework/GenericClasses/OpenFileDialog.cs b/Intersect.Client.Framework/GenericClasses/OpenFileDialog.cs
@@ -10,11 +10,6 @@ public enum DialogResult
 
     public class OpenFileDialog
     {
-
-        public OpenFileDialog()
-        {
-        }
-
         public string Title { get; set; }
 
         public string InitialDirectory { get; set; }

diff --git a/Intersect.Client.Framework/GenericClasses/SaveFileDialog.cs b/Intersect.Client.Framework/GenericClasses/SaveFileDialog.cs
@@ -3,11 +3,6 @@
 
     public class SaveFileDialog
     {
-
-        public SaveFileDialog()
-        {
-        }
-
         public string Title { get; set; }
 
         public string InitialDirectory { get; set; }

diff --git a/Intersect.Client.Framework/Gwen/Control/Base.cs b/Intersect.Client.Framework/Gwen/Control/Base.cs
@@ -11,6 +11,9 @@
 using Intersect.Client.Framework.Gwen.ControlInternal;
 using Intersect.Client.Framework.Gwen.DragDrop;
 using Intersect.Client.Framework.Gwen.Input;
+#if DEBUG
+using Intersect.Logging;
+#endif
 
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -1097,8 +1100,7 @@ private bool HasNamedChildren()
 #if DEBUG
         ~Base()
         {
-            //throw new InvalidOperationException(String.Format("IDisposable object finalized [{1:X}]: {0}", this, GetHashCode()));
-            ////debug.print(String.Format("IDisposable object finalized: {0}", GetType()));
+            Log.Debug($"IDisposable object finalized: {GetType()}");
         }
 #endif
 

diff --git a/Intersect.Client.Framework/Gwen/Renderer/Base.cs b/Intersect.Client.Framework/Gwen/Renderer/Base.cs
@@ -1,7 +1,10 @@
-using System;
-
-using Intersect.Client.Framework.GenericClasses;
+using Intersect.Client.Framework.GenericClasses;
 using Intersect.Client.Framework.Graphics;
+#if DEBUG
+using Intersect.Logging;
+#endif
+
+using System;
 
 namespace Intersect.Client.Framework.Gwen.Renderer
 {
@@ -96,8 +99,7 @@ public virtual void Dispose()
 #if DEBUG
         ~Base()
         {
-            //throw new InvalidOperationException(String.Format("IDisposable object finalized: {0}", GetType()));
-            ////debug.print(String.Format("IDisposable object finalized: {0}", GetType()));
+            Log.Debug($"IDisposable object finalized: {GetType()}");
         }
 #endif
 

diff --git a/Intersect.Client.Framework/Gwen/Skin/Base.cs b/Intersect.Client.Framework/Gwen/Skin/Base.cs
@@ -1,8 +1,12 @@
-using System;
-
-using Intersect.Client.Framework.GenericClasses;
+using Intersect.Client.Framework.GenericClasses;
 using Intersect.Client.Framework.Graphics;
 
+using System;
+
+#if DEBUG
+using Intersect.Logging;
+#endif
+
 namespace Intersect.Client.Framework.Gwen.Skin
 {
 
@@ -56,8 +60,7 @@ public virtual void Dispose()
 #if DEBUG
         ~Base()
         {
-            //throw new InvalidOperationException(String.Format("IDisposable object finalized: {0}", GetType()));
-            ////debug.print(String.Format("IDisposable object finalized: {0}", GetType()));
+            Log.Debug($"IDisposable object finalized: {GetType()}");
         }
 #endif
 

diff --git a/Intersect.Client.Framework/Properties/AssemblyInfo.cs b/Intersect.Client.Framework/Properties/AssemblyInfo.cs
@@ -34,5 +34,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.6.1.0")]
-[assembly: AssemblyFileVersion("0.6.1.0")]
+[assembly: AssemblyVersion("0.6.2.0")]
+[assembly: AssemblyFileVersion("0.6.2.0")]
diff --git a/Intersect.Client/Interface/Game/Draggable.cs b/Intersect.Client/Interface/Game/Draggable.cs
@@ -61,7 +61,6 @@ public void Dispose()
                 Active = null;
             }
 
-            ;
             Interface.GameUi.GameCanvas.RemoveChild(mPnl, false);
         }
 

diff --git a/Intersect.Client/Items/Item.cs b/Intersect.Client/Items/Item.cs
@@ -17,10 +17,6 @@ public class Item
 
         public int[] StatBuffs = new int[(int) Stats.StatCount];
 
-        public Item()
-        {
-        }
-
         public ItemBase Base => ItemBase.Get(ItemId);
 
         public void Load(Guid id, int quantity, Guid? bagId, int[] statBuffs)

diff --git a/Intersect.Client/MonoGame/Graphics/MonoTileBuffer.cs b/Intersect.Client/MonoGame/Graphics/MonoTileBuffer.cs
@@ -176,16 +176,11 @@ public override bool SetData()
 
         public override void Dispose()
         {
-            if (vertexBuffer != null)
-            {
-                ;
-            }
-
-            vertexBuffer.Dispose();
+            vertexBuffer?.Dispose();
             vertexBuffer = null;
-            indexBuffer.Dispose();
-            TileBufferCount--;
+            indexBuffer?.Dispose();
             indexBuffer = null;
+            TileBufferCount--;
             disposed = true;
         }
 

diff --git a/Intersect.Client/MonoGame/Network/MonoSocket.cs b/Intersect.Client/MonoGame/Network/MonoSocket.cs
@@ -21,10 +21,6 @@ public class MonoSocket : GameSocket
         public static ConcurrentQueue<KeyValuePair<IConnection, IPacket>> PacketQueue =
             new ConcurrentQueue<KeyValuePair<IConnection, IPacket>>();
 
-        public MonoSocket()
-        {
-        }
-
         public override void Connect(string host, int port)
         {
             if (ClientLidgrenNetwork != null)

diff --git a/Intersect.Client/Properties/AssemblyInfo.cs b/Intersect.Client/Properties/AssemblyInfo.cs
@@ -38,5 +38,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("0.6.1.0")]
-[assembly: AssemblyFileVersion("0.6.1.0")]
+[assembly: AssemblyVersion("0.6.2.0")]
+[assembly: AssemblyFileVersion("0.6.2.0")]