buffs can now be set to >100 days in length

nymda · Oct 24, 2020 · 76e2582 · 76e2582
1 parent 437c8c5
commit 76e2582
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 17 deletions.
diff --git a/WinTerrEdit/entry.Designer.cs b/WinTerrEdit/entry.Designer.cs
diff --git a/WinTerrEdit/entry.cs b/WinTerrEdit/entry.cs
@@ -412,6 +412,7 @@ public void loadData(string path)
                         extCounter = 0;
                     }
                 }
+                nudDur.Value = playerBuffs[0].duration;
             }
 
             //buff data has been found
@@ -603,6 +604,7 @@ private void btnLoad_Click(object sender, EventArgs e)
                         gbItems.Enabled = true;
                         gbBuffs.Enabled = true;
                         btnReload.Enabled = true;
+                        updateInvDisplay();
                     }
                     catch(Exception ex)
                     {
@@ -842,7 +844,6 @@ private void item_Click(object sender, EventArgs e)
                     nudDur.Value = playerBuffs[invSelectedIndex].duration;
                     cbBuffs.SelectedItem = playerBuffs[invSelectedIndex].buff.name;
                     gb_slot_buff.Text = "Buff slot " + (invSelectedIndex + 1);
-                    playerBuffs[invSelectedIndex].duration = (int)nudDur.Value;
                     break;
 
             }

diff --git a/WinTerrEdit/itemHandler.cs b/WinTerrEdit/itemHandler.cs
@@ -36,18 +36,31 @@ public int resolveEncodedData(int b1, int b2)
         {
             return b1 + (256 * b2);
         }
+        public int resolveBuff(int b1, int b2, int b3)
+        {
+            List<byte> bytes = new List<byte> { (byte)b1, (byte)b2, (byte)b3, 0x00 };
+            return BitConverter.ToInt32(bytes.ToArray(), 0);
+        }
         public List<int> encodeData(int inp)
         {
-            if(inp >= 0)
-            {
-                return new List<int> { inp % 256, inp / 256 };
-            }
-            else
-            {
-                return new List<int> { 0, 0 };
-            }
+            byte[] tmp = BitConverter.GetBytes(inp);
+            return new List<int> { tmp[0], tmp[1] };
+
+            //if (inp >= 0)
+            //{
+            //    return new List<int> { inp % 256, inp / 256 };
+            //}
+            //else
+            //{
+            //    return new List<int> { 0, 0 };
+            //}
 
         }
+        public List<int> encodeBuffs(int inp)
+        {
+            byte[] tmp = BitConverter.GetBytes(inp);
+            return new List<int> { tmp[0], tmp[1], tmp[2] };
+        }
         public baseItem searchItemByID(int id)
         {
             var res = globalTerrariaItems.Where(baseItem => baseItem.ID == id);
@@ -142,23 +155,26 @@ public playerBuff(List<int> terrData, itemHandler handler)
         {
             int id = handler.resolveEncodedData(terrData[0], terrData[1]);
             buff = handler.searchBuffById(id);
-            duration = handler.resolveEncodedData(terrData[4], terrData[5]);
+            duration = handler.resolveBuff(terrData[4], terrData[5], terrData[6]);
+            duration = duration / 60;
+            Console.WriteLine("LOADED DURATION: " + duration);
         }
 
         //returns the inventory item as a set of 10 bytes for reinserting into raw data
         public List<Byte> recompile(itemHandler handler)
         {
             List<Byte> final = new List<Byte> { };
             List<int> encodedItem = handler.encodeData(buff.ID);
-            List<int> encodedDuration = handler.encodeData(duration);
+            List<int> encodedDuration = handler.encodeBuffs(duration * 60);
+            Console.WriteLine("SAVED DURATION: " + duration * 60);
             //bytes 2, 3, 6, 7 and 9 seem to make the item dissapear if they are anything other than 0x00
             final.Add((byte)encodedItem[0]);
             final.Add((byte)encodedItem[1]);
             final.Add(0x00);
             final.Add(0x00);
             final.Add((byte)encodedDuration[0]);
             final.Add((byte)encodedDuration[1]);
-            final.Add(0x00);
+            final.Add((byte)encodedDuration[2]);
             final.Add(0x00);
             return final;
         }
@@ -173,7 +189,6 @@ public class baseItem
         public baseItem(string[] insertion)
         {
             //loads item data from array
-            Console.WriteLine(insertion[0]);
             this.ID = Int32.Parse(insertion[0]);
             this.name = insertion[1];
             this.name_internal = insertion[2];