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

Enchantment/DetailPage

Browse Source 
* removed tooltip-highlight when there is no tooltip to display
Spells/Tooltips
 * fixed ancient copy-paste error and 'greater than or equal' conditions are now always evaluated as such
This commit is contained in:
Sarjuuk
2020-12-27 20:07:57 +01:00
parent 89275a0e71
commit baf47433dd
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/types/spell.class.php
View File

@@ -959,7 +959,7 @@ class SpellList extends BaseType
$cond = $COND = function($a, $b, $c) { return $a ? $b : $c; }; $cond = $COND = function($a, $b, $c) { return $a ? $b : $c; };
$eq = $EQ = function($a, $b) { return $a == $b; }; $eq = $EQ = function($a, $b) { return $a == $b; };
$gt = $GT = function($a, $b) { return $a > $b; }; $gt = $GT = function($a, $b) { return $a > $b; };
$gte = $GTE = function($a, $b) { return $a <= $b; }; $gte = $GTE = function($a, $b) { return $a >= $b; };
$floor = $FLOOR = function($a) { return floor($a); }; $floor = $FLOOR = function($a) { return floor($a); };
$max = $MAX = function($a, $b) { return max($a, $b); }; $max = $MAX = function($a, $b) { return max($a, $b); };
$min = $MIN = function($a, $b) { return min($a, $b); }; $min = $MIN = function($a, $b) { return min($a, $b); };
@@ -994,7 +994,7 @@ class SpellList extends BaseType
$cond = $COND = !$this->interactive ? 'COND' : sprintf(Util::$dfnString, 'COND(<span class=\'q1\'>a</span>, <span class=\'q1\'>b</span>, <span class=\'q1\'>c</span>)<br /> <span class=\'q1\'>a</span> ? <span class=\'q1\'>b</span> : <span class=\'q1\'>c</span>', 'COND'); $cond = $COND = !$this->interactive ? 'COND' : sprintf(Util::$dfnString, 'COND(<span class=\'q1\'>a</span>, <span class=\'q1\'>b</span>, <span class=\'q1\'>c</span>)<br /> <span class=\'q1\'>a</span> ? <span class=\'q1\'>b</span> : <span class=\'q1\'>c</span>', 'COND');
$eq = $EQ = !$this->interactive ? 'EQ' : sprintf(Util::$dfnString, 'EQ(<span class=\'q1\'>a</span>, <span class=\'q1\'>b</span>)<br /> <span class=\'q1\'>a</span> == <span class=\'q1\'>b</span>', 'EQ'); $eq = $EQ = !$this->interactive ? 'EQ' : sprintf(Util::$dfnString, 'EQ(<span class=\'q1\'>a</span>, <span class=\'q1\'>b</span>)<br /> <span class=\'q1\'>a</span> == <span class=\'q1\'>b</span>', 'EQ');
$gt = $GT = !$this->interactive ? 'GT' : sprintf(Util::$dfnString, 'GT(<span class=\'q1\'>a</span>, <span class=\'q1\'>b</span>)<br /> <span class=\'q1\'>a</span> > <span class=\'q1\'>b</span>', 'GT'); $gt = $GT = !$this->interactive ? 'GT' : sprintf(Util::$dfnString, 'GT(<span class=\'q1\'>a</span>, <span class=\'q1\'>b</span>)<br /> <span class=\'q1\'>a</span> > <span class=\'q1\'>b</span>', 'GT');
$gte = $GTE = !$this->interactive ? 'GTE' : sprintf(Util::$dfnString, 'GTE(<span class=\'q1\'>a</span>, <span class=\'q1\'>b</span>)<br /> <span class=\'q1\'>a</span> <= <span class=\'q1\'>b</span>', 'GT'); $gte = $GTE = !$this->interactive ? 'GTE' : sprintf(Util::$dfnString, 'GTE(<span class=\'q1\'>a</span>, <span class=\'q1\'>b</span>)<br /> <span class=\'q1\'>a</span> >= <span class=\'q1\'>b</span>', 'GTE');
$floor = $FLOOR = !$this->interactive ? 'FLOOR' : sprintf(Util::$dfnString, 'FLOOR(<span class=\'q1\'>a</span>)', 'FLOOR'); $floor = $FLOOR = !$this->interactive ? 'FLOOR' : sprintf(Util::$dfnString, 'FLOOR(<span class=\'q1\'>a</span>)', 'FLOOR');
$min = $MIN = !$this->interactive ? 'MIN' : sprintf(Util::$dfnString, 'MIN(<span class=\'q1\'>a</span>, <span class=\'q1\'>b</span>)', 'MIN'); $min = $MIN = !$this->interactive ? 'MIN' : sprintf(Util::$dfnString, 'MIN(<span class=\'q1\'>a</span>, <span class=\'q1\'>b</span>)', 'MIN');
$max = $MAX = !$this->interactive ? 'MAX' : sprintf(Util::$dfnString, 'MAX(<span class=\'q1\'>a</span>, <span class=\'q1\'>b</span>)', 'MAX'); $max = $MAX = !$this->interactive ? 'MAX' : sprintf(Util::$dfnString, 'MAX(<span class=\'q1\'>a</span>, <span class=\'q1\'>b</span>)', 'MAX');

2
template/pages/enchantment.tpl.php
View File

@@ -47,7 +47,7 @@ foreach ($this->effects as $i => $e):
<th><?php echo Lang::spell('_effect').' #'.$i; ?></th> <th><?php echo Lang::spell('_effect').' #'.$i; ?></th>
<td colspan="3" style="line-height: 17px"> <td colspan="3" style="line-height: 17px">
<?php <?php
echo ' '.$e['name'].(!empty($e['tip']) ? Lang::main('colon').'(<span class="tip" id="efftip-'.$i.'"></span>)' : '').'<small>'; echo ' '.$e['name'].(!empty($e['tip']) ? Lang::main('colon').'(<span '.(User::isInGroup(U_GROUP_EMPLOYEE) ? 'class="tip" ' : '').'id="efftip-'.$i.'"></span>)' : '').'<small>';
if (isset($e['value'])): if (isset($e['value'])):
echo '<br>'.Lang::spell('_value').Lang::main('colon').$e['value']; echo '<br>'.Lang::spell('_value').Lang::main('colon').$e['value'];