coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

show next Quests for Quests also on Prolog if Quest is solved

Browse source
This commit is contained in:
coderkun 2014-03-22 14:38:14 +01:00
commit d2cca2002e
4 changed files with 36 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

23
controllers/QuestsController.inc
View file

@ -122,12 +122,19 @@
$questtexttypes = $this->Questtexts->getQuesttexttypes();
$questtexttypes = array_map(function($t) { return $t['url']; }, $questtexttypes);
$questtextCount = $this->Questtexts->getQuesttextsCountForQuest($quest['id'], $questtexttypeUrl);
if($questtextCount > 0 && in_array($questtexttypeUrl, $questtexttypes))
if(/*$questtextCount > 0 && */in_array($questtexttypeUrl, $questtexttypes))
{
$questtextPos = max(intval($questtextPos), 1);
$questtext = $this->Questtexts->getQuesttextByUrl($quest['id'], $questtexttypeUrl, $questtextPos);
$questtext['count'] = $questtextCount;
$questtext['sidequests'] = $this->Quests->getSidequestsForQuesttext($questtext['id']);
try {
$questtext = $this->Questtexts->getQuesttextByUrl($quest['id'], $questtexttypeUrl, $questtextPos);
$questtext['count'] = $questtextCount;
$questtext['sidequests'] = $this->Quests->getSidequestsForQuesttext($questtext['id']);
}
catch(\nre\exceptions\IdNotFoundException $e) {
if(!($questtexttypeUrl == 'Prolog' || $questtexttypeUrl == 'Epilog' && $questtextPos == 1)) {
throw $e;
}
}
}
// Quest status
@ -166,10 +173,13 @@
$task = $this->renderTask($questtype['classname'], $seminary, $questgroup, $quest, $character);
}
// Has Character solved quest?
$solved = $this->Quests->hasCharacterSolvedQuest($quest['id'], $character['id']);
// Next Quest/Questgroup
$nextQuests = null;
$nextQuestgroup = null;
if($questtexttypeUrl == 'Epilog')
if($questtexttypeUrl == 'Epilog' || $solved)
{
if($quest['is_mainquest'])
{
@ -191,9 +201,6 @@
}
}
// Has Character solved quest?
$solved = $this->Quests->hasCharacterSolvedQuest($quest['id'], $character['id']);
// Pass data to view
$this->set('seminary', $seminary);