More Item Parameter updates

soopercool101 · Sep 21, 2023 · 499e300 · 499e300
1 parent 7d1d9d0
commit 499e300
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 52 deletions.
diff --git a/BrawlLib/SSBB/ResourceNodes/ItmParamNode.cs b/BrawlLib/SSBB/ResourceNodes/ItmParamNode.cs
@@ -642,46 +642,30 @@ public float Unknown0x24
             }
         }
 
-        [Category("Unknown")]
-        public float Unknown0x28
-        {
-            get => Data._unknown0x28;
-            set
-            {
-                Data._unknown0x28 = value;
-                SignalPropertyChange();
-            }
-        }
-
-        [Category("Unknown")]
-        public float Unknown0x2C
-        {
-            get => Data._unknown0x2C;
-            set
-            {
-                Data._unknown0x2C = value;
-                SignalPropertyChange();
-            }
-        }
-
-        [Category("Unknown")]
-        public float Unknown0x30
+        [Category("Item Parameters")]
+        [TypeConverter(typeof(Vector2StringConverter))]
+        [Description("Affects the box around which characters push away the item")]
+        public Vector2 CharacterColliderY
         {
-            get => Data._unknown0x30;
+            get => new Vector2(Data._characterColliderY1, Data._characterColliderY2);
             set
             {
-                Data._unknown0x30 = value;
+                Data._characterColliderY1 = value._x;
+                Data._characterColliderY2 = value._y;
                 SignalPropertyChange();
             }
         }
 
-        [Category("Unknown")]
-        public float Unknown0x34
+        [Category("Item Parameters")]
+        [TypeConverter(typeof(Vector2StringConverter))]
+        [Description("Affects the box around which characters push away the item")]
+        public Vector2 CharacterColliderX
         {
-            get => Data._unknown0x34;
+            get => new Vector2(Data._characterColliderX1, Data._characterColliderX2);
             set
             {
-                Data._unknown0x34 = value;
+                Data._characterColliderX1 = value._x;
+                Data._characterColliderX2 = value._y;
                 SignalPropertyChange();
             }
         }
@@ -803,8 +787,9 @@ public float SlideGravity
             }
         }
 
-        [Category("Unknown")]
-        public float Unknown0x64
+        [Category("Item Parameters")]
+        [Description("Ground velocity following horizontal aerial landing")]
+        public float GroundVelocity
         {
             get => Data._unknown0x64;
             set
@@ -814,8 +799,8 @@ public float Unknown0x64
             }
         }
 
-        [Category("Unknown")]
-        public float Unknown0x68
+        [Category("Item Parameters")]
+        public float BounceRecoilMultiplier
         {
             get => Data._unknown0x68;
             set
@@ -919,24 +904,24 @@ public float Unknown0x94
             }
         }
 
-        [Category("Unknown")]
-        public float Unknown0x98
+        [Category("Item Parameters")]
+        public float BaseDamageMultiplier
         {
-            get => Data._unknown0x98;
+            get => Data._baseDamageMultiplier;
             set
             {
-                Data._unknown0x98 = value;
+                Data._baseDamageMultiplier = value;
                 SignalPropertyChange();
             }
         }
 
-        [Category("Unknown")]
-        public float Unknown0x9C
+        [Category("Item Parameters")]
+        public float SpeedDamageMultiplier
         {
-            get => Data._unknown0x9C;
+            get => Data._speedDamageMultiplier;
             set
             {
-                Data._unknown0x9C = value;
+                Data._speedDamageMultiplier = value;
                 SignalPropertyChange();
             }
         }
@@ -988,13 +973,24 @@ public bool IsHeavy
             }
         }
 
+        public enum GrabType : int
+        {
+            NotGrabbable = 0,
+            AutomaticPickup = 1,
+            Type2 = 2,
+            Type3 = 3,
+            Type4 = 4,
+            Type5 = 5,
+            Type6 = 6
+        }
+
         [Category("Unknown")]
-        public int Unknown0xB0
+        public GrabType PickupType
         {
-            get => Data._unknown0xB0;
+            get => (GrabType) (int)Data._pickupType;
             set
             {
-                Data._unknown0xB0 = value;
+                Data._pickupType = (int)value;
                 SignalPropertyChange();
             }
         }
@@ -1222,6 +1218,7 @@ public bool IsAssistSummon
         }
 
         [Category("Item Parameters")]
+        [Description("Disables Kirby/Dedede inhalation (among possible other effects), used by Pokémon and Mr. Saturn")]
         public bool IsPokemon
         {
             get => Data._flags0xB6[3];

diff --git a/BrawlLib/SSBB/Types/ItmParam.cs b/BrawlLib/SSBB/Types/ItmParam.cs
@@ -18,10 +18,10 @@ public struct ItmParamEntry
         public bfloat _gravity;
         public bfloat _terminalVelocity;
         public bfloat _unknown0x24;
-        public bfloat _unknown0x28;
-        public bfloat _unknown0x2C;
-        public bfloat _unknown0x30;
-        public bfloat _unknown0x34;
+        public bfloat _characterColliderY1;
+        public bfloat _characterColliderY2;
+        public bfloat _characterColliderX1;
+        public bfloat _characterColliderX2;
         public bfloat _unknown0x38;
         public bfloat _unknown0x3C;
         public bfloat _grabRangeDistanceX;
@@ -46,13 +46,13 @@ public struct ItmParamEntry
         public bfloat _unknown0x8C;
         public bfloat _unknown0x90;
         public bfloat _unknown0x94;
-        public bfloat _unknown0x98;
-        public bfloat _unknown0x9C;
+        public bfloat _baseDamageMultiplier;
+        public bfloat _speedDamageMultiplier;
         public bfloat _itemScale;
         public bfloat _itemHealth;
         public bint _unknown0xA8;
         public bool32 _isHeavy;
-        public bint _unknown0xB0;
+        public bint _pickupType;
         public Bin8 _flags0xB4;
         public Bin8 _flags0xB5;
         public Bin8 _flags0xB6;