diff --git a/includes/class.filter.php b/includes/class.filter.php index b99c0b5b..2a7c0808 100644 --- a/includes/class.filter.php +++ b/includes/class.filter.php @@ -352,7 +352,7 @@ class SpellListFilter extends Filter case 2: // costPct [op] [int] return 's.powerCostPercent '.$this->int2Op($cr[1]).' '.intVal($cr[2]); case 3: // requires FocusGO [y|n] - return $this->int2Bool($cr[1]) ? 's.spellFocusObject > 0' : 's.spellfocus = 0'; + return $this->int2Bool($cr[1]) ? 's.spellFocusObject > 0' : 's.spellFocusObject = 0'; case 4: // trainingcost [op] [int] return 's.trainingcost '.$this->int2Op($cr[1]).' '.intVal($cr[2]); case 5: // Profession Specialitation [y|n] diff --git a/includes/class.spell.php b/includes/class.spell.php index 6284771f..ad5481fc 100644 --- a/includes/class.spell.php +++ b/includes/class.spell.php @@ -1400,7 +1400,7 @@ class SpellList extends BaseType if ($tools || $reagents || $reqItems || $desc) $x .= "
"; - $x .= $createItem; + $x .= '
'.$createItem; } if ($reqWrapper2) diff --git a/includes/utilities.php b/includes/utilities.php index a2a4cde3..2eee4845 100644 --- a/includes/utilities.php +++ b/includes/utilities.php @@ -1621,18 +1621,18 @@ class Util } // EnchantmentTypes - // 0 => (dnd stuff; ignore) - // 1 => proc spell from ObjectX (amountX == procChance?; ignore) - // 2 => +AmountX damage - // 3 => Spells form ObjectX (amountX == procChance?) - // 4 => +AmountX resistance for ObjectX School - // 5 => +AmountX for Statistic by type of ObjectX - // 6 => Rockbiter AmountX as Damage (ignore) - // 7 => Engineering gadgets - // 8 => Extra Sockets AmountX as socketCount (ignore) + // 0 => TYPE_NONE dnd stuff; (ignore) + // 1 => TYPE_COMBAT_SPELL proc spell from ObjectX (amountX == procChance?; ignore) + // 2 => TYPE_DAMAGE +AmountX damage + // 3 => TYPE_EQUIP_SPELL Spells from ObjectX (amountX == procChance?) + // 4 => TYPE_RESISTANCE +AmountX resistance for ObjectX School + // 5 => TYPE_STAT +AmountX for Statistic by type of ObjectX + // 6 => TYPE_TOTEM Rockbiter AmountX as Damage (ignore) + // 7 => TYPE_USE_SPELL Engineering gadgets + // 8 => TYPE_PRISMATIC_SOCKET Extra Sockets AmountX as socketCount (ignore) public static function parseItemEnchantment($enchant, $amountOverride = null) { - if (!$enchant || empty($enchant)) + if (empty($enchant)) return false; $jsonStats = []; diff --git a/setup/database.rar b/setup/database.rar index 429d2f6b..d4bc55e2 100644 Binary files a/setup/database.rar and b/setup/database.rar differ