Quest Detail Page:

properly distinguish between provided, required and provided-required items

includes/shared.php

@@ -1,6 +1,6 @@
 <?php
 
-define('AOWOW_REVISION', 1);
+define('AOWOW_REVISION', 2);
 define('CLI', PHP_SAPI === 'cli');
 
 

pages/quest.php

@@ -344,6 +344,7 @@ class QuestPage extends GenericPage
         /*******************/
 
         $this->objectiveList = [];
+        $this->providedItem  = [];
 
         // gather ids for lookup
         $olItems = $olNPCs = $olGOs = $olFactions = [];
@@ -351,17 +352,18 @@ class QuestPage extends GenericPage
         // items
         $olItems[0] = array(                                // srcItem on idx:0
             $this->subject->getField('sourceItemId'),
-            $this->subject->getField('sourceItemCount')
+            $this->subject->getField('sourceItemCount'),
+            false
         );
 
         for ($i = 1; $i < 7; $i++)                          // reqItem in idx:1-6
         {
             $id  = $this->subject->getField('reqItemId'.$i);
             $qty = $this->subject->getField('reqItemCount'.$i);
-            if (!$id || !$qty || $id == $olItems[0][0])
+            if (!$id || !$qty)
                 continue;
 
-            $olItems[$i] = [$id, $qty];
+            $olItems[$i] = [$id, $qty, $id == $olItems[0][0]];
         }
 
         if ($ids = array_column($olItems, 0))
@@ -369,18 +371,33 @@ class QuestPage extends GenericPage
             $olItemData = new ItemList(array(['id', $ids]));
             $this->extendGlobalData($olItemData->getJSGlobals(GLOBALINFO_SELF));
 
-            foreach ($olItems as $i => $pair)
+            $providedRequired = false;
+            foreach ($olItems as $i => list($itemId, $qty, $provided))
             {
-                if (!$pair[0] || !in_array($pair[0], $olItemData->getFoundIDs()))
+                if (!$i || !$itemId || !in_array($itemId, $olItemData->getFoundIDs()))
                     continue;
 
+                if ($provided)
+                    $providedRequired = true;
+
                 $this->objectiveList[] = array(
                     'typeStr'   => Util::$typeStrings[TYPE_ITEM],
-                    'id'        => $pair[0],
+                    'id'        => $itemId,
-                    'name'      => $olItemData->json[$pair[0]]['name'],
+                    'name'      => $olItemData->json[$itemId]['name'],
-                    'qty'       => $pair[1] > 1 ? $pair[1] : 0,
+                    'qty'       => $qty > 1 ? $qty : 0,
-                    'quality'   => 7 - $olItemData->json[$pair[0]]['quality'],
+                    'quality'   => 7 - $olItemData->json[$itemId]['quality'],
-                    'extraText' => $i ? '' : '&nbsp;('.Lang::quest('provided').')'
+                    'extraText' => $provided ? '&nbsp;('.Lang::quest('provided').')' : ''
+                );
+            }
+
+            // if providd item is not required by quest, list it below other requirements
+            if (!$providedRequired && $olItems[0][0] && in_array($olItems[0][0], $olItemData->getFoundIDs()))
+            {
+                $this->providedItem = array(
+                    'id'        => $olItems[0][0],
+                    'name'      => $olItemData->json[$olItems[0][0]]['name'],
+                    'qty'       => $olItems[0][1] > 1 ? $olItems[0][1] : 0,
+                    'quality'   => 7 - $olItemData->json[$olItems[0][0]]['quality']
                 );
             }
         }

template/pages/quest.tpl.php

@@ -32,27 +32,16 @@ elseif ($this->offerReward):
     echo $this->offerReward."\n";
 endif;
 
-if ($e = $this->end):
+if ($this->end || $this->objectiveList):
 ?>
                 <table class="iconlist">
-                    <tr><th><p style="height: 26px; width: 30px;">&nbsp;</p></th><td><?php echo $e; ?></td></tr>
-<?php if ($s = $this->suggestedPl): ?>
-                    <tr><th><p style="height: 26px; width: 30px;">&nbsp;</p></th><td><?php echo Lang::quest('suggestedPl').Lang::main('colon').$s; ?></td></tr>
-<?php endif; ?>
-                </table>
 <?php
