From df1ba841c5a70e889bd7b689d495471f465606f7 Mon Sep 17 00:00:00 2001 From: Sarjuuk Date: Fri, 10 Jun 2022 16:58:18 +0200 Subject: [PATCH] Item/Tooltip * display hidden/cosmetic spells for staff --- includes/types/item.class.php | 39 +++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/includes/types/item.class.php b/includes/types/item.class.php index 139c11e80..552a1a65b 100644 --- a/includes/types/item.class.php +++ b/includes/types/item.class.php @@ -970,28 +970,31 @@ public function renderTooltip($interactive = false, $subOf = 0, $enhance = []) if ($itemSpellsAndTrigger) { - $cooldown = ''; - $itemSpells = new SpellList(array(['s.id', array_keys($itemSpellsAndTrigger)])); - foreach ($itemSpells->iterate() as $__) - if ($parsed = $itemSpells->parseText('description', $_reqLvl > 1 ? $_reqLvl : MAX_LEVEL, false, $causesScaling)[0]) + foreach ($itemSpells->iterate() as $sId => $__) + { + $parsed = $itemSpells->parseText('description', $_reqLvl > 1 ? $_reqLvl : MAX_LEVEL, false, $causesScaling)[0]; + if (!$parsed && User::isInGroup(U_GROUP_EMPLOYEE)) + $parsed = '<'.$itemSpells->getField('name', true, true).'>'; + else if (!$parsed) + continue; + + if ($interactive) { - if ($interactive) - { - $link = '%s'; - $parsed = preg_replace_callback('/([^;]*)( .*?<\/small>)([^&]*)/i', function($m) use($link) { - $m[1] = $m[1] ? sprintf($link, $m[1]) : ''; - $m[3] = $m[3] ? sprintf($link, $m[3]) : ''; - return $m[1].$m[2].$m[3]; - }, $parsed, -1, $nMatches - ); - - if (!$nMatches) - $parsed = sprintf($link, $parsed); - } + $link = '%s'; + $parsed = preg_replace_callback('/([^;]*)( .*?<\/small>)([^&]*)/i', function($m) use($link) { + $m[1] = $m[1] ? sprintf($link, $m[1]) : ''; + $m[3] = $m[3] ? sprintf($link, $m[3]) : ''; + return $m[1].$m[2].$m[3]; + }, $parsed, -1, $nMatches + ); - $green[] = Lang::item('trigger', $itemSpellsAndTrigger[$itemSpells->id][0]).$parsed.$itemSpellsAndTrigger[$itemSpells->id][1]; + if (!$nMatches) + $parsed = sprintf($link, $parsed); } + + $green[] = Lang::item('trigger', $itemSpellsAndTrigger[$itemSpells->id][0]).$parsed.$itemSpellsAndTrigger[$itemSpells->id][1]; + } } }