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

Formatting

Browse Source
This commit is contained in:
Valorith 2023-02-10 23:36:15 -05:00 committed by Akkadius
parent b61ee86ff3
commit d1a16c2ae8
7 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zone/embparser.cpp
View File

@ -161,8 +161,8 @@ const char *QuestEventSubroutines[_LargestEventID] = {
"EVENT_TASK_BEFORE_UPDATE",
"EVENT_AA_BUY",
"EVENT_AA_GAIN",
"EVENT_AAXP_GAIN",
"EVENT_XP_GAIN",
"EVENT_AA_EXP_GAIN",
"EVENT_EXP_GAIN",
"EVENT_PAYLOAD",
"EVENT_LEVEL_DOWN",
"EVENT_GM_COMMAND",
@ -2086,13 +2086,13 @@ void PerlembParser::ExportEventVariables(
break;
}
case EVENT_AAXP_GAIN: {
ExportVar(package_name.c_str(), "aaxp_value", extradata);
case EVENT_AA_EXP_GAIN: {
ExportVar(package_name.c_str(), "aaxp_value", data);
break;
}
case EVENT_XP_GAIN: {
ExportVar(package_name.c_str(), "xp_value", extradata);
case EVENT_EXP_GAIN: {
ExportVar(package_name.c_str(), "xp_value", data);
break;
}

4
zone/event_codes.h
View File

@ -106,8 +106,8 @@ typedef enum {
EVENT_TASK_BEFORE_UPDATE,
EVENT_AA_BUY,
EVENT_AA_GAIN,
EVENT_AAXP_GAIN,
EVENT_XP_GAIN,
EVENT_AA_EXP_GAIN,
EVENT_EXP_GAIN,
EVENT_PAYLOAD,
EVENT_LEVEL_DOWN,
EVENT_GM_COMMAND,

5
zone/exp.cpp
View File

@ -807,12 +807,13 @@ void Client::SetEXP(uint64 set_exp, uint64 set_aaxp, bool isrezzexp) {
if (m_pp.exp != set_exp) {
const auto xp_value = set_exp - m_pp.exp;
const auto export_string = fmt::format("{}", xp_value);
parse->EventPlayer(EVENT_XP_GAIN, this,export_string, xp_value);
parse->EventPlayer(EVENT_EXP_GAIN, this, export_string, 0);
}
if (m_pp.expAA != set_aaxp) {
const auto aaxp_value = set_aaxp - m_pp.expAA;
const auto export_string = fmt::format("{}",aaxp_value);
parse->EventPlayer(EVENT_AAXP_GAIN, this, export_string, aaxp_value);
parse->EventPlayer(EVENT_AA_EXP_GAIN, this, export_string, 0);
}
//set the client's EXP and AAEXP

4
zone/lua_general.cpp
View File

@ -4737,8 +4737,8 @@ luabind::scope lua_register_events() {
luabind::value("task_before_update", static_cast<int>(EVENT_TASK_BEFORE_UPDATE)),
luabind::value("aa_buy", static_cast<int>(EVENT_AA_BUY)),
luabind::value("aa_gain", static_cast<int>(EVENT_AA_GAIN)),
luabind::value("aaxp_gain", static_cast<int>(EVENT_AAXP_GAIN)),
luabind::value("xp_gain", static_cast<int>(EVENT_XP_GAIN)),
luabind::value("aa_exp_gain", static_cast<int>(EVENT_AA_EXP_GAIN)),
luabind::value("exp_gain", static_cast<int>(EVENT_EXP_GAIN)),
luabind::value("payload", static_cast<int>(EVENT_PAYLOAD)),
luabind::value("level_down", static_cast<int>(EVENT_LEVEL_DOWN)),
luabind::value("gm_command", static_cast<int>(EVENT_GM_COMMAND)),

8
zone/lua_parser.cpp
View File

@ -148,8 +148,8 @@ const char *LuaEvents[_LargestEventID] = {
"event_task_before_update",
"event_aa_buy",
"event_aa_gain",
"event_aaxp_gain",
"event_xp_gain",
"event_aa_exp_gain",
"event_exp_gain",
"event_payload",
"event_level_down",
"event_gm_command",
@ -277,8 +277,8 @@ LuaParser::LuaParser() {
PlayerArgumentDispatch[EVENT_INSPECT] = handle_player_inspect;
PlayerArgumentDispatch[EVENT_AA_BUY] = handle_player_aa_buy;
PlayerArgumentDispatch[EVENT_AA_GAIN] = handle_player_aa_gain;
PlayerArgumentDispatch[EVENT_AAXP_GAIN] = handle_player_aaxp_gain;
PlayerArgumentDispatch[EVENT_XP_GAIN] = handle_player_xp_gain;
PlayerArgumentDispatch[EVENT_AA_EXP_GAIN] = handle_player_aa_exp_gain;
PlayerArgumentDispatch[EVENT_EXP_GAIN] = handle_player_exp_gain;
PlayerArgumentDispatch[EVENT_PAYLOAD] = handle_player_payload;
PlayerArgumentDispatch[EVENT_LEVEL_UP] = handle_player_level_up;
PlayerArgumentDispatch[EVENT_LEVEL_DOWN] = handle_player_level_down;

8
zone/lua_parser_events.cpp
View File

@ -1181,7 +1181,7 @@ void handle_player_aa_gain(
lua_setfield(L, -2, "aa_gained");
}
void handle_player_aaxp_gain(
void handle_player_aa_exp_gain(
QuestInterface *parse,
lua_State* L,
Client* client,
@ -1190,10 +1190,10 @@ void handle_player_aaxp_gain(
std::vector<std::any> *extra_pointers
) {
lua_pushinteger(L, Strings::ToInt(data));
lua_setfield(L, -2, "aaxp_value");
lua_setfield(L, -2, "aa_exp_value");
}
void handle_player_xp_gain(
void handle_player_exp_gain(
QuestInterface *parse,
lua_State* L,
Client* client,
@ -1202,7 +1202,7 @@ void handle_player_xp_gain(
std::vector<std::any> *extra_pointers
) {
lua_pushinteger(L, Strings::ToInt(data));
lua_setfield(L, -2, "xp_value");
lua_setfield(L, -2, "exp_value");
}
void handle_player_level_up(

4
zone/lua_parser_events.h
View File

@ -608,7 +608,7 @@ void handle_player_aa_gain(
std::vector<std::any> *extra_pointers
);
void handle_player_aaxp_gain(
void handle_player_aa_exp_gain(
QuestInterface *parse,
lua_State* L,
Client* client,
@ -617,7 +617,7 @@ void handle_player_aaxp_gain(
std::vector<std::any> *extra_pointers
);
void handle_player_xp_gain(
void handle_player_exp_gain(
QuestInterface *parse,
lua_State* L,
Client* client,