1 files changed, 45 insertions, 29 deletions

diff --git a/src/Item.cpp b/src/Item.cpp
index 7e472f6d8..2c5deaddf 100644
--- a/src/Item.cpp
+++ b/src/Item.cpp
@@ -1,4 +1,4 @@
-
+
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Item.h"
@@ -41,33 +41,33 @@ short cItem::GetMaxDamage(void) const
 	switch (m_ItemType)
 	{
 		case E_ITEM_BOW:             return 384;
-		case E_ITEM_DIAMOND_AXE:     return 1563;
-		case E_ITEM_DIAMOND_HOE:     return 1563;
-		case E_ITEM_DIAMOND_PICKAXE: return 1563;
-		case E_ITEM_DIAMOND_SHOVEL:  return 1563;
-		case E_ITEM_DIAMOND_SWORD:   return 1563;
-		case E_ITEM_FLINT_AND_STEEL: return 65;
+		case E_ITEM_DIAMOND_AXE:     return 1561;
+		case E_ITEM_DIAMOND_HOE:     return 1561;
+		case E_ITEM_DIAMOND_PICKAXE: return 1561;
+		case E_ITEM_DIAMOND_SHOVEL:  return 1561;
+		case E_ITEM_DIAMOND_SWORD:   return 1561;
+		case E_ITEM_FLINT_AND_STEEL: return 64;
 		case E_ITEM_GOLD_AXE:        return 32;
 		case E_ITEM_GOLD_HOE:        return 32;
 		case E_ITEM_GOLD_PICKAXE:    return 32;
 		case E_ITEM_GOLD_SHOVEL:     return 32;
 		case E_ITEM_GOLD_SWORD:      return 32;
-		case E_ITEM_IRON_AXE:        return 251;
-		case E_ITEM_IRON_HOE:        return 251;
-		case E_ITEM_IRON_PICKAXE:    return 251;
-		case E_ITEM_IRON_SHOVEL:     return 251;
-		case E_ITEM_IRON_SWORD:      return 251;
-		case E_ITEM_SHEARS:          return 251;
-		case E_ITEM_STONE_AXE:       return 132;
-		case E_ITEM_STONE_HOE:       return 132;
-		case E_ITEM_STONE_PICKAXE:   return 132;
-		case E_ITEM_STONE_SHOVEL:    return 132;
-		case E_ITEM_STONE_SWORD:     return 132;
-		case E_ITEM_WOODEN_AXE:      return 60;
-		case E_ITEM_WOODEN_HOE:      return 60;
-		case E_ITEM_WOODEN_PICKAXE:  return 60;
-		case E_ITEM_WOODEN_SHOVEL:   return 60;
-		case E_ITEM_WOODEN_SWORD:    return 60;
+		case E_ITEM_IRON_AXE:        return 250;
+		case E_ITEM_IRON_HOE:        return 250;
+		case E_ITEM_IRON_PICKAXE:    return 250;
+		case E_ITEM_IRON_SHOVEL:     return 250;
+		case E_ITEM_IRON_SWORD:      return 250;
+		case E_ITEM_SHEARS:          return 250;
+		case E_ITEM_STONE_AXE:       return 131;
+		case E_ITEM_STONE_HOE:       return 131;
+		case E_ITEM_STONE_PICKAXE:   return 131;
+		case E_ITEM_STONE_SHOVEL:    return 131;
+		case E_ITEM_STONE_SWORD:     return 131;
+		case E_ITEM_WOODEN_AXE:      return 59;
+		case E_ITEM_WOODEN_HOE:      return 59;
+		case E_ITEM_WOODEN_PICKAXE:  return 59;
+		case E_ITEM_WOODEN_SHOVEL:   return 59;
+		case E_ITEM_WOODEN_SWORD:    return 59;
 	}
 	return 0;
 }
@@ -86,7 +86,7 @@ bool cItem::DamageItem(short a_Amount)
 	}
 
 	m_ItemDamage += a_Amount;
-	return (m_ItemDamage >= MaxDamage);
+	return (m_ItemDamage > MaxDamage);
 }
 
 
@@ -151,6 +151,8 @@ void cItem::GetJson(Json::Value & a_OutValue) const
 			a_OutValue["Colours"] = m_FireworkItem.ColoursToString(m_FireworkItem);
 			a_OutValue["FadeColours"] = m_FireworkItem.FadeColoursToString(m_FireworkItem);
 		}
+
+		a_OutValue["RepairCost"] = m_RepairCost;
 	}
 }
 
@@ -160,11 +162,11 @@ void cItem::GetJson(Json::Value & a_OutValue) const
 
 void cItem::FromJson(const Json::Value & a_Value)
 {
-	m_ItemType = (ENUM_ITEM_ID)a_Value.get("ID", -1 ).asInt();
+	m_ItemType = (ENUM_ITEM_ID)a_Value.get("ID", -1).asInt();
 	if (m_ItemType > 0)
 	{
-		m_ItemCount = (char)a_Value.get("Count", -1 ).asInt();
-		m_ItemDamage = (short)a_Value.get("Health", -1 ).asInt();
+		m_ItemCount = (char)a_Value.get("Count", -1).asInt();
+		m_ItemDamage = (short)a_Value.get("Health", -1).asInt();
 		m_Enchantments.Clear();
 		m_Enchantments.AddFromString(a_Value.get("ench", "").asString());
 		m_CustomName = a_Value.get("Name", "").asString();
@@ -179,6 +181,8 @@ void cItem::FromJson(const Json::Value & a_Value)
 			m_FireworkItem.ColoursFromString(a_Value.get("Colours", "").asString(), m_FireworkItem);
 			m_FireworkItem.FadeColoursFromString(a_Value.get("FadeColours", "").asString(), m_FireworkItem);
 		}
+
+		m_RepairCost = a_Value.get("RepairCost", 0).asInt();
 	}
 }
 
@@ -189,17 +193,29 @@ void cItem::FromJson(const Json::Value & a_Value)
 bool cItem::IsEnchantable(short item)
 {
 	if ((item >= 256) && (item <= 259))
+	{
 		return true;
+	}
 	if ((item >= 267) && (item <= 279))
+	{
 		return true;
-	if ((item >= 283) && (item <= 286))	
+	}
+	if ((item >= 283) && (item <= 286))
+	{
 		return true;
+	}
 	if ((item >= 290) && (item <= 294))
+	{
 		return true;
+	}
 	if ((item >= 298) && (item <= 317))
+	{
 		return true;
+	}
 	if ((item == 346) || (item == 359) || (item == 261))
+	{
 		return true;
+	}
 
 	return false;
 }
@@ -359,7 +375,7 @@ bool cItem::EnchantByXPLevels(int a_NumXPLevels)
 
 
 
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
 // cItems:
 
 cItem * cItems::Get(int a_Idx)