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

IconDB/Fixups (obligatory)

Browse Source 
* table had wrong engine
 * two hunter pets have unique icons only referenced in creaturefamily.dbc
 * fixed links to rel-tabs
This commit is contained in:
Sarjuuk
2017-03-29 22:16:08 +02:00
parent ee568da6ec
commit cd9f90cea9
6 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/types/icon.class.php
View File

@@ -78,7 +78,7 @@ class IconList extends BaseType
'buildingcount' => 0, // UNUSED 'buildingcount' => 0, // UNUSED
'petcount' => (int)$this->getField('nPets'), 'petcount' => (int)$this->getField('nPets'),
'threatcount' => 0, // UNUSED 'threatcount' => 0, // UNUSED
'classcount' => 0 // class icons are hardcoeded and do not referenced in dbc 'classcount' => 0 // class icons are hardcoded and not referenced in dbc
); );
} }

25
pages/icon.php
View File

@@ -54,7 +54,10 @@ class IconPage extends GenericPage
if (!$ubSpells->error) if (!$ubSpells->error)
{ {
$this->extendGlobalData($ubSpells->getJsGlobals()); $this->extendGlobalData($ubSpells->getJsGlobals());
$this->lvTabs[] = [SpellList::$brickFile, ['data' => array_values($ubSpells->getListviewData())]]; $this->lvTabs[] = [SpellList::$brickFile, array(
'data' => array_values($ubSpells->getListviewData()),
'id' => 'used-by-spell'
)];
} }
// used by: item // used by: item
@@ -62,7 +65,10 @@ class IconPage extends GenericPage
if (!$ubItems->error) if (!$ubItems->error)
{ {
$this->extendGlobalData($ubItems->getJsGlobals()); $this->extendGlobalData($ubItems->getJsGlobals());
$this->lvTabs[] = [ItemList::$brickFile, ['data' =>array_values( $ubItems->getListviewData())]]; $this->lvTabs[] = [ItemList::$brickFile, array(
'data' => array_values($ubItems->getListviewData()),
'id' => 'used-by-item'
)];
} }
// used by: achievement // used by: achievement
@@ -70,7 +76,10 @@ class IconPage extends GenericPage
if (!$ubAchievements->error) if (!$ubAchievements->error)
{ {
$this->extendGlobalData($ubAchievements->getJsGlobals()); $this->extendGlobalData($ubAchievements->getJsGlobals());
$this->lvTabs[] = [AchievementList::$brickFile, ['data' => array_values($ubAchievements->getListviewData())]]; $this->lvTabs[] = [AchievementList::$brickFile, array(
'data' => array_values($ubAchievements->getListviewData()),
'id' => 'used-by-achievement'
)];
} }
// used by: currency // used by: currency
@@ -78,7 +87,10 @@ class IconPage extends GenericPage
if (!$ubCurrencies->error) if (!$ubCurrencies->error)
{ {
$this->extendGlobalData($ubCurrencies->getJsGlobals()); $this->extendGlobalData($ubCurrencies->getJsGlobals());
$this->lvTabs[] = [CurrencyList::$brickFile, ['data' => array_values($ubCurrencies->getListviewData())]]; $this->lvTabs[] = [CurrencyList::$brickFile, array(
'data' => array_values($ubCurrencies->getListviewData()),
'id' => 'used-by-currency'
)];
} }
// used by: hunter pet // used by: hunter pet
@@ -86,7 +98,10 @@ class IconPage extends GenericPage
if (!$ubPets->error) if (!$ubPets->error)
{ {
$this->extendGlobalData($ubPets->getJsGlobals()); $this->extendGlobalData($ubPets->getJsGlobals());
$this->lvTabs[] = [PetList::$brickFile, ['data' => array_values($ubPets->getListviewData())]]; $this->lvTabs[] = [PetList::$brickFile, array(
'data' => array_values($ubPets->getListviewData()),
'id' => 'used-by-pet'
)];
} }
} }

5
pages/icons.php
View File

@@ -17,12 +17,11 @@ class IconsPage extends GenericPage
protected $mode = CACHE_TYPE_PAGE; protected $mode = CACHE_TYPE_PAGE;
protected $js = ['filters.js']; protected $js = ['filters.js'];
public function __construct($pageCall, $pageParam) public function __construct($pageCall)
{ {
$this->filterObj = new IconListFilter(); $this->filterObj = new IconListFilter();
$this->getCategoryFromUrl($pageParam);;
parent::__construct($pageCall, $pageParam); parent::__construct($pageCall);
$this->name = Util::ucFirst(Lang::game('icons')); $this->name = Util::ucFirst(Lang::game('icons'));
} }

10
setup/db_structure.sql
View File

@@ -858,10 +858,12 @@ DROP TABLE IF EXISTS `aowow_icons`;
/*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */; /*!40101 SET character_set_client = utf8 */;
CREATE TABLE `aowow_icons` ( CREATE TABLE `aowow_icons` (
`id` mediumint(9) NOT NULL, `id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
`iconString` varchar(55) NOT NULL DEFAULT '', `cuFlags` int(11) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`id`) `name` varchar(55) NOT NULL DEFAULT '',
) ENGINE=MyISAM DEFAULT CHARSET=utf8; PRIMARY KEY (`id`),
INDEX `name` (`name`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;
/*!40101 SET character_set_client = @saved_cs_client */; /*!40101 SET character_set_client = @saved_cs_client */;
-- --

4
setup/tools/sqlgen/icons.func.php
View File

@@ -9,7 +9,7 @@ if (!CLI)
$customData = array( $customData = array(
); );
$reqDBC = ['spellicon', 'itemdisplayinfo']; $reqDBC = ['spellicon', 'itemdisplayinfo', 'creaturefamily'];
function icons() function icons()
{ {
@@ -22,6 +22,8 @@ function icons()
(SELECT LOWER(SUBSTRING_INDEX(iconPath, "\\\\", -1)) AS x FROM dbc_spellicon WHERE iconPath LIKE "%icons%") (SELECT LOWER(SUBSTRING_INDEX(iconPath, "\\\\", -1)) AS x FROM dbc_spellicon WHERE iconPath LIKE "%icons%")
UNION UNION
(SELECT LOWER(inventoryIcon1) AS x FROM dbc_itemdisplayinfo WHERE inventoryIcon1 <> "") (SELECT LOWER(inventoryIcon1) AS x FROM dbc_itemdisplayinfo WHERE inventoryIcon1 <> "")
UNION
(SELECT LOWER(SUBSTRING_INDEX(iconString, "\\\\", -1)) AS x FROM dbc_creaturefamily WHERE iconString LIKE "%icons%")
) y ) y
GROUP BY GROUP BY
x x

2
setup/updates/1490815301_01.sql
View File

@@ -5,7 +5,7 @@ CREATE TABLE `aowow_icons` (
`name` VARCHAR(55) NOT NULL DEFAULT '', `name` VARCHAR(55) NOT NULL DEFAULT '',
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
INDEX `name` (`name`) INDEX `name` (`name`)
) COLLATE='utf8_general_ci' ENGINE=MyISAM AUTO_INCREMENT=1; ) COLLATE='utf8_general_ci' ENGINE=InnoDB AUTO_INCREMENT=1;
ALTER TABLE `aowow_items` ALTER TABLE `aowow_items`
ADD COLUMN `iconId` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `name_loc8`, ADD COLUMN `iconId` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `name_loc8`,