diff --git a/Source/Client/Session.cpp b/Source/Client/Session.cpp index 7f189c0f2..dfe33b921 100644 --- a/Source/Client/Session.cpp +++ b/Source/Client/Session.cpp @@ -2681,14 +2681,21 @@ void CSession::LoadMiniPartyInfo() { // OFFSET: 0x00DFD060 // FUNCTION: fn_23603 void CSession::LoadExternalSettings() { - if (g_serviceMode == 1) { + switch (g_serviceMode) { + case 1: this->m_hotkeyScript->Load(std::strstr(g_launchServerName, "QmSakray") != nullptr ? "Lua Files\\service_korea\\ExternalSettings_kr_sak_qm" : "Lua Files\\service_korea\\ExternalSettings_kr_sak", true, false); - } else if (g_serviceMode == 2) { + break; + case 2: this->m_hotkeyScript->Load("Lua Files\\service_korea\\ExternalSettings_kr_indoor", true, false); - } else if (g_serviceMode == 0 && std::strstr(g_launchServerName, "Dev") != nullptr) { - this->m_hotkeyScript->Load("Lua Files\\service_korea\\ExternalSettings_kr_qm", true, false); - } else { + break; + case 0: + if (std::strstr(g_launchServerName, "Dev") != nullptr) { + this->m_hotkeyScript->Load("Lua Files\\service_korea\\ExternalSettings_kr_qm", true, false); + break; + } + default: this->m_hotkeyScript->Load("Lua Files\\service_korea\\ExternalSettings_kr", true, false); + break; } this->m_hotkeyScript->Call(std::string("GetTableIntValueForC", 20), "ss>d", "MaxLevelTable", "BaseLevel", &*reinterpret_cast(this->maxBaseLevel)); @@ -2716,42 +2723,27 @@ void CSession::LoadExternalSettings() { *reinterpret_cast(&this->jobLevelLimits[0x1C]) == -1 || *reinterpret_cast(&this->jobLevelLimits[0x20]) == -1 || *reinterpret_cast(&this->jobLevelLimits[0x24]) == -1) { - const std::uint8_t source[] = { - 0x1E, 0x9B, 0xE7, 0x02, 0xF7, 0x9D, 0x18, - 0x1D, 0x2F, 0x8C, 0xE7, 0x03, 0xD6, 0xD8, - 0x29, 0x11, 0x32, 0x87, 0xF2, 0x1E, 0xA5, - 0xEB, 0x3C, 0x09, 0x2E, 0x8C, 0x95 - }; + const std::array source = {'\x1E', '\x9B', '\xE7', '\x02', '\xF7', '\x9D', '\x18', '\x1D', '\x2F', '\x8C', '\xE7', '\x03', '\xD6', '\xD8', '\x29', '\x11', '\x32', '\x87', '\xF2', '\x1E', '\xA5', '\xEB', '\x3C', '\x09', '\x2E', '\x8C', '\x95'}; thread_local EncryptedName name(source); - ShowErrorDialog(nullptr, name.Text(), 0); + ShowErrorDialog(name.Text(), 0); } this->m_hotkeyScript->Call(std::string("GetTableIntValueForC", 20), "ss>d", "MaxLevelTable", "BaseLevel4th", &*reinterpret_cast(&this->jobLevelLimits[0x74])); this->m_hotkeyScript->Call(std::string("GetTableIntValueForC", 20), "ss>d", "MaxLevelTable", "JobLevel4th", &*reinterpret_cast(&this->jobLevelLimits[0x78])); if (*reinterpret_cast(&this->jobLevelLimits[0x74]) == -1 || *reinterpret_cast(&this->jobLevelLimits[0x78]) == -1) { - const std::uint8_t source[] = { - 0xC2, 0x6B, 0x53, 0x54, 0x97, 0x4F, 0xEC, - 0xE5, 0xF3, 0x7C, 0x53, 0x55, 0xB6, 0x0A, - 0xDD, 0xE9, 0xEE, 0x77, 0x46, 0x48, 0xC5, - 0x39, 0xC8, 0xF1, 0xF2, 0x7C, 0x21 - }; + const std::array source = {'\xC2', '\x6B', '\x53', '\x54', '\x97', '\x4F', '\xEC', '\xE5', '\xF3', '\x7C', '\x53', '\x55', '\xB6', '\x0A', '\xDD', '\xE9', '\xEE', '\x77', '\x46', '\x48', '\xC5', '\x39', '\xC8', '\xF1', '\xF2', '\x7C', '\x21'}; thread_local EncryptedName name(source); - ShowErrorDialog(nullptr, name.Text(), 0); + ShowErrorDialog(name.Text(), 0); } this->m_hotkeyScript->Call(std::string("GetTableIntValueForC", 20), "ss>d", "MaxLevelTable", "BaseLevelDoram", &*reinterpret_cast(&this->jobLevelLimits[0x28])); this->m_hotkeyScript->Call(std::string("GetTableIntValueForC", 20), "ss>d", "MaxLevelTable", "JobLevelDoram", &*reinterpret_cast(&this->jobLevelLimits[0x2C])); if (*reinterpret_cast(&this->jobLevelLimits[0x2C]) == -1) { - const std::uint8_t source[] = { - 0x84, 0x29, 0xA1, 0x34, 0x8D, 0xA7, 0xC6, - 0xDF, 0xB5, 0x3E, 0xA1, 0x35, 0xAC, 0xE2, - 0xF7, 0xD3, 0xA8, 0x35, 0xB4, 0x28, 0xDF, - 0xD1, 0xE2, 0xCB, 0xB4, 0x3E, 0xD3 - }; + const std::array source = {'\x84', '\x29', '\xA1', '\x34', '\x8D', '\xA7', '\xC6', '\xDF', '\xB5', '\x3E', '\xA1', '\x35', '\xAC', '\xE2', '\xF7', '\xD3', '\xA8', '\x35', '\xB4', '\x28', '\xDF', '\xD1', '\xE2', '\xCB', '\xB4', '\x3E', '\xD3'}; thread_local EncryptedName name(source); - ShowErrorDialog(nullptr, name.Text(), 0); + ShowErrorDialog(name.Text(), 0); } this->m_hotkeyScript->Call(std::string("GetTableBoolValueForC", 21), "ss>b", "MakeableRace", "Doram", &*reinterpret_cast(this->raceCreationOptions)); @@ -2776,14 +2768,9 @@ void CSession::LoadExternalSettings() { this->m_hotkeyScript->Call(std::string("GetTableIntValueForC", 20), "ss>d", "MaxLevelAuraTable", "MaxLevelEffect4th_sub", &this->m_maxLevelEffect4thSub); if (this->m_maxLevelEffect4th == -1 || this->m_maxLevelEffect4thSub == -1) { - const std::uint8_t source[] = { - 0x66, 0x23, 0xB5, 0x54, 0xA1, 0x55, 0x94, - 0xF9, 0x57, 0x34, 0xB5, 0x55, 0x80, 0x10, - 0xA5, 0xF5, 0x4A, 0x3F, 0xA0, 0x48, 0xF3, - 0x23, 0xB0, 0xED, 0x56, 0x34, 0xC7 - }; + const std::array source = {'\x66', '\x23', '\xB5', '\x54', '\xA1', '\x55', '\x94', '\xF9', '\x57', '\x34', '\xB5', '\x55', '\x80', '\x10', '\xA5', '\xF5', '\x4A', '\x3F', '\xA0', '\x48', '\xF3', '\x23', '\xB0', '\xED', '\x56', '\x34', '\xC7'}; thread_local EncryptedName name(source); - ShowErrorDialog(nullptr, name.Text(), 0); + ShowErrorDialog(name.Text(), 0); } } @@ -4706,8 +4693,7 @@ void CSession::LoadLuaDataFiles() { this->m_hotkeyScript->Load("Lua Files\\DataInfo\\jobName_F", true, false); this->m_hotkeyScript->Load("Lua Files\\DataInfo\\jobName", true, false); { - const std::uint8_t source[] = {0x39, 0xB8, 0x8C, 0x7D, 0x2D, 0x0C, 0x89, 0x50, 0x06, 0x91, 0xA9, 0x3C, 0x1F, 0x04, - 0xAC, 0x5B, 0x13, 0xA2, 0xB1, 0x0D, 0x0E, 0x11, 0xAC, 0x5B, 0x13, 0xA2, 0xED}; + const std::array source = {'\x39', '\xB8', '\x8C', '\x7D', '\x2D', '\x0C', '\x89', '\x50', '\x06', '\x91', '\xA9', '\x3C', '\x1F', '\x04', '\xAC', '\x5B', '\x13', '\xA2', '\xB1', '\x0D', '\x0E', '\x11', '\xAC', '\x5B', '\x13', '\xA2', '\xED'}; thread_local EncryptedName name(source); this->m_hotkeyScript->Load(name.Text(), true, false); } @@ -4726,14 +4712,12 @@ void CSession::LoadLuaDataFiles() { this->m_hotkeyScript->Load("Lua Files\\SkillInfoz\\jobinheritlist", true, false); this->m_hotkeyScript->Load("Lua Files\\SkillInfoz\\SkillID", true, false); { - const std::uint8_t source[] = {0xB1, 0xCC, 0xDA, 0x01, 0xD9, 0x94, 0x2D, 0x2C, 0x8E, 0xE5, 0xE8, 0x4A, 0xF6, 0x91, 0x2D, 0x00, 0x93, 0xDF, - 0xD4, 0x5B, 0xC3, 0xAE, 0x2A, 0x20, 0x91, 0xD5, 0xF2, 0x4F, 0xF9, 0x92, 0x0D, 0x20, 0x8E, 0xCD, 0xBB}; + const std::array source = {'\xB1', '\xCC', '\xDA', '\x01', '\xD9', '\x94', '\x2D', '\x2C', '\x8E', '\xE5', '\xE8', '\x4A', '\xF6', '\x91', '\x2D', '\x00', '\x93', '\xDF', '\xD4', '\x5B', '\xC3', '\xAE', '\x2A', '\x20', '\x91', '\xD5', '\xF2', '\x4F', '\xF9', '\x92', '\x0D', '\x20', '\x8E', '\xCD', '\xBB'}; thread_local EncryptedName name(source); this->m_hotkeyScript->Load(name.Text(), true, false); } { - const std::uint8_t source[] = {0x29, 0x6C, 0x24, 0x29, 0x6B, 0x4A, 0x77, 0xEC, 0x16, 0x45, 0x16, 0x62, 0x44, 0x4F, 0x77, 0xC0, 0x0B, 0x7F, - 0x2A, 0x73, 0x71, 0x70, 0x70, 0xE0, 0x09, 0x75, 0x01, 0x6C, 0x5E, 0x40, 0x69, 0xE0, 0x15, 0x6D, 0x45}; + const std::array source = {'\x29', '\x6C', '\x24', '\x29', '\x6B', '\x4A', '\x77', '\xEC', '\x16', '\x45', '\x16', '\x62', '\x44', '\x4F', '\x77', '\xC0', '\x0B', '\x7F', '\x2A', '\x73', '\x71', '\x70', '\x70', '\xE0', '\x09', '\x75', '\x01', '\x6C', '\x5E', '\x40', '\x69', '\xE0', '\x15', '\x6D', '\x45'}; thread_local EncryptedName name(source); this->m_hotkeyScript->Load(name.Text(), true, false); } @@ -4742,8 +4726,7 @@ void CSession::LoadLuaDataFiles() { this->m_hotkeyScript->Load("Lua Files\\SkillInfoz\\skilltreeview", true, false); this->m_hotkeyScript->Load("Lua Files\\StateIcon\\EFSTIDs", true, false); { - const std::uint8_t source[] = {0xF5, 0x70, 0x16, 0x6F, 0x4D, 0x74, 0xE3, 0x10, 0xCA, 0x59, 0x24, 0x3B, 0x6A, 0x69, 0xEA, 0x3C, 0xDA, - 0x6A, 0x19, 0x13, 0x58, 0x69, 0xEE, 0x01, 0xDC, 0x4C, 0x14, 0x20, 0x65, 0x54, 0xE1, 0x13, 0xD6, 0x05}; + const std::array source = {'\xF5', '\x70', '\x16', '\x6F', '\x4D', '\x74', '\xE3', '\x10', '\xCA', '\x59', '\x24', '\x3B', '\x6A', '\x69', '\xEA', '\x3C', '\xDA', '\x6A', '\x19', '\x13', '\x58', '\x69', '\xEE', '\x01', '\xDC', '\x4C', '\x14', '\x20', '\x65', '\x54', '\xE1', '\x13', '\xD6', '\x05'}; thread_local EncryptedName name(source); this->m_hotkeyScript->Load(name.Text(), true, false); } @@ -4789,8 +4772,7 @@ void CSession::LoadLuaDataFiles() { this->LoadNavigationScripts(); this->m_hotkeyScript->Load("Lua Files\\DataInfo\\HelpMsgStr", true, false); { - const std::uint8_t source[] = {0x1D, 0xFE, 0xAC, 0x21, 0xFD, 0x54, 0x2D, 0xB4, 0x22, 0xD7, 0x88, 0x6F, 0xCF, 0x4F, 0x38, 0x80, 0x24, 0xEE, - 0xB8, 0x64, 0xE7, 0x78, 0x2F, 0xA5, 0x23, 0xF2, 0x9C, 0x74, 0xDE, 0x48, 0x24, 0x9D, 0x38, 0xF8, 0xB9, 0x01}; + const std::array source = {'\x1D', '\xFE', '\xAC', '\x21', '\xFD', '\x54', '\x2D', '\xB4', '\x22', '\xD7', '\x88', '\x6F', '\xCF', '\x4F', '\x38', '\x80', '\x24', '\xEE', '\xB8', '\x64', '\xE7', '\x78', '\x2F', '\xA5', '\x23', '\xF2', '\x9C', '\x74', '\xDE', '\x48', '\x24', '\x9D', '\x38', '\xF8', '\xB9', '\x01'}; thread_local EncryptedName name(source); this->m_hotkeyScript->Load(name.Text(), true, false); } @@ -4824,8 +4806,7 @@ void CSession::LoadLuaDataFiles() { this->m_hotkeyScript->Load("Lua Files\\SignBoardList_F", true, false); { - const std::uint8_t source[] = {0x25, 0x6A, 0x16, 0x75, 0xDB, 0xFC, 0x17, 0x06, 0x1A, 0x43, 0x24, 0x3C, - 0xFA, 0xFB, 0x39, 0x0C, 0x08, 0x6D, 0x13, 0x19, 0xF4, 0xE6, 0x0F, 0x63}; + const std::array source = {'\x25', '\x6A', '\x16', '\x75', '\xDB', '\xFC', '\x17', '\x06', '\x1A', '\x43', '\x24', '\x3C', '\xFA', '\xFB', '\x39', '\x0C', '\x08', '\x6D', '\x13', '\x19', '\xF4', '\xE6', '\x0F', '\x63'}; thread_local EncryptedName name(source); this->m_hotkeyScript->Load(name.Text(), true, false); } @@ -4835,14 +4816,12 @@ void CSession::LoadLuaDataFiles() { this->m_hotkeyScript->Load("Lua Files\\OffsetItemPos\\OffsetItemPos_F", true, false); this->m_hotkeyScript->Load("Lua Files\\OffsetItemPos\\OffsetItemPos", true, false); { - const std::uint8_t source[] = {0x95, 0x8C, 0x80, 0xC3, 0x2B, 0x7C, 0xC1, 0x4E, 0xAA, 0xA5, 0x85, 0x82, 0x19, 0x74, 0xC4, 0x45, 0xBF, 0x96, 0xBD, - 0xAF, 0x0C, 0x65, 0xC4, 0x45, 0xBC, 0xBD, 0x85, 0x96, 0x06, 0x51, 0xE9, 0x4A, 0xB2, 0xBB, 0x8E, 0x9B, 0x6D}; + const std::array source = {'\x95', '\x8C', '\x80', '\xC3', '\x2B', '\x7C', '\xC1', '\x4E', '\xAA', '\xA5', '\x85', '\x82', '\x19', '\x74', '\xC4', '\x45', '\xBF', '\x96', '\xBD', '\xAF', '\x0C', '\x65', '\xC4', '\x45', '\xBC', '\xBD', '\x85', '\x96', '\x06', '\x51', '\xE9', '\x4A', '\xB2', '\xBB', '\x8E', '\x9B', '\x6D'}; thread_local EncryptedName name(source); this->m_hotkeyScript->Load(name.Text(), true, false); } { - const std::uint8_t source[] = {0xC3, 0xC8, 0x8E, 0xA7, 0x3B, 0xAC, 0xC1, 0x10, 0xFC, 0xE1, 0x8B, 0xE6, 0x09, 0xA4, 0xC4, 0x1B, 0xE9, 0xD2, - 0xB3, 0xCB, 0x1C, 0xB5, 0xC4, 0x1B, 0xEA, 0xE8, 0x9F, 0xE0, 0x0F, 0xA4, 0xC9, 0x10, 0xCD, 0xD2, 0x97, 0x87}; + const std::array source = {'\xC3', '\xC8', '\x8E', '\xA7', '\x3B', '\xAC', '\xC1', '\x10', '\xFC', '\xE1', '\x8B', '\xE6', '\x09', '\xA4', '\xC4', '\x1B', '\xE9', '\xD2', '\xB3', '\xCB', '\x1C', '\xB5', '\xC4', '\x1B', '\xEA', '\xE8', '\x9F', '\xE0', '\x0F', '\xA4', '\xC9', '\x10', '\xCD', '\xD2', '\x97', '\x87'}; thread_local EncryptedName name(source); this->m_hotkeyScript->Load(name.Text(), true, false); } @@ -4854,33 +4833,28 @@ void CSession::LoadLuaDataFiles() { this->m_hotkeyScript->Load("Lua Files\\datainfo\\tb_cashshop_banner", true, false); this->m_hotkeyScript->Load("Lua Files\\datainfo\\tb_stoveshop_banner", true, false); { - const std::uint8_t source[] = {0xA3, 0x04, 0xBE, 0x33, 0x2B, 0x26, 0xAB, 0x88, 0x9C, 0x2D, 0x9E, 0x74, 0x04, - 0x3B, 0x9B, 0xAC, 0x88, 0x18, 0xAB, 0x50, 0x02, 0x21, 0xA1, 0x84, 0x88, 0x71}; + const std::array source = {'\xA3', '\x04', '\xBE', '\x33', '\x2B', '\x26', '\xAB', '\x88', '\x9C', '\x2D', '\x9E', '\x74', '\x04', '\x3B', '\x9B', '\xAC', '\x88', '\x18', '\xAB', '\x50', '\x02', '\x21', '\xA1', '\x84', '\x88', '\x71'}; thread_local EncryptedName name(source); this->m_hotkeyScript->Load(name.Text(), true, false); } { - const std::uint8_t source[] = {0xD9, 0xFA, 0x80, 0x2D, 0x1B, 0x60, 0x0D, 0x94, 0xE6, 0xD3, 0xA0, 0x6A, 0x34, 0x7D, - 0x3D, 0xB0, 0xF2, 0xE6, 0x95, 0x4E, 0x32, 0x67, 0x07, 0x98, 0xF2, 0xD0, 0xA7, 0x0D}; + const std::array source = {'\xD9', '\xFA', '\x80', '\x2D', '\x1B', '\x60', '\x0D', '\x94', '\xE6', '\xD3', '\xA0', '\x6A', '\x34', '\x7D', '\x3D', '\xB0', '\xF2', '\xE6', '\x95', '\x4E', '\x32', '\x67', '\x07', '\x98', '\xF2', '\xD0', '\xA7', '\x0D'}; thread_local EncryptedName name(source); this->m_hotkeyScript->Load(name.Text(), true, false); } this->m_hotkeyScript->Load("Lua Files\\datainfo\\tb_checkAttendance_banner", true, false); { - const std::uint8_t source[] = {0xCB, 0x66, 0x0A, 0x5F, 0x7F, 0x60, 0x1D, 0x6E, 0xF4, 0x4F, 0x2F, 0x1E, 0x54, 0x68, 0x16, 0x6E, 0xD4, 0x78, - 0x02, 0x11, 0x65, 0x4D, 0x10, 0x66, 0xE6, 0x74, 0x0E, 0x2C, 0x52, 0x60, 0x1F, 0x47, 0xEE, 0x60, 0x1F, 0x7F}; + const std::array source = {'\xCB', '\x66', '\x0A', '\x5F', '\x7F', '\x60', '\x1D', '\x6E', '\xF4', '\x4F', '\x2F', '\x1E', '\x54', '\x68', '\x16', '\x6E', '\xD4', '\x78', '\x02', '\x11', '\x65', '\x4D', '\x10', '\x66', '\xE6', '\x74', '\x0E', '\x2C', '\x52', '\x60', '\x1F', '\x47', '\xEE', '\x60', '\x1F', '\x7F'}; thread_local EncryptedName name(source); this->m_hotkeyScript->Load(name.Text(), true, false); } { - const std::uint8_t source[] = {0xE9, 0xE8, 0x0C, 0xD9, 0x25, 0x4E, 0x1B, 0x66, 0xD6, 0xC1, 0x29, 0x98, 0x0E, 0x46, 0x10, 0x66, 0xF6, 0xF6, - 0x04, 0x97, 0x3F, 0x63, 0x16, 0x6E, 0xC4, 0xFA, 0x08, 0xAA, 0x08, 0x4E, 0x19, 0x4A, 0xCB, 0xFB, 0x02, 0xF9}; + const std::array source = {'\xE9', '\xE8', '\x0C', '\xD9', '\x25', '\x4E', '\x1B', '\x66', '\xD6', '\xC1', '\x29', '\x98', '\x0E', '\x46', '\x10', '\x66', '\xF6', '\xF6', '\x04', '\x97', '\x3F', '\x63', '\x16', '\x6E', '\xC4', '\xFA', '\x08', '\xAA', '\x08', '\x4E', '\x19', '\x4A', '\xCB', '\xFB', '\x02', '\xF9'}; thread_local EncryptedName name(source); this->m_hotkeyScript->Load(name.Text(), true, false); } { - const std::uint8_t source[] = {0x21, 0xCE, 0xF4, 0x0D, 0xD5, 0x92, 0x7B, 0xA0, 0x1E, 0xE7, 0xD1, 0x4C, 0xFE, 0x9A, 0x70, 0xA0, 0x3E, 0xD0, 0xFC, - 0x43, 0xCF, 0xBF, 0x76, 0xA8, 0x0C, 0xDC, 0xF0, 0x7E, 0xF8, 0x92, 0x79, 0x8C, 0x03, 0xDD, 0xFA, 0x72, 0xD5, 0xFB}; + const std::array source = {'\x21', '\xCE', '\xF4', '\x0D', '\xD5', '\x92', '\x7B', '\xA0', '\x1E', '\xE7', '\xD1', '\x4C', '\xFE', '\x9A', '\x70', '\xA0', '\x3E', '\xD0', '\xFC', '\x43', '\xCF', '\xBF', '\x76', '\xA8', '\x0C', '\xDC', '\xF0', '\x7E', '\xF8', '\x92', '\x79', '\x8C', '\x03', '\xDD', '\xFA', '\x72', '\xD5', '\xFB'}; thread_local EncryptedName name(source); this->m_hotkeyScript->Load(name.Text(), true, false); }