evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

questPortrait callback

Browse Source
This commit is contained in:
Kae 2024-11-05 09:44:46 +11:00
parent cc5fbb0087
commit e1dea58e80
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/game/StarQuestManager.cpp
View File

@ -144,10 +144,7 @@ StringMap<QuestPtr> QuestManager::serverQuests() const {
} }
QuestPtr QuestManager::getQuest(String const& questId) const { QuestPtr QuestManager::getQuest(String const& questId) const {
if (auto quest = m_quests.ptr(questId)) return m_quests.get(questId);
return *quest;
return {};
} }
bool QuestManager::hasQuest(String const& questId) const { bool QuestManager::hasQuest(String const& questId) const {

24
source/game/scripting/StarPlayerLuaBindings.cpp
View File

@ -478,24 +478,28 @@ LuaCallbacks LuaBindings::makePlayerCallbacks(Player* player) {
}); });
callbacks.registerCallback("quest", [player](String const& questId) -> Json { callbacks.registerCallback("quest", [player](String const& questId) -> Json {
if (auto quest = player->questManager()->getQuest(questId)) if (!player->questManager()->hasQuest(questId))
return quest->diskStore();
return {}; return {};
return player->questManager()->getQuest(questId)->diskStore();
}); });
callbacks.registerCallback("questState", [player](String const& questId) -> Maybe<String> { callbacks.registerCallback("questPortrait", [player](String const& questId, String const& portraitName) -> Maybe<List<Drawable>> {
if (auto quest = player->questManager()->getQuest(questId)) if (!player->questManager()->hasQuest(questId))
return QuestStateNames.getRight(quest->state());
return {}; return {};
return player->questManager()->getQuest(questId)->portrait(portraitName);
});
callbacks.registerCallback("questState", [player](String const& questId) -> Maybe<String> {
if (!player->questManager()->hasQuest(questId))
return {};
return QuestStateNames.getRight(player->questManager()->getQuest(questId)->state());
}); });
callbacks.registerCallback("callQuest", [player](String const& questId, String const& func, LuaVariadic<LuaValue> const& args) -> Maybe<LuaValue> { callbacks.registerCallback("callQuest", [player](String const& questId, String const& func, LuaVariadic<LuaValue> const& args) -> Maybe<LuaValue> {
if (auto quest = player->questManager()->getQuest(questId)) if (!player->questManager()->hasQuest(questId))
return quest->callScript(func, args);
return {}; return {};
return player->questManager()->getQuest(questId)->callScript(func, args);
}); });
callbacks.registerCallback("hasQuest", [player](String const& questId) { callbacks.registerCallback("hasQuest", [player](String const& questId) {