|
@@ -314,7 +314,7 @@ Framework::XML::Element* QuestDialog::getQuestGraphItem(
|
|
{
|
|
{
|
|
int group = zQuest->requiredQuestsGroups.get(index);
|
|
int group = zQuest->requiredQuestsGroups.get(index);
|
|
if (index != 0)
|
|
if (index != 0)
|
|
- {
|
|
|
|
|
|
+ { // disjunctive normal form
|
|
if (group != currentGroup)
|
|
if (group != currentGroup)
|
|
{
|
|
{
|
|
requirements += "||";
|
|
requirements += "||";
|
|
@@ -329,7 +329,7 @@ Framework::XML::Element* QuestDialog::getQuestGraphItem(
|
|
{
|
|
{
|
|
currentGroup = group;
|
|
currentGroup = group;
|
|
}
|
|
}
|
|
- requirements += *requiredQuest;
|
|
|
|
|
|
+ requirements += Framework::Text("quest_") + *requiredQuest;
|
|
index++;
|
|
index++;
|
|
}
|
|
}
|
|
if (!zQuest->isActive(zParty))
|
|
if (!zQuest->isActive(zParty))
|
|
@@ -339,7 +339,8 @@ Framework::XML::Element* QuestDialog::getQuestGraphItem(
|
|
<< zQuest->questId << "\" name=\"Unknown Quest\" image=\""
|
|
<< zQuest->questId << "\" name=\"Unknown Quest\" image=\""
|
|
<< zQuest->imagePath
|
|
<< zQuest->imagePath
|
|
<< "\" description=\"You have to finish other quests befor this "
|
|
<< "\" description=\"You have to finish other quests befor this "
|
|
- "quest will be available.\" finished=\"false\" mainQuest=\""
|
|
|
|
|
|
+ "quest will be available.\" finished=\"false\" "
|
|
|
|
+ "rewarded=\"false\" mainQuest=\""
|
|
<< zQuest->mainQuest << "\" requirements=\"" << requirements
|
|
<< zQuest->mainQuest << "\" requirements=\"" << requirements
|
|
<< "\" width=\"" << (zQuest->mainQuest ? "50" : "30")
|
|
<< "\" width=\"" << (zQuest->mainQuest ? "50" : "30")
|
|
<< "\" height=\"" << (zQuest->mainQuest ? "50" : "30") << "\"/>";
|
|
<< "\" height=\"" << (zQuest->mainQuest ? "50" : "30") << "\"/>";
|
|
@@ -353,7 +354,8 @@ Framework::XML::Element* QuestDialog::getQuestGraphItem(
|
|
<< zQuest->questName + "\" image=\""
|
|
<< zQuest->questName + "\" image=\""
|
|
<< zQuest->imagePath << "\" description=\""
|
|
<< zQuest->imagePath << "\" description=\""
|
|
<< zQuest->description << "\" finished=\""
|
|
<< zQuest->description << "\" finished=\""
|
|
- << zStorage->isQuestFinished() << "\" mainQuest=\""
|
|
|
|
|
|
+ << zStorage->isQuestFinished() << "\" rewarded=\""
|
|
|
|
+ << zStorage->isQuestRewarded() << "\" mainQuest=\""
|
|
<< zQuest->mainQuest << "\" requirements=\""
|
|
<< zQuest->mainQuest << "\" requirements=\""
|
|
<< requirements << "\" width=\""
|
|
<< requirements << "\" width=\""
|
|
<< (zQuest->mainQuest ? "50" : "30") << "\" height=\""
|
|
<< (zQuest->mainQuest ? "50" : "30") << "\" height=\""
|