diff --git a/zone/lua_mob.cpp b/zone/lua_mob.cpp index ac0352f10..3b274ba6a 100644 --- a/zone/lua_mob.cpp +++ b/zone/lua_mob.cpp @@ -272,11 +272,6 @@ void Lua_Mob::ChangeSize(double in_size, bool no_restriction) { self->ChangeSize(static_cast(in_size), no_restriction); } -void Lua_Mob::RandomizeFeatures(bool send_illusion, bool save_variables) { - Lua_Safe_Call_Void(); - self->RandomizeFeatures(send_illusion, save_variables); -} - void Lua_Mob::GMMove(double x, double y, double z) { Lua_Safe_Call_Void(); self->GMMove(static_cast(x), static_cast(y), static_cast(z)); @@ -2478,6 +2473,21 @@ Lua_Mob Lua_Mob::GetUltimateOwner() { return Lua_Mob(self->GetUltimateOwner()); } +bool Lua_Mob::RandomizeFeatures() { + Lua_Safe_Call_Bool(); + return self->RandomizeFeatures(); +} + +bool Lua_Mob::RandomizeFeatures(bool send_illusion) { + Lua_Safe_Call_Bool(); + return self->RandomizeFeatures(send_illusion); +} + +bool Lua_Mob::RandomizeFeatures(bool send_illusion, bool save_variables) { + Lua_Safe_Call_Bool(); + return self->RandomizeFeatures(send_illusion, save_variables); +} + void Lua_Mob::CloneAppearance(Lua_Mob other) { Lua_Safe_Call_Void(); self->CloneAppearance(other); @@ -2821,7 +2831,9 @@ luabind::scope lua_register_mob() { .def("ProjectileAnimation", (void(Lua_Mob::*)(Lua_Mob,int,bool,double,double,double,double))&Lua_Mob::ProjectileAnimation) .def("QuestSay", (void(Lua_Mob::*)(Lua_Client,const char *))&Lua_Mob::QuestSay) .def("QuestSay", (void(Lua_Mob::*)(Lua_Client,const char *,luabind::adl::object))&Lua_Mob::QuestSay) - .def("RandomizeFeatures", (void(Lua_Mob::*)(bool,bool))&Lua_Mob::RandomizeFeatures) + .def("RandomizeFeatures", (bool(Lua_Mob::*)(void))&Lua_Mob::RandomizeFeatures) + .def("RandomizeFeatures", (bool(Lua_Mob::*)(bool))&Lua_Mob::RandomizeFeatures) + .def("RandomizeFeatures", (bool(Lua_Mob::*)(bool,bool))&Lua_Mob::RandomizeFeatures) .def("RangedAttack", &Lua_Mob::RangedAttack) .def("RemoveAllNimbusEffects", &Lua_Mob::RemoveAllNimbusEffects) .def("RemoveNimbusEffect", (void(Lua_Mob::*)(int))&Lua_Mob::RemoveNimbusEffect) diff --git a/zone/lua_mob.h b/zone/lua_mob.h index 445e42578..9fc99b533 100644 --- a/zone/lua_mob.h +++ b/zone/lua_mob.h @@ -76,7 +76,9 @@ public: void DoAnim(int anim_num, int type, bool ackreq, int filter); void ChangeSize(double in_size); void ChangeSize(double in_size, bool no_restriction); - void RandomizeFeatures(bool send_illusion, bool save_variables); + bool RandomizeFeatures(); + bool RandomizeFeatures(bool send_illusion); + bool RandomizeFeatures(bool send_illusion, bool save_variables); void GMMove(double x, double y, double z); void GMMove(double x, double y, double z, double heading); void TryMoveAlong(float distance, float heading); diff --git a/zone/perl_mob.cpp b/zone/perl_mob.cpp index 724e6a133..c30d74375 100644 --- a/zone/perl_mob.cpp +++ b/zone/perl_mob.cpp @@ -277,11 +277,6 @@ void Perl_Mob_ChangeSize(Mob* self, float in_size, bool no_restriction) // @cate self->ChangeSize(in_size, no_restriction); } -void Perl_Mob_RandomizeFeatures(Mob* self, bool send_illusion, bool save_variables) // @categories Script Utility -{ - self->RandomizeFeatures(send_illusion, save_variables); -} - void Perl_Mob_GMMove(Mob* self, float x, float y, float z) // @categories Script Utility { self->GMMove(x, y, z); @@ -2457,6 +2452,21 @@ Mob* Perl_Mob_GetUltimateOwner(Mob* self) // @categories Script Utility, Pet return self->GetUltimateOwner(); } +bool Perl_Mob_RandomizeFeatures(Mob* self) // @categories Script Utility +{ + return self->RandomizeFeatures(); +} + +bool Perl_Mob_RandomizeFeatures(Mob* self, bool send_illusion) // @categories Script Utility +{ + return self->RandomizeFeatures(send_illusion); +} + +bool Perl_Mob_RandomizeFeatures(Mob* self, bool send_illusion, bool save_variables) // @categories Script Utility +{ + return self->RandomizeFeatures(send_illusion, save_variables); +} + void Perl_Mob_CloneAppearance(Mob* self, Mob* other) // @categories Script Utility { self->CloneAppearance(other); @@ -2818,7 +2828,9 @@ void perl_register_mob() package.add("ProjectileAnim", (void(*)(Mob*, Mob*, int, bool, float, float, float))&Perl_Mob_ProjectileAnim); package.add("ProjectileAnim", (void(*)(Mob*, Mob*, int, bool, float, float, float, float))&Perl_Mob_ProjectileAnim); package.add("ProjectileAnim", (void(*)(Mob*, Mob*, int, bool, float, float, float, float, const char*))&Perl_Mob_ProjectileAnim); - package.add("RandomizeFeatures", &Perl_Mob_RandomizeFeatures); + package.add("RandomizeFeatures", (bool(*)(Mob*))&Perl_Mob_RandomizeFeatures); + package.add("RandomizeFeatures", (bool(*)(Mob*, bool))&Perl_Mob_RandomizeFeatures); + package.add("RandomizeFeatures", (bool(*)(Mob*, bool, bool))&Perl_Mob_RandomizeFeatures); package.add("RangedAttack", &Perl_Mob_RangedAttack); package.add("RemoveAllAppearanceEffects", &Perl_Mob_RemoveAllAppearanceEffects); package.add("RemoveAllNimbusEffects", &Perl_Mob_RemoveAllNimbusEffects);