mirror of
https://github.com/EQEmu/Server.git
synced 2026-06-13 10:58:20 +00:00
Merge branch 'master' of https://github.com/EQEmu/Server into integration/multi-tenancy-expansions-repository
This commit is contained in:
Akkadius
+236
-191
@@ -72,7 +72,7 @@ void load_encounter_with_data(std::string name, std::string info_str) {
|
||||
entity_list.AddEncounter(enc);
|
||||
lua_encounters[name] = enc;
|
||||
lua_encounters_loaded[name] = true;
|
||||
std::vector<EQEmu::Any> info_ptrs;
|
||||
std::vector<EQ::Any> info_ptrs;
|
||||
info_ptrs.push_back(&info_str);
|
||||
parse->EventEncounter(EVENT_ENCOUNTER_LOAD, name, "", 0, &info_ptrs);
|
||||
}
|
||||
@@ -134,7 +134,7 @@ void unload_encounter_with_data(std::string name, std::string info_str) {
|
||||
lua_encounters[name]->Depop();
|
||||
lua_encounters.erase(name);
|
||||
lua_encounters_loaded.erase(name);
|
||||
std::vector<EQEmu::Any> info_ptrs;
|
||||
std::vector<EQ::Any> info_ptrs;
|
||||
info_ptrs.push_back(&info_str);
|
||||
parse->EventEncounter(EVENT_ENCOUNTER_UNLOAD, name, "", 0, &info_ptrs);
|
||||
}
|
||||
@@ -1027,6 +1027,18 @@ void lua_cross_zone_signal_client_by_char_id(uint32 player_id, int signal) {
|
||||
quest_manager.CrossZoneSignalPlayerByCharID(player_id, signal);
|
||||
}
|
||||
|
||||
void lua_cross_zone_signal_client_by_group_id(uint32 group_id, int signal) {
|
||||
quest_manager.CrossZoneSignalPlayerByGroupID(group_id, signal);
|
||||
}
|
||||
|
||||
void lua_cross_zone_signal_client_by_raid_id(uint32 raid_id, int signal) {
|
||||
quest_manager.CrossZoneSignalPlayerByRaidID(raid_id, signal);
|
||||
}
|
||||
|
||||
void lua_cross_zone_signal_client_by_guild_id(uint32 guild_id, int signal) {
|
||||
quest_manager.CrossZoneSignalPlayerByGuildID(guild_id, signal);
|
||||
}
|
||||
|
||||
void lua_cross_zone_signal_client_by_name(const char *player, int signal) {
|
||||
quest_manager.CrossZoneSignalPlayerByName(player, signal);
|
||||
}
|
||||
@@ -1035,10 +1047,34 @@ void lua_cross_zone_message_player_by_name(uint32 type, const char *player, cons
|
||||
quest_manager.CrossZoneMessagePlayerByName(type, player, message);
|
||||
}
|
||||
|
||||
void lua_cross_zone_message_player_by_group_id(uint32 type, int group_id, const char *message) {
|
||||
quest_manager.CrossZoneMessagePlayerByGroupID(type, group_id, message);
|
||||
}
|
||||
|
||||
void lua_cross_zone_message_player_by_raid_id(uint32 type, int raid_id, const char *message) {
|
||||
quest_manager.CrossZoneMessagePlayerByRaidID(type, raid_id, message);
|
||||
}
|
||||
|
||||
void lua_cross_zone_message_player_by_guild_id(uint32 type, int guild_id, const char *message) {
|
||||
quest_manager.CrossZoneMessagePlayerByGuildID(type, guild_id, message);
|
||||
}
|
||||
|
||||
void lua_cross_zone_set_entity_variable_by_client_name(const char *player, const char *id, const char *m_var) {
|
||||
quest_manager.CrossZoneSetEntityVariableByClientName(player, id, m_var);
|
||||
}
|
||||
|
||||
void lua_cross_zone_set_entity_variable_by_group_id(int group_id, const char *id, const char *m_var) {
|
||||
quest_manager.CrossZoneSetEntityVariableByGroupID(group_id, id, m_var);
|
||||
}
|
||||
|
||||
void lua_cross_zone_set_entity_variable_by_raid_id(int raid_id, const char *id, const char *m_var) {
|
||||
quest_manager.CrossZoneSetEntityVariableByRaidID(raid_id, id, m_var);
|
||||
}
|
||||
|
||||
void lua_cross_zone_set_entity_variable_by_guild_id(int guild_id, const char *id, const char *m_var) {
|
||||
quest_manager.CrossZoneSetEntityVariableByGuildID(guild_id, id, m_var);
|
||||
}
|
||||
|
||||
void lua_world_wide_marquee(uint32 type, uint32 priority, uint32 fadein, uint32 fadeout, uint32 duration, const char *message) {
|
||||
quest_manager.WorldWideMarquee(type, priority, fadein, fadeout, duration, message);
|
||||
}
|
||||
@@ -2060,9 +2096,18 @@ luabind::scope lua_register_general() {
|
||||
luabind::def("voice_tell", &lua_voice_tell),
|
||||
luabind::def("send_mail", &lua_send_mail),
|
||||
luabind::def("cross_zone_signal_client_by_char_id", &lua_cross_zone_signal_client_by_char_id),
|
||||
luabind::def("cross_zone_signal_client_by_group_id", &lua_cross_zone_signal_client_by_group_id),
|
||||
luabind::def("cross_zone_signal_client_by_raid_id", &lua_cross_zone_signal_client_by_raid_id),
|
||||
luabind::def("cross_zone_signal_client_by_guild_id", &lua_cross_zone_signal_client_by_guild_id),
|
||||
luabind::def("cross_zone_signal_client_by_name", &lua_cross_zone_signal_client_by_name),
|
||||
luabind::def("cross_zone_message_player_by_name", &lua_cross_zone_message_player_by_name),
|
||||
luabind::def("cross_zone_message_player_by_group_id", &lua_cross_zone_message_player_by_group_id),
|
||||
luabind::def("cross_zone_message_player_by_raid_id", &lua_cross_zone_message_player_by_raid_id),
|
||||
luabind::def("cross_zone_message_player_by_guild_id", &lua_cross_zone_message_player_by_guild_id),
|
||||
luabind::def("cross_zone_set_entity_variable_by_client_name", &lua_cross_zone_set_entity_variable_by_client_name),
|
||||
luabind::def("cross_zone_set_entity_variable_by_group_id", &lua_cross_zone_set_entity_variable_by_group_id),
|
||||
luabind::def("cross_zone_set_entity_variable_by_raid_id", &lua_cross_zone_set_entity_variable_by_raid_id),
|
||||
luabind::def("cross_zone_set_entity_variable_by_guild_id", &lua_cross_zone_set_entity_variable_by_guild_id),
|
||||
luabind::def("world_wide_marquee", &lua_world_wide_marquee),
|
||||
luabind::def("get_qglobals", (luabind::adl::object(*)(lua_State*,Lua_NPC,Lua_Client))&lua_get_qglobals),
|
||||
luabind::def("get_qglobals", (luabind::adl::object(*)(lua_State*,Lua_Client))&lua_get_qglobals),
|
||||
@@ -2281,95 +2326,95 @@ luabind::scope lua_register_slot() {
|
||||
return luabind::class_<Slots>("Slot")
|
||||
.enum_("constants")
|
||||
[
|
||||
luabind::value("Charm", static_cast<int>(EQEmu::invslot::slotCharm)),
|
||||
luabind::value("Ear1", static_cast<int>(EQEmu::invslot::slotEar1)),
|
||||
luabind::value("Head", static_cast<int>(EQEmu::invslot::slotHead)),
|
||||
luabind::value("Face", static_cast<int>(EQEmu::invslot::slotFace)),
|
||||
luabind::value("Ear2", static_cast<int>(EQEmu::invslot::slotEar2)),
|
||||
luabind::value("Neck", static_cast<int>(EQEmu::invslot::slotNeck)),
|
||||
luabind::value("Shoulders", static_cast<int>(EQEmu::invslot::slotShoulders)),
|
||||
luabind::value("Arms", static_cast<int>(EQEmu::invslot::slotArms)),
|
||||
luabind::value("Back", static_cast<int>(EQEmu::invslot::slotBack)),
|
||||
luabind::value("Wrist1", static_cast<int>(EQEmu::invslot::slotWrist1)),
|
||||
luabind::value("Wrist2", static_cast<int>(EQEmu::invslot::slotWrist2)),
|
||||
luabind::value("Range", static_cast<int>(EQEmu::invslot::slotRange)),
|
||||
luabind::value("Hands", static_cast<int>(EQEmu::invslot::slotHands)),
|
||||
luabind::value("Primary", static_cast<int>(EQEmu::invslot::slotPrimary)),
|
||||
luabind::value("Secondary", static_cast<int>(EQEmu::invslot::slotSecondary)),
|
||||
luabind::value("Finger1", static_cast<int>(EQEmu::invslot::slotFinger1)),
|
||||
luabind::value("Finger2", static_cast<int>(EQEmu::invslot::slotFinger2)),
|
||||
luabind::value("Chest", static_cast<int>(EQEmu::invslot::slotChest)),
|
||||
luabind::value("Legs", static_cast<int>(EQEmu::invslot::slotLegs)),
|
||||
luabind::value("Feet", static_cast<int>(EQEmu::invslot::slotFeet)),
|
||||
luabind::value("Waist", static_cast<int>(EQEmu::invslot::slotWaist)),
|
||||
luabind::value("PowerSource", static_cast<int>(EQEmu::invslot::slotPowerSource)),
|
||||
luabind::value("Ammo", static_cast<int>(EQEmu::invslot::slotAmmo)),
|
||||
luabind::value("General1", static_cast<int>(EQEmu::invslot::slotGeneral1)),
|
||||
luabind::value("General2", static_cast<int>(EQEmu::invslot::slotGeneral2)),
|
||||
luabind::value("General3", static_cast<int>(EQEmu::invslot::slotGeneral3)),
|
||||
luabind::value("General4", static_cast<int>(EQEmu::invslot::slotGeneral4)),
|
||||
luabind::value("General5", static_cast<int>(EQEmu::invslot::slotGeneral5)),
|
||||
luabind::value("General6", static_cast<int>(EQEmu::invslot::slotGeneral6)),
|
||||
luabind::value("General7", static_cast<int>(EQEmu::invslot::slotGeneral7)),
|
||||
luabind::value("General8", static_cast<int>(EQEmu::invslot::slotGeneral8)),
|
||||
luabind::value("General9", static_cast<int>(EQEmu::invslot::slotGeneral9)),
|
||||
luabind::value("General10", static_cast<int>(EQEmu::invslot::slotGeneral10)),
|
||||
luabind::value("Cursor", static_cast<int>(EQEmu::invslot::slotCursor)),
|
||||
luabind::value("PossessionsBegin", static_cast<int>(EQEmu::invslot::POSSESSIONS_BEGIN)),
|
||||
luabind::value("PossessionsEnd", static_cast<int>(EQEmu::invslot::POSSESSIONS_END)),
|
||||
luabind::value("EquipmentBegin", static_cast<int>(EQEmu::invslot::EQUIPMENT_BEGIN)),
|
||||
luabind::value("EquipmentEnd", static_cast<int>(EQEmu::invslot::EQUIPMENT_END)),
|
||||
luabind::value("GeneralBegin", static_cast<int>(EQEmu::invslot::GENERAL_BEGIN)),
|
||||
luabind::value("GeneralEnd", static_cast<int>(EQEmu::invslot::GENERAL_END)),
|
||||
luabind::value("PossessionsBagsBegin", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN)),
|
||||
luabind::value("PossessionsBagsEnd", static_cast<int>(EQEmu::invbag::CURSOR_BAG_END)),
|
||||
luabind::value("GeneralBagsBegin", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN)),
|
||||
luabind::value("GeneralBagsEnd", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_END)),
|
||||
luabind::value("General1BagBegin", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN)),
|
||||
luabind::value("General1BagEnd", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 9),
|
||||
luabind::value("General2BagBegin", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 10),
|
||||
luabind::value("General2BagEnd", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 19),
|
||||
luabind::value("General3BagBegin", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 20),
|
||||
luabind::value("General3BagEnd", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 29),
|
||||
luabind::value("General4BagBegin", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 30),
|
||||
luabind::value("General4BagEnd", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 39),
|
||||
luabind::value("General5BagBegin", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 40),
|
||||
luabind::value("General5BagEnd", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 49),
|
||||
luabind::value("General6BagBegin", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 50),
|
||||
luabind::value("General6BagEnd", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 59),
|
||||
luabind::value("General7BagBegin", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 60),
|
||||
luabind::value("General7BagEnd", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 69),
|
||||
luabind::value("General8BagBegin", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 70),
|
||||
luabind::value("General8BagEnd", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 79),
|
||||
luabind::value("General9BagBegin", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 80),
|
||||
luabind::value("General9BagEnd", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 89),
|
||||
luabind::value("General10BagBegin", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 90),
|
||||
luabind::value("General10BagEnd", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 99),
|
||||
luabind::value("CursorBagBegin", static_cast<int>(EQEmu::invbag::CURSOR_BAG_BEGIN)),
|
||||
luabind::value("CursorBagEnd", static_cast<int>(EQEmu::invbag::CURSOR_BAG_END)),
|
||||
luabind::value("Tradeskill", static_cast<int>(EQEmu::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE)),
|
||||
luabind::value("Augment", static_cast<int>(EQEmu::invslot::SLOT_AUGMENT_GENERIC_RETURN)),
|
||||
luabind::value("BankBegin", static_cast<int>(EQEmu::invslot::BANK_BEGIN)),
|
||||
luabind::value("BankEnd", static_cast<int>(EQEmu::invslot::BANK_END)),
|
||||
luabind::value("BankBagsBegin", static_cast<int>(EQEmu::invbag::BANK_BAGS_BEGIN)),
|
||||
luabind::value("BankBagsEnd", static_cast<int>(EQEmu::invbag::BANK_BAGS_END)),
|
||||
luabind::value("SharedBankBegin", static_cast<int>(EQEmu::invslot::SHARED_BANK_BEGIN)),
|
||||
luabind::value("SharedBankEnd", static_cast<int>(EQEmu::invslot::SHARED_BANK_END)),
|
||||
luabind::value("SharedBankBagsBegin", static_cast<int>(EQEmu::invbag::SHARED_BANK_BAGS_BEGIN)),
|
||||
luabind::value("SharedBankBagsEnd", static_cast<int>(EQEmu::invbag::SHARED_BANK_BAGS_END)),
|
||||
luabind::value("BagSlotBegin", static_cast<int>(EQEmu::invbag::SLOT_BEGIN)),
|
||||
luabind::value("BagSlotEnd", static_cast<int>(EQEmu::invbag::SLOT_END)),
|
||||
luabind::value("AugSocketBegin", static_cast<int>(EQEmu::invaug::SOCKET_BEGIN)),
|
||||
luabind::value("AugSocketEnd", static_cast<int>(EQEmu::invaug::SOCKET_END)),
|
||||
luabind::value("Invalid", static_cast<int>(EQEmu::invslot::SLOT_INVALID)),
|
||||
luabind::value("Charm", static_cast<int>(EQ::invslot::slotCharm)),
|
||||
luabind::value("Ear1", static_cast<int>(EQ::invslot::slotEar1)),
|
||||
luabind::value("Head", static_cast<int>(EQ::invslot::slotHead)),
|
||||
luabind::value("Face", static_cast<int>(EQ::invslot::slotFace)),
|
||||
luabind::value("Ear2", static_cast<int>(EQ::invslot::slotEar2)),
|
||||
luabind::value("Neck", static_cast<int>(EQ::invslot::slotNeck)),
|
||||
luabind::value("Shoulders", static_cast<int>(EQ::invslot::slotShoulders)),
|
||||
luabind::value("Arms", static_cast<int>(EQ::invslot::slotArms)),
|
||||
luabind::value("Back", static_cast<int>(EQ::invslot::slotBack)),
|
||||
luabind::value("Wrist1", static_cast<int>(EQ::invslot::slotWrist1)),
|
||||
luabind::value("Wrist2", static_cast<int>(EQ::invslot::slotWrist2)),
|
||||
luabind::value("Range", static_cast<int>(EQ::invslot::slotRange)),
|
||||
luabind::value("Hands", static_cast<int>(EQ::invslot::slotHands)),
|
||||
luabind::value("Primary", static_cast<int>(EQ::invslot::slotPrimary)),
|
||||
luabind::value("Secondary", static_cast<int>(EQ::invslot::slotSecondary)),
|
||||
luabind::value("Finger1", static_cast<int>(EQ::invslot::slotFinger1)),
|
||||
luabind::value("Finger2", static_cast<int>(EQ::invslot::slotFinger2)),
|
||||
luabind::value("Chest", static_cast<int>(EQ::invslot::slotChest)),
|
||||
luabind::value("Legs", static_cast<int>(EQ::invslot::slotLegs)),
|
||||
luabind::value("Feet", static_cast<int>(EQ::invslot::slotFeet)),
|
||||
luabind::value("Waist", static_cast<int>(EQ::invslot::slotWaist)),
|
||||
luabind::value("PowerSource", static_cast<int>(EQ::invslot::slotPowerSource)),
|
||||
luabind::value("Ammo", static_cast<int>(EQ::invslot::slotAmmo)),
|
||||
luabind::value("General1", static_cast<int>(EQ::invslot::slotGeneral1)),
|
||||
luabind::value("General2", static_cast<int>(EQ::invslot::slotGeneral2)),
|
||||
luabind::value("General3", static_cast<int>(EQ::invslot::slotGeneral3)),
|
||||
luabind::value("General4", static_cast<int>(EQ::invslot::slotGeneral4)),
|
||||
luabind::value("General5", static_cast<int>(EQ::invslot::slotGeneral5)),
|
||||
luabind::value("General6", static_cast<int>(EQ::invslot::slotGeneral6)),
|
||||
luabind::value("General7", static_cast<int>(EQ::invslot::slotGeneral7)),
|
||||
luabind::value("General8", static_cast<int>(EQ::invslot::slotGeneral8)),
|
||||
luabind::value("General9", static_cast<int>(EQ::invslot::slotGeneral9)),
|
||||
luabind::value("General10", static_cast<int>(EQ::invslot::slotGeneral10)),
|
||||
luabind::value("Cursor", static_cast<int>(EQ::invslot::slotCursor)),
|
||||
luabind::value("PossessionsBegin", static_cast<int>(EQ::invslot::POSSESSIONS_BEGIN)),
|
||||
luabind::value("PossessionsEnd", static_cast<int>(EQ::invslot::POSSESSIONS_END)),
|
||||
luabind::value("EquipmentBegin", static_cast<int>(EQ::invslot::EQUIPMENT_BEGIN)),
|
||||
luabind::value("EquipmentEnd", static_cast<int>(EQ::invslot::EQUIPMENT_END)),
|
||||
luabind::value("GeneralBegin", static_cast<int>(EQ::invslot::GENERAL_BEGIN)),
|
||||
luabind::value("GeneralEnd", static_cast<int>(EQ::invslot::GENERAL_END)),
|
||||
luabind::value("PossessionsBagsBegin", static_cast<int>(EQ::invbag::GENERAL_BAGS_BEGIN)),
|
||||
luabind::value("PossessionsBagsEnd", static_cast<int>(EQ::invbag::CURSOR_BAG_END)),
|
||||
luabind::value("GeneralBagsBegin", static_cast<int>(EQ::invbag::GENERAL_BAGS_BEGIN)),
|
||||
luabind::value("GeneralBagsEnd", static_cast<int>(EQ::invbag::GENERAL_BAGS_END)),
|
||||
luabind::value("General1BagBegin", static_cast<int>(EQ::invbag::GENERAL_BAGS_BEGIN)),
|
||||
luabind::value("General1BagEnd", static_cast<int>(EQ::invbag::GENERAL_BAGS_BEGIN) + 9),
|
||||
luabind::value("General2BagBegin", static_cast<int>(EQ::invbag::GENERAL_BAGS_BEGIN) + 10),
|
||||
luabind::value("General2BagEnd", static_cast<int>(EQ::invbag::GENERAL_BAGS_BEGIN) + 19),
|
||||
luabind::value("General3BagBegin", static_cast<int>(EQ::invbag::GENERAL_BAGS_BEGIN) + 20),
|
||||
luabind::value("General3BagEnd", static_cast<int>(EQ::invbag::GENERAL_BAGS_BEGIN) + 29),
|
||||
luabind::value("General4BagBegin", static_cast<int>(EQ::invbag::GENERAL_BAGS_BEGIN) + 30),
|
||||
luabind::value("General4BagEnd", static_cast<int>(EQ::invbag::GENERAL_BAGS_BEGIN) + 39),
|
||||
luabind::value("General5BagBegin", static_cast<int>(EQ::invbag::GENERAL_BAGS_BEGIN) + 40),
|
||||
luabind::value("General5BagEnd", static_cast<int>(EQ::invbag::GENERAL_BAGS_BEGIN) + 49),
|
||||
luabind::value("General6BagBegin", static_cast<int>(EQ::invbag::GENERAL_BAGS_BEGIN) + 50),
|
||||
luabind::value("General6BagEnd", static_cast<int>(EQ::invbag::GENERAL_BAGS_BEGIN) + 59),
|
||||
luabind::value("General7BagBegin", static_cast<int>(EQ::invbag::GENERAL_BAGS_BEGIN) + 60),
|
||||
luabind::value("General7BagEnd", static_cast<int>(EQ::invbag::GENERAL_BAGS_BEGIN) + 69),
|
||||
luabind::value("General8BagBegin", static_cast<int>(EQ::invbag::GENERAL_BAGS_BEGIN) + 70),
|
||||
luabind::value("General8BagEnd", static_cast<int>(EQ::invbag::GENERAL_BAGS_BEGIN) + 79),
|
||||
luabind::value("General9BagBegin", static_cast<int>(EQ::invbag::GENERAL_BAGS_BEGIN) + 80),
|
||||
luabind::value("General9BagEnd", static_cast<int>(EQ::invbag::GENERAL_BAGS_BEGIN) + 89),
|
||||
luabind::value("General10BagBegin", static_cast<int>(EQ::invbag::GENERAL_BAGS_BEGIN) + 90),
|
||||
luabind::value("General10BagEnd", static_cast<int>(EQ::invbag::GENERAL_BAGS_BEGIN) + 99),
|
||||
luabind::value("CursorBagBegin", static_cast<int>(EQ::invbag::CURSOR_BAG_BEGIN)),
|
||||
luabind::value("CursorBagEnd", static_cast<int>(EQ::invbag::CURSOR_BAG_END)),
|
||||
luabind::value("Tradeskill", static_cast<int>(EQ::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE)),
|
||||
luabind::value("Augment", static_cast<int>(EQ::invslot::SLOT_AUGMENT_GENERIC_RETURN)),
|
||||
luabind::value("BankBegin", static_cast<int>(EQ::invslot::BANK_BEGIN)),
|
||||
luabind::value("BankEnd", static_cast<int>(EQ::invslot::BANK_END)),
|
||||
luabind::value("BankBagsBegin", static_cast<int>(EQ::invbag::BANK_BAGS_BEGIN)),
|
||||
luabind::value("BankBagsEnd", static_cast<int>(EQ::invbag::BANK_BAGS_END)),
|
||||
luabind::value("SharedBankBegin", static_cast<int>(EQ::invslot::SHARED_BANK_BEGIN)),
|
||||
luabind::value("SharedBankEnd", static_cast<int>(EQ::invslot::SHARED_BANK_END)),
|
||||
luabind::value("SharedBankBagsBegin", static_cast<int>(EQ::invbag::SHARED_BANK_BAGS_BEGIN)),
|
||||
luabind::value("SharedBankBagsEnd", static_cast<int>(EQ::invbag::SHARED_BANK_BAGS_END)),
|
||||
luabind::value("BagSlotBegin", static_cast<int>(EQ::invbag::SLOT_BEGIN)),
|
||||
luabind::value("BagSlotEnd", static_cast<int>(EQ::invbag::SLOT_END)),
|
||||
luabind::value("AugSocketBegin", static_cast<int>(EQ::invaug::SOCKET_BEGIN)),
|
||||
luabind::value("AugSocketEnd", static_cast<int>(EQ::invaug::SOCKET_END)),
|
||||
luabind::value("Invalid", static_cast<int>(EQ::invslot::SLOT_INVALID)),
|
||||
|
||||
luabind::value("Shoulder", static_cast<int>(EQEmu::invslot::slotShoulders)), // deprecated
|
||||
luabind::value("Bracer1", static_cast<int>(EQEmu::invslot::slotWrist1)), // deprecated
|
||||
luabind::value("Bracer2", static_cast<int>(EQEmu::invslot::slotWrist2)), // deprecated
|
||||
luabind::value("Ring1", static_cast<int>(EQEmu::invslot::slotFinger1)), // deprecated
|
||||
luabind::value("Ring2", static_cast<int>(EQEmu::invslot::slotFinger2)), // deprecated
|
||||
luabind::value("PersonalBegin", static_cast<int>(EQEmu::invslot::GENERAL_BEGIN)), // deprecated
|
||||
luabind::value("PersonalEnd", static_cast<int>(EQEmu::invslot::GENERAL_END)), // deprecated
|
||||
luabind::value("Shoulder", static_cast<int>(EQ::invslot::slotShoulders)), // deprecated
|
||||
luabind::value("Bracer1", static_cast<int>(EQ::invslot::slotWrist1)), // deprecated
|
||||
luabind::value("Bracer2", static_cast<int>(EQ::invslot::slotWrist2)), // deprecated
|
||||
luabind::value("Ring1", static_cast<int>(EQ::invslot::slotFinger1)), // deprecated
|
||||
luabind::value("Ring2", static_cast<int>(EQ::invslot::slotFinger2)), // deprecated
|
||||
luabind::value("PersonalBegin", static_cast<int>(EQ::invslot::GENERAL_BEGIN)), // deprecated
|
||||
luabind::value("PersonalEnd", static_cast<int>(EQ::invslot::GENERAL_END)), // deprecated
|
||||
luabind::value("CursorEnd", 0xFFFE) // deprecated (not in use..and never valid vis-a-vis client behavior)
|
||||
];
|
||||
}
|
||||
@@ -2378,20 +2423,20 @@ luabind::scope lua_register_material() {
|
||||
return luabind::class_<Materials>("Material")
|
||||
.enum_("constants")
|
||||
[
|
||||
luabind::value("Head", static_cast<int>(EQEmu::textures::armorHead)),
|
||||
luabind::value("Chest", static_cast<int>(EQEmu::textures::armorChest)),
|
||||
luabind::value("Arms", static_cast<int>(EQEmu::textures::armorArms)),
|
||||
luabind::value("Wrist", static_cast<int>(EQEmu::textures::armorWrist)),
|
||||
luabind::value("Hands", static_cast<int>(EQEmu::textures::armorHands)),
|
||||
luabind::value("Legs", static_cast<int>(EQEmu::textures::armorLegs)),
|
||||
luabind::value("Feet", static_cast<int>(EQEmu::textures::armorFeet)),
|
||||
luabind::value("Primary", static_cast<int>(EQEmu::textures::weaponPrimary)),
|
||||
luabind::value("Secondary", static_cast<int>(EQEmu::textures::weaponSecondary)),
|
||||
luabind::value("Count", static_cast<int>(EQEmu::textures::materialCount)),
|
||||
luabind::value("Invalid", static_cast<int>(EQEmu::textures::materialInvalid)),
|
||||
luabind::value("Head", static_cast<int>(EQ::textures::armorHead)),
|
||||
luabind::value("Chest", static_cast<int>(EQ::textures::armorChest)),
|
||||
luabind::value("Arms", static_cast<int>(EQ::textures::armorArms)),
|
||||
luabind::value("Wrist", static_cast<int>(EQ::textures::armorWrist)),
|
||||
luabind::value("Hands", static_cast<int>(EQ::textures::armorHands)),
|
||||
luabind::value("Legs", static_cast<int>(EQ::textures::armorLegs)),
|
||||
luabind::value("Feet", static_cast<int>(EQ::textures::armorFeet)),
|
||||
luabind::value("Primary", static_cast<int>(EQ::textures::weaponPrimary)),
|
||||
luabind::value("Secondary", static_cast<int>(EQ::textures::weaponSecondary)),
|
||||
luabind::value("Count", static_cast<int>(EQ::textures::materialCount)),
|
||||
luabind::value("Invalid", static_cast<int>(EQ::textures::materialInvalid)),
|
||||
|
||||
luabind::value("Bracer", static_cast<int>(EQEmu::textures::armorWrist)), // deprecated
|
||||
luabind::value("Max", static_cast<int>(EQEmu::textures::materialCount)) // deprecated
|
||||
luabind::value("Bracer", static_cast<int>(EQ::textures::armorWrist)), // deprecated
|
||||
luabind::value("Max", static_cast<int>(EQ::textures::materialCount)) // deprecated
|
||||
];
|
||||
}
|
||||
|
||||
@@ -2399,14 +2444,14 @@ luabind::scope lua_register_client_version() {
|
||||
return luabind::class_<ClientVersions>("ClientVersion")
|
||||
.enum_("constants")
|
||||
[
|
||||
luabind::value("Unknown", static_cast<int>(EQEmu::versions::ClientVersion::Unknown)),
|
||||
luabind::value("Titanium", static_cast<int>(EQEmu::versions::ClientVersion::Titanium)),
|
||||
luabind::value("SoF", static_cast<int>(EQEmu::versions::ClientVersion::SoF)),
|
||||
luabind::value("SoD", static_cast<int>(EQEmu::versions::ClientVersion::SoD)),
|
||||
luabind::value("Underfoot", static_cast<int>(EQEmu::versions::ClientVersion::UF)), // deprecated
|
||||
luabind::value("UF", static_cast<int>(EQEmu::versions::ClientVersion::UF)),
|
||||
luabind::value("RoF", static_cast<int>(EQEmu::versions::ClientVersion::RoF)),
|
||||
luabind::value("RoF2", static_cast<int>(EQEmu::versions::ClientVersion::RoF2))
|
||||
luabind::value("Unknown", static_cast<int>(EQ::versions::ClientVersion::Unknown)),
|
||||
luabind::value("Titanium", static_cast<int>(EQ::versions::ClientVersion::Titanium)),
|
||||
luabind::value("SoF", static_cast<int>(EQ::versions::ClientVersion::SoF)),
|
||||
luabind::value("SoD", static_cast<int>(EQ::versions::ClientVersion::SoD)),
|
||||
luabind::value("Underfoot", static_cast<int>(EQ::versions::ClientVersion::UF)), // deprecated
|
||||
luabind::value("UF", static_cast<int>(EQ::versions::ClientVersion::UF)),
|
||||
luabind::value("RoF", static_cast<int>(EQ::versions::ClientVersion::RoF)),
|
||||
luabind::value("RoF2", static_cast<int>(EQ::versions::ClientVersion::RoF2))
|
||||
];
|
||||
}
|
||||
|
||||
@@ -2479,86 +2524,86 @@ luabind::scope lua_register_skills() {
|
||||
return luabind::class_<Skills>("Skill")
|
||||
.enum_("constants")
|
||||
[
|
||||
luabind::value("1HBlunt", EQEmu::skills::Skill1HBlunt),
|
||||
luabind::value("1HSlashing", EQEmu::skills::Skill1HSlashing),
|
||||
luabind::value("2HBlunt", EQEmu::skills::Skill2HBlunt),
|
||||
luabind::value("2HSlashing", EQEmu::skills::Skill2HSlashing),
|
||||
luabind::value("Abjuration", EQEmu::skills::SkillAbjuration),
|
||||
luabind::value("Alteration", EQEmu::skills::SkillAlteration),
|
||||
luabind::value("ApplyPoison", EQEmu::skills::SkillApplyPoison),
|
||||
luabind::value("Archery", EQEmu::skills::SkillArchery),
|
||||
luabind::value("Backstab", EQEmu::skills::SkillBackstab),
|
||||
luabind::value("BindWound", EQEmu::skills::SkillBindWound),
|
||||
luabind::value("Bash", EQEmu::skills::SkillBash),
|
||||
luabind::value("Block", EQEmu::skills::SkillBlock),
|
||||
luabind::value("BrassInstruments", EQEmu::skills::SkillBrassInstruments),
|
||||
luabind::value("Channeling", EQEmu::skills::SkillChanneling),
|
||||
luabind::value("Conjuration", EQEmu::skills::SkillConjuration),
|
||||
luabind::value("Defense", EQEmu::skills::SkillDefense),
|
||||
luabind::value("Disarm", EQEmu::skills::SkillDisarm),
|
||||
luabind::value("DisarmTraps", EQEmu::skills::SkillDisarmTraps),
|
||||
luabind::value("Divination", EQEmu::skills::SkillDivination),
|
||||
luabind::value("Dodge", EQEmu::skills::SkillDodge),
|
||||
luabind::value("DoubleAttack", EQEmu::skills::SkillDoubleAttack),
|
||||
luabind::value("DragonPunch", EQEmu::skills::SkillDragonPunch),
|
||||
luabind::value("TailRake", EQEmu::skills::SkillTailRake),
|
||||
luabind::value("DualWield", EQEmu::skills::SkillDualWield),
|
||||
luabind::value("EagleStrike", EQEmu::skills::SkillEagleStrike),
|
||||
luabind::value("Evocation", EQEmu::skills::SkillEvocation),
|
||||
luabind::value("FeignDeath", EQEmu::skills::SkillFeignDeath),
|
||||
luabind::value("FlyingKick", EQEmu::skills::SkillFlyingKick),
|
||||
luabind::value("Forage", EQEmu::skills::SkillForage),
|
||||
luabind::value("HandtoHand", EQEmu::skills::SkillHandtoHand),
|
||||
luabind::value("Hide", EQEmu::skills::SkillHide),
|
||||
luabind::value("Kick", EQEmu::skills::SkillKick),
|
||||
luabind::value("Meditate", EQEmu::skills::SkillMeditate),
|
||||
luabind::value("Mend", EQEmu::skills::SkillMend),
|
||||
luabind::value("Offense", EQEmu::skills::SkillOffense),
|
||||
luabind::value("Parry", EQEmu::skills::SkillParry),
|
||||
luabind::value("PickLock", EQEmu::skills::SkillPickLock),
|
||||
luabind::value("1HPiercing", EQEmu::skills::Skill1HPiercing),
|
||||
luabind::value("Riposte", EQEmu::skills::SkillRiposte),
|
||||
luabind::value("RoundKick", EQEmu::skills::SkillRoundKick),
|
||||
luabind::value("SafeFall", EQEmu::skills::SkillSafeFall),
|
||||
luabind::value("SenseHeading", EQEmu::skills::SkillSenseHeading),
|
||||
luabind::value("Singing", EQEmu::skills::SkillSinging),
|
||||
luabind::value("Sneak", EQEmu::skills::SkillSneak),
|
||||
luabind::value("SpecializeAbjure", EQEmu::skills::SkillSpecializeAbjure),
|
||||
luabind::value("SpecializeAlteration", EQEmu::skills::SkillSpecializeAlteration),
|
||||
luabind::value("SpecializeConjuration", EQEmu::skills::SkillSpecializeConjuration),
|
||||
luabind::value("SpecializeDivination", EQEmu::skills::SkillSpecializeDivination),
|
||||
luabind::value("SpecializeEvocation", EQEmu::skills::SkillSpecializeEvocation),
|
||||
luabind::value("PickPockets", EQEmu::skills::SkillPickPockets),
|
||||
luabind::value("StringedInstruments", EQEmu::skills::SkillStringedInstruments),
|
||||
luabind::value("Swimming", EQEmu::skills::SkillSwimming),
|
||||
luabind::value("Throwing", EQEmu::skills::SkillThrowing),
|
||||
luabind::value("TigerClaw", EQEmu::skills::SkillTigerClaw),
|
||||
luabind::value("Tracking", EQEmu::skills::SkillTracking),
|
||||
luabind::value("WindInstruments", EQEmu::skills::SkillWindInstruments),
|
||||
luabind::value("Fishing", EQEmu::skills::SkillFishing),
|
||||
luabind::value("MakePoison", EQEmu::skills::SkillMakePoison),
|
||||
luabind::value("Tinkering", EQEmu::skills::SkillTinkering),
|
||||
luabind::value("Research", EQEmu::skills::SkillResearch),
|
||||
luabind::value("Alchemy", EQEmu::skills::SkillAlchemy),
|
||||
luabind::value("Baking", EQEmu::skills::SkillBaking),
|
||||
luabind::value("Tailoring", EQEmu::skills::SkillTailoring),
|
||||
luabind::value("SenseTraps", EQEmu::skills::SkillSenseTraps),
|
||||
luabind::value("Blacksmithing", EQEmu::skills::SkillBlacksmithing),
|
||||
luabind::value("Fletching", EQEmu::skills::SkillFletching),
|
||||
luabind::value("Brewing", EQEmu::skills::SkillBrewing),
|
||||
luabind::value("AlcoholTolerance", EQEmu::skills::SkillAlcoholTolerance),
|
||||
luabind::value("Begging", EQEmu::skills::SkillBegging),
|
||||
luabind::value("JewelryMaking", EQEmu::skills::SkillJewelryMaking),
|
||||
luabind::value("Pottery", EQEmu::skills::SkillPottery),
|
||||
luabind::value("PercussionInstruments", EQEmu::skills::SkillPercussionInstruments),
|
||||
luabind::value("Intimidation", EQEmu::skills::SkillIntimidation),
|
||||
luabind::value("Berserking", EQEmu::skills::SkillBerserking),
|
||||
luabind::value("Taunt", EQEmu::skills::SkillTaunt),
|
||||
luabind::value("Frenzy", EQEmu::skills::SkillFrenzy),
|
||||
luabind::value("RemoveTraps", EQEmu::skills::SkillRemoveTraps),
|
||||
luabind::value("TripleAttack", EQEmu::skills::SkillTripleAttack),
|
||||
luabind::value("2HPiercing", EQEmu::skills::Skill2HPiercing),
|
||||
luabind::value("HIGHEST_SKILL", EQEmu::skills::HIGHEST_SKILL)
|
||||
luabind::value("1HBlunt", EQ::skills::Skill1HBlunt),
|
||||
luabind::value("1HSlashing", EQ::skills::Skill1HSlashing),
|
||||
luabind::value("2HBlunt", EQ::skills::Skill2HBlunt),
|
||||
luabind::value("2HSlashing", EQ::skills::Skill2HSlashing),
|
||||
luabind::value("Abjuration", EQ::skills::SkillAbjuration),
|
||||
luabind::value("Alteration", EQ::skills::SkillAlteration),
|
||||
luabind::value("ApplyPoison", EQ::skills::SkillApplyPoison),
|
||||
luabind::value("Archery", EQ::skills::SkillArchery),
|
||||
luabind::value("Backstab", EQ::skills::SkillBackstab),
|
||||
luabind::value("BindWound", EQ::skills::SkillBindWound),
|
||||
luabind::value("Bash", EQ::skills::SkillBash),
|
||||
luabind::value("Block", EQ::skills::SkillBlock),
|
||||
luabind::value("BrassInstruments", EQ::skills::SkillBrassInstruments),
|
||||
luabind::value("Channeling", EQ::skills::SkillChanneling),
|
||||
luabind::value("Conjuration", EQ::skills::SkillConjuration),
|
||||
luabind::value("Defense", EQ::skills::SkillDefense),
|
||||
luabind::value("Disarm", EQ::skills::SkillDisarm),
|
||||
luabind::value("DisarmTraps", EQ::skills::SkillDisarmTraps),
|
||||
luabind::value("Divination", EQ::skills::SkillDivination),
|
||||
luabind::value("Dodge", EQ::skills::SkillDodge),
|
||||
luabind::value("DoubleAttack", EQ::skills::SkillDoubleAttack),
|
||||
luabind::value("DragonPunch", EQ::skills::SkillDragonPunch),
|
||||
luabind::value("TailRake", EQ::skills::SkillTailRake),
|
||||
luabind::value("DualWield", EQ::skills::SkillDualWield),
|
||||
luabind::value("EagleStrike", EQ::skills::SkillEagleStrike),
|
||||
luabind::value("Evocation", EQ::skills::SkillEvocation),
|
||||
luabind::value("FeignDeath", EQ::skills::SkillFeignDeath),
|
||||
luabind::value("FlyingKick", EQ::skills::SkillFlyingKick),
|
||||
luabind::value("Forage", EQ::skills::SkillForage),
|
||||
luabind::value("HandtoHand", EQ::skills::SkillHandtoHand),
|
||||
luabind::value("Hide", EQ::skills::SkillHide),
|
||||
luabind::value("Kick", EQ::skills::SkillKick),
|
||||
luabind::value("Meditate", EQ::skills::SkillMeditate),
|
||||
luabind::value("Mend", EQ::skills::SkillMend),
|
||||
luabind::value("Offense", EQ::skills::SkillOffense),
|
||||
luabind::value("Parry", EQ::skills::SkillParry),
|
||||
luabind::value("PickLock", EQ::skills::SkillPickLock),
|
||||
luabind::value("1HPiercing", EQ::skills::Skill1HPiercing),
|
||||
luabind::value("Riposte", EQ::skills::SkillRiposte),
|
||||
luabind::value("RoundKick", EQ::skills::SkillRoundKick),
|
||||
luabind::value("SafeFall", EQ::skills::SkillSafeFall),
|
||||
luabind::value("SenseHeading", EQ::skills::SkillSenseHeading),
|
||||
luabind::value("Singing", EQ::skills::SkillSinging),
|
||||
luabind::value("Sneak", EQ::skills::SkillSneak),
|
||||
luabind::value("SpecializeAbjure", EQ::skills::SkillSpecializeAbjure),
|
||||
luabind::value("SpecializeAlteration", EQ::skills::SkillSpecializeAlteration),
|
||||
luabind::value("SpecializeConjuration", EQ::skills::SkillSpecializeConjuration),
|
||||
luabind::value("SpecializeDivination", EQ::skills::SkillSpecializeDivination),
|
||||
luabind::value("SpecializeEvocation", EQ::skills::SkillSpecializeEvocation),
|
||||
luabind::value("PickPockets", EQ::skills::SkillPickPockets),
|
||||
luabind::value("StringedInstruments", EQ::skills::SkillStringedInstruments),
|
||||
luabind::value("Swimming", EQ::skills::SkillSwimming),
|
||||
luabind::value("Throwing", EQ::skills::SkillThrowing),
|
||||
luabind::value("TigerClaw", EQ::skills::SkillTigerClaw),
|
||||
luabind::value("Tracking", EQ::skills::SkillTracking),
|
||||
luabind::value("WindInstruments", EQ::skills::SkillWindInstruments),
|
||||
luabind::value("Fishing", EQ::skills::SkillFishing),
|
||||
luabind::value("MakePoison", EQ::skills::SkillMakePoison),
|
||||
luabind::value("Tinkering", EQ::skills::SkillTinkering),
|
||||
luabind::value("Research", EQ::skills::SkillResearch),
|
||||
luabind::value("Alchemy", EQ::skills::SkillAlchemy),
|
||||
luabind::value("Baking", EQ::skills::SkillBaking),
|
||||
luabind::value("Tailoring", EQ::skills::SkillTailoring),
|
||||
luabind::value("SenseTraps", EQ::skills::SkillSenseTraps),
|
||||
luabind::value("Blacksmithing", EQ::skills::SkillBlacksmithing),
|
||||
luabind::value("Fletching", EQ::skills::SkillFletching),
|
||||
luabind::value("Brewing", EQ::skills::SkillBrewing),
|
||||
luabind::value("AlcoholTolerance", EQ::skills::SkillAlcoholTolerance),
|
||||
luabind::value("Begging", EQ::skills::SkillBegging),
|
||||
luabind::value("JewelryMaking", EQ::skills::SkillJewelryMaking),
|
||||
luabind::value("Pottery", EQ::skills::SkillPottery),
|
||||
luabind::value("PercussionInstruments", EQ::skills::SkillPercussionInstruments),
|
||||
luabind::value("Intimidation", EQ::skills::SkillIntimidation),
|
||||
luabind::value("Berserking", EQ::skills::SkillBerserking),
|
||||
luabind::value("Taunt", EQ::skills::SkillTaunt),
|
||||
luabind::value("Frenzy", EQ::skills::SkillFrenzy),
|
||||
luabind::value("RemoveTraps", EQ::skills::SkillRemoveTraps),
|
||||
luabind::value("TripleAttack", EQ::skills::SkillTripleAttack),
|
||||
luabind::value("2HPiercing", EQ::skills::Skill2HPiercing),
|
||||
luabind::value("HIGHEST_SKILL", EQ::skills::HIGHEST_SKILL)
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user