diff --git a/zone/attack.cpp b/zone/attack.cpp index 9a210236c..2b5fb4a34 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -4301,7 +4301,7 @@ void Mob::TryCriticalHit(Mob *defender, DamageHitInfo &hit, ExtraAttackOptions * // Crippling blows also have a chance to stun // Kayen: Crippling Blow would cause a chance to interrupt for npcs < 55, with a // staggers message. - if (defender->GetLevel() <= 55 && !defender->GetSpecialAbility(IMMUNE_STUN)) { + if (defender->GetLevel() <= 55 && !defender->GetSpecialAbility(UNSTUNABLE)) { defender->Emote("staggers."); defender->Stun(2000); } diff --git a/zone/lua_general.cpp b/zone/lua_general.cpp index 06e09f1a1..a07db54fb 100644 --- a/zone/lua_general.cpp +++ b/zone/lua_general.cpp @@ -1691,7 +1691,7 @@ luabind::scope lua_register_random() { luabind::def("Int", &random_int), luabind::def("Real", &random_real), luabind::def("Roll", &random_roll_int), - luabind::def("Roll", &random_roll_real), + luabind::def("RollReal", &random_roll_real), luabind::def("Roll0", &random_roll0) ]; } diff --git a/zone/lua_npc.cpp b/zone/lua_npc.cpp index 42f9fd556..50ff597f6 100644 --- a/zone/lua_npc.cpp +++ b/zone/lua_npc.cpp @@ -503,6 +503,12 @@ int Lua_NPC::GetRawAC() { return self->GetRawAC(); } +int Lua_NPC::GetAvoidanceRating() +{ + Lua_Safe_Call_Int(); + return self->GetAvoidanceRating(); +} + luabind::scope lua_register_npc() { return luabind::class_("NPC") .def(luabind::constructor<>()) @@ -604,7 +610,8 @@ luabind::scope lua_register_npc() { .def("MerchantCloseShop", (void(Lua_NPC::*)(void))&Lua_NPC::MerchantCloseShop) .def("SetMerchantProbability", (void(Lua_NPC::*)(void))&Lua_NPC::SetMerchantProbability) .def("GetMerchantProbability", (uint8(Lua_NPC::*)(void))&Lua_NPC::GetMerchantProbability) - .def("GetRawAC", (int(Lua_NPC::*)(void))&Lua_NPC::GetRawAC); + .def("GetRawAC", (int(Lua_NPC::*)(void))&Lua_NPC::GetRawAC) + .def("GetAvoidanceRating", &Lua_NPC::GetAvoidanceRating); } #endif diff --git a/zone/lua_npc.h b/zone/lua_npc.h index 8e36e29a6..d3d673641 100644 --- a/zone/lua_npc.h +++ b/zone/lua_npc.h @@ -126,6 +126,7 @@ public: void SetMerchantProbability(uint8 amt); uint8 GetMerchantProbability(); int GetRawAC(); + int GetAvoidanceRating(); }; #endif