From 9cacca5feecbea217f99a50d8f6000890c36c56c Mon Sep 17 00:00:00 2001 From: Kinglykrab Date: Sun, 6 Oct 2024 17:23:13 -0400 Subject: [PATCH] Perl/Cleanup --- common/database/database_update_manifest.cpp | 2 +- common/evolving.cpp | 8 +- common/inventory_profile.cpp | 12 +-- common/item_instance.cpp | 4 +- common/item_instance.h | 6 +- ...base_character_evolving_items_repository.h | 24 ++--- .../character_evolving_items_repository.h | 86 +++++++++--------- common/shareddb.cpp | 8 +- zone/gm_commands/evolving_items.cpp | 6 +- zone/perl_questitem.cpp | 90 +++++++++++++++++++ 10 files changed, 168 insertions(+), 78 deletions(-) diff --git a/common/database/database_update_manifest.cpp b/common/database/database_update_manifest.cpp index 108955f269a..5d939f5e98b 100644 --- a/common/database/database_update_manifest.cpp +++ b/common/database/database_update_manifest.cpp @@ -5760,7 +5760,7 @@ CREATE TABLE `character_evolving_items` ( `char_id` INT(10) UNSIGNED NULL DEFAULT '0', `item_id` INT(10) UNSIGNED NULL DEFAULT '0', `activated` TINYINT(1) UNSIGNED NULL DEFAULT '0', - `equiped` TINYINT(3) UNSIGNED NULL DEFAULT '0', + `equipped` TINYINT(3) UNSIGNED NULL DEFAULT '0', `current_amount` BIGINT(20) NULL DEFAULT '0', `progression` DOUBLE(22,0) NULL DEFAULT '0', `final_item_id` INT(10) UNSIGNED NULL DEFAULT '0', diff --git a/common/evolving.cpp b/common/evolving.cpp index 57e44ef2db0..79b58ef3421 100644 --- a/common/evolving.cpp +++ b/common/evolving.cpp @@ -72,9 +72,9 @@ double EvolvingItemsManager::CalculateProgression(const uint64 current_amount, c void EvolvingItemsManager::DoLootChecks(const uint32 char_id, const uint16 slot_id, const EQ::ItemInstance &inst) const { - inst.SetEvolveEquiped(false); + inst.SetEvolveEquipped(false); if (inst.IsEvolving() && slot_id <= EQ::invslot::EQUIPMENT_END && slot_id >= EQ::invslot::EQUIPMENT_BEGIN) { - inst.SetEvolveEquiped(true); + inst.SetEvolveEquipped(true); } if (!inst.IsEvolving()) { @@ -86,7 +86,7 @@ void EvolvingItemsManager::DoLootChecks(const uint32 char_id, const uint16 slot_ e.char_id = char_id; e.item_id = inst.GetID(); - e.equiped = inst.GetEvolveEquiped(); + e.equipped = inst.GetEvolveEquipped(); e.final_item_id = evolving_items_manager.GetFinalItemID(inst); auto r = CharacterEvolvingItemsRepository::InsertOne(*m_db, e); @@ -100,7 +100,7 @@ void EvolvingItemsManager::DoLootChecks(const uint32 char_id, const uint16 slot_ return; } - CharacterEvolvingItemsRepository::SetEquiped(*m_db, inst.GetEvolveUniqueID(), inst.GetEvolveEquiped()); + CharacterEvolvingItemsRepository::SetEquipped(*m_db, inst.GetEvolveUniqueID(), inst.GetEvolveEquipped()); } uint32 EvolvingItemsManager::GetFinalItemID(const EQ::ItemInstance &inst) const diff --git a/common/inventory_profile.cpp b/common/inventory_profile.cpp index 8e30ea32fe6..3e0533eb320 100644 --- a/common/inventory_profile.cpp +++ b/common/inventory_profile.cpp @@ -345,7 +345,7 @@ bool EQ::InventoryProfile::SwapItem( return false; } - source_item_instance->SetEvolveEquiped(false); + source_item_instance->SetEvolveEquipped(false); if ((destination_slot >= invslot::EQUIPMENT_BEGIN && destination_slot <= invslot::EQUIPMENT_END)) { auto source_item = source_item_instance->GetItem(); if (!source_item) { @@ -365,7 +365,7 @@ bool EQ::InventoryProfile::SwapItem( return false; } if (source_item_instance->IsEvolving() > 0) { - source_item_instance->SetEvolveEquiped(true); + source_item_instance->SetEvolveEquipped(true); } } } @@ -376,7 +376,7 @@ bool EQ::InventoryProfile::SwapItem( return false; } - destination_item_instance->SetEvolveEquiped(false); + destination_item_instance->SetEvolveEquipped(false); if ((source_slot >= invslot::EQUIPMENT_BEGIN && source_slot <= invslot::EQUIPMENT_END)) { auto destination_item = destination_item_instance->GetItem(); if (!destination_item) { @@ -396,7 +396,7 @@ bool EQ::InventoryProfile::SwapItem( return false; } if (destination_item_instance->IsEvolving()) { - destination_item_instance->SetEvolveEquiped(true); + destination_item_instance->SetEvolveEquipped(true); } } } @@ -1412,7 +1412,7 @@ int16 EQ::InventoryProfile::_PutItem(int16 slot_id, ItemInstance* inst) int16 result = INVALID_INDEX; int16 parentSlot = INVALID_INDEX; - inst->SetEvolveEquiped(false); + inst->SetEvolveEquipped(false); if (slot_id == invslot::slotCursor) { // Replace current item on cursor, if exists @@ -1423,7 +1423,7 @@ int16 EQ::InventoryProfile::_PutItem(int16 slot_id, ItemInstance* inst) else if (slot_id >= invslot::EQUIPMENT_BEGIN && slot_id <= invslot::EQUIPMENT_END) { if ((((uint64)1 << slot_id) & m_lookup->PossessionsBitmask) != 0) { if (inst->IsEvolving()) { - inst->SetEvolveEquiped(true); + inst->SetEvolveEquipped(true); } m_worn[slot_id] = inst; result = slot_id; diff --git a/common/item_instance.cpp b/common/item_instance.cpp index f5bbfe5af7f..1ac7f440d1d 100644 --- a/common/item_instance.cpp +++ b/common/item_instance.cpp @@ -1962,13 +1962,13 @@ void EQ::ItemInstance::SetTimer(std::string name, uint32 time) const{ m_timers[name] = t; } -void EQ::ItemInstance::SetEvolveEquiped(const bool in) const +void EQ::ItemInstance::SetEvolveEquipped(const bool in) const { if (!IsEvolving()) { return; } - m_evolving_details.equiped = in; + m_evolving_details.equipped = in; if (in && !GetTimers().contains("evolve")) { SetTimer("evolve", RuleI(EvolvingItems, DelayUponEquipping)); return; diff --git a/common/item_instance.h b/common/item_instance.h index 06822978b7d..8087fd3382c 100644 --- a/common/item_instance.h +++ b/common/item_instance.h @@ -314,8 +314,8 @@ namespace EQ int8 GetEvolveLvl() const { if (GetItem()) { return GetItem()->EvolvingLevel; } return false; } bool IsEvolving() const { if (GetItem()) { return GetItem()->EvolvingItem; } return false; } int8 GetMaxEvolveLvl() const { if (GetItem()) { return GetItem()->EvolvingMax; } return false; } - bool GetEvolveActivated() const { return m_evolving_details.activated; } - bool GetEvolveEquiped() const { return m_evolving_details.equiped; } + bool GetEvolveActivated() const { return m_evolving_details.activated ? true : false; } + bool GetEvolveEquipped() const { return m_evolving_details.equipped ? true : false; } double GetEvolveProgression() const { return m_evolving_details.progression; } uint64 GetEvolveUniqueID() const { return m_evolving_details.id; } uint32 GetEvolveCharID() const { return m_evolving_details.char_id; } @@ -324,7 +324,7 @@ namespace EQ uint64 GetEvolveCurrentAmount() const { return m_evolving_details.current_amount; } uint32 GetEvolveFinalItemID() const { return m_evolving_details.final_item_id; } uint32 GetAugmentEvolveUniqueID(uint8 augment_index) const; - void SetEvolveEquiped(const bool in) const; + void SetEvolveEquipped(const bool in) const; void SetEvolveActivated(const bool in) const { m_evolving_details.activated = in; } void SetEvolveProgression(const double in) const { m_evolving_details.progression = in; } void SetEvolveUniqueID(const uint64 in) const { m_evolving_details.id = in; } diff --git a/common/repositories/base/base_character_evolving_items_repository.h b/common/repositories/base/base_character_evolving_items_repository.h index 971a084d631..30cff13bb28 100644 --- a/common/repositories/base/base_character_evolving_items_repository.h +++ b/common/repositories/base/base_character_evolving_items_repository.h @@ -23,7 +23,7 @@ class BaseCharacterEvolvingItemsRepository { uint32_t char_id; uint32_t item_id; uint8_t activated; - uint8_t equiped; + uint8_t equipped; int64_t current_amount; double progression; uint32_t final_item_id; @@ -42,7 +42,7 @@ class BaseCharacterEvolvingItemsRepository { "char_id", "item_id", "activated", - "equiped", + "equipped", "current_amount", "progression", "final_item_id", @@ -57,7 +57,7 @@ class BaseCharacterEvolvingItemsRepository { "char_id", "item_id", "activated", - "equiped", + "equipped", "current_amount", "progression", "final_item_id", @@ -106,7 +106,7 @@ class BaseCharacterEvolvingItemsRepository { e.char_id = 0; e.item_id = 0; e.activated = 0; - e.equiped = 0; + e.equipped = 0; e.current_amount = 0; e.progression = 0; e.final_item_id = 0; @@ -151,7 +151,7 @@ class BaseCharacterEvolvingItemsRepository { e.char_id = row[1] ? static_cast(strtoul(row[1], nullptr, 10)) : 0; e.item_id = row[2] ? static_cast(strtoul(row[2], nullptr, 10)) : 0; e.activated = row[3] ? static_cast(strtoul(row[3], nullptr, 10)) : 0; - e.equiped = row[4] ? static_cast(strtoul(row[4], nullptr, 10)) : 0; + e.equipped = row[4] ? static_cast(strtoul(row[4], nullptr, 10)) : 0; e.current_amount = row[5] ? strtoll(row[5], nullptr, 10) : 0; e.progression = row[6] ? strtod(row[6], nullptr) : 0; e.final_item_id = row[7] ? static_cast(strtoul(row[7], nullptr, 10)) : 0; @@ -192,7 +192,7 @@ class BaseCharacterEvolvingItemsRepository { v.push_back(columns[1] + " = " + std::to_string(e.char_id)); v.push_back(columns[2] + " = " + std::to_string(e.item_id)); v.push_back(columns[3] + " = " + std::to_string(e.activated)); - v.push_back(columns[4] + " = " + std::to_string(e.equiped)); + v.push_back(columns[4] + " = " + std::to_string(e.equipped)); v.push_back(columns[5] + " = " + std::to_string(e.current_amount)); v.push_back(columns[6] + " = " + std::to_string(e.progression)); v.push_back(columns[7] + " = " + std::to_string(e.final_item_id)); @@ -222,7 +222,7 @@ class BaseCharacterEvolvingItemsRepository { v.push_back(std::to_string(e.char_id)); v.push_back(std::to_string(e.item_id)); v.push_back(std::to_string(e.activated)); - v.push_back(std::to_string(e.equiped)); + v.push_back(std::to_string(e.equipped)); v.push_back(std::to_string(e.current_amount)); v.push_back(std::to_string(e.progression)); v.push_back(std::to_string(e.final_item_id)); @@ -260,7 +260,7 @@ class BaseCharacterEvolvingItemsRepository { v.push_back(std::to_string(e.char_id)); v.push_back(std::to_string(e.item_id)); v.push_back(std::to_string(e.activated)); - v.push_back(std::to_string(e.equiped)); + v.push_back(std::to_string(e.equipped)); v.push_back(std::to_string(e.current_amount)); v.push_back(std::to_string(e.progression)); v.push_back(std::to_string(e.final_item_id)); @@ -302,7 +302,7 @@ class BaseCharacterEvolvingItemsRepository { e.char_id = row[1] ? static_cast(strtoul(row[1], nullptr, 10)) : 0; e.item_id = row[2] ? static_cast(strtoul(row[2], nullptr, 10)) : 0; e.activated = row[3] ? static_cast(strtoul(row[3], nullptr, 10)) : 0; - e.equiped = row[4] ? static_cast(strtoul(row[4], nullptr, 10)) : 0; + e.equipped = row[4] ? static_cast(strtoul(row[4], nullptr, 10)) : 0; e.current_amount = row[5] ? strtoll(row[5], nullptr, 10) : 0; e.progression = row[6] ? strtod(row[6], nullptr) : 0; e.final_item_id = row[7] ? static_cast(strtoul(row[7], nullptr, 10)) : 0; @@ -335,7 +335,7 @@ class BaseCharacterEvolvingItemsRepository { e.char_id = row[1] ? static_cast(strtoul(row[1], nullptr, 10)) : 0; e.item_id = row[2] ? static_cast(strtoul(row[2], nullptr, 10)) : 0; e.activated = row[3] ? static_cast(strtoul(row[3], nullptr, 10)) : 0; - e.equiped = row[4] ? static_cast(strtoul(row[4], nullptr, 10)) : 0; + e.equipped = row[4] ? static_cast(strtoul(row[4], nullptr, 10)) : 0; e.current_amount = row[5] ? strtoll(row[5], nullptr, 10) : 0; e.progression = row[6] ? strtod(row[6], nullptr) : 0; e.final_item_id = row[7] ? static_cast(strtoul(row[7], nullptr, 10)) : 0; @@ -418,7 +418,7 @@ class BaseCharacterEvolvingItemsRepository { v.push_back(std::to_string(e.char_id)); v.push_back(std::to_string(e.item_id)); v.push_back(std::to_string(e.activated)); - v.push_back(std::to_string(e.equiped)); + v.push_back(std::to_string(e.equipped)); v.push_back(std::to_string(e.current_amount)); v.push_back(std::to_string(e.progression)); v.push_back(std::to_string(e.final_item_id)); @@ -449,7 +449,7 @@ class BaseCharacterEvolvingItemsRepository { v.push_back(std::to_string(e.char_id)); v.push_back(std::to_string(e.item_id)); v.push_back(std::to_string(e.activated)); - v.push_back(std::to_string(e.equiped)); + v.push_back(std::to_string(e.equipped)); v.push_back(std::to_string(e.current_amount)); v.push_back(std::to_string(e.progression)); v.push_back(std::to_string(e.final_item_id)); diff --git a/common/repositories/character_evolving_items_repository.h b/common/repositories/character_evolving_items_repository.h index e5f6da13219..5829840a7a4 100644 --- a/common/repositories/character_evolving_items_repository.h +++ b/common/repositories/character_evolving_items_repository.h @@ -47,56 +47,56 @@ class CharacterEvolvingItemsRepository: public BaseCharacterEvolvingItemsReposit // Custom extended repository methods here - static CharacterEvolvingItems SetCurrentAmountAndProgression(Database &db, const uint64 id, const uint64 amount, const double progression) - { - auto e = FindOne(db, id); - if (e.id == 0) { - return NewEntity(); - } + static CharacterEvolvingItems SetCurrentAmountAndProgression(Database& db, const uint64 id, const uint64 amount, const double progression) + { + auto e = FindOne(db, id); + if (e.id == 0) { + return NewEntity(); + } - e.current_amount = amount; - e.progression = progression; - e.deleted_at = 0; - UpdateOne(db, e); - return e; - } + e.current_amount = amount; + e.progression = progression; + e.deleted_at = 0; + UpdateOne(db, e); + return e; + } - static CharacterEvolvingItems SetEquiped(Database &db, const uint64 id, const bool equiped) - { - auto e = FindOne(db, id); - if (e.id == 0) { - return NewEntity(); - } + static CharacterEvolvingItems SetEquipped(Database& db, const uint64 id, const bool equipped) + { + auto e = FindOne(db, id); + if (e.id == 0) { + return NewEntity(); + } - e.equiped = equiped; - e.deleted_at = 0; - UpdateOne(db, e); - return e; - } + e.equipped = equipped; + e.deleted_at = 0; + UpdateOne(db, e); + return e; + } - static CharacterEvolvingItems SoftDelete(Database &db, const uint64 id) - { - auto e = FindOne(db, id); - if (e.id == 0) { - return NewEntity(); - } + static CharacterEvolvingItems SoftDelete(Database& db, const uint64 id) + { + auto e = FindOne(db, id); + if (e.id == 0) { + return NewEntity(); + } - e.deleted_at = time(nullptr); - UpdateOne(db, e); - return e; - } + e.deleted_at = time(nullptr); + UpdateOne(db, e); + return e; + } - static bool UpdateCharID(Database &db, const uint64 id, const uint32 to_char_id) - { - auto e = FindOne(db, id); - if (e.id == 0) { - return false; - } + static bool UpdateCharID(Database& db, const uint64 id, const uint32 to_char_id) + { + auto e = FindOne(db, id); + if (e.id == 0) { + return false; + } - e.char_id = to_char_id; - e.deleted_at = 0; - return UpdateOne(db, e); - } + e.char_id = to_char_id; + e.deleted_at = 0; + return UpdateOne(db, e); + } }; #endif //EQEMU_CHARACTER_EVOLVING_ITEMS_REPOSITORY_H diff --git a/common/shareddb.cpp b/common/shareddb.cpp index 5cc227e3c1d..6000df8fd98 100644 --- a/common/shareddb.cpp +++ b/common/shareddb.cpp @@ -794,7 +794,7 @@ bool SharedDatabase::GetInventory(Client *c) if (item->EvolvingItem) { if (slot_id >= EQ::invslot::EQUIPMENT_BEGIN && slot_id <= EQ::invslot::EQUIPMENT_END) { - inst->SetEvolveEquiped(true); + inst->SetEvolveEquipped(true); } auto t = std::ranges::find_if( @@ -810,7 +810,7 @@ bool SharedDatabase::GetInventory(Client *c) e.char_id = char_id; e.item_id = item_id; - e.equiped = inst->GetEvolveEquiped(); + e.equipped = inst->GetEvolveEquipped(); e.final_item_id = evolving_items_manager.GetFinalItemID(*inst); auto r = CharacterEvolvingItemsRepository::InsertOne(*this, e); @@ -821,7 +821,7 @@ bool SharedDatabase::GetInventory(Client *c) inst->SetEvolveCharID(e.char_id); inst->SetEvolveItemID(e.item_id); inst->SetEvolveActivated(e.activated); - inst->SetEvolveEquiped(e.equiped); + inst->SetEvolveEquipped(e.equipped); inst->SetEvolveCurrentAmount(e.current_amount); inst->CalculateEvolveProgression(); inst->SetEvolveFinalItemID(e.final_item_id); @@ -831,7 +831,7 @@ bool SharedDatabase::GetInventory(Client *c) inst->SetEvolveCharID(t->char_id); inst->SetEvolveItemID(t->item_id); inst->SetEvolveActivated(t->activated); - inst->SetEvolveEquiped(t->equiped); + inst->SetEvolveEquipped(t->equipped); inst->SetEvolveCurrentAmount(t->current_amount); inst->CalculateEvolveProgression(); inst->SetEvolveFinalItemID(t->final_item_id); diff --git a/zone/gm_commands/evolving_items.cpp b/zone/gm_commands/evolving_items.cpp index b19cee9420c..308fe6b2099 100644 --- a/zone/gm_commands/evolving_items.cpp +++ b/zone/gm_commands/evolving_items.cpp @@ -53,7 +53,7 @@ void command_evolvingitems(Client *c, const Seperator *sep) ); c->Message( Chat::Yellow, - fmt::format("{}{}{}", "Equiped", ":", value->GetEvolveEquiped() ? "Yes" : "No").c_str() + fmt::format("{}{}{}", "Equiped", ":", value->GetEvolveEquipped() ? "Yes" : "No").c_str() ); c->Message( Chat::Yellow, @@ -106,7 +106,7 @@ void command_evolvingitems(Client *c, const Seperator *sep) ); c->Message( Chat::Yellow, - fmt::format("{}{}{}", "Equiped", ":", value->GetEvolveEquiped() ? "Yes" : "No").c_str() + fmt::format("{}{}{}", "Equiped", ":", value->GetEvolveEquipped() ? "Yes" : "No").c_str() ); c->Message( Chat::Yellow, @@ -154,7 +154,7 @@ void command_evolvingitems(Client *c, const Seperator *sep) ); c->Message( Chat::Yellow, - fmt::format("{}{}{}", "Equiped", ":", item->GetEvolveEquiped() ? "Yes" : "No").c_str() + fmt::format("{}{}{}", "Equiped", ":", item->GetEvolveEquipped() ? "Yes" : "No").c_str() ); c->Message(Chat::Yellow, fmt::format("{}{}{:0d}", "Unique ID", ":", item->GetEvolveUniqueID()).c_str()); c->Message( diff --git a/zone/perl_questitem.cpp b/zone/perl_questitem.cpp index 6340eed4e35..3fa81e0f8f1 100644 --- a/zone/perl_questitem.cpp +++ b/zone/perl_questitem.cpp @@ -292,12 +292,88 @@ std::string Perl_QuestItem_GetItemLink(EQ::ItemInstance* self) return linker.GenerateLink(); } +int8 Perl_QuestItem_GetEvolveLevel(EQ::ItemInstance* self) +{ + return self->GetEvolveLvl(); +} + +bool Perl_QuestItem_IsEvolving(EQ::ItemInstance* self) +{ + return self->IsEvolving(); +} + +bool Perl_QuestItem_GetEvolveActivated(EQ::ItemInstance* self) +{ + return self->GetEvolveActivated(); +} + +bool Perl_QuestItem_GetEvolveEquipped(EQ::ItemInstance* self) +{ + return self->GetEvolveEquipped(); +} + +double Perl_QuestItem_GetEvolveProgression(EQ::ItemInstance* self) +{ + return self->GetEvolveProgression(); +} + +uint64 Perl_QuestItem_GetEvolveUniqueID(EQ::ItemInstance* self) +{ + return self->GetEvolveUniqueID(); +} + +uint32 Perl_QuestItem_GetEvolveCharacterID(EQ::ItemInstance* self) +{ + return self->GetEvolveCharID(); +} + +uint32 Perl_QuestItem_GetEvolveItemID(EQ::ItemInstance* self) +{ + return self->GetEvolveItemID(); +} + +uint32 Perl_QuestItem_GetEvolveLoreID(EQ::ItemInstance* self) +{ + return self->GetEvolveLoreID(); +} + +uint64 Perl_QuestItem_GetEvolveCurrentAmount(EQ::ItemInstance* self) +{ + return self->GetEvolveCurrentAmount(); +} + +uint32 Perl_QuestItem_GetEvolveFinalItemID(EQ::ItemInstance* self) +{ + return self->GetEvolveFinalItemID(); +} + +uint32 Perl_QuestItem_GetAugmentEvolveUniqueID(EQ::ItemInstance* self, uint8 slot_id) +{ + return self->GetAugmentEvolveUniqueID(slot_id); +} + +void Perl_QuestItem_SetEvolveProgression(EQ::ItemInstance* self, float amount) +{ + self->SetEvolveProgression(amount); +} + +void Perl_QuestItem_SetEvolveAmount(EQ::ItemInstance* self, uint64 amount) +{ + self->SetEvolveCurrentAmount(amount); +} + +void Perl_QuestItem_AddEvolveAmount(EQ::ItemInstance* self, uint64 amount) +{ + self->SetEvolveAddToCurrentAmount(amount); +} + void perl_register_questitem() { perl::interpreter perl(PERL_GET_THX); auto package = perl.new_class("QuestItem"); + package.add("AddEvolveAmount", &Perl_QuestItem_AddEvolveAmount); package.add("AddEXP", &Perl_QuestItem_AddEXP); package.add("ClearTimers", &Perl_QuestItem_ClearTimers); package.add("Clone", &Perl_QuestItem_Clone); @@ -305,6 +381,7 @@ void perl_register_questitem() package.add("CountAugmentByID", &Perl_QuestItem_CountAugmentByID); package.add("DeleteCustomData", &Perl_QuestItem_DeleteCustomData); package.add("GetAugment", &Perl_QuestItem_GetAugment); + package.add("GetAugmentEvolveUniqueID", &Perl_QuestItem_GetAugmentEvolveUniqueID); package.add("GetAugmentIDs", &Perl_QuestItem_GetAugmentIDs); package.add("GetAugmentItemID", &Perl_QuestItem_GetAugmentItemID); package.add("GetAugmentType", &Perl_QuestItem_GetAugmentType); @@ -312,6 +389,16 @@ void perl_register_questitem() package.add("GetColor", &Perl_QuestItem_GetColor); package.add("GetCustomData", &Perl_QuestItem_GetCustomData); package.add("GetCustomDataString", &Perl_QuestItem_GetCustomDataString); + package.add("GetEvolveActivated", &Perl_QuestItem_GetEvolveActivated); + package.add("GetEvolveCharacterID", &Perl_QuestItem_GetEvolveCharacterID); + package.add("GetEvolveCurrentAmount", &Perl_QuestItem_GetEvolveCurrentAmount); + package.add("GetEvolveEquipped", &Perl_QuestItem_GetEvolveEquipped); + package.add("GetEvolveFinalItemID", &Perl_QuestItem_GetEvolveFinalItemID); + package.add("GetEvolveItemID", &Perl_QuestItem_GetEvolveItemID); + package.add("GetEvolveLevel", &Perl_QuestItem_GetEvolveLevel); + package.add("GetEvolveLoreID", &Perl_QuestItem_GetEvolveLoreID); + package.add("GetEvolveProgression", &Perl_QuestItem_GetEvolveProgression); + package.add("GetEvolveUniqueID", &Perl_QuestItem_GetEvolveUniqueID); package.add("GetEXP", &Perl_QuestItem_GetEXP); package.add("GetID", &Perl_QuestItem_GetID); package.add("GetItem", (EQ::ItemData*(*)(EQ::ItemInstance*))&Perl_QuestItem_GetItem); @@ -331,6 +418,7 @@ void perl_register_questitem() package.add("IsAugmented", &Perl_QuestItem_IsAugmented); package.add("IsEquipable", (bool(*)(EQ::ItemInstance*, int16))&Perl_QuestItem_IsEquipable); package.add("IsEquipable", (bool(*)(EQ::ItemInstance*, uint16, uint16))&Perl_QuestItem_IsEquipable); + package.add("IsEvolving", &Perl_QuestItem_IsEvolving); package.add("IsExpendable", &Perl_QuestItem_IsExpendable); package.add("IsInstanceNoDrop", &Perl_QuestItem_IsInstanceNoDrop); package.add("IsStackable", &Perl_QuestItem_IsStackable); @@ -346,6 +434,8 @@ void perl_register_questitem() package.add("SetCustomData", (void(*)(EQ::ItemInstance*, std::string, float))&Perl_QuestItem_SetCustomData); package.add("SetCustomData", (void(*)(EQ::ItemInstance*, std::string, int))&Perl_QuestItem_SetCustomData); package.add("SetCustomData", (void(*)(EQ::ItemInstance*, std::string, std::string))&Perl_QuestItem_SetCustomData); + package.add("SetEvolveAmount", &Perl_QuestItem_SetEvolveAmount); + package.add("SetEvolveProgression", &Perl_QuestItem_SetEvolveProgression); package.add("SetEXP", &Perl_QuestItem_SetEXP); package.add("SetInstanceNoDrop", &Perl_QuestItem_SetInstanceNoDrop); package.add("SetPrice", &Perl_QuestItem_SetPrice);