From 9e9459a36735b768f647a4cb5013c2928464a6eb Mon Sep 17 00:00:00 2001 From: Mattes D Date: Sun, 21 Dec 2014 19:48:29 +0100 Subject: Fixed a possible division by zero. --- src/Enchantments.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src/Enchantments.cpp') diff --git a/src/Enchantments.cpp b/src/Enchantments.cpp index 36c451b81..e72ec668a 100644 --- a/src/Enchantments.cpp +++ b/src/Enchantments.cpp @@ -1021,26 +1021,34 @@ cEnchantments cEnchantments::GetRandomEnchantmentFromVector(cWeightedEnchantment -cEnchantments cEnchantments::GenerateEnchantmentFromVector(cWeightedEnchantments & a_Enchantments, int a_Seed) +cEnchantments cEnchantments::SelectEnchantmentFromVector(const cWeightedEnchantments & a_Enchantments, int a_Seed) { + // Sum up all the enchantments' weights: int AllWeights = 0; for (const auto Enchantment : a_Enchantments) { AllWeights += Enchantment.m_Weight; } + // If there's no weight for any of the enchantments, return an empty enchantment + if (AllWeights <= 0) + { + return cEnchantments(); + } + + // Pick a random enchantment: cNoise Noise(a_Seed); int RandomNumber = Noise.IntNoise1DInt(AllWeights) / 7 % AllWeights; - for (const auto Enchantment : a_Enchantments) { RandomNumber -= Enchantment.m_Weight; - if (RandomNumber < 0) + if (RandomNumber <= 0) { return Enchantment.m_Enchantments; } } + // No enchantment picked, return an empty one (we probably shouldn't ever get here): return cEnchantments(); } -- cgit v1.2.3 From ae8c871565e7a13159eb2a0839053f1b5b6bcfc4 Mon Sep 17 00:00:00 2001 From: Jonathan Fabian Date: Sun, 21 Dec 2014 19:29:34 -0500 Subject: Added Depth Strider enchantment --- src/Enchantments.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src/Enchantments.cpp') diff --git a/src/Enchantments.cpp b/src/Enchantments.cpp index e72ec668a..5ed18de6b 100644 --- a/src/Enchantments.cpp +++ b/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); + } } } -- cgit v1.2.3