Fixed some inconsistencies in how damage/speed of tools is calculated…

… in GUIs * Fixed damage not being calculated properly in Crafting Stations * Fixed Crafting Stations stonebound speed calculations (they were using a different algorithm) * Fixed typo that made GUIs show the primary mining speed of dual harvest twice * Fixed Stonebound damage bonus/loss always being truncated to an int in GUIs Conflicts: src/main/java/tconstruct/tools/gui/CraftingStationGui.java src/main/java/tconstruct/tools/gui/ToolStationGui.java
SlimeKnights · Jul 7, 2014 · d719885 · d719885
1 parent 41ff78b
commit d719885
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/main/java/tconstruct/tools/gui/CraftingStationGui.java b/src/main/java/tconstruct/tools/gui/CraftingStationGui.java
@@ -136,7 +136,7 @@ void drawModularToolStats (ItemStack stack, ToolCore tool, NBTTagCompound tags)
         // Attack
         if (categories.contains("weapon"))
         {
-            int attack = (int) (tags.getInteger("Attack"));
+            int attack = (int) (tags.getInteger("Attack"))+1;
             float stoneboundDamage = (float) Math.log(durability / 72f + 1) * -2 * stonebound;
             attack += stoneboundDamage;
             attack *= tool.getDamageModifier();
@@ -152,9 +152,10 @@ void drawModularToolStats (ItemStack stack, ToolCore tool, NBTTagCompound tags)
 
             if (stoneboundDamage != 0)
             {
+                DecimalFormat df = new DecimalFormat("##.##");
                 heart = stoneboundDamage == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9");
                 String bloss = stoneboundDamage > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5");
-                this.fontRendererObj.drawString(bloss + (int) stoneboundDamage / 2 + heart, xSize + 8, base + offset * 10, 0xffffff);
+                this.fontRendererObj.drawString(bloss + df.format(stoneboundDamage / 2f) + heart, xSize + 8, base + offset * 10, 0xffffff);
                 offset++;
             }
             offset++;
@@ -217,11 +218,11 @@ void drawModularToolStats (ItemStack stack, ToolCore tool, NBTTagCompound tags)
         {
             float mineSpeed = tags.getInteger("MiningSpeed") / 100f;
             float mineSpeed2 = tags.getInteger("MiningSpeed2") / 100f;
-            float stoneboundSpeed = (float) Math.log(durability / 90f + 1) * 2 * stonebound;
+            float stoneboundSpeed = (float) Math.log(durability / 72f + 1) * 2 * stonebound;
             DecimalFormat df = new DecimalFormat("##.##");
             df.setRoundingMode(RoundingMode.DOWN);
             float trueSpeed = mineSpeed + stoneboundSpeed;
-            float trueSpeed2 = mineSpeed + stoneboundSpeed;
+            float trueSpeed2 = mineSpeed2 + stoneboundSpeed;
 
             fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation12"), xSize + 8, base + offset * 10, 0xffffff);
             offset++;
@@ -266,7 +267,7 @@ else if (categories.contains("harvest"))
 
             float trueSpeed = mineSpeed / (heads * 100f);
 
-            float stoneboundSpeed = (float) Math.log(durability / 90f + 1) * 2 * stonebound;
+            float stoneboundSpeed = (float) Math.log(durability / 72f + 1) * 2 * stonebound;
             DecimalFormat df = new DecimalFormat("##.##");
             df.setRoundingMode(RoundingMode.DOWN);
             trueSpeed += stoneboundSpeed;

diff --git a/src/main/java/tconstruct/tools/gui/ToolStationGui.java b/src/main/java/tconstruct/tools/gui/ToolStationGui.java
@@ -231,9 +231,10 @@ void drawModularToolStats (ItemStack stack, ToolCore tool, NBTTagCompound tags)
 
             if (stoneboundDamage != 0)
             {
+                DecimalFormat df = new DecimalFormat("##.##");
                 heart = stoneboundDamage == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9");
                 String bloss = stoneboundDamage > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5");
-                this.fontRendererObj.drawString(bloss + (int) stoneboundDamage / 2 + heart, 294, base + offset * 10, 0xffffff);
+                this.fontRendererObj.drawString(bloss + df.format(stoneboundDamage / 2f) + heart, xSize + 8, base + offset * 10, 0xffffff);
                 offset++;
             }
             offset++;
@@ -300,7 +301,7 @@ void drawModularToolStats (ItemStack stack, ToolCore tool, NBTTagCompound tags)
             DecimalFormat df = new DecimalFormat("##.##");
             df.setRoundingMode(RoundingMode.DOWN);
             float trueSpeed = mineSpeed + stoneboundSpeed;
-            float trueSpeed2 = mineSpeed + stoneboundSpeed;
+            float trueSpeed2 = mineSpeed2 + stoneboundSpeed;
 
             fontRendererObj.drawString(StatCollector.translateToLocal("gui.toolstation12"), 294, base + offset * 10, 0xffffff);
             offset++;