summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/ClientHandle.cpp677
-rw-r--r--src/ClientHandle.h5
-rw-r--r--src/Enchantments.h4
-rw-r--r--src/Item.cpp106
-rw-r--r--src/Item.h3
-rw-r--r--src/UI/SlotArea.cpp49
-rw-r--r--src/UI/Window.cpp86
-rw-r--r--src/UI/Window.h20
8 files changed, 803 insertions, 147 deletions
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index 73a275ab1..90165b432 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -31,6 +31,8 @@
#include "CompositeChat.h"
#include "Items/ItemSword.h"
+#include "FastRandom.h"
+
/** Maximum number of explosions to send this tick, server will start dropping if exceeded */
@@ -2687,34 +2689,679 @@ void cClientHandle::SocketClosed(void)
void cClientHandle::HandleEnchantItem(Byte & WindowID, Byte & Enchantment)
{
- //Get Item
- cItem EnchantItem = m_Player->GetDraggingItem();
-
- cEnchantmentsArray enchantments;
- cItem::GetApplicableEnchantmentsForType(EnchantItem.m_ItemType, enchantments);
+ cItem Item = m_Player->GetDraggingItem();
+ cEnchantingWindow * Window = (cEnchantingWindow*)m_Player->GetWindow();
+ int BaseEnchantmentLevel = Window->GetPropertyValue(Enchantment);
+
+ // Step 1 from Enchanting
+ int Enchantability = 1;
+
+ if (Item.m_ItemType == E_ITEM_WOODEN_SWORD || Item.m_ItemType == E_ITEM_WOODEN_PICKAXE || Item.m_ItemType == E_ITEM_WOODEN_SHOVEL || Item.m_ItemType == E_ITEM_WOODEN_AXE || Item.m_ItemType == E_ITEM_WOODEN_HOE)
+ {
+ Enchantability = 15;
+ }
+ else if (Item.m_ItemType == E_ITEM_LEATHER_CAP || Item.m_ItemType == E_ITEM_LEATHER_TUNIC || Item.m_ItemType == E_ITEM_LEATHER_PANTS || Item.m_ItemType == E_ITEM_LEATHER_BOOTS)
+ {
+ Enchantability = 15;
+ }
+ else if (Item.m_ItemType == E_ITEM_STONE_SWORD || Item.m_ItemType == E_ITEM_STONE_PICKAXE || Item.m_ItemType == E_ITEM_STONE_SHOVEL || Item.m_ItemType == E_ITEM_STONE_AXE || Item.m_ItemType == E_ITEM_STONE_HOE)
+ {
+ Enchantability = 5;
+ }
+ else if (Item.m_ItemType == E_ITEM_IRON_HELMET || Item.m_ItemType == E_ITEM_IRON_CHESTPLATE || Item.m_ItemType == E_ITEM_IRON_LEGGINGS || Item.m_ItemType == E_ITEM_IRON_BOOTS)
+ {
+ Enchantability = 9;
+ }
+ else if (Item.m_ItemType == E_ITEM_IRON_SWORD || Item.m_ItemType == E_ITEM_IRON_PICKAXE || Item.m_ItemType == E_ITEM_IRON_SHOVEL || Item.m_ItemType == E_ITEM_IRON_AXE || Item.m_ItemType == E_ITEM_IRON_HOE)
+ {
+ Enchantability = 14;
+ }
+ else if (Item.m_ItemType == E_ITEM_CHAIN_HELMET || Item.m_ItemType == E_ITEM_CHAIN_CHESTPLATE || Item.m_ItemType == E_ITEM_CHAIN_LEGGINGS || Item.m_ItemType == E_ITEM_CHAIN_BOOTS)
+ {
+ Enchantability = 12;
+ }
+ else if (Item.m_ItemType == E_ITEM_DIAMOND_HELMET || Item.m_ItemType == E_ITEM_DIAMOND_CHESTPLATE || Item.m_ItemType == E_ITEM_DIAMOND_LEGGINGS || Item.m_ItemType == E_ITEM_DIAMOND_BOOTS)
+ {
+ Enchantability = 10;
+ }
+ else if (Item.m_ItemType == E_ITEM_DIAMOND_SWORD || Item.m_ItemType == E_ITEM_DIAMOND_PICKAXE || Item.m_ItemType == E_ITEM_DIAMOND_SHOVEL || Item.m_ItemType == E_ITEM_DIAMOND_AXE || Item.m_ItemType == E_ITEM_DIAMOND_HOE)
+ {
+ Enchantability = 10;
+ }
+ else if (Item.m_ItemType == E_ITEM_GOLD_HELMET || Item.m_ItemType == E_ITEM_GOLD_CHESTPLATE || Item.m_ItemType == E_ITEM_GOLD_LEGGINGS || Item.m_ItemType == E_ITEM_GOLD_BOOTS)
+ {
+ Enchantability = 25;
+ }
+ else if (Item.m_ItemType == E_ITEM_GOLD_SWORD || Item.m_ItemType == E_ITEM_GOLD_PICKAXE || Item.m_ItemType == E_ITEM_GOLD_SHOVEL || Item.m_ItemType == E_ITEM_GOLD_AXE || Item.m_ItemType == E_ITEM_GOLD_HOE)
+ {
+ Enchantability = 22;
+ }
+
+ cFastRandom Random;
+ int ModifiedEnchantmentLevel = BaseEnchantmentLevel + Random.NextInt(Enchantability / 4) + Random.NextInt(Enchantability / 4) + 1;
+ float RandomBonus = 1.0F + (Random.NextFloat(1) + Random.NextFloat(1) - 1.0F) * 0.15F;
+
+ int FinalEnchantmentLevel = (int)(ModifiedEnchantmentLevel * RandomBonus + 0.5F);
+
+ // Step 2 and 3 from Enchanting
+ cEnchantmentsVector enchantments;
+
+ if (ItemCategory::IsSword(Item.m_ItemType))
+ {
+ // Sharpness
+ if (FinalEnchantmentLevel >= 34 && FinalEnchantmentLevel <= 54)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 10, cEnchantments("Sharpness=4"));
+ }
+ else if (FinalEnchantmentLevel >= 23 && FinalEnchantmentLevel <= 43)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 10, cEnchantments("Sharpness=3"));
+ }
+ else if (FinalEnchantmentLevel >= 12 && FinalEnchantmentLevel <= 32)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 10, cEnchantments("Sharpness=2"));
+ }
+ else if (FinalEnchantmentLevel >= 1 && FinalEnchantmentLevel <= 21)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 10, cEnchantments("Sharpness=1"));
+ }
+
+ // Smite
+ if (FinalEnchantmentLevel >= 29 && FinalEnchantmentLevel <= 49)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 5, cEnchantments("Smite=4"));
+ }
+ else if (FinalEnchantmentLevel >= 21 && FinalEnchantmentLevel <= 41)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 5, cEnchantments("Smite=3"));
+ }
+ else if (FinalEnchantmentLevel >= 13 && FinalEnchantmentLevel <= 33)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 5, cEnchantments("Smite=2"));
+ }
+ else if (FinalEnchantmentLevel >= 5 && FinalEnchantmentLevel <= 25)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 5, cEnchantments("Smite=1"));
+ }
+
+ // Bane of Arthropods
+ if (FinalEnchantmentLevel >= 29 && FinalEnchantmentLevel <= 49)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 5, cEnchantments("BaneOfArthropods=4"));
+ }
+ else if (FinalEnchantmentLevel >= 21 && FinalEnchantmentLevel <= 41)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 5, cEnchantments("BaneOfArthropods=3"));
+ }
+ else if (FinalEnchantmentLevel >= 13 && FinalEnchantmentLevel <= 33)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 5, cEnchantments("BaneOfArthropods=2"));
+ }
+ else if (FinalEnchantmentLevel >= 5 && FinalEnchantmentLevel <= 25)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 5, cEnchantments("BaneOfArthropods=1"));
+ }
+
+ // Knockback
+ if (FinalEnchantmentLevel >= 25 && FinalEnchantmentLevel <= 75)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 5, cEnchantments("Knockback=2"));
+ }
+ else if (FinalEnchantmentLevel >= 5 && FinalEnchantmentLevel <= 55)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 5, cEnchantments("Knockback=1"));
+ }
+
+ // Fire Aspect
+ if (FinalEnchantmentLevel >= 30 && FinalEnchantmentLevel <= 80)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 2, cEnchantments("FireAspect=2"));
+ }
+ else if (FinalEnchantmentLevel >= 10 && FinalEnchantmentLevel <= 60)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 2, cEnchantments("FireAspect=1"));
+ }
+
+ // Looting
+ if (FinalEnchantmentLevel >= 33 && FinalEnchantmentLevel <= 83)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 2, cEnchantments("Looting=3"));
+ }
+ else if (FinalEnchantmentLevel >= 24 && FinalEnchantmentLevel <= 74)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 2, cEnchantments("Looting=2"));
+ }
+ else if (FinalEnchantmentLevel >= 15 && FinalEnchantmentLevel <= 65)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 2, cEnchantments("Looting=1"));
+ }
+ }
+
+ else if (ItemCategory::IsTool(Item.m_ItemType))
+ {
+ // Efficiency
+ if (FinalEnchantmentLevel >= 31 && FinalEnchantmentLevel <= 81)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 10, cEnchantments("Efficiency=4"));
+ }
+ else if (FinalEnchantmentLevel >= 21 && FinalEnchantmentLevel <= 71)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 10, cEnchantments("Efficiency=3"));
+ }
+ else if (FinalEnchantmentLevel >= 11 && FinalEnchantmentLevel <= 61)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 10, cEnchantments("Efficiency=2"));
+ }
+ else if (FinalEnchantmentLevel >= 1 && FinalEnchantmentLevel <= 51)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 10, cEnchantments("Efficiency=1"));
+ }
+
+ // Silk Touch
+ if (FinalEnchantmentLevel >= 15 && FinalEnchantmentLevel <= 65)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 1, cEnchantments("SilkTouch=1"));
+ }
+
+ // Fortune
+ if (FinalEnchantmentLevel >= 33 && FinalEnchantmentLevel <= 83)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 2, cEnchantments("Fortune=3"));
+ }
+ else if (FinalEnchantmentLevel >= 24 && FinalEnchantmentLevel <= 74)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 2, cEnchantments("Fortune=2"));
+ }
+ else if (FinalEnchantmentLevel >= 15 && FinalEnchantmentLevel <= 65)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 2, cEnchantments("Fortune=1"));
+ }
+ }
+
+ else if (ItemCategory::IsArmor(Item.m_ItemType))
+ {
+ // Protection
+ if (FinalEnchantmentLevel >= 34 && FinalEnchantmentLevel <= 54)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 10, cEnchantments("Protection=4"));
+ }
+ else if (FinalEnchantmentLevel >= 23 && FinalEnchantmentLevel <= 43)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 10, cEnchantments("Protection=3"));
+ }
+ else if (FinalEnchantmentLevel >= 12 && FinalEnchantmentLevel <= 32)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 10, cEnchantments("Protection=2"));
+ }
+ else if (FinalEnchantmentLevel >= 1 && FinalEnchantmentLevel <= 21)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 10, cEnchantments("Protection=1"));
+ }
+
+ // Fire Protection
+ if (FinalEnchantmentLevel >= 34 && FinalEnchantmentLevel <= 46)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 5, cEnchantments("FireProtection=4"));
+ }
+ else if (FinalEnchantmentLevel >= 26 && FinalEnchantmentLevel <= 38)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 5, cEnchantments("FireProtection=3"));
+ }
+ else if (FinalEnchantmentLevel >= 18 && FinalEnchantmentLevel <= 30)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 5, cEnchantments("FireProtection=2"));
+ }
+ else if (FinalEnchantmentLevel >= 10 && FinalEnchantmentLevel <= 22)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 5, cEnchantments("FireProtection=1"));
+ }
+
+ // Blast Protection
+ if (FinalEnchantmentLevel >= 29 && FinalEnchantmentLevel <= 41)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 2, cEnchantments("BlastProtection=4"));
+ }
+ else if (FinalEnchantmentLevel >= 21 && FinalEnchantmentLevel <= 33)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 2, cEnchantments("BlastProtection=3"));
+ }
+ else if (FinalEnchantmentLevel >= 13 && FinalEnchantmentLevel <= 25)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 2, cEnchantments("BlastProtection=2"));
+ }
+ else if (FinalEnchantmentLevel >= 5 && FinalEnchantmentLevel <= 17)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 2, cEnchantments("BlastProtection=1"));
+ }
+
+ // Projectile Protection
+ if (FinalEnchantmentLevel >= 21 && FinalEnchantmentLevel <= 36)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 5, cEnchantments("ProjectileProtection=4"));
+ }
+ else if (FinalEnchantmentLevel >= 15 && FinalEnchantmentLevel <= 30)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 5, cEnchantments("ProjectileProtection=3"));
+ }
+ else if (FinalEnchantmentLevel >= 9 && FinalEnchantmentLevel <= 24)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 5, cEnchantments("ProjectileProtection=2"));
+ }
+ else if (FinalEnchantmentLevel >= 3 && FinalEnchantmentLevel <= 18)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 5, cEnchantments("ProjectileProtection=1"));
+ }
+
+ // Thorns
+ if (FinalEnchantmentLevel >= 50 && FinalEnchantmentLevel <= 100)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 1, cEnchantments("Thorns=3"));
+ }
+ else if (FinalEnchantmentLevel >= 30 && FinalEnchantmentLevel <= 80)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 1, cEnchantments("Thorns=2"));
+ }
+ else if (FinalEnchantmentLevel >= 10 && FinalEnchantmentLevel <= 60)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 1, cEnchantments("Thorns=1"));
+ }
+
+
+ if (ItemCategory::IsHelmet(Item.m_ItemType))
+ {
+ // Respiration
+ if (FinalEnchantmentLevel >= 30 && FinalEnchantmentLevel <= 60)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 2, cEnchantments("Respiration=3"));
+ }
+ else if (FinalEnchantmentLevel >= 20 && FinalEnchantmentLevel <= 50)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 2, cEnchantments("Respiration=2"));
+ }
+ else if (FinalEnchantmentLevel >= 10 && FinalEnchantmentLevel <= 40)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 2, cEnchantments("Respiration=1"));
+ }
+
+ // Aqua Affinity
+ if (FinalEnchantmentLevel >= 1 && FinalEnchantmentLevel <= 41)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 2, cEnchantments("AquaAffinity=1"));
+ }
+ }
+
+ else if (ItemCategory::IsBoots(Item.m_ItemType))
+ {
+ // Feather Fall
+ if (FinalEnchantmentLevel >= 23 && FinalEnchantmentLevel <= 33)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 5, cEnchantments("FeatherFalling=4"));
+ }
+ else if (FinalEnchantmentLevel >= 17 && FinalEnchantmentLevel <= 27)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 5, cEnchantments("FeatherFalling=3"));
+ }
+ else if (FinalEnchantmentLevel >= 11 && FinalEnchantmentLevel <= 21)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 5, cEnchantments("FeatherFalling=2"));
+ }
+ else if (FinalEnchantmentLevel >= 5 && FinalEnchantmentLevel <= 15)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 5, cEnchantments("FeatherFalling=1"));
+ }
+ }
+ }
+
+ else if (Item.m_ItemType == E_ITEM_BOW)
+ {
+ // Power
+ if (FinalEnchantmentLevel >= 31 && FinalEnchantmentLevel <= 46)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 10, cEnchantments("Power=4"));
+ }
+ else if (FinalEnchantmentLevel >= 21 && FinalEnchantmentLevel <= 36)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 10, cEnchantments("Power=3"));
+ }
+ else if (FinalEnchantmentLevel >= 11 && FinalEnchantmentLevel <= 26)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 10, cEnchantments("Power=2"));
+ }
+ else if (FinalEnchantmentLevel >= 1 && FinalEnchantmentLevel <= 16)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 10, cEnchantments("Power=1"));
+ }
+
+ // Punch
+ if (FinalEnchantmentLevel >= 32 && FinalEnchantmentLevel <= 57)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 2, cEnchantments("Punch=2"));
+ }
+ else if (FinalEnchantmentLevel >= 12 && FinalEnchantmentLevel <= 37)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 2, cEnchantments("Punch=1"));
+ }
+
+ // Flame and Infinity
+ if (FinalEnchantmentLevel >= 20 && FinalEnchantmentLevel <= 50)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 2, cEnchantments("Flame=1"));
+ enchantments = AddEnchantmentWeight(enchantments, 1, cEnchantments("Infinity=1"));
+ }
+ }
+
+ else if (Item.m_ItemType == E_ITEM_FISHING_ROD)
+ {
+ // Luck of the Sea and Lure
+ if (FinalEnchantmentLevel >= 33 && FinalEnchantmentLevel <= 83)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 1, cEnchantments("LuckOfTheSea=3"));
+ enchantments = AddEnchantmentWeight(enchantments, 1, cEnchantments("Lure=3"));
+ }
+ else if (FinalEnchantmentLevel >= 24 && FinalEnchantmentLevel <= 74)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 1, cEnchantments("LuckOfTheSea=2"));
+ enchantments = AddEnchantmentWeight(enchantments, 1, cEnchantments("Lure=2"));
+ }
+ else if (FinalEnchantmentLevel >= 15 && FinalEnchantmentLevel <= 65)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 1, cEnchantments("LuckOfTheSea=1"));
+ enchantments = AddEnchantmentWeight(enchantments, 1, cEnchantments("Lure=1"));
+ }
+ }
+
+ // Unbreaking
+ if (FinalEnchantmentLevel >= 21 && FinalEnchantmentLevel <= 71)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 5, cEnchantments("Unbreaking=3"));
+ }
+ else if (FinalEnchantmentLevel >= 13 && FinalEnchantmentLevel <= 63)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 5, cEnchantments("Unbreaking=2"));
+ }
+ else if (FinalEnchantmentLevel >= 5 && FinalEnchantmentLevel <= 55)
+ {
+ enchantments = AddEnchantmentWeight(enchantments, 5, cEnchantments("Unbreaking=1"));
+ }
+
+ int RandomEnchantment1 = floor(Random.NextFloat(1) * enchantments.size());
+ cEnchantments Enchantment1 = enchantments[RandomEnchantment1];
+ Item.m_Enchantments.AddFromString(Enchantment1.ToString());
+ enchantments.erase(std::remove(enchantments.begin(), enchantments.end(), Enchantment1), enchantments.end());
+
+ // TODO: Don't add every time so much enchantments
+
+ // Checking for conflicting enchantments
+ enchantments = CheckEnchantmentConflicts(enchantments, Enchantment1);
+
+ int RandomEnchantment2 = floor(Random.NextFloat(1) * enchantments.size());
+ cEnchantments Enchantment2 = enchantments[RandomEnchantment2];
+ Item.m_Enchantments.AddFromString(Enchantment2.ToString());
+ enchantments.erase(std::remove(enchantments.begin(), enchantments.end(), Enchantment2), enchantments.end());
+
+ // Checking for conflicting enchantments
+ enchantments = CheckEnchantmentConflicts(enchantments, Enchantment2);
+
+ int RandomEnchantment3 = floor(Random.NextFloat(1) * enchantments.size());
+ cEnchantments Enchantment3 = enchantments[RandomEnchantment3];
+ Item.m_Enchantments.AddFromString(Enchantment3.ToString());
+ enchantments.erase(std::remove(enchantments.begin(), enchantments.end(), Enchantment3), enchantments.end());
+
+ m_Player->GetWindow()->SetSlot(*m_Player, 0, Item);
+}
+
+
- m_Player->SendMessage(Printf("ItemType: %d", EnchantItem.m_ItemType));
- m_Player->SendMessage(enchantments[1].ToString());
+cEnchantmentsVector cClientHandle::AddEnchantmentWeight(cEnchantmentsVector a_Map, int a_Weight, cEnchantments a_Enchantment)
+{
+ for (int i = 0; i < a_Weight; i++)
+ {
+ a_Map.push_back(a_Enchantment);
+ }
+
+ return a_Map;
+}
+
+
+
+
+
+cEnchantmentsVector cClientHandle::CheckEnchantmentConflicts(cEnchantmentsVector a_Map, cEnchantments a_FirstEnchantment)
+{
+ int FirstEnchantmentID = std::stoi(StringSplit(a_FirstEnchantment.ToString(), "=")[0]);
- //shuffle enchantments (i don't know if this is good)
- std::random_shuffle(enchantments.begin(), enchantments.end());
+ if (FirstEnchantmentID == cEnchantments::enchProtection)
+ {
+ for (cEnchantments enchantment : a_Map)
+ {
+ int EnchantmentID = std::stoi(StringSplit(enchantment.ToString(), "=")[0]);
- m_Player->SendMessage(enchantments[1].ToString());
+ if (EnchantmentID == cEnchantments::enchFireProtection)
+ {
+ a_Map.erase(std::remove(a_Map.begin(), a_Map.end(), enchantment), a_Map.end());
+ break;
+ }
+ }
+ for (cEnchantments enchantment : a_Map)
+ {
+ int EnchantmentID = std::stoi(StringSplit(enchantment.ToString(), "=")[0]);
+ if (EnchantmentID == cEnchantments::enchBlastProtection)
+ {
+ a_Map.erase(std::remove(a_Map.begin(), a_Map.end(), enchantment), a_Map.end());
+ break;
+ }
+ }
+ for (cEnchantments enchantment : a_Map)
+ {
+ int EnchantmentID = std::stoi(StringSplit(enchantment.ToString(), "=")[0]);
+ if (EnchantmentID == cEnchantments::enchProjectileProtection)
+ {
+ a_Map.erase(std::remove(a_Map.begin(), a_Map.end(), enchantment), a_Map.end());
+ break;
+ }
+ }
+ }
+ else if (FirstEnchantmentID == cEnchantments::enchFireProtection)
+ {
+ for (cEnchantments enchantment : a_Map)
+ {
+ int EnchantmentID = std::stoi(StringSplit(enchantment.ToString(), "=")[0]);
+ if (EnchantmentID == cEnchantments::enchProtection)
+ {
+ a_Map.erase(std::remove(a_Map.begin(), a_Map.end(), enchantment), a_Map.end());
+ break;
+ }
+ }
+ for (cEnchantments enchantment : a_Map)
+ {
+ int EnchantmentID = std::stoi(StringSplit(enchantment.ToString(), "=")[0]);
+ if (EnchantmentID == cEnchantments::enchBlastProtection)
+ {
+ a_Map.erase(std::remove(a_Map.begin(), a_Map.end(), enchantment), a_Map.end());
+ break;
+ }
+ }
+ for (cEnchantments enchantment : a_Map)
+ {
+ int EnchantmentID = std::stoi(StringSplit(enchantment.ToString(), "=")[0]);
+ if (EnchantmentID == cEnchantments::enchProjectileProtection)
+ {
+ a_Map.erase(std::remove(a_Map.begin(), a_Map.end(), enchantment), a_Map.end());
+ break;
+ }
+ }
+ }
+ else if (FirstEnchantmentID == cEnchantments::enchBlastProtection)
+ {
+ for (cEnchantments enchantment : a_Map)
+ {
+ int EnchantmentID = std::stoi(StringSplit(enchantment.ToString(), "=")[0]);
- //Enchant Item
- EnchantItem.m_Enchantments.AddFromString(enchantments[1].ToString());
+ if (EnchantmentID == cEnchantments::enchProtection)
+ {
+ a_Map.erase(std::remove(a_Map.begin(), a_Map.end(), enchantment), a_Map.end());
+ break;
+ }
+ }
+ for (cEnchantments enchantment : a_Map)
+ {
+ int EnchantmentID = std::stoi(StringSplit(enchantment.ToString(), "=")[0]);
- //Set Enchanted Item to Window Slot
- m_Player->GetWindow()->SetSlot(*m_Player, 0, EnchantItem);
+ if (EnchantmentID == cEnchantments::enchFireProtection)
+ {
+ a_Map.erase(std::remove(a_Map.begin(), a_Map.end(), enchantment), a_Map.end());
+ break;
+ }
+ }
+ for (cEnchantments enchantment : a_Map)
+ {
+ int EnchantmentID = std::stoi(StringSplit(enchantment.ToString(), "=")[0]);
+
+ if (EnchantmentID == cEnchantments::enchProjectileProtection)
+ {
+ a_Map.erase(std::remove(a_Map.begin(), a_Map.end(), enchantment), a_Map.end());
+ break;
+ }
+ }
+ }
+ else if (FirstEnchantmentID == cEnchantments::enchProjectileProtection)
+ {
+ for (cEnchantments enchantment : a_Map)
+ {
+ int EnchantmentID = std::stoi(StringSplit(enchantment.ToString(), "=")[0]);
+
+ if (EnchantmentID == cEnchantments::enchProtection)
+ {
+ a_Map.erase(std::remove(a_Map.begin(), a_Map.end(), enchantment), a_Map.end());
+ break;
+ }
+ }
+ for (cEnchantments enchantment : a_Map)
+ {
+ int EnchantmentID = std::stoi(StringSplit(enchantment.ToString(), "=")[0]);
+
+ if (EnchantmentID == cEnchantments::enchFireProtection)
+ {
+ a_Map.erase(std::remove(a_Map.begin(), a_Map.end(), enchantment), a_Map.end());
+ break;
+ }
+ }
+ for (cEnchantments enchantment : a_Map)
+ {
+ int EnchantmentID = std::stoi(StringSplit(enchantment.ToString(), "=")[0]);
+
+ if (EnchantmentID == cEnchantments::enchBlastProtection)
+ {
+ a_Map.erase(std::remove(a_Map.begin(), a_Map.end(), enchantment), a_Map.end());
+ break;
+ }
+ }
+ }
+
+ else if (FirstEnchantmentID == cEnchantments::enchSharpness)
+ {
+ for (cEnchantments enchantment : a_Map)
+ {
+ int EnchantmentID = std::stoi(StringSplit(enchantment.ToString(), "=")[0]);
+
+ if (EnchantmentID == cEnchantments::enchSmite)
+ {
+ a_Map.erase(std::remove(a_Map.begin(), a_Map.end(), enchantment), a_Map.end());
+ break;
+ }
+ }
+ for (cEnchantments enchantment : a_Map)
+ {
+ int EnchantmentID = std::stoi(StringSplit(enchantment.ToString(), "=")[0]);
+
+ if (EnchantmentID == cEnchantments::enchBaneOfArthropods)
+ {
+ a_Map.erase(std::remove(a_Map.begin(), a_Map.end(), enchantment), a_Map.end());
+ break;
+ }
+ }
+ }
+ else if (FirstEnchantmentID == cEnchantments::enchSmite)
+ {
+ for (cEnchantments enchantment : a_Map)
+ {
+ int EnchantmentID = std::stoi(StringSplit(enchantment.ToString(), "=")[0]);
+
+ if (EnchantmentID == cEnchantments::enchSharpness)
+ {
+ a_Map.erase(std::remove(a_Map.begin(), a_Map.end(), enchantment), a_Map.end());
+ break;
+ }
+ }
+ for (cEnchantments enchantment : a_Map)
+ {
+ int EnchantmentID = std::stoi(StringSplit(enchantment.ToString(), "=")[0]);
+
+ if (EnchantmentID == cEnchantments::enchBaneOfArthropods)
+ {
+ a_Map.erase(std::remove(a_Map.begin(), a_Map.end(), enchantment), a_Map.end());
+ break;
+ }
+ }
+ }
+ else if (FirstEnchantmentID == cEnchantments::enchBaneOfArthropods)
+ {
+ for (cEnchantments enchantment : a_Map)
+ {
+ int EnchantmentID = std::stoi(StringSplit(enchantment.ToString(), "=")[0]);
+
+ if (EnchantmentID == cEnchantments::enchSharpness)
+ {
+ a_Map.erase(std::remove(a_Map.begin(), a_Map.end(), enchantment), a_Map.end());
+ break;
+ }
+ }
+ for (cEnchantments enchantment : a_Map)
+ {
+ int EnchantmentID = std::stoi(StringSplit(enchantment.ToString(), "=")[0]);
+
+ if (EnchantmentID == cEnchantments::enchSmite)
+ {
+ a_Map.erase(std::remove(a_Map.begin(), a_Map.end(), enchantment), a_Map.end());
+ break;
+ }
+ }
+ }
+ else if (FirstEnchantmentID == cEnchantments::enchSilkTouch)
+ {
+ for (cEnchantments enchantment : a_Map)
+ {
+ int EnchantmentID = std::stoi(StringSplit(enchantment.ToString(), "=")[0]);
+
+ if (EnchantmentID == cEnchantments::enchFortune)
+ {
+ a_Map.erase(std::remove(a_Map.begin(), a_Map.end(), enchantment), a_Map.end());
+ break;
+ }
+ }
+ }
+ else if (FirstEnchantmentID == cEnchantments::enchFortune)
+ {
+ for (cEnchantments enchantment : a_Map)
+ {
+ int EnchantmentID = std::stoi(StringSplit(enchantment.ToString(), "=")[0]);
+
+ if (EnchantmentID == cEnchantments::enchSilkTouch)
+ {
+ a_Map.erase(std::remove(a_Map.begin(), a_Map.end(), enchantment), a_Map.end());
+ break;
+ }
+ }
+ }
- LOGWARN("Item enchanted!");
+ return a_Map;
}
diff --git a/src/ClientHandle.h b/src/ClientHandle.h
index 01765cc85..4c88d79e2 100644
--- a/src/ClientHandle.h
+++ b/src/ClientHandle.h
@@ -18,6 +18,7 @@
#include "ByteBuffer.h"
#include "Scoreboard.h"
#include "Map.h"
+#include "Enchantments.h"
@@ -230,8 +231,10 @@ public:
/** Called when the player moves into a different world; queues sreaming the new chunks */
void MoveToWorld(cWorld & a_World, bool a_SendRespawnPacket);
- ///Handle item enchanting
+ /** Called when the player will enchant a Item */
void HandleEnchantItem(Byte & WindowID, Byte & Enchantment);
+ cEnchantmentsVector AddEnchantmentWeight(cEnchantmentsVector a_Map, int a_Weight, cEnchantments a_Enchantment);
+ cEnchantmentsVector CheckEnchantmentConflicts(cEnchantmentsVector a_Map, cEnchantments a_FirstEnchantment);
private:
diff --git a/src/Enchantments.h b/src/Enchantments.h
index 2af772928..70d6b6613 100644
--- a/src/Enchantments.h
+++ b/src/Enchantments.h
@@ -29,7 +29,7 @@ Level value of 0 means no such enchantment, and it will not be stored in the m_E
Serialization will never put zero-level enchantments into the stringspec and will always use numeric IDs.
*/
-typedef std::vector<cEnchantments> cEnchantmentsArray;
+typedef std::vector<cEnchantments> cEnchantmentsVector;
// tolua_begin
class cEnchantments
@@ -105,7 +105,7 @@ public:
/// Reads the enchantments from the specified NBT list tag (ench or StoredEnchantments)
friend void EnchantmentSerializer::ParseFromNBT(cEnchantments& a_Enchantments, const cParsedNBT & a_NBT, int a_EnchListTagIdx);
-
+
protected:
/// Maps enchantment ID -> enchantment level
typedef std::map<int, int> cMap;
diff --git a/src/Item.cpp b/src/Item.cpp
index 093147b54..856b68be6 100644
--- a/src/Item.cpp
+++ b/src/Item.cpp
@@ -209,112 +209,6 @@ bool cItem::IsEnchantable(short item)
-void cItem::GetApplicableEnchantmentsForType(short a_ItemType, cEnchantmentsArray & a_Enchantments)
-{
- LOGWARN("Get Enchantments");
-
- if (ItemCategory::IsSword(a_ItemType))
- {
- a_Enchantments.push_back(cEnchantments("Sharpness=4"));
- a_Enchantments.push_back(cEnchantments("Smite=5"));
- a_Enchantments.push_back(cEnchantments("BaneOfArthropods=5"));
- a_Enchantments.push_back(cEnchantments("Knockback=2"));
- a_Enchantments.push_back(cEnchantments("FireAspect=2"));
- a_Enchantments.push_back(cEnchantments("Looting=3"));
- a_Enchantments.push_back(cEnchantments("Unbreaking=3"));
- }
-
- else if (ItemCategory::IsPickaxe(a_ItemType))
- {
- a_Enchantments.push_back(cEnchantments("Efficiency=4"));
- a_Enchantments.push_back(cEnchantments("SilkTouch=1"));
- a_Enchantments.push_back(cEnchantments("Unbreaking=3"));
- a_Enchantments.push_back(cEnchantments("Fortune=3"));
- }
-
- else if (ItemCategory::IsAxe(a_ItemType))
- {
- a_Enchantments.push_back(cEnchantments("Efficiency=4"));
- a_Enchantments.push_back(cEnchantments("SilkTouch=1"));
- a_Enchantments.push_back(cEnchantments("Unbreaking=3"));
- a_Enchantments.push_back(cEnchantments("Fortune=3"));
- }
-
- else if (ItemCategory::IsShovel(a_ItemType))
- {
- a_Enchantments.push_back(cEnchantments("Efficiency=4"));
- a_Enchantments.push_back(cEnchantments("SilkTouch=1"));
- a_Enchantments.push_back(cEnchantments("Unbreaking=3"));
- a_Enchantments.push_back(cEnchantments("Fortune=3"));
- }
-
- else if (ItemCategory::IsHoe(a_ItemType))
- {
- a_Enchantments.push_back(cEnchantments("Unbreaking=3"));
- }
-
- else if (ItemCategory::IsArmor(a_ItemType))
- {
- a_Enchantments.push_back(cEnchantments("Protection=4"));
- a_Enchantments.push_back(cEnchantments("FireProtection=4"));
- a_Enchantments.push_back(cEnchantments("BlastProtection=4"));
- a_Enchantments.push_back(cEnchantments("ProjectileProtection=4"));
- a_Enchantments.push_back(cEnchantments("Thorns=3"));
- a_Enchantments.push_back(cEnchantments("Unbreaking=3"));
-
- if (ItemCategory::IsHelmet(a_ItemType))
- {
- a_Enchantments.push_back(cEnchantments("Respiration=3"));
- a_Enchantments.push_back(cEnchantments("AquaAffinity=1"));
- }
-
- else if (ItemCategory::IsBoots(a_ItemType))
- {
- a_Enchantments.push_back(cEnchantments("FeatherFalling=4"));
- }
- }
-
- //Bow
- else if (a_ItemType == 261)
- {
- a_Enchantments.push_back(cEnchantments("Power=4"));
- a_Enchantments.push_back(cEnchantments("Punch=2"));
- a_Enchantments.push_back(cEnchantments("Flame=1"));
- a_Enchantments.push_back(cEnchantments("Infinity=1"));
- a_Enchantments.push_back(cEnchantments("Unbreaking=3"));
- }
-
- //Fishing Rod
- else if (a_ItemType == 346)
- {
- a_Enchantments.push_back(cEnchantments("LuckOfTheSea=3"));
- a_Enchantments.push_back(cEnchantments("Lure=3"));
- a_Enchantments.push_back(cEnchantments("Unbreaking=3"));
- }
-
- //Shears
- else if (a_ItemType == 359)
- {
- a_Enchantments.push_back(cEnchantments("Unbreaking=3"));
- }
-
- //Flint and Steel
- else if (a_ItemType == 259)
- {
- a_Enchantments.push_back(cEnchantments("Unbreaking=3"));
- }
-
- //Carrot on a Stick
- else if (a_ItemType == 398)
- {
- a_Enchantments.push_back(cEnchantments("Unbreaking=3"));
- }
-}
-
-
-
-
-
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// cItems:
diff --git a/src/Item.h b/src/Item.h
index 620c77b29..910ecb382 100644
--- a/src/Item.h
+++ b/src/Item.h
@@ -175,9 +175,6 @@ public:
/** Returns true if the specified item type is enchantable (as per 1.2.5 protocol requirements) */
static bool IsEnchantable(short a_ItemType); // tolua_export
- /** Fills a_Enchantments with the list of enchantments applicable to the specified item type */
- static void cItem::GetApplicableEnchantmentsForType(short a_ItemType, cEnchantmentsArray & a_Enchantments);
-
// tolua_begin
short m_ItemType;
diff --git a/src/UI/SlotArea.cpp b/src/UI/SlotArea.cpp
index 9463bc593..f76b11380 100644
--- a/src/UI/SlotArea.cpp
+++ b/src/UI/SlotArea.cpp
@@ -608,7 +608,6 @@ cSlotAreaTemporary(a_NumSlots, a_ParentWindow)
void cSlotAreaEnchanting::Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem)
{
- LOGWARN("Clicked");
// Check if Slot is in the Enchantment Table
if (a_SlotNum == 0)
{
@@ -642,17 +641,39 @@ void cSlotAreaEnchanting::OnPlayerRemoved(cPlayer & a_Player)
void cSlotAreaEnchanting::ClickedResult(cPlayer & a_Player)
{
- LOGWARN("Click!");
-
if (a_Player.GetDraggingItem().IsEmpty())
{
- LOGWARN("EMPTY");
- m_ParentWindow.SetProperty(0, 0);
- m_ParentWindow.SetProperty(1, 0);
- m_ParentWindow.SetProperty(2, 0);
+ m_ParentWindow.SetProperty(0, 0, a_Player);
+ m_ParentWindow.SetProperty(1, 0, a_Player);
+ m_ParentWindow.SetProperty(2, 0, a_Player);
}
else if (a_Player.GetDraggingItem().IsEnchantable)
{
+ int PosX = 0;
+ int PosY = 0;
+ int PosZ = 0;
+ cEnchantingWindow * Window = (cEnchantingWindow*)&m_ParentWindow;
+ Window->GetBlockPos(PosX, PosY, PosZ);
+
+ cBlockArea Area;
+ Area.Read(a_Player.GetWorld(), PosX - 2, PosX + 2, PosY, PosY + 1, PosZ - 2, PosZ + 2);
+
+ for (int x = 0; x < 7; x++)
+ {
+ for (int y = 0; y < 2; y++)
+ {
+ for (int z = 0; z < 7; z++)
+ {
+ LOG(Printf("%i", Area.GetBlockType(x, y, z)).c_str());
+
+ if (Area.GetBlockType(x, y, z) == E_BLOCK_BOOKCASE)
+ {
+ LOG("BookShelf");
+ }
+ }
+ }
+ }
+
int bookshelves = 15; // TODO: Check Bookshelves
cFastRandom Random;
@@ -661,17 +682,15 @@ void cSlotAreaEnchanting::ClickedResult(cPlayer & a_Player)
int middleSlot = (base * 2) / 3 + 1;
int bottomSlot = std::max(base, bookshelves * 2);
- LOGWARN("Enchantable");
- m_ParentWindow.SetProperty(0, topSlot);
- m_ParentWindow.SetProperty(1, middleSlot);
- m_ParentWindow.SetProperty(2, bottomSlot);
+ m_ParentWindow.SetProperty(0, topSlot, a_Player);
+ m_ParentWindow.SetProperty(1, middleSlot, a_Player);
+ m_ParentWindow.SetProperty(2, bottomSlot, a_Player);
}
else
{
- LOGWARN("Not Enchantable");
- m_ParentWindow.SetProperty(0, 0);
- m_ParentWindow.SetProperty(1, 0);
- m_ParentWindow.SetProperty(2, 0);
+ m_ParentWindow.SetProperty(0, 0, a_Player);
+ m_ParentWindow.SetProperty(1, 0, a_Player);
+ m_ParentWindow.SetProperty(2, 0, a_Player);
}
}
diff --git a/src/UI/Window.cpp b/src/UI/Window.cpp
index 5d89534dd..c514e76e7 100644
--- a/src/UI/Window.cpp
+++ b/src/UI/Window.cpp
@@ -808,7 +808,10 @@ cCraftingWindow::cCraftingWindow(int a_BlockX, int a_BlockY, int a_BlockZ) :
// cEnchantingWindow:
cEnchantingWindow::cEnchantingWindow(int a_BlockX, int a_BlockY, int a_BlockZ) :
-cWindow(wtEnchantment, "Enchant")
+ cWindow(wtEnchantment, "Enchant"),
+ m_BlockX(a_BlockX),
+ m_BlockY(a_BlockY),
+ m_BlockZ(a_BlockZ)
{
m_SlotAreas.push_back(new cSlotAreaEnchanting(1, *this));
m_SlotAreas.push_back(new cSlotAreaInventory(*this));
@@ -819,6 +822,87 @@ cWindow(wtEnchantment, "Enchant")
+void cEnchantingWindow::SetProperty(int a_Property, int a_Value)
+{
+ if (a_Property == 0)
+ {
+ m_PropertyValue0 = a_Value;
+ }
+ else if (a_Property == 1)
+ {
+ m_PropertyValue1 = a_Value;
+ }
+ else if (a_Property == 2)
+ {
+ m_PropertyValue2 = a_Value;
+ }
+
+ cCSLock Lock(m_CS);
+ for (cPlayerList::iterator itr = m_OpenedBy.begin(), end = m_OpenedBy.end(); itr != end; ++itr)
+ {
+ (*itr)->GetClientHandle()->SendWindowProperty(*this, a_Property, a_Value);
+ } // for itr - m_OpenedBy[]
+}
+
+
+
+
+
+void cEnchantingWindow::SetProperty(int a_Property, int a_Value, cPlayer & a_Player)
+{
+ if (a_Property == 0)
+ {
+ m_PropertyValue0 = a_Value;
+ }
+ else if (a_Property == 1)
+ {
+ m_PropertyValue1 = a_Value;
+ }
+ else if (a_Property == 2)
+ {
+ m_PropertyValue2 = a_Value;
+ }
+
+ a_Player.GetClientHandle()->SendWindowProperty(*this, a_Property, a_Value);
+}
+
+
+
+
+
+int cEnchantingWindow::GetPropertyValue(int a_Property)
+{
+ if (a_Property == 0)
+ {
+ return m_PropertyValue0;
+ }
+ else if (a_Property == 1)
+ {
+ return m_PropertyValue1;
+ }
+ else if (a_Property == 2)
+ {
+ return m_PropertyValue2;
+ }
+
+ return -1;
+}
+
+
+
+
+
+void cEnchantingWindow::GetBlockPos(int & a_PosX, int & a_PosY, int & a_PosZ)
+{
+ a_PosX = m_BlockX;
+ a_PosY = m_BlockY;
+ a_PosZ = m_BlockZ;
+}
+
+
+
+
+
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// cChestWindow:
diff --git a/src/UI/Window.h b/src/UI/Window.h
index cdaec5aaa..52ab6c3ae 100644
--- a/src/UI/Window.h
+++ b/src/UI/Window.h
@@ -136,11 +136,11 @@ public:
void SetWindowTitle(const AString & a_WindowTitle ) { m_WindowTitle = a_WindowTitle; }
/// Sends the UpdateWindowProperty (0x69) packet to all clients of the window
- void SetProperty(int a_Property, int a_Value);
+ virtual void SetProperty(int a_Property, int a_Value);
/// Sends the UpdateWindowPropert(0x69) packet to the specified player
- void SetProperty(int a_Property, int a_Value, cPlayer & a_Player);
-
+ virtual void SetProperty(int a_Property, int a_Value, cPlayer & a_Player);
+
// tolua_end
void OwnerDestroyed(void);
@@ -165,7 +165,7 @@ public:
/// Used by cSlotAreas to send individual slots to clients, a_RelativeSlotNum is the slot number relative to a_SlotArea
void SendSlot(cPlayer & a_Player, cSlotArea * a_SlotArea, int a_RelativeSlotNum);
-
+
protected:
cSlotAreas m_SlotAreas;
@@ -237,6 +237,18 @@ class cEnchantingWindow :
typedef cWindow super;
public:
cEnchantingWindow(int a_BlockX, int a_BlockY, int a_BlockZ);
+ virtual void SetProperty(int a_Property, int a_Value, cPlayer & a_Player) override;
+ virtual void SetProperty(int a_Property, int a_Value) override;
+
+ /** Return the Value of a Property */
+ int GetPropertyValue(int a_Property);
+
+ /** Set the Position Values to the Position of the Enchantment Table */
+ void GetBlockPos(int & a_PosX, int & a_PosY, int & a_PosZ);
+
+protected:
+ int m_PropertyValue0, m_PropertyValue1, m_PropertyValue2;
+ int m_BlockX, m_BlockY, m_BlockZ;
};