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

Currency/PvP

Browse Source 
* convert and assign correct icons for honor points and arena points from /Interface/PvPFrame
This commit is contained in:
Sarjuuk
2023-04-20 19:47:32 +02:00
parent a6897ad2f8
commit 5c227c01e4
5 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/types/currency.class.php
View File

@@ -51,9 +51,9 @@ class CurrencyList extends BaseType
{ {
// todo (low): find out, why i did this in the first place // todo (low): find out, why i did this in the first place
if ($this->id == 104) // in case of honor commit sebbuku if ($this->id == 104) // in case of honor commit sebbuku
$icon = ['inv_bannerpvp_02', 'inv_bannerpvp_01']; // ['alliance', 'horde']; $icon = ['pvp-currency-alliance', 'pvp-currency-horde'];
else if ($this->id == 103) // also arena-icon diffs from item-icon else if ($this->id == 103) // also arena-icon diffs from item-icon
$icon = ['money_arena', 'money_arena']; $icon = ['pvp-arenapoints-icon', 'pvp-arenapoints-icon'];
else else
$icon = [$this->curTpl['iconString'], $this->curTpl['iconString']]; $icon = [$this->curTpl['iconString'], $this->curTpl['iconString']];

6
pages/currency.php
View File

@@ -75,9 +75,13 @@ class CurrencyPage extends GenericPage
/* Main Content */ /* Main Content */
/****************/ /****************/
$hi = $this->subject->getJSGlobals()[Type::CURRENCY][$this->typeId]['icon'];
if ($hi[0] == $hi[1])
unset($hi[1]);
$this->infobox = $infobox ? '[ul][li]'.implode('[/li][li]', $infobox).'[/li][/ul]' : null; $this->infobox = $infobox ? '[ul][li]'.implode('[/li][li]', $infobox).'[/li][/ul]' : null;
$this->name = $this->subject->getField('name', true); $this->name = $this->subject->getField('name', true);
$this->headIcons = $this->typeId == 104 ? ['inv_bannerpvp_02', 'inv_bannerpvp_01'] : [$this->subject->getField('iconString')]; $this->headIcons = $hi;
$this->redButtons = array( $this->redButtons = array(
BUTTON_WOWHEAD => true, BUTTON_WOWHEAD => true,
BUTTON_LINKS => true BUTTON_LINKS => true

2
setup/db_structure.sql
View File

@@ -3185,7 +3185,7 @@ UNLOCK TABLES;
LOCK TABLES `aowow_dbversion` WRITE; LOCK TABLES `aowow_dbversion` WRITE;
/*!40000 ALTER TABLE `aowow_dbversion` DISABLE KEYS */; /*!40000 ALTER TABLE `aowow_dbversion` DISABLE KEYS */;
INSERT INTO `aowow_dbversion` VALUES (1680717297,0,NULL,NULL); INSERT INTO `aowow_dbversion` VALUES (1682012751,0,NULL,NULL);
/*!40000 ALTER TABLE `aowow_dbversion` ENABLE KEYS */; /*!40000 ALTER TABLE `aowow_dbversion` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;

5
setup/tools/filegen/simpleImg.func.php
View File

@@ -75,7 +75,8 @@ if (!CLI)
8 => ['Pictures/', [['Interface/Pictures/', '.png', 0, 0, 0]], '/.*\.blp$', false, 0, null], 8 => ['Pictures/', [['Interface/Pictures/', '.png', 0, 0, 0]], '/.*\.blp$', false, 0, null],
9 => ['PvPRankBadges/', [['Interface/PvPRankBadges/', '.png', 0, 0, 0]], '/.*\.blp$', false, 0, null], 9 => ['PvPRankBadges/', [['Interface/PvPRankBadges/', '.png', 0, 0, 0]], '/.*\.blp$', false, 0, null],
10 => ['Calendar/Holidays/', $calendarDirs, '/.*(start|[ayhs])\.blp$', true, 0, null], 10 => ['Calendar/Holidays/', $calendarDirs, '/.*(start|[ayhs])\.blp$', true, 0, null],
11 => ['GLUES/LOADINGSCREENS/', $loadScreenDirs, '/lo.*\.blp$', false, 0, null] 11 => ['GLUES/LOADINGSCREENS/', $loadScreenDirs, '/lo.*\.blp$', false, 0, null],
12 => ['PVPFrame/', array_map(function($x) { $x[4] = 2; return $x; }, $iconDirs), '/PVP-(ArenaPoints|Currency).*\.blp$', true, 0, null]
); );
// textures are composed of 64x64 icons // textures are composed of 64x64 icons
// numeric indexed arrays mimick the position on the texture // numeric indexed arrays mimick the position on the texture
@@ -197,7 +198,7 @@ if (!CLI)
}; };
if (CLISetup::getOpt('icons')) if (CLISetup::getOpt('icons'))
array_push($groups, 0, 2, 3, 4, 5, 10); array_push($groups, 0, 2, 3, 4, 5, 10, 12);
if (CLISetup::getOpt('glyphs')) if (CLISetup::getOpt('glyphs'))
$groups[] = 1; $groups[] = 1;
if (CLISetup::getOpt('pagetexts')) if (CLISetup::getOpt('pagetexts'))

1
setup/updates/1682012750_01.sql Normal file
View File

@@ -0,0 +1 @@
UPDATE `aowow_dbversion` SET `build` = CONCAT(IFNULL(`build`, ''), ' simpleImg');