Batch #1675 by ragnarok-clanker: 2 byte-identical, 45 confirmed by peer review. - fn_10839 UIButton::Slot25: logic confirmed by peer review - fn_10852 UIButton::Slot31: logic confirmed by peer review - fn_10868 UIButton::Slot27: logic confirmed by peer review - fn_10930 UIStaticBitmap::SetBitmap: logic confirmed by peer review - fn_10931 UIBitmapButton::SetBitmap: logic confirmed by peer review - fn_11320 UIComboBoxEx2::Slot15: logic confirmed by peer review - fn_11326 UIListBox::Slot15: logic confirmed by peer review - fn_11327 UIListBoxEx::Slot15: logic confirmed by peer review - fn_11381 UIScrollBar::Paint: logic confirmed by peer review - fn_11383 UIScrollBar_Navi::Paint: logic confirmed by peer review - fn_11425 UIScrollBar::Slot25: logic confirmed by peer review - fn_11440 UIScrollBar::Slot31: logic confirmed by peer review - fn_11445 UITextButton::Slot31: logic confirmed by peer review - fn_11468 UIScrollBar::Slot27: logic confirmed by peer review - fn_11471 UITextButton::Slot27: logic confirmed by peer review - fn_11494 UITextButton::Slot33: logic confirmed by peer review - fn_11779 UIFrameWnd::Slot25: logic confirmed by peer review - fn_11781 UIFrameWnd::Slot31: logic confirmed by peer review - fn_11786 UIFrameWnd::Slot27: logic confirmed by peer review - fn_12610 CSession::GetOption: logic confirmed by peer review - fn_12689 ActivateShortcut: logic confirmed by peer review - fn_12711 ShortcutTooltip::Hover: logic confirmed by peer review - fn_12724 ShortcutDetails::Open: logic confirmed by peer review (already on main) - fn_12760 UIShortCutWnd::SendMsg: logic confirmed by peer review - fn_17144 UIWindowMgr::RemoveOrder: logic confirmed by peer review - fn_17158 UIWindowMgr::Capture: byte-identical - fn_17180 UIWindowMgr::BringToFront: logic confirmed by peer review - fn_17192 UIWindowMgr::IsOrderFixed: logic confirmed by peer review - fn_17232 UIWindowMgr::ReleaseCapture: byte-identical - fn_17255 UIWindowMgr::SetCapture: logic confirmed by peer review - fn_20382 CConnection::CConnection: logic confirmed by peer review - fn_20383 CRagConnection::CRagConnection: logic confirmed by peer review - fn_20384 CConnection::~CConnection: logic confirmed by peer review (already on main) - fn_20389 CConnection::Connect: logic confirmed by peer review - fn_20390 CConnection::Close: logic confirmed by peer review - fn_20409 GetRagConnection: logic confirmed by peer review - fn_21406 AutomaticSkills::Complete: logic confirmed by peer review - fn_03927 CCharacterLinkedUserDataMgr::CompleteLoad: logic confirmed by peer review - fn_03933 CCharacterLinkedUserDataMgr::Save: logic confirmed by peer review - fn_03937 CSession::SetOption: logic confirmed by peer review - fn_11073 UIScrollBar::UIScrollBar: logic confirmed by peer review - fn_11102 UIComboBoxEx2::~UIComboBoxEx2: logic confirmed by peer review (already on main) - fn_09150 AutomaticSkills::DisableAll: logic confirmed by peer review - fn_09153 AutomaticSkills::Use: logic confirmed by peer review - fn_10689 UIBitmapButton::~UIBitmapButton: logic confirmed by peer review (already on main) - fn_10795 UIBitmapButton::Paint: logic confirmed by peer review - fn_10817 UIStaticBitmap::Paint: logic confirmed by peer review Reviewed-by: ragnarok-clanker
106 lines
2.7 KiB
C++
106 lines
2.7 KiB
C++
#include "Client/Session.h"
|
|
#include "Client/Session.h"
|
|
#include "Contents/Async/AsyncWorkMgr.h"
|
|
#include "Contents/UserData/CharacterConfigSave.h"
|
|
#include "Contents/UserData/CharacterLinkedUserDataMgr.h"
|
|
#include "Contents/UserData/NormalItemSlots.h"
|
|
#include "Contents/Skills/PlayerSkillBundle.h"
|
|
#include "Contents/Configuration/ServiceOptions.h"
|
|
|
|
#include <json/value.h>
|
|
#include <json/writer.h>
|
|
|
|
// OFFSET: 0x00DE0E40
|
|
// FUNCTION: fn_23474
|
|
int CharacterConfigSave::UseLevel(int id) const {
|
|
const auto key = static_cast<std::uint32_t>(id);
|
|
|
|
if (key - 1u <= 0x1F3D) {
|
|
return this->useLevels[key];
|
|
}
|
|
|
|
if (id > 10000) {
|
|
return this->additionalLevels[key - 10000u];
|
|
}
|
|
|
|
if (key - 8000u <= 60) {
|
|
return this->homunculusLevels[key - 8000u];
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
// OFFSET: 0x005E6EF0
|
|
// FUNCTION: fn_03933
|
|
void CCharacterLinkedUserDataMgr::Save(CharacterConfigSave& context, const char* token16, CAsyncWorkMgr& workManager) {
|
|
if (!this->m_loaded) {
|
|
return;
|
|
}
|
|
|
|
Json::Value root;
|
|
Json::Value data;
|
|
|
|
if (g_session.GetOption(7) != 0) {
|
|
Json::Value values;
|
|
|
|
context.skills.ForEachGrouped([&](CSkillInfo* skill) {
|
|
const int id = static_cast<int>(skill->id);
|
|
const int level = context.UseLevel(id);
|
|
|
|
if (level != 0) {
|
|
Json::Value value;
|
|
value["SKID"] = id;
|
|
value["SKLv"] = level;
|
|
values.append(value);
|
|
}
|
|
|
|
return true;
|
|
});
|
|
data["UseSkillInfo"] = values;
|
|
}
|
|
|
|
if (g_session.GetOption(8) != 0) {
|
|
Json::Value values;
|
|
|
|
for (const CSkillInfo& skill : context.homunculusSkills) {
|
|
const int id = static_cast<int>(skill.id);
|
|
const auto index = skill.id - 8000u;
|
|
const int level = static_cast<int>(index) < 0 ? 0 : context.homunculusLevels[index];
|
|
|
|
if (level != 0) {
|
|
Json::Value value;
|
|
value["HomunSKID"] = id;
|
|
value["HomunSKLv"] = level;
|
|
values.append(value);
|
|
}
|
|
}
|
|
|
|
data["HomunSkillInfo"] = values;
|
|
}
|
|
|
|
data["ItemComparison"] = context.serviceOptions.Get(264) != 0;
|
|
data["SortPrivateTab"] = context.sortPrivate;
|
|
ExportNormalItemSlots(data, context.items, context.saved, context.itemSlotActive);
|
|
|
|
if (!data.isNull()) {
|
|
root["data"] = data;
|
|
Json::StyledWriter writer;
|
|
const std::string response = writer.write(root);
|
|
const std::string token(token16, 16);
|
|
const std::string url = this->SaveUrl();
|
|
workManager.SaveCharacter(this->m_accountId, this->m_characterId, this->m_accountName, url, token, response);
|
|
|
|
++this->m_pendingSaves;
|
|
}
|
|
}
|
|
|
|
// OFFSET: 0x00DDD0D0
|
|
// FUNCTION: fn_23379
|
|
int CSession::HomunSkillLevel(int skillId) const {
|
|
const int index = skillId - 8000;
|
|
if (index > -1) {
|
|
return this->m_homunSkillLevels[index];
|
|
}
|
|
|
|
return 0;
|
|
}
|