summaryrefslogtreecommitdiffstats
path: root/src/Mobs/Witch.cpp
diff options
context:
space:
mode:
authorTheJumper <maximilian.springer@web.de>2014-02-23 19:44:58 +0100
committerTheJumper <maximilian.springer@web.de>2014-02-23 19:50:51 +0100
commit2cc597372afddbd798c2a8c2e754b3f9c7a36038 (patch)
treebb5202265e994a69e16041a86e8199563ee6e940 /src/Mobs/Witch.cpp
parentBlockBed.cpp: Fixed Multiple people in one bed. (diff)
downloadcuberite-2cc597372afddbd798c2a8c2e754b3f9c7a36038.tar
cuberite-2cc597372afddbd798c2a8c2e754b3f9c7a36038.tar.gz
cuberite-2cc597372afddbd798c2a8c2e754b3f9c7a36038.tar.bz2
cuberite-2cc597372afddbd798c2a8c2e754b3f9c7a36038.tar.lz
cuberite-2cc597372afddbd798c2a8c2e754b3f9c7a36038.tar.xz
cuberite-2cc597372afddbd798c2a8c2e754b3f9c7a36038.tar.zst
cuberite-2cc597372afddbd798c2a8c2e754b3f9c7a36038.zip
Diffstat (limited to '')
-rw-r--r--src/Mobs/Witch.cpp29
1 files changed, 22 insertions, 7 deletions
diff --git a/src/Mobs/Witch.cpp b/src/Mobs/Witch.cpp
index 25d27041f..6956f7b7a 100644
--- a/src/Mobs/Witch.cpp
+++ b/src/Mobs/Witch.cpp
@@ -18,13 +18,28 @@ cWitch::cWitch(void) :
void cWitch::GetDrops(cItems & a_Drops, cEntity * a_Killer)
{
- AddRandomDropItem(a_Drops, 0, 6, E_ITEM_GLASS_BOTTLE);
- AddRandomDropItem(a_Drops, 0, 6, E_ITEM_GLOWSTONE_DUST);
- AddRandomDropItem(a_Drops, 0, 6, E_ITEM_GUNPOWDER);
- AddRandomDropItem(a_Drops, 0, 6, E_ITEM_REDSTONE_DUST);
- AddRandomDropItem(a_Drops, 0, 6, E_ITEM_SPIDER_EYE);
- AddRandomDropItem(a_Drops, 0, 6, E_ITEM_STICK);
- AddRandomDropItem(a_Drops, 0, 6, E_ITEM_SUGAR);
+ int LootingLevel = 0;
+ if (a_Killer != NULL)
+ {
+ LootingLevel = a_Killer->GetEquippedWeapon().m_Enchantments.GetLevel(cEnchantments::enchLooting);
+ }
+ MTRand r1;
+ int DropTypeCount = (r1.randInt() % 3) + 1;
+ for (int i = 0; i < DropTypeCount; i++)
+ {
+ int DropType = r1.randInt() % 7;
+ switch (DropType)
+ {
+ case 0: AddRandomDropItem(a_Drops, 0, 2 + LootingLevel, E_ITEM_GLASS_BOTTLE); break;
+ case 1: AddRandomDropItem(a_Drops, 0, 2 + LootingLevel, E_ITEM_GLOWSTONE_DUST); break;
+ case 2: AddRandomDropItem(a_Drops, 0, 2 + LootingLevel, E_ITEM_GUNPOWDER); break;
+ case 3: AddRandomDropItem(a_Drops, 0, 2 + LootingLevel, E_ITEM_REDSTONE_DUST); break;
+ case 4: AddRandomDropItem(a_Drops, 0, 2 + LootingLevel, E_ITEM_SPIDER_EYE); break;
+ case 5: AddRandomDropItem(a_Drops, 0, 2 + LootingLevel, E_ITEM_STICK); break;
+ case 6: AddRandomDropItem(a_Drops, 0, 2 + LootingLevel, E_ITEM_SUGAR); break;
+ }
+ }
+ AddRandomWeaponDropItem(a_Drops, LootingLevel);
}