pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 13:16:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into aa

Browse Source
This commit is contained in:
KimLS
2015-06-10 22:47:45 -07:00
parent 1589169200 8dccc8bf90
commit 416538764a
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/lua_mob.cpp
+6 -1
View File
@@ -1851,6 +1851,10 @@ int Lua_Mob::CanBuffStack(int spell_id, int caster_level, bool fail_if_overwrite
return self->CanBuffStack(spell_id, caster_level, fail_if_overwrite); return self->CanBuffStack(spell_id, caster_level, fail_if_overwrite);
} }
void Lua_Mob::SetPseudoRoot(bool in) {
Lua_Safe_Call_Void();
self->SetPseudoRoot(in);
}
luabind::scope lua_register_mob() { luabind::scope lua_register_mob() {
return luabind::class_<Lua_Mob, Lua_Entity>("Mob") return luabind::class_<Lua_Mob, Lua_Entity>("Mob")
@@ -2168,7 +2172,8 @@ luabind::scope lua_register_mob() {
.def("BuffFadeBySlot", (void(Lua_Mob::*)(int))&Lua_Mob::BuffFadeBySlot) .def("BuffFadeBySlot", (void(Lua_Mob::*)(int))&Lua_Mob::BuffFadeBySlot)
.def("BuffFadeBySlot", (void(Lua_Mob::*)(int,bool))&Lua_Mob::BuffFadeBySlot) .def("BuffFadeBySlot", (void(Lua_Mob::*)(int,bool))&Lua_Mob::BuffFadeBySlot)
.def("CanBuffStack", (int(Lua_Mob::*)(int,int))&Lua_Mob::CanBuffStack) .def("CanBuffStack", (int(Lua_Mob::*)(int,int))&Lua_Mob::CanBuffStack)
.def("CanBuffStack", (int(Lua_Mob::*)(int,int,bool))&Lua_Mob::CanBuffStack); .def("CanBuffStack", (int(Lua_Mob::*)(int,int,bool))&Lua_Mob::CanBuffStack)
.def("SetPseudoRoot", (void(Lua_Mob::*)(bool))&Lua_Mob::SetPseudoRoot);
} }
luabind::scope lua_register_special_abilities() { luabind::scope lua_register_special_abilities() {
zone/lua_mob.h
+1
View File
@@ -352,6 +352,7 @@ public:
void BuffFadeBySlot(int slot, bool recalc_bonuses); void BuffFadeBySlot(int slot, bool recalc_bonuses);
int CanBuffStack(int spell_id, int caster_level); int CanBuffStack(int spell_id, int caster_level);
int CanBuffStack(int spell_id, int caster_level, bool fail_if_overwrite); int CanBuffStack(int spell_id, int caster_level, bool fail_if_overwrite);
void SetPseudoRoot(bool in);
}; };
#endif #endif
zone/mob.cpp
+1 -1
View File
@@ -615,7 +615,7 @@ int Mob::_GetWalkSpeed() const {
} }
int Mob::_GetRunSpeed() const { int Mob::_GetRunSpeed() const {
if (IsRooted() || IsStunned() || IsMezzed()) if (IsRooted() || IsStunned() || IsMezzed() || IsPseudoRooted())
return 0; return 0;
int aa_mod = 0; int aa_mod = 0;