yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-11-29 15:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Items/Itemsets

Browse Source 
* fixed erronous linking to the baseline set for virtual sets
 * display items from the same set, for the same slot in the 'see also' tab
This commit is contained in:
Sarjuuk
2020-03-28 15:30:57 +01:00
parent bf2e1bd612
commit 3b749025de
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
includes/types/item.class.php
View File

@@ -979,10 +979,31 @@ class ItemList extends BaseType
$pieces = []; $pieces = [];
if ($setId = $this->getField('itemset')) if ($setId = $this->getField('itemset'))
{ {
// while Ids can technically be used multiple times the only difference in data are the items used. So it doesn't matter what we get $condition = [
$itemset = new ItemsetList(array(['id', $setId])); ['refSetId', $setId],
// ['quality', $this->curTpl['quality']],
['minLevel', $this->curTpl['itemLevel'], '<='],
['maxLevel', $this->curTpl['itemLevel'], '>=']
];
$itemset = new ItemsetList($condition);
if (!$itemset->error && $itemset->pieceToSet) if (!$itemset->error && $itemset->pieceToSet)
{ {
// handle special cases where:
// > itemset has items of different qualities (handled by not limiting for this in the initial query)
// > itemset is virtual and multiple instances have the same itemLevel but not quality (filter below)
if ($itemset->getMatches() > 1)
{
foreach ($itemset->iterate() as $id => $__)
{
if ($itemset->getField('quality') == $this->curTpl['quality'])
{
$itemset->pieceToSet = array_filter($itemset->pieceToSet, function($x) use ($id) { return $id == $x; });
break;
}
}
}
$pieces = DB::Aowow()->select(' $pieces = DB::Aowow()->select('
SELECT b.id AS ARRAY_KEY, b.name_loc0, b.name_loc2, b.name_loc3, b.name_loc4, b.name_loc6, b.name_loc8, GROUP_CONCAT(a.id SEPARATOR \':\') AS equiv SELECT b.id AS ARRAY_KEY, b.name_loc0, b.name_loc2, b.name_loc3, b.name_loc4, b.name_loc6, b.name_loc8, GROUP_CONCAT(a.id SEPARATOR \':\') AS equiv
FROM ?_items a, ?_items b FROM ?_items a, ?_items b
@@ -996,7 +1017,7 @@ class ItemList extends BaseType
$xSet = '<br /><span class="q">'.Lang::item('setName', ['<a href="?itemset='.$itemset->id.'" class="q">'.$itemset->getField('name', true).'</a>', 0, count($pieces)]).'</span>'; $xSet = '<br /><span class="q">'.Lang::item('setName', ['<a href="?itemset='.$itemset->id.'" class="q">'.$itemset->getField('name', true).'</a>', 0, count($pieces)]).'</span>';
if ($skId = $itemset->getField('skillId')) // bonus requires skill to activate if ($skId = $itemset->getField('skillId')) // bonus requires skill to activate
{ {
$xSet .= '<br />'.sprintf(Lang::game('requires'), '<a href="?skills='.$skId.'" class="q1">'.SkillList::getName($skId).'</a>'); $xSet .= '<br />'.sprintf(Lang::game('requires'), '<a href="?skills='.$skId.'" class="q1">'.SkillList::getName($skId).'</a>');

3
pages/item.php
View File

@@ -677,6 +677,9 @@ class ItemPage extends genericPage
] ]
); );
if ($_ = $this->subject->getField('itemset'))
$conditions[1][] = ['AND', ['slot', $_slot], ['itemset', $_]];
$saItems = new ItemList($conditions); $saItems = new ItemList($conditions);
if (!$saItems->error) if (!$saItems->error)
{ {