From e513e01b290b2617a636cd0c0e85e3c07165f95a Mon Sep 17 00:00:00 2001 From: Sarjuuk Date: Fri, 24 Mar 2023 13:23:07 +0100 Subject: [PATCH] Setup/TalentIcons (#382) * fix icon order for pet talents --- setup/db_structure.sql | 2 +- setup/tools/filegen/talentIcons.func.php | 2 +- setup/updates/1679660926_01.sql | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 setup/updates/1679660926_01.sql diff --git a/setup/db_structure.sql b/setup/db_structure.sql index 74967047..95b6cede 100644 --- a/setup/db_structure.sql +++ b/setup/db_structure.sql @@ -3185,7 +3185,7 @@ UNLOCK TABLES; LOCK TABLES `aowow_dbversion` WRITE; /*!40000 ALTER TABLE `aowow_dbversion` DISABLE KEYS */; -INSERT INTO `aowow_dbversion` VALUES (1648222153,0,NULL,NULL); +INSERT INTO `aowow_dbversion` VALUES (1679660927,0,NULL,NULL); /*!40000 ALTER TABLE `aowow_dbversion` ENABLE KEYS */; UNLOCK TABLES; diff --git a/setup/tools/filegen/talentIcons.func.php b/setup/tools/filegen/talentIcons.func.php index 168137b2..d7a5ddac 100644 --- a/setup/tools/filegen/talentIcons.func.php +++ b/setup/tools/filegen/talentIcons.func.php @@ -15,7 +15,7 @@ if (!CLI) function talentIcons() { $success = true; - $query = 'SELECT ic.name AS iconString FROM ?_icons ic JOIN ?_spell s ON s.iconId = ic.id JOIN dbc_talent t ON t.rank1 = s.id JOIN dbc_talenttab tt ON tt.id = t.tabId WHERE tt.?# = ?d AND tt.tabNumber = ?d ORDER BY t.row, t.column, t.petCategory1 ASC'; + $query = 'SELECT ic.name AS iconString FROM ?_icons ic JOIN ?_spell s ON s.iconId = ic.id JOIN dbc_talent t ON t.rank1 = s.id JOIN dbc_talenttab tt ON tt.id = t.tabId WHERE tt.?# = ?d AND tt.tabNumber = ?d ORDER BY t.row, t.column ASC, s.id DESC'; $dims = 36; //v-pets $filenames = ['icons', 'warrior', 'paladin', 'hunter', 'rogue', 'priest', 'deathknight', 'shaman', 'mage', 'warlock', null, 'druid']; diff --git a/setup/updates/1679660926_01.sql b/setup/updates/1679660926_01.sql new file mode 100644 index 00000000..5b3fe754 --- /dev/null +++ b/setup/updates/1679660926_01.sql @@ -0,0 +1 @@ +UPDATE `aowow_dbversion` SET `build` = CONCAT(IFNULL(`build`, ''), ' talentIcons');