diff --git a/includes/types/spell.class.php b/includes/types/spell.class.php index 911fb3d0..c59f67a2 100644 --- a/includes/types/spell.class.php +++ b/includes/types/spell.class.php @@ -959,7 +959,7 @@ class SpellList extends BaseType $cond = $COND = function($a, $b, $c) { return $a ? $b : $c; }; $eq = $EQ = 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); }; $max = $MAX = function($a, $b) { return max($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(a, b, c)
a ? b : c', 'COND'); $eq = $EQ = !$this->interactive ? 'EQ' : sprintf(Util::$dfnString, 'EQ(a, b)
a == b', 'EQ'); $gt = $GT = !$this->interactive ? 'GT' : sprintf(Util::$dfnString, 'GT(a, b)
a > b', 'GT'); - $gte = $GTE = !$this->interactive ? 'GTE' : sprintf(Util::$dfnString, 'GTE(a, b)
a <= b', 'GT'); + $gte = $GTE = !$this->interactive ? 'GTE' : sprintf(Util::$dfnString, 'GTE(a, b)
a >= b', 'GTE'); $floor = $FLOOR = !$this->interactive ? 'FLOOR' : sprintf(Util::$dfnString, 'FLOOR(a)', 'FLOOR'); $min = $MIN = !$this->interactive ? 'MIN' : sprintf(Util::$dfnString, 'MIN(a, b)', 'MIN'); $max = $MAX = !$this->interactive ? 'MAX' : sprintf(Util::$dfnString, 'MAX(a, b)', 'MAX'); diff --git a/template/pages/enchantment.tpl.php b/template/pages/enchantment.tpl.php index 04bc7506..60ffb72a 100644 --- a/template/pages/enchantment.tpl.php +++ b/template/pages/enchantment.tpl.php @@ -47,7 +47,7 @@ foreach ($this->effects as $i => $e): )' : '').''; + echo ' '.$e['name'].(!empty($e['tip']) ? Lang::main('colon').'()' : '').''; if (isset($e['value'])): echo '
'.Lang::spell('_value').Lang::main('colon').$e['value'];