From 6e8e1c6d8da3d5a0f5ca39f6f18d88c2ca6c1e71 Mon Sep 17 00:00:00 2001 From: Masy98 Date: Sat, 20 Dec 2014 10:31:34 +0100 Subject: Added Rabbits --- src/Mobs/Rabbit.cpp | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/Mobs/Rabbit.cpp (limited to 'src/Mobs/Rabbit.cpp') diff --git a/src/Mobs/Rabbit.cpp b/src/Mobs/Rabbit.cpp new file mode 100644 index 000000000..1c7d810b7 --- /dev/null +++ b/src/Mobs/Rabbit.cpp @@ -0,0 +1,38 @@ + +#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules + +#include "Rabbit.h" +#include "../Entities/Player.h" +#include "../World.h" + + + + + +cRabbit::cRabbit(void) : + super("Rabbit", mtRabbit, "mob.rabbit.idle", "mob.rabbit.death", 0.9, 0.9) +{ +} + + + + + +void cRabbit::GetDrops(cItems & a_Drops, cEntity * a_Killer) +{ + int LootingLevel = 0; + if (a_Killer != nullptr) + { + LootingLevel = a_Killer->GetEquippedWeapon().m_Enchantments.GetLevel(cEnchantments::enchLooting); + } + AddRandomDropItem(a_Drops, 0, 1 + LootingLevel, IsOnFire() ? E_ITEM_COOKED_RABBIT : E_ITEM_RAW_RABBIT); + AddRandomDropItem(a_Drops, 0, 1 + LootingLevel, E_ITEM_RABBIT_HIDE); + cItems RareDrops; + RareDrops.Add(cItem(E_ITEM_RABBITS_FOOT)); + AddRandomRareDropItem(a_Drops, RareDrops, LootingLevel); +} + + + + + -- cgit v1.2.3 From 3d2b1875a196a6aa39414381d580bdf5b2135bff Mon Sep 17 00:00:00 2001 From: Masy98 Date: Sat, 20 Dec 2014 10:38:56 +0100 Subject: Fixed Rabbit size --- src/Mobs/Rabbit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Mobs/Rabbit.cpp') diff --git a/src/Mobs/Rabbit.cpp b/src/Mobs/Rabbit.cpp index 1c7d810b7..7b873da33 100644 --- a/src/Mobs/Rabbit.cpp +++ b/src/Mobs/Rabbit.cpp @@ -10,7 +10,7 @@ cRabbit::cRabbit(void) : - super("Rabbit", mtRabbit, "mob.rabbit.idle", "mob.rabbit.death", 0.9, 0.9) + super("Rabbit", mtRabbit, "mob.rabbit.idle", "mob.rabbit.death", 0.82, 0.68) { } -- cgit v1.2.3 From 5695649bb94276a7465c6c1df5a271889650abc0 Mon Sep 17 00:00:00 2001 From: Masy98 Date: Sat, 20 Dec 2014 13:04:42 +0100 Subject: Fixed damn empty line with no use --- src/Mobs/Rabbit.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/Mobs/Rabbit.cpp') diff --git a/src/Mobs/Rabbit.cpp b/src/Mobs/Rabbit.cpp index 7b873da33..cf49d2744 100644 --- a/src/Mobs/Rabbit.cpp +++ b/src/Mobs/Rabbit.cpp @@ -32,7 +32,3 @@ void cRabbit::GetDrops(cItems & a_Drops, cEntity * a_Killer) AddRandomRareDropItem(a_Drops, RareDrops, LootingLevel); } - - - - -- cgit v1.2.3