feat: random drops

Author: WeylonSantana

Framework/Intersect.Framework.Core/GameObjects/Drop.cs

@@ -6,5 +6,7 @@ public partial class Drop
 
     public Guid ItemId { get; set; }
 
-    public int Quantity { get; set; }
+    public int Quantity { get; set; } = 1;
+
+    public int MinQuantity { get; set; } = 1;
 }

Intersect.Editor/Forms/Editors/frmNpc.Designer.cs

@@ -211,7 +211,8 @@ private void InitLocalization()
 
         grpDrops.Text = Strings.NpcEditor.drops;
         lblDropItem.Text = Strings.NpcEditor.dropitem;
-        lblDropAmount.Text = Strings.NpcEditor.dropamount;
+        lblDropAmount.Text = Strings.NpcEditor.DropMaxAmount;
+        lblDropMinAmount.Text = Strings.NpcEditor.DropMinAmount;
         lblDropChance.Text = Strings.NpcEditor.dropchance;
         btnDropAdd.Text = Strings.NpcEditor.dropadd;
         btnDropRemove.Text = Strings.NpcEditor.dropremove;
@@ -446,7 +447,9 @@ private void UpdateDropValues(bool keepIndex = false)
             {
                 lstDrops.Items.Add(
                     Strings.NpcEditor.dropdisplay.ToString(
-                        ItemBase.GetName(mEditorItem.Drops[i].ItemId), mEditorItem.Drops[i].Quantity,
+                        ItemBase.GetName(mEditorItem.Drops[i].ItemId),
+                        mEditorItem.Drops[i].MinQuantity,
+                        mEditorItem.Drops[i].Quantity,
                         mEditorItem.Drops[i].Chance
                     )
                 );
@@ -726,25 +729,34 @@ private void nudExp_ValueChanged(object sender, EventArgs e)
 
     private void cmbDropItem_SelectedIndexChanged(object sender, EventArgs e)
     {
-        if (lstDrops.SelectedIndex > -1 && lstDrops.SelectedIndex < mEditorItem.Drops.Count)
+        if (lstDrops.SelectedIndex < 0 || lstDrops.SelectedIndex > lstDrops.Items.Count)
         {
-            mEditorItem.Drops[lstDrops.SelectedIndex].ItemId = ItemBase.IdFromList(cmbDropItem.SelectedIndex - 1);
+            return;
         }
 
+        mEditorItem.Drops[lstDrops.SelectedIndex].ItemId = ItemBase.IdFromList(cmbDropItem.SelectedIndex - 1);
         UpdateDropValues(true);
     }
 
     private void nudDropAmount_ValueChanged(object sender, EventArgs e)
     {
-        // This should never be below 1. We shouldn't accept giving 0 items!
-        nudDropAmount.Value = Math.Max(1, nudDropAmount.Value);
+        if (lstDrops.SelectedIndex < 0 || lstDrops.SelectedIndex > lstDrops.Items.Count)
+        {
+            return;
+        }
 
-        if (lstDrops.SelectedIndex < lstDrops.Items.Count)
+        mEditorItem.Drops[lstDrops.SelectedIndex].Quantity = (int)nudDropAmount.Value;
+        UpdateDropValues(true);
+    }
+
+    private void nudDropMinAmount_ValueChanged(object sender, EventArgs e)
+    {
+        if (lstDrops.SelectedIndex < 0 || lstDrops.SelectedIndex > lstDrops.Items.Count)
         {
             return;
         }
 
-        mEditorItem.Drops[(int)lstDrops.SelectedIndex].Quantity = (int)nudDropAmount.Value;
+        mEditorItem.Drops[lstDrops.SelectedIndex].MinQuantity = (int)nudDropMinAmount.Value;
         UpdateDropValues(true);
     }
 
@@ -754,6 +766,7 @@ private void lstDrops_SelectedIndexChanged(object sender, EventArgs e)
         {
             cmbDropItem.SelectedIndex = ItemBase.ListIndex(mEditorItem.Drops[lstDrops.SelectedIndex].ItemId) + 1;
             nudDropAmount.Value = mEditorItem.Drops[lstDrops.SelectedIndex].Quantity;
+            nudDropMinAmount.Value = mEditorItem.Drops[lstDrops.SelectedIndex].MinQuantity;
             nudDropChance.Value = (decimal)mEditorItem.Drops[lstDrops.SelectedIndex].Chance;
         }
     }
@@ -763,6 +776,7 @@ private void btnDropAdd_Click(object sender, EventArgs e)
         mEditorItem.Drops.Add(new Drop());
         mEditorItem.Drops[mEditorItem.Drops.Count - 1].ItemId = ItemBase.IdFromList(cmbDropItem.SelectedIndex - 1);
         mEditorItem.Drops[mEditorItem.Drops.Count - 1].Quantity = (int)nudDropAmount.Value;
+        mEditorItem.Drops[mEditorItem.Drops.Count - 1].MinQuantity = (int)nudDropMinAmount.Value;
         mEditorItem.Drops[mEditorItem.Drops.Count - 1].Chance = (double)nudDropChance.Value;
 
         UpdateDropValues();
@@ -782,7 +796,7 @@ private void btnDropRemove_Click(object sender, EventArgs e)
 
     private void nudDropChance_ValueChanged(object sender, EventArgs e)
     {
-        if (lstDrops.SelectedIndex < lstDrops.Items.Count)
+        if (lstDrops.SelectedIndex < 0 || lstDrops.SelectedIndex > lstDrops.Items.Count)
         {
             return;
         }

Intersect.Editor/Forms/Editors/frmNpc.cs

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
+  <!--
     Microsoft ResX Schema 
-    
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
     
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->