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

do not link Quests that have not been taken on decisions

Browse source
This commit is contained in:
coderkun 2014-03-30 04:13:56 +02:00
commit ec44c48de6
2 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
controllers/QuestsController.inc
View file

@ -200,11 +200,20 @@
// Next Quest/Questgroup // Next Quest/Questgroup
$nextQuests = null; $nextQuests = null;
$charactedHasChoosenNextQuest = false;
$nextQuestgroup = null; $nextQuestgroup = null;
if($questtexttypeUrl == 'Epilog' || $solved) if($questtexttypeUrl == 'Epilog' || $solved)
{ {
// Next Quest // Next Quest
$nextQuests = $this->Quests->getNextQuests($quest['id']); $nextQuests = $this->Quests->getNextQuests($quest['id']);
foreach($nextQuests as &$nextQuest)
{
// Set entered status of Quest
$nextQuest['entered'] = $this->Quests->hasCharacterEnteredQuest($nextQuest['id'], $character['id']);
if($nextQuest['entered']) {
$charactedHasChoosenNextQuest = true;
}
}
// Next Questgroup // Next Questgroup
if(empty($nextQuests)) if(empty($nextQuests))
@ -233,6 +242,7 @@
$this->set('queststatustext', $questStatusText); $this->set('queststatustext', $questStatusText);
$this->set('relatedquesttext', $relatedQuesttext); $this->set('relatedquesttext', $relatedQuesttext);
$this->set('nextquests', $nextQuests); $this->set('nextquests', $nextQuests);
$this->set('charactedHasChoosenNextQuest', $charactedHasChoosenNextQuest);
$this->set('nextquestgroup', $nextQuestgroup); $this->set('nextquestgroup', $nextQuestgroup);
$this->set('task', $task); $this->set('task', $task);
$this->set('media', $questmedia); $this->set('media', $questmedia);

18
views/html/quests/quest.tpl
View file

@ -63,9 +63,23 @@
<ul> <ul>
<?php foreach($nextquests as &$nextquest) : ?> <?php foreach($nextquests as &$nextquest) : ?>
<?php if($nextquest['id'] == $relatedquesttext['quest']['id']) : ?> <?php if($nextquest['id'] == $relatedquesttext['quest']['id']) : ?>
<li><?=_('Quest')?>: <a href="<?=$linker->link(array($nextquest['questgroup_url'],$nextquest['url'],$relatedquesttext['type_url'],$relatedquesttext['pos']),3)?>"><?=$nextquest['title']?></a></li> <li>
<?=_('Quest')?>:
<?php if($nextquest['entered'] || !$charactedHasChoosenNextQuest) : ?>
<a href="<?=$linker->link(array($nextquest['questgroup_url'],$nextquest['url'],$relatedquesttext['type_url'],$relatedquesttext['pos']),3)?>"><?=$nextquest['title']?></a>
<?php else : ?>
<?=$nextquest['title']?>
<?php endif ?>
</li>
<?php else : ?> <?php else : ?>
<li><?=_('Quest')?>: <a href="<?=$linker->link(array($nextquest['questgroup_url'],$nextquest['url']),3)?>"><?=$nextquest['title']?></a></li> <li>
<?=_('Quest')?>:
<?php if($nextquest['entered'] || !$charactedHasChoosenNextQuest) : ?>
<a href="<?=$linker->link(array($nextquest['questgroup_url'],$nextquest['url']),3)?>"><?=$nextquest['title']?></a>
<?php else : ?>
<?=$nextquest['title']?>
<?php endif ?>
</li>
<?php endif ?> <?php endif ?>
<?php endforeach ?> <?php endforeach ?>
</ul> </ul>