add mineResist and minPick fields to ModTile

guyde2011 · Aug 1, 2015 · 3642a20 · 3642a20
1 parent dfef4bf
commit 3642a20
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/Terraria.ModLoader/ModTile.cs b/Terraria.ModLoader/ModTile.cs
@@ -31,6 +31,8 @@ public ushort Type
     public int animationFrameHeight = 0;
     public Color? mapColor = null;
     public string mapName = "";
+    public float mineResist = 1f;
+    public int minPick = 0;
 
     public void AddToArray(ref int[] array)
     {

diff --git a/Terraria.ModLoader/TileLoader.cs b/Terraria.ModLoader/TileLoader.cs
@@ -683,4 +683,33 @@ internal static bool TileFrame(int i, int j, int type, ref bool resetFrame, ref
         }
         return flag;
     }
+
+    //in Terraria.Player.ItemCheck in if statements for mining
+    //  replace num222 += item.hammer; with TileLoader.MineDamage(item.hammer, ref num222);
+    //  replace num222 += item.axe; with TileLoader.MineDamage(item.axe, ref num222);
+    //in Terraria.Player.PickTile replace num += pickPower; with TileLoader.MineDamage(pickPower, ref num);
+    internal static void MineDamage(int minePower, ref int damage)
+    {
+        Tile target = Main.tile[Player.tileTargetX, Player.tileTargetY];
+        ModTile modTile = GetTile(target.type);
+        if(modTile != null)
+        {
+            damage = (int)(damage + minePower / modTile.mineResist);
+        }
+        else
+        {
+            damage += minePower;
+        }
+    }
+
+    //in Terraria.Player.ItemCheck at end of else if chain setting num to 0 add
+    //  else { TileLoader.PickPowerCheck(tile, pickPower, ref num); }
+    internal static void PickPowerCheck(Tile target, int pickPower, ref int damage)
+    {
+        ModTile modTile = GetTile(target.type);
+        if(modTile != null && pickPower < modTile.minPick)
+        {
+            damage = 0;
+        }
+    }
 }}