From 1b32b005626e7dd7e466358910d461bf5fb11a64 Mon Sep 17 00:00:00 2001 From: TheJumper Date: Fri, 21 Feb 2014 18:45:00 +0100 Subject: Fixed Mob Drops, Add Rare and Uncommon Drops, Looting inflicts Drops --- src/Mobs/Skeleton.cpp | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) (limited to 'src/Mobs/Skeleton.cpp') diff --git a/src/Mobs/Skeleton.cpp b/src/Mobs/Skeleton.cpp index 4c8e78988..b0a5670cf 100644 --- a/src/Mobs/Skeleton.cpp +++ b/src/Mobs/Skeleton.cpp @@ -20,8 +20,28 @@ cSkeleton::cSkeleton(bool IsWither) : void cSkeleton::GetDrops(cItems & a_Drops, cEntity * a_Killer) { - AddRandomDropItem(a_Drops, 0, 2, E_ITEM_ARROW); - AddRandomDropItem(a_Drops, 0, 2, E_ITEM_BONE); + int LootingLevel = a_Killer->GetEquippedWeapon().m_Enchantments.GetLevel(21); + if (IsWither()) + { + AddRandomDropItem(a_Drops, 0, 2 + LootingLevel, E_ITEM_BONE); + AddRandomUncommonDropItem(a_Drops, 33.0f, E_ITEM_COAL); + cItems RareDrops; + RareDrops.Add(cItem(E_ITEM_HEAD, 1, 1)); + if (!GetEquippedWeapon().IsEmpty()) RareDrops.Add(GetEquippedWeapon()); + AddRandomRareDropItem(a_Drops, RareDrops, LootingLevel); + } + else + { + AddRandomDropItem(a_Drops, 0, 2 + LootingLevel, E_ITEM_ARROW); + AddRandomDropItem(a_Drops, 0, 2 + LootingLevel, E_ITEM_BONE); + cItems RareDrops; + if (!GetEquippedHelmet().IsEmpty()) RareDrops.Add(GetEquippedHelmet()); + if (!GetEquippedChestplate().IsEmpty()) RareDrops.Add(GetEquippedChestplate()); + if (!GetEquippedLeggings().IsEmpty()) RareDrops.Add(GetEquippedLeggings()); + if (!GetEquippedBoots().IsEmpty()) RareDrops.Add(GetEquippedBoots()); + if (!GetEquippedWeapon().IsEmpty()) RareDrops.Add(GetEquippedWeapon()); + AddRandomRareDropItem(a_Drops, RareDrops, LootingLevel); + } } -- cgit v1.2.3