diff --git a/zone/perl_client.cpp b/zone/perl_client.cpp index 333167b34..62435e248 100644 --- a/zone/perl_client.cpp +++ b/zone/perl_client.cpp @@ -2585,7 +2585,7 @@ void perl_register_client() package.add("HasItemEquippedByID", &Perl_Client_HasItemEquippedByID); package.add("HasPEQZoneFlag", &Perl_Client_HasPEQZoneFlag); package.add("HasSkill", &Perl_Client_HasSkill); - package.add("HasSpellScribed", &Perl_Client_HasSkill); + package.add("HasSpellScribed", &Perl_Client_HasSpellScribed); package.add("HasZoneFlag", &Perl_Client_HasZoneFlag); package.add("Hungry", &Perl_Client_Hungry); package.add("InZone", &Perl_Client_InZone); @@ -2662,6 +2662,7 @@ void perl_register_client() package.add("RemoveAllExpeditionLockouts", (void(*)(Client*))&Perl_Client_RemoveAllExpeditionLockouts); package.add("RemoveAllExpeditionLockouts", (void(*)(Client*, std::string))&Perl_Client_RemoveAllExpeditionLockouts); package.add("RemoveExpeditionLockout", &Perl_Client_RemoveExpeditionLockout); + package.add("RemoveFromInstance", &Perl_Client_RemoveFromInstance); package.add("RemoveItem", (void(*)(Client*, uint32))&Perl_Client_RemoveItem); package.add("RemoveItem", (void(*)(Client*, uint32, uint32))&Perl_Client_RemoveItem); package.add("RemoveLDoNLoss", &Perl_Client_RemoveLDoNLoss); diff --git a/zone/perl_npc.cpp b/zone/perl_npc.cpp index 9479f03a6..cbc0ec968 100644 --- a/zone/perl_npc.cpp +++ b/zone/perl_npc.cpp @@ -459,11 +459,16 @@ float Perl_NPC_GetNPCStat(NPC* self, const char* identifier) // @categories Stat return self->GetNPCStat(identifier); } -void Perl_NPC_AddSpellToNPCList(NPC* self, int priority, int spell_id, int type, int mana_cost, int recast_delay, int resist_adjust) // @categories Spells and Disciplines, Script Utility +void Perl_NPC_AddSpellToNPCList(NPC* self, int16 priority, uint16_t spell_id, uint32 type, int16 mana_cost, int recast_delay, int16 resist_adjust) // @categories Spells and Disciplines, Script Utility { self->AddSpellToNPCList(priority, spell_id, type, mana_cost, recast_delay, resist_adjust, 0, 0); } +void Perl_NPC_AddSpellToNPCList(NPC* self, int16 priority, uint16_t spell_id, uint32 type, int16 mana_cost, int recast_delay, int16 resist_adjust, int8 min_hp, int8 max_hp) // @categories Spells and Disciplines, Script Utility +{ + self->AddSpellToNPCList(priority, spell_id, type, mana_cost, recast_delay, resist_adjust, min_hp, max_hp); +} + void Perl_NPC_RemoveSpellFromNPCList(NPC* self, uint16_t spell_id) // @categories Spells and Disciplines { self->RemoveSpellFromNPCList(spell_id); @@ -664,7 +669,8 @@ void perl_register_npc() package.add("AI_SetRoambox", (void(*)(NPC*, float, float, float, float, float))&Perl_NPC_AI_SetRoambox); package.add("AI_SetRoambox", (void(*)(NPC*, float, float, float, float, float, uint32))&Perl_NPC_AI_SetRoambox); package.add("AI_SetRoambox", (void(*)(NPC*, float, float, float, float, float, uint32, uint32))&Perl_NPC_AI_SetRoambox); - package.add("AddAISpell", &Perl_NPC_AddSpellToNPCList); + package.add("AddAISpell", (void(*)(NPC*, int16, uint16, uint32, int16, int, int16))&Perl_NPC_AddSpellToNPCList); + package.add("AddAISpell", (void(*)(NPC*, int16, uint16, uint32, int16, int, int16, int8, int8))&Perl_NPC_AddSpellToNPCList); package.add("AddAISpellEffect", &Perl_NPC_AddAISpellEffect); package.add("AddCash", &Perl_NPC_AddCash); package.add("AddDefensiveProc", &Perl_NPC_AddDefensiveProc); diff --git a/zone/perl_object.cpp b/zone/perl_object.cpp index b958ade1f..3e620f325 100644 --- a/zone/perl_object.cpp +++ b/zone/perl_object.cpp @@ -251,6 +251,7 @@ void perl_register_object() package.add("GetY", &Perl_Object_GetY); package.add("GetZ", &Perl_Object_GetZ); package.add("IsGroundSpawn", &Perl_Object_IsGroundSpawn); + package.add("IsObject", &Perl_Object_IsObject); package.add("Repop", &Perl_Object_Repop); package.add("Save", &Perl_Object_Save); package.add("SetEntityVariable", &Perl_Object_SetEntityVariable);