Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Quest API] Add Potion Belt Methods #4634

Merged
merged 5 commits into from
Feb 4, 2025
Merged

[Quest API] Add Potion Belt Methods #4634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0fc3147
[Quest API] Add Potion Belt Methods
Kinglykrab Feb 2, 2025
a547f8a
Update client.h
Kinglykrab Feb 2, 2025
e43fbb4
Cleanup
Kinglykrab Feb 2, 2025
25a7252
Update client.h
Akkadius Feb 3, 2025
8004df4
Constrain properly
Kinglykrab Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions zone/client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1832,6 +1832,29 @@ class Client : public Mob

Raid *p_raid_instance;

inline uint32 GetPotionBeltItemIcon(uint8 slot_id)
{
return EQ::ValueWithin(
slot_id,
0,
EQ::profile::POTION_BELT_SIZE - 1
) ? m_pp.potionbelt.Items[slot_id].Icon : 0;
};

inline uint32 GetPotionBeltItemID(uint8 slot_id)
{
return EQ::ValueWithin(slot_id, 0, EQ::profile::POTION_BELT_SIZE - 1) ? m_pp.potionbelt.Items[slot_id].ID : 0;
};

inline std::string GetPotionBeltItemName(uint8 slot_id)
{
return EQ::ValueWithin(
slot_id,
0,
EQ::profile::POTION_BELT_SIZE - 1
) ? m_pp.potionbelt.Items[slot_id].Name : 0;
};

void ShowDevToolsMenu();
CheatManager cheat_manager;

Expand Down
21 changes: 21 additions & 0 deletions zone/lua_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3530,6 +3530,24 @@ std::string Lua_Client::GetBandolierItemName(uint8 bandolier_slot, uint8 slot_id
return self->GetBandolierItemName(bandolier_slot, slot_id);
}

uint32 Lua_Client::GetPotionBeltItemIcon(uint8 slot_id)
{
Lua_Safe_Call_Int();
return self->GetPotionBeltItemIcon(slot_id);
}

uint32 Lua_Client::GetPotionBeltItemID(uint8 slot_id)
{
Lua_Safe_Call_Int();
return self->GetPotionBeltItemID(slot_id);
}

std::string Lua_Client::GetPotionBeltItemName(uint8 slot_id)
{
Lua_Safe_Call_String();
return self->GetPotionBeltItemName(slot_id);
}

luabind::scope lua_register_client() {
return luabind::class_<Lua_Client, Lua_Mob>("Client")
.def(luabind::constructor<>())
Expand Down Expand Up @@ -3776,6 +3794,9 @@ luabind::scope lua_register_client() {
.def("GetNextAvailableDisciplineSlot", (int(Lua_Client::*)(void))&Lua_Client::GetNextAvailableDisciplineSlot)
.def("GetNextAvailableSpellBookSlot", (int(Lua_Client::*)(int))&Lua_Client::GetNextAvailableSpellBookSlot)
.def("GetNextAvailableSpellBookSlot", (int(Lua_Client::*)(void))&Lua_Client::GetNextAvailableSpellBookSlot)
.def("GetPotionBeltItemIcon", (uint32(Lua_Client::*)(uint8))&Lua_Client::GetPotionBeltItemIcon)
.def("GetPotionBeltItemID", (uint32(Lua_Client::*)(uint8))&Lua_Client::GetPotionBeltItemID)
.def("GetPotionBeltItemName", (std::string(Lua_Client::*)(uint8))&Lua_Client::GetPotionBeltItemName)
.def("GetPVP", (bool(Lua_Client::*)(void))&Lua_Client::GetPVP)
.def("GetPVPPoints", (uint32(Lua_Client::*)(void))&Lua_Client::GetPVPPoints)
.def("GetRaceBitmask", (uint16(Lua_Client::*)(void))&Lua_Client::GetRaceBitmask)
Expand Down
3 changes: 3 additions & 0 deletions zone/lua_client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,9 @@ class Lua_Client : public Lua_Mob
uint32 GetBandolierItemIcon(uint8 bandolier_slot, uint8 slot_id);
uint32 GetBandolierItemID(uint8 bandolier_slot, uint8 slot_id);
std::string GetBandolierItemName(uint8 bandolier_slot, uint8 slot_id);
uint32 GetPotionBeltItemIcon(uint8 slot_id);
uint32 GetPotionBeltItemID(uint8 slot_id);
std::string GetPotionBeltItemName(uint8 slot_id);

// account data buckets
void SetAccountBucket(std::string bucket_name, std::string bucket_value);
Expand Down
18 changes: 18 additions & 0 deletions zone/perl_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3289,6 +3289,21 @@ std::string Perl_Client_GetBandolierItemName(Client* self, uint8 bandolier_slot,
return self->GetBandolierItemName(bandolier_slot, slot_id);
}

uint32 Perl_Client_GetPotionBeltItemIcon(Client* self, uint8 slot_id)
{
return self->GetPotionBeltItemIcon(slot_id);
}

uint32 Perl_Client_GetPotionBeltItemID(Client* self, uint8 slot_id)
{
return self->GetPotionBeltItemID(slot_id);
}

std::string Perl_Client_GetPotionBeltItemName(Client* self, uint8 slot_id)
{
return self->GetPotionBeltItemName(slot_id);
}

void perl_register_client()
{
perl::interpreter perl(PERL_GET_THX);
Expand Down Expand Up @@ -3534,6 +3549,9 @@ void perl_register_client()
package.add("GetMemmedSpells", &Perl_Client_GetMemmedSpells);
package.add("GetModCharacterFactionLevel", &Perl_Client_GetModCharacterFactionLevel);
package.add("GetMoney", &Perl_Client_GetMoney);
package.add("GetPotionBeltItemIcon", &Perl_Client_GetPotionBeltItemIcon);
package.add("GetPotionBeltItemID", &Perl_Client_GetPotionBeltItemID);
package.add("GetPotionBeltItemName", &Perl_Client_GetPotionBeltItemName);
package.add("GetPVP", &Perl_Client_GetPVP);
package.add("GetPVPPoints", &Perl_Client_GetPVPPoints);
package.add("GetRaceAbbreviation", &Perl_Client_GetRaceAbbreviation);
Expand Down