-endif;
+    if ($this->end):
-
+        echo "                    <tr><th><p style=\"height: 26px; width: 30px;\">&nbsp;</p></th><td>".$this->end."</td></tr>\n";
-if ($o = $this->objectiveList):
-    if ($e = $this->end):
-        echo "                <div class=\"pad\"></div>\n";
-        echo '                '.Lang::quest('providedItem').Lang::main('colon')."\n";
     endif;
-?>
-                <table class="iconlist">
-<?php
-    foreach ($o as $i => $ol):
 
+    if ($o = $this->objectiveList):
+        foreach ($o as $i => $ol):
             if (isset($ol['text'])):
                 echo '                    <tr><th><p style="height: 26px; width: 30px;">&nbsp;</p></th><td>'.$ol['text']."</td></tr>\n";
             elseif (!empty($ol['proxy'])):                      // this implies creatures
@@ -83,11 +72,12 @@ if ($o = $this->objectiveList):
                     echo '                    <tr><th><ul><li><var>&nbsp;</var></li></ul></th>';
                 endif;
 
-            echo '<td><span class="q'.(isset($ol['quality']) ? $ol['quality'] : null).'"><a href="?'.$ol['typeStr'].'='.$ol['id'].'">'.$ol['name'].'</a></span>'.(!$this->end ? $ol['extraText'] : null).(!empty($ol['qty']) ? '&nbsp;('.$ol['qty'].')' : null)."</td></tr>\n";
+                echo '<td><span class="q'.(isset($ol['quality']) ? $ol['quality'] : null).'"><a href="?'.$ol['typeStr'].'='.$ol['id'].'">'.$ol['name'].'</a></span>'.($ol['extraText']).(!empty($ol['qty']) ? '&nbsp;('.$ol['qty'].')' : null)."</td></tr>\n";
             endif;
         endforeach;
+    endif;
 
-    if ($this->suggestedPl && !$this->end):
+    if ($this->suggestedPl):
         echo '                    <tr><th><p style="height: 26px; width: 30px;">&nbsp;</p></th><td>'.Lang::quest('suggestedPl').Lang::main('colon').$this->suggestedPl."</td></tr>\n";
     endif;
 ?>
@@ -95,7 +85,7 @@ if ($o = $this->objectiveList):
 
                 <script type="text/javascript">//<![CDATA[
 <?php
-    foreach ($this->objectiveList as $k => $i):
+    foreach ($o as $k => $i):
         if (isset($i['typeStr']) && ($i['typeStr'] == 'item' || $i['typeStr'] == 'spell')):
             echo "                    \$WH.ge('iconlist-icon-".$k."').appendChild(g_".$i['typeStr']."s.createIcon(".$i['id'].", 0, ".$i['qty']."));\n";
         endif;
@@ -103,6 +93,22 @@ if ($o = $this->objectiveList):
 ?>
                 //]]></script>
 <?php
+    if ($p = $this->providedItem):
+        echo "                <div class=\"pad\"></div>\n";
+        echo '                '.Lang::quest('providedItem').Lang::main('colon')."\n";
+        echo "                <table class=\"iconlist\">\n";
+        echo '                    <tr><th align="right" id="iconlist-icon-'.count($this->objectiveList).'"></th>';
+        echo '<td><span class="q'.$p['quality'].'"><a href="?item='.$p['id'].'">'.$p['name'].'</a></span>'.($p['qty'] ? '&nbsp;('.$ol['qty'].')' : null)."</td></tr>\n";
+?>
+                </table>
+
+                <script type="text/javascript">//<![CDATA[
+<?php
+        echo "                    \$WH.ge('iconlist-icon-".count($this->objectiveList)."').appendChild(g_items.createIcon(".$p['id'].", 0, ".$p['qty']."));\n";
+?>
+                //]]></script>
+<?php
+    endif;
 endif;
 
 $this->brick('mapper');