diff --git a/includes/types/item.class.php b/includes/types/item.class.php index a3dd308b..5ee32a82 100644 --- a/includes/types/item.class.php +++ b/includes/types/item.class.php @@ -1320,8 +1320,8 @@ class ItemList extends BaseType $ire = DB::Aowow()->select(' SELECT i.id AS ARRAY_KEY_1, ire.id AS ARRAY_KEY_2, iet.chance, ire.* FROM ?_items i - JOIN item_enchantment_template iet ON iet.entry = ABS(i.randomEnchant) - JOIN ?_itemRandomEnchant ire ON IF(i.randomEnchant > 0, ire.id = iet.ench, ire.id = -iet.ench) + JOIN item_enchantment_template iet ON iet.entry = ABS(i.randomenchant) + JOIN ?_itemrandomenchant ire ON IF(i.randomenchant > 0, ire.id = iet.ench, ire.id = -iet.ench) WHERE i.id IN (?a)', array_keys($this->templates) ); diff --git a/setup/tools/dataset/enchants.php b/setup/tools/dataset/enchants.php old mode 100644 new mode 100755 index 9946b7f4..dedbdbfe --- a/setup/tools/dataset/enchants.php +++ b/setup/tools/dataset/enchants.php @@ -127,7 +127,7 @@ if (!defined('AOWOW_REVISION')) $ench['jsonequip']['requiredLevel'] = $misc['requiredLevel']; // check if the spell has an entry in skill_line_ability -> Source:Profession - if ($skill = DB::Aowow()->SelectCell('SELECT skillLineId FROM dbc.skillLineAbility WHERE spellId = ?d', $enchantSpells->id)) + if ($skill = DB::Aowow()->SelectCell('SELECT skillLineId FROM dbc.skilllineability WHERE spellId = ?d', $enchantSpells->id)) { $ench['name'][] = $enchantSpells->getField('name', true); $ench['source'][] = $enchantSpells->id; diff --git a/setup/tools/dataset/glyphs.php b/setup/tools/dataset/glyphs.php old mode 100644 new mode 100755 index 774003ba..86331317 --- a/setup/tools/dataset/glyphs.php +++ b/setup/tools/dataset/glyphs.php @@ -42,7 +42,7 @@ if (!defined('AOWOW_REVISION')) ?_spell s1 ON s1.Id = i.spellid_1 LEFT JOIN - ?_glyphProperties g ON + ?_glyphproperties g ON g.Id = s1.effect1MiscValue LEFT JOIN ?_spell s2 ON diff --git a/setup/tools/dataset/pets.php b/setup/tools/dataset/pets.php old mode 100644 new mode 100755 index 816bc78c..f31733fd --- a/setup/tools/dataset/pets.php +++ b/setup/tools/dataset/pets.php @@ -48,16 +48,16 @@ if (!defined('AOWOW_REVISION')) FROM world.creature_template ct JOIN - ?_factionTemplate ft ON - ft.Id = ct.faction_A -- no beast has different faction set for Horde + ?_factiontemplate ft ON + ft.Id = ct.faction -- no beast has different faction set for Horde JOIN - dbc.creatureFamily cf ON + dbc.creaturefamily cf ON cf.Id = ct.family LEFT JOIN world.locales_creature lc ON lc.entry = ct.entry JOIN - dbc.creatureDisplayInfo cdi ON + dbc.creaturedisplayinfo cdi ON cdi.id = ct.modelId1 WHERE cf.petTalentType <> -1 AND diff --git a/setup/tools/dataset/statistics.php b/setup/tools/dataset/statistics.php old mode 100644 new mode 100755 index f1b11606..cfc6b304 --- a/setup/tools/dataset/statistics.php +++ b/setup/tools/dataset/statistics.php @@ -40,7 +40,7 @@ if (!defined('AOWOW_REVISION')) ); foreach ($dataz as $class => &$data) - $data[2] = array_values(DB::Aowow()->selectRow('SELECT mle.chance*100 cMle, spl.chance*100 cSpl FROM dbc.gtChanceToMeleeCritBase mle, dbc.gtChanceToSpellCritBase spl WHERE mle.idx = spl.idx AND mle.idx = ?d', $class - 1)); + $data[2] = array_values(DB::Aowow()->selectRow('SELECT mle.chance*100 cMle, spl.chance*100 cSpl FROM dbc.gtchancetomeleecritbase mle, dbc.gtchancetospellcritbase spl WHERE mle.idx = spl.idx AND mle.idx = ?d', $class - 1)); return $dataz; }