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

TC dropped faction_H from creature_template and so do i

Browse Source 
made opensearch auto-discoverable
This commit is contained in:
Sarjuuk
2014-04-28 22:30:17 +02:00
parent 48cec63e1d
commit 5db461d151
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,7 @@ class CreatureList extends BaseType
protected $queryBase = 'SELECT ct.*, ct.id AS ARRAY_KEY FROM ?_creature ct';
public $queryOpts = array(
'ct' => [['ft', 'clsMin', 'clsMax', 'qse']],
'ft' => ['j' => '?_factiontemplate ft ON ft.id = ct.factionA', 's' => ', ft.A, ft.H, ft.factionId'],
'ft' => ['j' => '?_factiontemplate ft ON ft.id = ct.faction', 's' => ', ft.A, ft.H, ft.factionId'],
'clsMin' => ['j' => 'creature_classlevelstats clsMin ON ct.unitClass = clsMin.class AND ct.minLevel = clsMin.level', 's' => ', clsMin.attackpower AS mleAtkPwrMin, clsMin.rangedattackpower AS rngAtkPwrMin, clsMin.baseArmor * ct.armorMod AS armorMin, (CASE ct.exp WHEN 0 THEN clsMin.damage_base WHEN 1 THEN clsMin.damage_exp1 ELSE clsMin.damage_exp2 END) * ct.dmgMultiplier AS dmgMin, (CASE ct.exp WHEN 0 THEN clsMin.basehp0 WHEN 1 THEN clsMin.basehp1 ELSE clsMin.basehp2 END) * ct.healthMod AS healthMin, clsMin.baseMana * ct.manaMod AS manaMin'],
'clsMax' => ['j' => 'creature_classlevelstats clsMax ON ct.unitClass = clsMax.class AND ct.maxLevel = clsMax.level', 's' => ', clsMax.attackpower AS mleAtkPwrMax, clsMax.rangedattackpower AS rngAtkPwrMax, clsMax.baseArmor * ct.armorMod AS armorMax, (CASE ct.exp WHEN 0 THEN clsMin.damage_base WHEN 1 THEN clsMin.damage_exp1 ELSE clsMin.damage_exp2 END) * ct.dmgMultiplier AS dmgMax, (CASE ct.exp WHEN 0 THEN clsMax.basehp0 WHEN 1 THEN clsMax.basehp1 ELSE clsMax.basehp2 END) * ct.healthMod AS healthMax, clsMax.baseMana * ct.manaMod AS manaMax'],
'qse' => ['j' => ['?_quests_startend qse ON qse.type = 1 AND qse.typeId = ct.id', true], 's' => ', IF(min(qse.method) = 1 OR max(qse.method) = 3, 1, 0) AS startsQuests, IF(min(qse.method) = 2 OR max(qse.method) = 3, 1, 0) AS endsQuests', 'g' => 'ct.id'],
@@ -363,7 +363,7 @@ class CreatureListFilter extends Filter
if (!$facTpls)
return [0];
return ['OR', ['factionA', $facTpls], ['factionH', $facTpls]];
return ['faction', $facTpls];
}
break;
case 42: // increasesrepwith [enum]

2
pages/faction.php
View File

@@ -202,7 +202,7 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData))
// tab: members
if ($_ = $faction->getField('templateIds'))
{
$members = new CreatureList(array(['factionA', $_], ['factionH', $_], 'OR'));
$members = new CreatureList(array(['faction', $_]));
if (!$members->error)
{
$members->addGlobalsToJscript();

3
template/head.tpl
View File

@@ -1,7 +1,8 @@
<title>{if $title}{$title|escape:"html"} - {/if}{$appName}</title>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
<meta http-equiv="X-UA-Compatible" content="chrome=1">
<link rel="SHORTCUT ICON" href="template/images/favicon.ico">
<link rel="SHORTCUT ICON" href="{$smarty.const.STATIC_URL}/images/logos/favicon.ico">
<link rel="search" type="application/opensearchdescription+xml" href="{$smarty.const.STATIC_URL}/download/searchplugins/aowow.xml" title="Aowow" />
<link rel="stylesheet" type="text/css" href="{$smarty.const.STATIC_URL}/css/basic.css?{$AOWOW_REVISION}" />
<link rel="stylesheet" type="text/css" href="{$smarty.const.STATIC_URL}/css/global.css?{$AOWOW_REVISION}" />
<link rel="stylesheet" type="text/css" href="{$smarty.const.STATIC_URL}/css/locale_{$user.language}.css?{$AOWOW_REVISION}" />