Maintenance: Resubmission of 14942 (gate: three existing in-class helpers whose lines changed lacked an annotation; marked // INLINED
Batch #14943 by ragnarok-clanker: no function's compiled code changes; checked with 741 compiled unit(s), including every includer of Source/ActorPickNode.h, Source/Client/Browser/BrowserClientSite.h, Source/Client/Browser/BrowserPopupDispatch.h, Source/Client/Mode/CGameMode.h, Source/Client/Mode/CLoginMode.h, Source/Client/Mode/CMode.h, Source/Client/Mode/ModeDragState.h, Source/Client/Replay.h, Source/Client/Session.h, Source/Client/Stove/StoveMgr.h, Source/Contents/AchievementMgr.h, Source/Contents/ActorNameCard.h, Source/Contents/Actors/CharacterRender.h, Source/Contents/Actors/EffectActors.h, Source/Contents/Actors/GameActor.h, Source/Contents/Actors/GrannyGameActor.h, Source/Contents/Actors/GroundScope.h, Source/Contents/Actors/Item.h, Source/Contents/Actors/Npc.h, Source/Contents/Actors/Pc.h, Source/Contents/Actors/RenderObjectState.h, Source/Contents/Actors/Skill.h, Source/Contents/AdventureGuideMgr.h, Source/Contents/Camera/Camera.h, Source/Contents/Camera/CameraState.h, Source/Contents/CashEmotionMgr.h, Source/Contents/Configuration/GameSettingsMgr.h, Source/Contents/EffectResourceSwitcher.h, Source/Contents/Effects/AMachineEffect.h, Source/Contents/Effects/AcidifiedThrow.h, Source/Contents/Effects/AxeBoomerang.h, Source/Contents/Effects/BlastForge.h, Source/Contents/Effects/CaneOfEvilEyeEffect.h, Source/Contents/Effects/CharacterParticleBundle.h, Source/Contents/Effects/CloudKillEffect.h, Source/Contents/Effects/Effect.h, Source/Contents/Effects/EffectActor.h, Source/Contents/Effects/EffectEmitter.h, Source/Contents/Effects/EffectMaker.h, Source/Contents/Effects/EffectPrimitiveState.h, Source/Contents/Effects/FuumaShouakuEffect.h, Source/Contents/Effects/GravityControlEffect.h, Source/Contents/Effects/HealSpEffect.h, Source/Contents/Effects/Level99Effect.h, Source/Contents/Effects/MapChainEffect.h, Source/Contents/Effects/MonsterSkillEffects.h, Source/Contents/Effects/MsgEffect.h, Source/Contents/Effects/NyanggrassEffect.h, Source/Contents/Effects/Particle.h, Source/Contents/Effects/PowderingEffect.h, Source/Contents/Effects/RagEffectState.h, Source/Contents/Effects/RectUpEffect.h, Source/Contents/Effects/ShadowExceedEffect.h, Source/Contents/Effects/SkillEffects.h, Source/Contents/Effects/SpriteParticle.h, Source/Contents/Effects/StormCannonEffect.h, Source/Contents/Effects/ThrowEffects.h, Source/Contents/EntryQueueMgr.h, Source/Contents/EquipmentResourceMgr.h, Source/Contents/FlyingShipRouteInfo.h, Source/Contents/Ground/GroundGeometry.h, Source/Contents/GuildInfo.h, Source/Contents/Items/ItemDescription.h, Source/Contents/Items/ItemInfo.h, Source/Contents/MapSkyMgr.h, Source/Contents/Messenger/MessengerWindows.h, Source/Contents/Models/ModelNode.h, Source/Contents/NavigationManager.h, Source/Contents/Party/AdventurerAgencyMgr.h, Source/Contents/RDamageVar.h, Source/Contents/RenewQuestMgr.h, Source/Contents/ReputeMgr.h, Source/Contents/RodexMailStore.h, Source/Contents/RouletteMgr.h, Source/Contents/Schedule/Schedule.h, Source/Contents/SignBoard/SignBoard.h, Source/Contents/Skills/ClientSkills.h, Source/Contents/Skills/PlayerSkillBundle.h, Source/Contents/Skills/SkillInfo.h, Source/Contents/SpriteLayerDrawing.h, Source/Contents/TipBoxTitles.h, Source/Contents/UserData/AccountLinkedUserDataMgr.h, Source/Contents/UserData/NormalItemSlots.h, Source/Contents/World/World.h, Source/Contents/WorldView/WorldViewData.h, Source/Render/Primitives/LightmappedPrimitive.h, Source/Render/Primitives/RenderPrimitive.h, Source/Render/Renderer.h, Source/Render/Textures/SpritePixels.h, Source/Render/Textures/Texture.h, Source/Resource/EZeffectResource.h, Source/Resource/Models/AnimatedModelResource.h, Source/Resource/Models/GrannyModelResource.h, Source/Resource/Sprites/ActionResource.h, Source/Resource/World/GroundResource.h, Source/Resource/World/WorldResource.h, Source/Resource/XmlNode.h, Source/UI/AdventureGuide/UIAdventureGuide.h, Source/UI/Buttons/UIBmpRadioBtn.h, Source/UI/Buttons/UIDescriptRace.h, Source/UI/Buttons/UIItemTagButton.h, Source/UI/Buttons/UISlotBmpButton.h, Source/UI/Buttons/UISpriteButton.h, Source/UI/Buttons/UITVTextButton.h, Source/UI/Buttons/UITextureButton.h, Source/UI/CashEmotion/UICashEmotionListWnd.h, Source/UI/CashEmotion/UICashEmotionPack.h, Source/UI/CashShop/UICashShopWnd.h, Source/UI/Chat/UIChatRoomMakeWnd.h, Source/UI/Chat/UIChatRoomTitle.h, Source/UI/Chat/UINewChatWnd.h, Source/UI/Chat/UISubChatHisWnd.h, Source/UI/Chat/UISubChatMiniWnd.h, Source/UI/Chat/UIWhisperWnd.h, Source/UI/Clan/UIClanWnd.h, Source/UI/Dialogs/UIBookWnd.h, Source/UI/Dialogs/UIChooseWarpWnd.h, Source/UI/Dialogs/UIMenuWnd.h, Source/UI/Dialogs/UIMiniMapWnd.h, Source/UI/Dialogs/UIMinimapZoomWnd.h, Source/UI/Dialogs/UINpcEditDialogWnd.h, Source/UI/Dialogs/UIPasswordWnd.h, Source/UI/Dialogs/UISayDialogWnd.h, Source/UI/Dialogs/UISelectCartWnd.h, Source/UI/Dialogs/UITipboxWnd.h, Source/UI/Edit/UIEditBoxEx.h, Source/UI/Edit/UIEditCtrl.h, Source/UI/Edit/UIEditCtrl_Currency.h, Source/UI/Edit/UIItemTagCtrl.h, Source/UI/Enchant/EnchantUI.h, Source/UI/Exchange/UIExchangeUI.h, Source/UI/FrameSkin.h, Source/UI/GameSettings/GameSettingsUI.h, Source/UI/Gauges/UIPcGage.h, Source/UI/Guild/UIGuildHelperWnd.h, Source/UI/Guild/UIGuildWnd.h, Source/UI/Guild/UIGuild_Storage_Log.h, Source/UI/Item/UIEquipmentPropertiesWnd.h, Source/UI/Item/UIItemBaseWnd.h, Source/UI/Item/UIItemPurchaseWnd.h, Source/UI/Item/UIItemSellWnd2.h, Source/UI/Item/UIItemShopWnd.h, Source/UI/Item/UIItemShopWnd2.h, Source/UI/Item/UIItemStoreFindWnd.h, Source/UI/Item/UIItemStoreSubWnd.h, Source/UI/Item/UIItemStoreWnd.h, Source/UI/Item/UIItemWnd.h, Source/UI/Item/UIMerchantItemLogWnd.h, Source/UI/Item/UIParaItemShopWnd.h, Source/UI/Items/UICardItemIllustWnd.h, Source/UI/Items/UIEquipWnd.h, Source/UI/Items/UIExchangeWnd.h, Source/UI/Items/UIGameItem.h, Source/UI/Items/UIItemCollectionWnd.h, Source/UI/Items/UIItemIdentifyWnd.h, Source/UI/Items/UIItemParamChangeDisplayWnd.h, Source/UI/Items/UISwapEquipmentWnd.h, Source/UI/Layout/WindowGeometry.h, Source/UI/Lists/UIChatHisBox.h, Source/UI/Lists/UIComboBoxV2Wnd.h, Source/UI/Lists/UIImgMenu.h, Source/UI/Lists/UIListBoxID.h, Source/UI/Lists/UIListBoxTemplate.h, Source/UI/Lists/UIMemberListBox.h, Source/UI/Lists/UITabControl.h, Source/UI/Lists/UITagListBox.h, Source/UI/Lists/UITreeView.h, Source/UI/Menu/UIMenuIconWnd.h, Source/UI/Navigation/UINavigationV4Wnd.h, Source/UI/ProbabilityTable/UIProbabilityTable.h, Source/UI/Quest/UIQuestDisplay.h, Source/UI/Quest/UIRenewQuestUI.h, Source/UI/Quest/UIRenewQuestWnd.h, Source/UI/Rodex/UIRodexComposeWnd.h, Source/UI/Rodex/UIRodexInboxWnd.h, Source/UI/RuneSystem/UIRuneSystemWindows.h, Source/UI/RuneSystem/UIRuneSystemWnd.h, Source/UI/Shop/UIMerchantItemMyShopWnd.h, Source/UI/Shop/UIMerchantItemPurchaseMSGWnd.h, Source/UI/Shop/UIMerchantItemPurchaseWnd.h, Source/UI/Shop/UIMerchantItemShopWnd.h, Source/UI/Shop/UIMerchantMirrorItemWnd.h, Source/UI/Shop/UIMerchantShopMakeWnd.h, Source/UI/Shop/UIMerchantShopTitle.h, Source/UI/Skill/UISkillDescribeWnd.h, Source/UI/Skill/UISkillListWnd.h, Source/UI/SkillDelayInfo/SkillDelayInfo.h, Source/UI/StylingShop/UIStylingShopWnd.h, Source/UI/Text/CreateLineInfo.h, Source/UI/Text/UIAchWnd.h, Source/UI/Text/UIBalloonText.h, Source/UI/Text/UINameBalloonText.h, Source/UI/Text/UIStaticTextControl.h, Source/UI/Text/UIString.h, Source/UI/Text/UITextViewerControl.h, Source/UI/UIBarGraph.h, Source/UI/UIBartermarketWnd.h, Source/UI/UIChangeMaterialWnd.h, Source/UI/UIGradeEnchantWnd.h, Source/UI/UILapineScrollBar.h, Source/UI/UIMacroBlackListCheckWnd.h, Source/UI/UIMacroDetectorWnd.h, Source/UI/UIMacroReport.h, Source/UI/UIMacroUserInfoWnd.h, Source/UI/UIPreviewEquipWnd.h, Source/UI/UIRefiningWnd.h, Source/UI/UIScrollWnd.h, Source/UI/UISlotBitmap.h, Source/UI/Window/FuncDrawWNDChar.h, Source/UI/Window/UIBattleMsgOptionWnd.h, Source/UI/Window/UIChatRoomWnd.h, Source/UI/Window/UICollectionSystemWnd.h, Source/UI/Window/UIControl.h, Source/UI/Window/UIHomunInfoWnd.h, Source/UI/Window/UIHotKeyWnd.h, Source/UI/Window/UIJobListWnd.h, Source/UI/Window/UILoginOTPWnd.h, Source/UI/Window/UILoginWnd.h, Source/UI/Window/UIMakeCharWnd.h, Source/UI/Window/UIMonsterDisplayWnd.h, Source/UI/Window/UIMonsterInfoWnd.h, Source/UI/Window/UINavigationHelpWnd.h, Source/UI/Window/UINavigationWnd.h, Source/UI/Window/UINewMakeCharWnd.h, Source/UI/Window/UINewSelectCharWnd.h, Source/UI/Window/UINoticeWnd.h, Source/UI/Window/UIPetInfoWnd.h, Source/UI/Window/UIRegisterMgr.h, Source/UI/Window/UIRoMapWnd.h, Source/UI/Window/UIRodexContentsWnd.h, Source/UI/Window/UISecondCostumeWnd.h, Source/UI/Window/UISeekPartyMBWnd.h, Source/UI/Window/UISeekPartyWnd.h, Source/UI/Window/UISelCharForUServerWnd.h, Source/UI/Window/UISerachStoreInfoWnd.h, Source/UI/Window/UITransMenuWnd.h, Source/UI/Window/UIWindow.h, Source/UI/Window/UIWindowMgr.h, Source/UI/Window/UIWindowMgr.inl, Source/Utility/Lexicon/LexiconSerializer.h.
This commit is contained in:
ragnarok-clanker
parent
d7d87febd6
commit
dc3d5ce1a5
689 changed files with 29168 additions and 29165 deletions
|
|
@ -1119,7 +1119,7 @@ using AdventureGuideContentsTable = std::map<int, std::map<int, AdventureGuideCo
|
|||
// OFFSET: 0x0065F5C0
|
||||
// FUNCTION: fn_05188
|
||||
AdventureGuideEpisode::AdventureGuideEpisode(AdventureGuideEpisodeSource&& source)
|
||||
: name(source.name), order(source.order), unknown_001C(source.unknown_0008), values(std::move(source.values)) {
|
||||
: name(source.name), order(source.order), maxLevel(source.maxLevel), values(std::move(source.values)) {
|
||||
}
|
||||
|
||||
// OFFSET: 0x0065F680
|
||||
|
|
@ -1199,7 +1199,7 @@ void CAdventureGuideMgr::GetEpisodeList(std::list<AdventureGuideEpisode>& out) {
|
|||
out.clear();
|
||||
|
||||
for (const AdventureGuideEpisode& episode : m_episodes) {
|
||||
if (episode.order <= g_session.m_level && g_session.m_level <= episode.unknown_001C) {
|
||||
if (episode.order <= g_session.m_level && g_session.m_level <= episode.maxLevel) {
|
||||
out.push_back(episode);
|
||||
}
|
||||
}
|
||||
|
|
@ -1213,13 +1213,13 @@ void CAdventureGuideMgr::GetContentsList(std::list<std::pair<int, AdventureGuide
|
|||
std::map<int, std::map<int, AdventureGuideContents>>* table;
|
||||
switch (type) {
|
||||
case 1:
|
||||
table = &unknown_003C;
|
||||
table = &episodeContents;
|
||||
break;
|
||||
case 3:
|
||||
table = &unknown_0044;
|
||||
table = &questContents;
|
||||
break;
|
||||
case 4:
|
||||
table = &unknown_004C;
|
||||
table = &dungeonContents;
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
|
|
@ -1232,11 +1232,11 @@ void CAdventureGuideMgr::GetContentsList(std::list<std::pair<int, AdventureGuide
|
|||
|
||||
std::copy_if((*contents)->begin(), (*contents)->end(), std::back_inserter(out),
|
||||
[](const std::pair<const int, AdventureGuideContents>& entry) {
|
||||
return entry.second.unknown_0004 <= g_session.m_level && g_session.m_level <= entry.second.unknown_0008;
|
||||
return entry.second.minLevel <= g_session.m_level && g_session.m_level <= entry.second.maxLevel;
|
||||
});
|
||||
|
||||
out.sort([](const std::pair<int, AdventureGuideContents>& lhs, const std::pair<int, AdventureGuideContents>& rhs) {
|
||||
return lhs.second.unknown_0004 < rhs.second.unknown_0004;
|
||||
return lhs.second.minLevel < rhs.second.minLevel;
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -1248,10 +1248,10 @@ void CAdventureGuideMgr::GetEntryList(std::list<std::pair<int, AdventureGuideEnt
|
|||
std::map<int, std::map<int, AdventureGuideEntry>>* table;
|
||||
switch (type) {
|
||||
case 5:
|
||||
table = &unknown_0054;
|
||||
table = &itemEntries;
|
||||
break;
|
||||
case 6:
|
||||
table = &unknown_005C;
|
||||
table = &equipmentEntries;
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
|
|
@ -1264,7 +1264,7 @@ void CAdventureGuideMgr::GetEntryList(std::list<std::pair<int, AdventureGuideEnt
|
|||
|
||||
std::copy((*entries)->begin(), (*entries)->end(), std::back_inserter(out));
|
||||
out.sort([](const std::pair<int, AdventureGuideEntry>& lhs, const std::pair<int, AdventureGuideEntry>& rhs) {
|
||||
return lhs.second.unknown_0004 < rhs.second.unknown_0004;
|
||||
return lhs.second.minLevel < rhs.second.minLevel;
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -1272,17 +1272,17 @@ void CAdventureGuideMgr::GetEntryList(std::list<std::pair<int, AdventureGuideEnt
|
|||
// FUNCTION: fn_05240
|
||||
AdventureGuideResult CAdventureGuideMgr::InsertDungeonContents(int id, int menu, int minLevel, int maxLevel, bool flag, std::string_view first, std::string_view second) {
|
||||
const AdventureGuideContents contents{flag, minLevel, maxLevel, 0, std::string(first), std::string(second)};
|
||||
unknown_004C[menu].try_emplace(id, contents);
|
||||
dungeonContents[menu].try_emplace(id, contents);
|
||||
return AdventureGuideResult(true, "good");
|
||||
}
|
||||
|
||||
// OFFSET: 0x00665150
|
||||
// FUNCTION: fn_05241
|
||||
AdventureGuideResult CAdventureGuideMgr::InsertDungeonReward(int id, std::string_view text) {
|
||||
const auto it = std::find_if(unknown_004C.begin(), unknown_004C.end(), [&](const auto& entry) {
|
||||
const auto it = std::find_if(dungeonContents.begin(), dungeonContents.end(), [&](const auto& entry) {
|
||||
return entry.second.find(id) != entry.second.end();
|
||||
});
|
||||
if (it == unknown_004C.end()) {
|
||||
if (it == dungeonContents.end()) {
|
||||
return AdventureGuideResult(false, FormatOwnedString("[%d] cannot be find", id));
|
||||
}
|
||||
|
||||
|
|
@ -1295,7 +1295,7 @@ AdventureGuideResult CAdventureGuideMgr::InsertDungeonReward(int id, std::string
|
|||
AdventureGuideResult CAdventureGuideMgr::InsertDungeonSubMenu(int id, int minLevel, int maxLevel, std::string_view text) {
|
||||
const AdventureGuideDetail detail{minLevel, maxLevel, 0, std::string(text)};
|
||||
for (auto& [key, intro] : m_intros) {
|
||||
if (intro.unknown_0000 == 4) {
|
||||
if (intro.type == 4) {
|
||||
intro.details.try_emplace(id, detail);
|
||||
break;
|
||||
}
|
||||
|
|
@ -1308,17 +1308,17 @@ AdventureGuideResult CAdventureGuideMgr::InsertDungeonSubMenu(int id, int minLev
|
|||
// FUNCTION: fn_05243
|
||||
AdventureGuideResult CAdventureGuideMgr::InsertEpisodeContents(int id, int menu, int minLevel, int maxLevel, int unknown, bool flag, std::string_view first, std::string_view second) {
|
||||
const AdventureGuideContents contents{flag, minLevel, maxLevel, unknown, std::string(first), std::string(second)};
|
||||
unknown_003C[menu].try_emplace(id, contents);
|
||||
episodeContents[menu].try_emplace(id, contents);
|
||||
return AdventureGuideResult(true, "good");
|
||||
}
|
||||
|
||||
// OFFSET: 0x00665750
|
||||
// FUNCTION: fn_05244
|
||||
AdventureGuideResult CAdventureGuideMgr::InsertEpisodeReward(int id, std::string_view text) {
|
||||
const auto it = std::find_if(unknown_003C.begin(), unknown_003C.end(), [&](const auto& entry) {
|
||||
const auto it = std::find_if(episodeContents.begin(), episodeContents.end(), [&](const auto& entry) {
|
||||
return entry.second.find(id) != entry.second.end();
|
||||
});
|
||||
if (it == unknown_003C.end()) {
|
||||
if (it == episodeContents.end()) {
|
||||
return AdventureGuideResult(false, FormatOwnedString("[%d] cannot be find", id));
|
||||
}
|
||||
|
||||
|
|
@ -1331,7 +1331,7 @@ AdventureGuideResult CAdventureGuideMgr::InsertEpisodeReward(int id, std::string
|
|||
AdventureGuideResult CAdventureGuideMgr::InsertEpisodeSubMenu(int id, int minLevel, int maxLevel, int unknown, std::string_view text) {
|
||||
const AdventureGuideDetail detail{minLevel, maxLevel, unknown, std::string(text)};
|
||||
for (auto& [key, intro] : m_intros) {
|
||||
if (intro.unknown_0000 == 1) {
|
||||
if (intro.type == 1) {
|
||||
intro.details.try_emplace(id, detail);
|
||||
break;
|
||||
}
|
||||
|
|
@ -1346,10 +1346,10 @@ AdventureGuideResult CAdventureGuideMgr::InsertEntryContents(int type, int id, i
|
|||
const AdventureGuideEntry entry{flag0, flag1, flag2, minLevel, maxLevel, std::string(text)};
|
||||
switch (type) {
|
||||
case 5:
|
||||
unknown_0054[menu].try_emplace(id, entry);
|
||||
itemEntries[menu].try_emplace(id, entry);
|
||||
break;
|
||||
case 6:
|
||||
unknown_005C[menu].try_emplace(id, entry);
|
||||
equipmentEntries[menu].try_emplace(id, entry);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -1363,18 +1363,18 @@ AdventureGuideResult CAdventureGuideMgr::InsertObtainGuide(int type, int id, std
|
|||
|
||||
switch (type) {
|
||||
case 5:
|
||||
it = std::find_if(unknown_0054.begin(), unknown_0054.end(), [id](const auto& entry) {
|
||||
it = std::find_if(itemEntries.begin(), itemEntries.end(), [id](const auto& entry) {
|
||||
return entry.second.find(id) != entry.second.end();
|
||||
});
|
||||
if (it == unknown_0054.end()) {
|
||||
if (it == itemEntries.end()) {
|
||||
return AdventureGuideResult(false, FormatOwnedString("[%d] cannot be find", id));
|
||||
}
|
||||
break;
|
||||
case 6:
|
||||
it = std::find_if(unknown_005C.begin(), unknown_005C.end(), [id](const auto& entry) {
|
||||
it = std::find_if(equipmentEntries.begin(), equipmentEntries.end(), [id](const auto& entry) {
|
||||
return entry.second.find(id) != entry.second.end();
|
||||
});
|
||||
if (it == unknown_005C.end()) {
|
||||
if (it == equipmentEntries.end()) {
|
||||
return AdventureGuideResult(false, FormatOwnedString("[%d] cannot be find", id));
|
||||
}
|
||||
break;
|
||||
|
|
@ -1389,7 +1389,7 @@ AdventureGuideResult CAdventureGuideMgr::InsertObtainGuide(int type, int id, std
|
|||
AdventureGuideResult CAdventureGuideMgr::InsertEntrySubMenu(int type, int id, int minLevel, int maxLevel, std::string_view text) {
|
||||
const AdventureGuideDetail detail{minLevel, maxLevel, 0, std::string(text)};
|
||||
for (auto& [key, intro] : m_intros) {
|
||||
if (intro.unknown_0000 == type) {
|
||||
if (intro.type == type) {
|
||||
intro.details.try_emplace(id, detail);
|
||||
break;
|
||||
}
|
||||
|
|
@ -1402,7 +1402,7 @@ AdventureGuideResult CAdventureGuideMgr::InsertEntrySubMenu(int type, int id, in
|
|||
// FUNCTION: fn_05249
|
||||
AdventureGuideResult CAdventureGuideMgr::InsertIntroContents(int id, std::string_view title, std::string_view text) {
|
||||
const AdventureGuideText entry{std::string(title), std::string(text)};
|
||||
unknown_002C.try_emplace(id, entry);
|
||||
introTexts.try_emplace(id, entry);
|
||||
return AdventureGuideResult(true, "good");
|
||||
}
|
||||
|
||||
|
|
@ -1445,17 +1445,17 @@ AdventureGuideResult CAdventureGuideMgr::InsertMonsterReward(std::string_view na
|
|||
// FUNCTION: fn_05253
|
||||
AdventureGuideResult CAdventureGuideMgr::InsertQuestContents(int id, int menu, int minLevel, int maxLevel, bool flag, std::string_view first, std::string_view second) {
|
||||
const AdventureGuideContents contents{flag, minLevel, maxLevel, 0, std::string(first), std::string(second)};
|
||||
unknown_0044[menu].try_emplace(id, contents);
|
||||
questContents[menu].try_emplace(id, contents);
|
||||
return AdventureGuideResult(true, "good");
|
||||
}
|
||||
|
||||
// OFFSET: 0x00666E70
|
||||
// FUNCTION: fn_05254
|
||||
AdventureGuideResult CAdventureGuideMgr::InsertQuestReward(int id, std::string_view text) {
|
||||
const auto it = std::find_if(unknown_0044.begin(), unknown_0044.end(), [&](const auto& entry) {
|
||||
const auto it = std::find_if(questContents.begin(), questContents.end(), [&](const auto& entry) {
|
||||
return entry.second.find(id) != entry.second.end();
|
||||
});
|
||||
if (it == unknown_0044.end()) {
|
||||
if (it == questContents.end()) {
|
||||
return AdventureGuideResult(false, FormatOwnedString("[%d] cannot be find", id));
|
||||
}
|
||||
|
||||
|
|
@ -1468,7 +1468,7 @@ AdventureGuideResult CAdventureGuideMgr::InsertQuestReward(int id, std::string_v
|
|||
AdventureGuideResult CAdventureGuideMgr::InsertQuestSubMenu(int id, int minLevel, int maxLevel, std::string_view text) {
|
||||
const AdventureGuideDetail detail{minLevel, maxLevel, 0, std::string(text)};
|
||||
for (auto& [key, intro] : m_intros) {
|
||||
if (intro.unknown_0000 == 3) {
|
||||
if (intro.type == 3) {
|
||||
intro.details.try_emplace(id, detail);
|
||||
break;
|
||||
}
|
||||
|
|
@ -1581,41 +1581,41 @@ bool CAdventureGuideMgr::Load() {
|
|||
bool CAdventureGuideMgr::IsAvailable(int type, int id) {
|
||||
switch (type) {
|
||||
case 1: {
|
||||
const std::optional<std::map<int, AdventureGuideContents>*> found = FindMapped(this->unknown_003C, id);
|
||||
const std::optional<std::map<int, AdventureGuideContents>*> found = FindMapped(this->episodeContents, id);
|
||||
if (!found) {
|
||||
return true;
|
||||
}
|
||||
return std::any_of((*found)->begin(), (*found)->end(), [](const auto& entry) {
|
||||
return entry.second.unknown_0004 <= g_session.m_level && g_session.m_level <= entry.second.unknown_0008;
|
||||
return entry.second.minLevel <= g_session.m_level && g_session.m_level <= entry.second.maxLevel;
|
||||
});
|
||||
}
|
||||
case 4: {
|
||||
const std::optional<std::map<int, AdventureGuideContents>*> found = FindMapped(this->unknown_004C, id);
|
||||
const std::optional<std::map<int, AdventureGuideContents>*> found = FindMapped(this->dungeonContents, id);
|
||||
if (!found) {
|
||||
return true;
|
||||
}
|
||||
return std::any_of((*found)->begin(), (*found)->end(), [](const auto& entry) {
|
||||
return entry.second.unknown_0004 <= g_session.m_level && g_session.m_level <= entry.second.unknown_0008;
|
||||
return entry.second.minLevel <= g_session.m_level && g_session.m_level <= entry.second.maxLevel;
|
||||
});
|
||||
}
|
||||
case 3: {
|
||||
const std::optional<std::map<int, AdventureGuideContents>*> found = FindMapped(this->unknown_0044, id);
|
||||
const std::optional<std::map<int, AdventureGuideContents>*> found = FindMapped(this->questContents, id);
|
||||
if (!found) {
|
||||
return true;
|
||||
}
|
||||
return std::any_of((*found)->begin(), (*found)->end(), [](const auto& entry) {
|
||||
return entry.second.unknown_0004 <= g_session.m_level && g_session.m_level <= entry.second.unknown_0008;
|
||||
return entry.second.minLevel <= g_session.m_level && g_session.m_level <= entry.second.maxLevel;
|
||||
});
|
||||
}
|
||||
case 5: {
|
||||
const std::optional<std::map<int, AdventureGuideEntry>*> found = FindMapped(this->unknown_0054, id);
|
||||
const std::optional<std::map<int, AdventureGuideEntry>*> found = FindMapped(this->itemEntries, id);
|
||||
if (!found) {
|
||||
return true;
|
||||
}
|
||||
return std::any_of((*found)->begin(), (*found)->end(), [](const auto& entry) { return entry.second.IsAvailable(entry.first); });
|
||||
}
|
||||
case 6: {
|
||||
const std::optional<std::map<int, AdventureGuideEntry>*> found = FindMapped(this->unknown_005C, id);
|
||||
const std::optional<std::map<int, AdventureGuideEntry>*> found = FindMapped(this->equipmentEntries, id);
|
||||
if (!found) {
|
||||
return true;
|
||||
}
|
||||
|
|
@ -1629,7 +1629,7 @@ bool CAdventureGuideMgr::IsAvailable(int type, int id) {
|
|||
// OFFSET: 0x00667510
|
||||
// FUNCTION: fn_05257
|
||||
bool AdventureGuideEntry::IsAvailable(int itemId) const {
|
||||
if (this->unknown_0004 > g_session.m_level || g_session.m_level > this->unknown_0008) {
|
||||
if (this->minLevel > g_session.m_level || g_session.m_level > this->maxLevel) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue