[Quest API] Add getcleannpcnamebyid(npc_id) to Perl/Lua. (#1383)

* [Quest API] Add optional clean name parameter to getnpcnamebyid in Perl/Lua.
- Allows Server Operators to grab the clean name without having to clean it up in their Perl/Lua.

* Convert from a parameter to a method.

* Add safer method.

* Convert to proper type.
This commit is contained in:
Alex
2021-06-12 00:41:06 -04:00
committed by GitHub
parent cc46297b32
commit 00dd7c2b71
7 changed files with 64 additions and 1 deletions
+16 -1
View File
@@ -3026,7 +3026,6 @@ XS(XS__getnpcnamebyid) {
dXSTARG;
uint32 npc_id = (int) SvIV(ST(0));
auto npc_name = quest_manager.getnpcnamebyid(npc_id);
sv_setpv(TARG, npc_name.c_str());
XSprePUSH;
PUSHTARG;
@@ -6760,6 +6759,21 @@ XS(XS__crosszoneaddldonwinbyexpeditionid) {
XSRETURN_EMPTY;
}
XS(XS__getcleannpcnamebyid);
XS(XS__getcleannpcnamebyid) {
dXSARGS;
if (items != 1)
Perl_croak(aTHX_ "Usage: quest::getcleannpcnamebyid(uint32 npc_id)");
dXSTARG;
uint32 npc_id = (uint32) SvUV(ST(0));
auto npc_name = quest_manager.getcleannpcnamebyid(npc_id);
sv_setpv(TARG, npc_name.c_str());
XSprePUSH;
PUSHTARG;
XSRETURN(1);
}
/*
This is the callback perl will look for to setup the
quest package's XSUBs
@@ -6984,6 +6998,7 @@ EXTERN_C XS(boot_quest) {
newXS(strcpy(buf, "getaaexpmodifierbycharid"), XS__getaaexpmodifierbycharid, file);
newXS(strcpy(buf, "getcharidbyname"), XS__getcharidbyname, file);
newXS(strcpy(buf, "getclassname"), XS__getclassname, file);
newXS(strcpy(buf, "getcleannpcnamebyid"), XS__getcleannpcnamebyid, file);
newXS(strcpy(buf, "gethexcolorcode"), XS__gethexcolorcode, file);
newXS(strcpy(buf, "getcurrencyid"), XS__getcurrencyid, file);
newXS(strcpy(buf, "getexpmodifierbycharid"), XS__getexpmodifierbycharid, file);
+5
View File
@@ -2455,6 +2455,10 @@ void lua_cross_zone_add_ldon_win_by_expedition_id(uint32 expedition_id, uint32 t
quest_manager.CrossZoneLDoNUpdate(update_type, update_subtype, expedition_id, theme_id);
}
std::string lua_get_clean_npc_name_by_id(uint32 npc_id) {
return quest_manager.getcleannpcnamebyid(npc_id);
}
#define LuaCreateNPCParse(name, c_type, default_value) do { \
cur = table[#name]; \
if(luabind::type(cur) != LUA_TNIL) { \
@@ -2796,6 +2800,7 @@ luabind::scope lua_register_general() {
luabind::def("get_char_id_by_name", (uint32(*)(const char*))&lua_get_char_id_by_name),
luabind::def("get_class_name", (std::string(*)(uint8))&lua_get_class_name),
luabind::def("get_class_name", (std::string(*)(uint8,uint8))&lua_get_class_name),
luabind::def("get_clean_npc_name_by_id", &lua_get_clean_npc_name_by_id),
luabind::def("get_currency_id", &lua_get_currency_id),
luabind::def("get_currency_item_id", &lua_get_currency_item_id),
luabind::def("get_guild_name_by_id", &lua_get_guild_name_by_id),
+8
View File
@@ -2789,6 +2789,14 @@ std::string QuestManager::getnpcnamebyid(uint32 npc_id) {
return res;
}
std::string QuestManager::getcleannpcnamebyid(uint32 npc_id) {
std::string res;
if (npc_id > 0) {
res = database.GetCleanNPCNameByID(npc_id);
}
return res;
}
uint16 QuestManager::CreateInstance(const char *zone, int16 version, uint32 duration)
{
QuestManagerCurrentQuestVars();
+1
View File
@@ -274,6 +274,7 @@ public:
int getguildidbycharid(uint32 char_id);
int getgroupidbycharid(uint32 char_id);
std::string getnpcnamebyid(uint32 npc_id);
std::string getcleannpcnamebyid(uint32 npc_id);
int getraididbycharid(uint32 char_id);
void SetRunning(bool val);
bool IsRunning();