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

misc fixes

Browse Source
This commit is contained in:
Sarjuuk
2013-05-21 23:03:54 +02:00
parent 3bb5b83baf
commit 8b7ca25f08
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/class.item.php
View File

@@ -235,7 +235,7 @@ class ItemList extends BaseType
// requires map (todo: reparse ?_zones for non-conflicting data; generate Link to zone) // requires map (todo: reparse ?_zones for non-conflicting data; generate Link to zone)
if ($this->curTpl['Map']) if ($this->curTpl['Map'])
{ {
$map = DB::Aowow()->selectRow('SELECT * FROM ?_zones WHERE mapid=?d LIMIT 1', $this->curTpl['Map']); $map = DB::Aowow()->selectRow('SELECT * FROM ?_zones WHERE mapId=?d LIMIT 1', $this->curTpl['Map']);
$x .= '<br />'.Util::localizedString($map, 'name'); $x .= '<br />'.Util::localizedString($map, 'name');
} }

2
includes/utilities.php
View File

@@ -528,7 +528,7 @@ class SmartyAoWoW extends Smarty
'reqCSS' => [], // <[string,string]> path to required CSSFile, IE condition 'reqCSS' => [], // <[string,string]> path to required CSSFile, IE condition
'title' => null, // [string] page title 'title' => null, // [string] page title
'tab' => null, // [int] # of tab to highlight in the menu 'tab' => null, // [int] # of tab to highlight in the menu
'type' => null, // [int] numCode for spell, npx, object, ect 'type' => null, // [int] numCode for spell, npc, object, ect
'typeId' => null, // [int] entry to display 'typeId' => null, // [int] entry to display
'path' => '[]', // [string] (js:array) path to preselect in the menu 'path' => '[]', // [string] (js:array) path to preselect in the menu
'gStaticUrl' => substr('http://'.$_SERVER['SERVER_NAME'].strtr($_SERVER['SCRIPT_NAME'], ['index.php' => '']), 0, -1) 'gStaticUrl' => substr('http://'.$_SERVER['SERVER_NAME'].strtr($_SERVER['SCRIPT_NAME'], ['index.php' => '']), 0, -1)

2
pages/achievement.php
View File

@@ -182,7 +182,7 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData))
case ACHIEVEMENT_CRITERIA_TYPE_PLAY_ARENA: case ACHIEVEMENT_CRITERIA_TYPE_PLAY_ARENA:
case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_BATTLEGROUND: case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_BATTLEGROUND:
case ACHIEVEMENT_CRITERIA_TYPE_DEATH_AT_MAP: case ACHIEVEMENT_CRITERIA_TYPE_DEATH_AT_MAP:
if ($zoneId = DB::Aowow()->selectCell('SELECT areatableID FROM ?_zones WHERE mapID = ? LIMIT 1', $obj)) if ($zoneId = DB::Aowow()->selectCell('SELECT id FROM ?_zones WHERE mapId = ? LIMIT 1', $obj))
$tmp['link'] = array( $tmp['link'] = array(
'href' => '?zone='.$zoneId, 'href' => '?zone='.$zoneId,
'text' => $crtName, 'text' => $crtName,

9
pages/spell.php
View File

@@ -258,7 +258,7 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData))
$foo['icon']['count'] = "'".($effBP + 1).'-'.$foo['icon']['count']."'"; $foo['icon']['count'] = "'".($effBP + 1).'-'.$foo['icon']['count']."'";
} }
// .. from spell // .. from spell
else if ($_ = $spell->getField('effect'.$i.'TriggerSpell')) else if (($_ = $spell->getField('effect'.$i.'TriggerSpell')) && $_ > 0)
{ {
$trig = new SpellList(array(['s.id', (int)$_])); $trig = new SpellList(array(['s.id', (int)$_]));
@@ -438,14 +438,15 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData))
case 69: // School Absorb case 69: // School Absorb
case 72: // Mod Power Cost School Percent case 72: // Mod Power Cost School Percent
case 74: // Reflect Spell School case 74: // Reflect Spell School
case 79: // Mod Damage Pct Done case 79: // Mod Damage Done Pct
case 81: // Split Damage Pct case 81: // Split Damage Pct
case 87: // Mod Dmg Taken Pct case 87: // Mod Damage Taken Pct
case 97: // Mana Shield case 97: // Mana Shield
case 101: // Mod Resistance Pct case 101: // Mod Resistance Pct
case 115: // Mod Healing Taken case 115: // Mod Healing Taken
case 118: // Mod Healing Pct case 118: // Mod Healing Taken Pct
case 135: // Mod Healing Done case 135: // Mod Healing Done
case 136: // Mod Healing Done Pct
case 142: // Mod Base Resistance Pct case 142: // Mod Base Resistance Pct
case 143: // Mod Resistance Exclusive case 143: // Mod Resistance Exclusive
case 149: // Reduce Pushback case 149: // Reduce Pushback

4
setup/tools/dataset-assembler/pets.php
View File

@@ -68,7 +68,7 @@ if (!defined('AOWOW_REVISION'))
$queryZones = ' $queryZones = '
SELECT DISTINCT SELECT DISTINCT
z.areatableId AS location z.id AS location
FROM FROM
world.creature c world.creature c
JOIN JOIN
@@ -84,7 +84,7 @@ if (!defined('AOWOW_REVISION'))
$queryInstanceZone = ' $queryInstanceZone = '
SELECT DISTINCT SELECT DISTINCT
z.areatableId AS location z.id AS location
FROM FROM
world.creature c, world.creature c,
?_zones z ?_zones z