diff --git a/Source/Client/Session.cpp b/Source/Client/Session.cpp index 7529e3e7..86543490 100644 --- a/Source/Client/Session.cpp +++ b/Source/Client/Session.cpp @@ -41,6 +41,16 @@ #include "Contents/CashEmotionMgr.h" #include "Contents/Jobs/JobInheritance.h" #include "UI/Window/UIRoMapWnd.h" +#include "Contents/AchievementMgr.h" +#include "Contents/CheckAttendanceMgr.h" +#include "Contents/Items/BarterMarketItemMgr.h" +#include "Contents/Items/ChangeMaterialMgr.h" +#include "Contents/Items/ItemInfoMgr.h" +#include "Contents/Items/RuneSystem.h" +#include "Contents/MapInfoMgr.h" +#include "Contents/PetEvolutionMgr.h" +#include "Contents/PrivateAirplaneMgr.h" +#include "Contents/SpecialPopupMgr.h" #include #include #include @@ -76,6 +86,11 @@ public: /* 0000 */ std::vector tokens; }; +class CUserHotkeyMgr { +public: + static bool Initialize(); +}; + namespace EquipmentProperties { class CEquipmentPropertiesMgr { public: @@ -3022,9 +3037,9 @@ void CSession::Init() { this->unknown_5C1C = 0; *reinterpret_cast(&this->unknown_5C15[0x03]) = 0; this->m_skipPriceWarning = true; - *reinterpret_cast(&this->unknown_5C28[0x08]) = 0; - *reinterpret_cast(&this->unknown_5C28[0x0C]) = 0; - *reinterpret_cast(&this->unknown_5C28[0x10]) = 0; + *reinterpret_cast(&this->unknown_5C30[0x00]) = 0; + *reinterpret_cast(&this->unknown_5C30[0x04]) = 0; + *reinterpret_cast(&this->unknown_5C30[0x08]) = 0; this->unknown_06FC = 0; this->unknown_06A8 = 0; for (ITEM_INFO& item : this->unknown_5C68) { @@ -3332,7 +3347,7 @@ void CSession::InitWeaponHitWaveNames() { // OFFSET: 0x00DF8C40 // FUNCTION: fn_23513 void CSession::InitJobKeyNames() { - std::vector& names = reinterpret_cast&>(this->unknown_0FC4[0x14]); + std::vector& names = this->m_jobKeyNames; names.resize(JT_2004_JOB_LAST, "NOVICE"); names[JT_NOVICE] = "NOVICE"; names[JT_SUPERNOVICE] = "SUPERNOVICE"; @@ -4626,6 +4641,87 @@ EncryptedName<13, 0x4B670715D543C1C3ULL>& DruidRidingName(); EncryptedName<14, 0x7155E5EF0DFB0D03ULL>& KarnosRidingName(); EncryptedName<14, 0x4B1D078937DB892BULL>& AliteaRidingName(); +// OFFSET: 0x00DC2B20 +// FUNCTION: fn_22763 +CSession::CSession() { + this->m_priorityClass = 32; + *reinterpret_cast(&this->unknown_8128[4]) = 0x100; + this->unknown_8148 = -1; + this->unknown_80A8.clear(); + + CItemInfoMgr::Create(); + CSpecialPopupMgr::Create(); + CRuneSystemMgr::Create(); + if (!CUserHotkeyMgr::Initialize()) { + const std::uint8_t captionSource[] = {0x3A, 0x61, 0xAD, 0xBE, 0xF7, 0x67}; + thread_local EncryptedName caption(captionSource); + const char* captionText = caption.Text(); + const std::uint8_t textSource[] = {0xB2, 0x92, 0x4A, 0x6C, 0x65, 0x31, 0x20, 0x85, 0x9A, 0xA2, 0x40, 0x44, 0x70, 0x0B, 0x75, 0xCB, 0xB2, + 0xB5, 0x5C, 0x68, 0x63, 0x1C, 0x06, 0x9F, 0x82, 0xB3, 0x58, 0x67, 0x74, 0x1C, 0x67, 0xD8, 0xF1}; + thread_local EncryptedName text(textSource); + MessageBoxA(nullptr, text.Text(), captionText, MB_OK); + } + if (!CBarterMarketItemMgr::CreateInstance()) { + const std::uint8_t captionSource[] = {0xE2, 0x87, 0x0D, 0x56, 0x43, 0x4B}; + thread_local EncryptedName caption(captionSource); + const char* captionText = caption.Text(); + const std::uint8_t textSource[] = {0x40, 0x49, 0x5C, 0xCF, 0xDC, 0x33, 0x1E, 0xBC, 0x4A, 0x65, 0x4E, 0xC9, 0xC9, 0x38, 0x0F, 0x94, + 0x68, 0x55, 0x44, 0xDE, 0xC9, 0x14, 0x09, 0xBC, 0x64, 0x6A, 0x48, 0xC9, 0x87, 0x67, 0x3E, 0xAB, + 0x6C, 0x46, 0x5B, 0xDE, 0xF4, 0x33, 0x0E, 0xAD, 0x68, 0x49, 0x4C, 0xDE, 0x95, 0x74, 0x7D}; + thread_local EncryptedName text(textSource); + MessageBoxA(nullptr, text.Text(), captionText, MB_OK); + } + if (!CExpandedBarterMarketItemMgr::CreateInstance()) { + const std::uint8_t captionSource[] = {0xDE, 0x25, 0x71, 0xF6, 0x15, 0x05}; + thread_local EncryptedName caption(captionSource); + const char* captionText = caption.Text(); + const std::uint8_t textSource[] = {0xF4, 0xD3, 0x9E, 0x43, 0xDA, 0xD1, 0x8C, 0xE6, 0xFE, 0xFF, 0x8C, 0x45, 0xCF, 0xDA, 0x9D, 0xCE, + 0xDC, 0xCF, 0x86, 0x52, 0xCF, 0xF6, 0x9B, 0xE6, 0xD0, 0x8F, 0xA0, 0x50, 0xC9, 0x85, 0xD5, 0xC0, + 0xCF, 0xD8, 0x8C, 0x43, 0xDE, 0xF6, 0x81, 0xF0, 0xC9, 0xDC, 0x83, 0x54, 0xDE, 0x97, 0xC6, 0x83}; + thread_local EncryptedName text(textSource); + MessageBoxA(nullptr, text.Text(), captionText, MB_OK); + } + if (!CPetEvolutionMgr::Create()) { + const std::uint8_t captionSource[] = {0x88, 0x83, 0xEB, 0xDA, 0xFF, 0x5B}; + thread_local EncryptedName caption(captionSource); + const char* captionText = caption.Text(); + const std::uint8_t textSource[] = {0xA2, 0x2B, 0x9C, 0xA3, 0x90, 0x65, 0x56, 0xB1, 0x94, 0x0F, 0x90, 0xB8, 0xBB, 0x5E, + 0x5E, 0xAF, 0xC1, 0x1D, 0x90, 0xBB, 0xB0, 0x33, 0x70, 0xB3, 0x88, 0x0F, 0xF9}; + thread_local EncryptedName text(textSource); + MessageBoxA(nullptr, text.Text(), captionText, MB_OK); + } + if (!CAchievementMgr::CreateInstance()) { + const std::uint8_t captionSource[] = {0xCA, 0xEB, 0x99, 0x62, 0xC7, 0x7F}; + thread_local EncryptedName caption(captionSource); + const char* captionText = caption.Text(); + const std::uint8_t textSource[] = {0x3C, 0x54, 0xEE, 0x79, 0x5E, 0x6A, 0xFD, 0x4A, 0x12, 0x70, 0xE3, 0x65, 0x7A, + 0x68, 0xF9, 0x0F, 0x19, 0x7C, 0xE1, 0x74, 0x17, 0x66, 0xE5, 0x46, 0x0B, 0x15}; + thread_local EncryptedName text(textSource); + MessageBoxA(nullptr, text.Text(), captionText, MB_OK); + } + + this->m_newRobeDrawOnTop = false; + *reinterpret_cast(&this->unknown_61A8_0000[4]) = 0; + this->m_swapEquipmentMode = 0; + this->unknown_7F74[0] = 1; + *reinterpret_cast(&this->unknown_7F74[4]) = 0; + CPrivateAirplaneMgr::Create(); + CCheckAttendanceMgr::Create(); + *reinterpret_cast(&this->unknown_5974[0x28]) = 0; + this->unknown_7FBC = 0; + CMapInfoMgr::Create(); + this->unknown_8074 = 0; + *reinterpret_cast(&this->unknown_7EF0[0x74]) = 0; + *reinterpret_cast(&this->unknown_7EF0[0x78]) = 0; + CChangeMaterialMgr::CreateInstance(); + this->m_options.Clear(); + *reinterpret_cast(&this->unknown_807C[0x18]) = 0; + this->m_damageSkinIndex = 0; + this->m_damageSkinMode = 0; + this->m_damageMillionUnit = 0; + this->m_navigationPlayerMap[0] = '\0'; +} + // OFFSET: 0x00DE7290 // FUNCTION: fn_23497 void CSession::LoadLuaDataFiles() { @@ -4836,7 +4932,6 @@ void CSession::LoadLuaDataFiles() { this->m_hotkeyScript->Load("Lua Files\\AdventureGuide\\AvailableJobList_F", true, false); this->m_hotkeyScript->Load("Lua Files\\AdventureGuide\\AvailableJobList", true, false); } - // OFFSET: 0x00DE98B0 // FUNCTION: fn_23502 void CSession::InitResourceNameTables() { diff --git a/Source/Client/Session.h b/Source/Client/Session.h index cee39a82..e2e6bfcd 100644 --- a/Source/Client/Session.h +++ b/Source/Client/Session.h @@ -157,6 +157,12 @@ struct SubChatWndInfo { /* 0040 */ int height; }; +struct SessionEntry00A4 { + /* 0000 */ std::string name; + /* 0018 */ unsigned char unknown_0018[0x0C]; + /* 0024 */ std::vector values; +}; + class CSession { public: /* 0000 */ std::uint32_t unknown_0000; @@ -166,7 +172,8 @@ public: /* 008C */ std::list m_mercSkills; /* 0094 */ std::list m_mainCooldownIcons; /* 009C */ std::list m_alternateCooldownIcons; - /* 00A4 */ unsigned char unknown_00A4[0x10]; + /* 00A4 */ std::map unknown_00A4; + /* 00AC */ std::map unknown_00AC; /* 00B4 */ int m_simplifiedSkillList; /* 00B8 */ int m_showSkillDescription; /* 00BC */ unsigned char m_hotkeyPage; @@ -254,7 +261,9 @@ public: /* 0FA8 */ std::vector m_jobNameTable; /* 0FB4 */ std::map m_jobNameTableWoman; /* 0FBC */ std::map m_jobNameTableMan; - /* 0FC4 */ unsigned char unknown_0FC4[0x20]; + /* 0FC4 */ std::map unknown_0FC4; + /* 0FCC */ std::vector m_sexLabels; + /* 0FD8 */ std::vector m_jobKeyNames; /* 0FE4 */ std::list m_pingSamples; /* 0FEC */ std::vector m_palJobNames; /* 0FF8 */ unsigned char unknown_0FF8[0x18]; @@ -270,7 +279,7 @@ public: /* 1050 */ int unknown_1050; /* 1054 */ int unknown_1054; /* 1058 */ int m_petActionTable[5][5][7]; - /* 1314 */ unsigned char unknown_1314[0x258]; + /* 1314 */ std::string unknown_1314[25]; /* 156C */ XmlDocument m_petTalkTable; /* 159C */ XmlDocument m_monsterSkillInfo; /* 15CC */ XmlDocument m_monsterTalkTable; @@ -334,7 +343,9 @@ public: /* 523C */ std::vector>> m_mapViewParameters; /* 5248 */ std::vector m_indoorRswNames; /* 5254 */ std::map m_npcLocationRadius; - /* 525C */ unsigned char unknown_525C[0x38]; + /* 525C */ unsigned char unknown_525C[0x24]; + /* 5280 */ std::list unknown_5280; + /* 5288 */ unsigned char unknown_5288[0x0C]; /* 5294 */ const char* const* m_bodyJobNames; /* 5298 */ unsigned char unknown_5298[0x08]; /* 52A0 */ const char* const* m_sexNames; @@ -384,9 +395,10 @@ public: /* 54A8 */ int unknown_54A8; /* 54AC */ std::string unknown_54AC; /* 54C4 */ std::string unknown_54C4; - /* 54DC */ unsigned char unknown_54DC[0x30]; + /* 54DC */ std::string unknown_54DC; + /* 54F4 */ std::string unknown_54F4; /* 550C */ std::string unknown_550C; - /* 5524 */ unsigned char unknown_5524[0x18]; + /* 5524 */ std::string unknown_5524; /* 553C */ std::string m_serverName; /* 5554 */ unsigned char unknown_5554[4]; /* 5558 */ int unknown_5558; @@ -502,7 +514,8 @@ public: }; /* 5C1C */ int unknown_5C1C; /* 5C20 */ long long m_bankBalance; - /* 5C28 */ unsigned char unknown_5C28[0x40]; + /* 5C28 */ std::map unknown_5C28; + /* 5C30 */ unsigned char unknown_5C30[0x38]; /* 5C68 */ ITEM_INFO unknown_5C68[5]; /* 6140 */ std::uint16_t unknown_6140; /* 6144 */ std::map unknown_6144; @@ -536,7 +549,7 @@ public: }; /* 61B8 */ ITEM_INFO unknown_61B8[10]; /* 6B68 */ ITEM_INFO unknown_6B68[10]; - /* 7518 */ unsigned char unknown_7518[0x9B0]; + /* 7518 */ ITEM_INFO unknown_7518[10]; /* 7EC8 */ std::uint32_t unknown_7EC8; /* 7ECC */ unsigned char unknown_7ECC[0x04]; /* 7ED0 */ int unknown_7ED0; @@ -568,7 +581,7 @@ public: /* 8078 */ const char* const* m_jobSpriteNames; /* 807C */ unsigned char unknown_807C[0x20]; /* 809C */ std::vector unknown_809C; - /* 80A8 */ unsigned char unknown_80A8[0x0C]; + /* 80A8 */ std::vector unknown_80A8; /* 80B4 */ std::map m_nameToId; /* 80BC */ std::map m_shops; /* 80C4 */ int m_damageSkinIndex; @@ -1006,6 +1019,7 @@ public: void UpdateUnknown1708(int enabled); void RefreshItem1738Window(); void RefreshHpSpWindows(); + CSession(); void Init(); void ResetCharacterState(); void ClearItemContainers(); @@ -1064,6 +1078,7 @@ static_assert(sizeof(SessionRecord6144) == 0x38); static_assert(sizeof(SessionRecord6178) == 0x2C); static_assert(sizeof(ProhibitionLogEntry) == 0x54); static_assert(sizeof(SubChatWndInfo) == 0x44); +static_assert(sizeof(SessionEntry00A4) == 0x30); static_assert(offsetof(SubChatWndInfo, x) == 0x34); static_assert(offsetof(CSession, m_noSubChatWnds) == 0x73C); static_assert(offsetof(CSession, m_subChatWnds) == 0x744);