Merge pull request #1684 from jonfabe/DepthStrider

Add Depth Strider enchantment

src/Enchantments.cpp

@@ -183,6 +183,7 @@ int cEnchantments::StringToEnchantmentID(const AString & a_EnchantmentName)
 		{ enchRespiration,          "Respiration"},
 		{ enchAquaAffinity,         "AquaAffinity"},
 		{ enchThorns,               "Thorns"},
+		{ enchDepthStrider,         "DepthStrider"},
 		{ enchSharpness,            "Sharpness"},
 		{ enchSmite,                "Smite"},
 		{ enchBaneOfArthropods,     "BaneOfArthropods"},
@@ -506,6 +507,20 @@ void cEnchantments::AddItemEnchantmentWeights(cWeightedEnchantments & a_Enchantm
 			{
 				AddEnchantmentWeightToVector(a_Enchantments, 5, enchFeatherFalling, 1);
 			}
+			
+			// Depth Strider
+			if ((a_EnchantmentLevel >= 30) && (a_EnchantmentLevel <= 45))
+			{
+				AddEnchantmentWeightToVector(a_Enchantments, 2, enchDepthStrider, 3);
+			}
+			else if ((a_EnchantmentLevel >= 20) && (a_EnchantmentLevel <= 35))
+			{
+				AddEnchantmentWeightToVector(a_Enchantments, 2, enchDepthStrider, 2);
+			}
+			else if ((a_EnchantmentLevel >= 10) && (a_EnchantmentLevel <= 25))
+			{
+				AddEnchantmentWeightToVector(a_Enchantments, 2, enchDepthStrider, 1);
+			}
 		}
 	}
 

src/Enchantments.h

@@ -53,6 +53,7 @@ public:
 		enchRespiration          = 5,
 		enchAquaAffinity         = 6,
 		enchThorns               = 7,
+		enchDepthStrider         = 8,
 		enchSharpness            = 16,
 		enchSmite                = 17,
 		enchBaneOfArthropods     = 18,

src/World.cpp

@@ -279,8 +279,8 @@ cWorld::cWorld(const AString & a_WorldName, eDimension a_Dimension, const AStrin
 	m_WorldAge(0),
 	m_TimeOfDay(0),
 	m_LastTimeUpdate(0),
-	m_LastSave(0),
 	m_LastUnload(0),
+	m_LastSave(0),
 	m_SkyDarkness(0),
 	m_GameMode(gmNotSet),
 	m_bEnabledPVP(false),