pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 05:21:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Quest API] Fix LDoN Methods in Perl/Lua (#3287)

Browse Source 
# Perl
- Add `quest::removeldonloss(theme_id)`.
- Add `quest::removeldonwin(theme_id)`.

# Lua
- Fix `eq.remove_ldon_win(theme_id)` as it was using `quest_manager.addldonwin(theme_id)` instead of `quest_manager.removeldonwin(theme_id)`.
This commit is contained in:
Alex King 2023-04-10 16:16:54 -04:00 committed by GitHub
parent 445f967ed6
commit 21002c2e8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zone/embparser_api.cpp
View File

@ -849,11 +849,21 @@ void Perl__addldonwin(uint32 theme_id)
quest_manager.addldonwin(theme_id);
}
void Perl__removeldonwin(uint32 theme_id)
{
quest_manager.removeldonwin(theme_id);
}
void Perl__addldonloss(uint32 theme_id)
{
quest_manager.addldonloss(theme_id);
}
void Perl__removeldonloss(uint32 theme_id)
{
quest_manager.removeldonloss(theme_id);
}
void Perl__setnexthpevent(int at_mob_percentage)
{
quest_manager.setnexthpevent(at_mob_percentage);
@ -4632,6 +4642,8 @@ void perl_register_quest()
package.add("remove_expedition_lockout_by_char_id", &Perl__remove_expedition_lockout_by_char_id);
package.add("removeitem", (void(*)(uint32_t))&Perl__removeitem);
package.add("removeitem", (void(*)(uint32_t, int))&Perl__removeitem);
package.add("removeldonloss", &Perl__removeldonloss);
package.add("removeldonwin", &Perl__removeldonwin);
package.add("removetitle", &Perl__removetitle);
package.add("rename", &Perl__rename);
package.add("repopzone", &Perl__repopzone);

2
zone/lua_general.cpp
View File

@ -1987,7 +1987,7 @@ void lua_remove_ldon_loss(uint32 theme_id) {
}
void lua_remove_ldon_win(uint32 theme_id) {
quest_manager.addldonwin(theme_id);
quest_manager.removeldonwin(theme_id);
}
std::string lua_get_clean_npc_name_by_id(uint32 npc_id) {

42
zone/questmgr.cpp
View File

@ -1763,36 +1763,42 @@ void QuestManager::resume() {
owner->CastToNPC()->ResumeWandering();
}
void QuestManager::addldonpoints(uint32 theme_id, int points) {
void QuestManager::addldonpoints(uint32 theme_id, int points)
{
QuestManagerCurrentQuestVars();
if(initiator)
if (initiator) {
initiator->UpdateLDoNPoints(theme_id, points);
}
}
void QuestManager::addldonloss(uint32 theme_id) {
void QuestManager::addldonloss(uint32 theme_id)
{
QuestManagerCurrentQuestVars();
if(initiator) {
if (initiator) {
initiator->UpdateLDoNWinLoss(theme_id);
}
}
void QuestManager::addldonwin(uint32 theme_id) {
void QuestManager::addldonwin(uint32 theme_id)
{
QuestManagerCurrentQuestVars();
if(initiator) {
if (initiator) {
initiator->UpdateLDoNWinLoss(theme_id, true);
}
}
void QuestManager::removeldonloss(uint32 theme_id) {
void QuestManager::removeldonloss(uint32 theme_id)
{
QuestManagerCurrentQuestVars();
if(initiator) {
if (initiator) {
initiator->UpdateLDoNWinLoss(theme_id, false, true);
}
}
void QuestManager::removeldonwin(uint32 theme_id) {
void QuestManager::removeldonwin(uint32 theme_id)
{
QuestManagerCurrentQuestVars();
if(initiator) {
if (initiator) {
initiator->UpdateLDoNWinLoss(theme_id, true, true);
}
}
@ -3609,14 +3615,14 @@ void QuestManager::UpdateZoneHeader(std::string type, std::string value) {
EQ::ItemInstance *QuestManager::CreateItem(uint32 item_id, int16 charges, uint32 augment_one, uint32 augment_two, uint32 augment_three, uint32 augment_four, uint32 augment_five, uint32 augment_six, bool attuned) const {
if (database.GetItem(item_id)) {
return database.CreateItem(
item_id,
charges,
augment_one,
augment_two,
augment_three,
augment_four,
augment_five,
augment_six,
item_id,
charges,
augment_one,
augment_two,
augment_three,
augment_four,
augment_five,
augment_six,
attuned
);
}