Spell/DetailPage

* finally set GCDCat var
 * (a smooth decade later and it turns out it was StartRecoveryCategory all along)
This commit is contained in:
Sarjuuk
2025-07-25 03:51:16 +02:00
parent 3f0d6c2de6
commit 967841fcb9
9 changed files with 50 additions and 13 deletions

View File

@@ -2427,6 +2427,7 @@ class SpellListFilter extends Filter
19 => [parent::CR_FLAG, 'attributes0', SPELL_ATTR0_LEVEL_DAMAGE_CALCULATION ], // scaling 19 => [parent::CR_FLAG, 'attributes0', SPELL_ATTR0_LEVEL_DAMAGE_CALCULATION ], // scaling
20 => [parent::CR_CALLBACK, 'cbReagents', ], // has Reagents [yn] 20 => [parent::CR_CALLBACK, 'cbReagents', ], // has Reagents [yn]
22 => [parent::CR_CALLBACK, 'cbProficiency', null, null ], // proficiencytype [proficiencytype] 22 => [parent::CR_CALLBACK, 'cbProficiency', null, null ], // proficiencytype [proficiencytype]
// 26 => [parent::CR_NUMERIC, 'startRecoveryCategory', NUM_CAST_INT, false ], // gcd-cat
25 => [parent::CR_BOOLEAN, 'skillLevelYellow' ], // rewardsskillups 25 => [parent::CR_BOOLEAN, 'skillLevelYellow' ], // rewardsskillups
27 => [parent::CR_FLAG, 'attributes1', SPELL_ATTR1_CHANNELED_1, true ], // channeled [yn] 27 => [parent::CR_FLAG, 'attributes1', SPELL_ATTR1_CHANNELED_1, true ], // channeled [yn]
28 => [parent::CR_NUMERIC, 'castTime', NUM_CAST_FLOAT ], // casttime [num] 28 => [parent::CR_NUMERIC, 'castTime', NUM_CAST_FLOAT ], // casttime [num]

View File

@@ -46,7 +46,6 @@ $lang = array(
'gains' => "Belohnungen", 'gains' => "Belohnungen",
'login' => "Login", 'login' => "Login",
'forum' => "Forum", 'forum' => "Forum",
'n_a' => "n. v.",
'siteRep' => "Ruf", 'siteRep' => "Ruf",
'yourRepHistory'=> "Dein Ruf-Verlauf", 'yourRepHistory'=> "Dein Ruf-Verlauf",
'aboutUs' => "Über Aowow", 'aboutUs' => "Über Aowow",
@@ -1490,6 +1489,11 @@ $lang = array(
'_seeMore' => "Mehr anzeigen", '_seeMore' => "Mehr anzeigen",
'_rankRange' => "Rang: %d - %d", '_rankRange' => "Rang: %d - %d",
'_showXmore' => "Zeige %d weitere", '_showXmore' => "Zeige %d weitere",
'n_a' => "n. v.",
'normal' => "Normal",
'special' => "Besonders",
'currentArea' => '<Momentanes Gebiet>', 'currentArea' => '<Momentanes Gebiet>',
'discovered' => "Durch Geistesblitz erlernt", 'discovered' => "Durch Geistesblitz erlernt",
'ppm' => "(%s Auslösungen pro Minute)", 'ppm' => "(%s Auslösungen pro Minute)",

View File

@@ -46,7 +46,6 @@ $lang = array(
'gains' => "Gains", 'gains' => "Gains",
'login' => "Login", 'login' => "Login",
'forum' => "Forum", 'forum' => "Forum",
'n_a' => "n/a",
'siteRep' => "Reputation", 'siteRep' => "Reputation",
'yourRepHistory'=> "Your Reputation History", 'yourRepHistory'=> "Your Reputation History",
'aboutUs' => "About us & contact", 'aboutUs' => "About us & contact",
@@ -1490,6 +1489,11 @@ $lang = array(
'_seeMore' => "See more", '_seeMore' => "See more",
'_rankRange' => "Rank: %d - %d", '_rankRange' => "Rank: %d - %d",
'_showXmore' => "Show %d More", '_showXmore' => "Show %d More",
'n_a' => "n/a",
'normal' => "Normal",
'special' => "Special",
'currentArea' => '<current area>', 'currentArea' => '<current area>',
'discovered' => "Learned via discovery", 'discovered' => "Learned via discovery",
'ppm' => "(%s procs per minute)", 'ppm' => "(%s procs per minute)",

View File

@@ -46,7 +46,6 @@ $lang = array(
'gains' => "Ganancias", 'gains' => "Ganancias",
'login' => "Ingresar", 'login' => "Ingresar",
'forum' => "Foro", 'forum' => "Foro",
'n_a' => "n/d",
'siteRep' => "Reputación", 'siteRep' => "Reputación",
'yourRepHistory'=> "Tu Historial de Reputación", 'yourRepHistory'=> "Tu Historial de Reputación",
'aboutUs' => "Sobre Aowow", 'aboutUs' => "Sobre Aowow",
@@ -1490,6 +1489,11 @@ $lang = array(
'_seeMore' => "Más información", '_seeMore' => "Más información",
'_rankRange' => "Rango: %d - %d", '_rankRange' => "Rango: %d - %d",
'_showXmore' => "Mostrar %d más", '_showXmore' => "Mostrar %d más",
'n_a' => "n/d",
'normal' => "Normal",
'special' => "Especial",
'currentArea' => '<current area>', 'currentArea' => '<current area>',
'discovered' => "Aprendido via descubrimiento", 'discovered' => "Aprendido via descubrimiento",
'ppm' => "(%s procs por minuto)", 'ppm' => "(%s procs por minuto)",

View File

@@ -46,7 +46,6 @@ $lang = array(
'gains' => "Gains", 'gains' => "Gains",
'login' => "[Login]", 'login' => "[Login]",
'forum' => "Forum", 'forum' => "Forum",
'n_a' => "n/d",
'siteRep' => "Réputation", 'siteRep' => "Réputation",
'yourRepHistory'=> "Votre historique de réputation", 'yourRepHistory'=> "Votre historique de réputation",
'aboutUs' => "À propos de Aowow", 'aboutUs' => "À propos de Aowow",
@@ -1490,6 +1489,11 @@ $lang = array(
'_seeMore' => "[See more]", '_seeMore' => "[See more]",
'_rankRange' => "Rang : %d - %d", '_rankRange' => "Rang : %d - %d",
'_showXmore' => "En afficher %d de plus", '_showXmore' => "En afficher %d de plus",
'n_a' => "n/d",
'normal' => "Standard",
'special' => "Spécial",
'currentArea' => '<current area>', 'currentArea' => '<current area>',
'discovered' => "Appris via une découverte", 'discovered' => "Appris via une découverte",
'ppm' => "(%s déclenchements par minute)", 'ppm' => "(%s déclenchements par minute)",

View File

@@ -46,7 +46,6 @@ $lang = array(
'gains' => "Бонус", 'gains' => "Бонус",
'login' => "[Login]", 'login' => "[Login]",
'forum' => "Форум", 'forum' => "Форум",
'n_a' => "нет",
'siteRep' => "Репутация", 'siteRep' => "Репутация",
'yourRepHistory'=> "История вашей репутации", 'yourRepHistory'=> "История вашей репутации",
'aboutUs' => "О Aowow", 'aboutUs' => "О Aowow",
@@ -1490,6 +1489,11 @@ $lang = array(
'_seeMore' => "[See more]", '_seeMore' => "[See more]",
'_rankRange' => "Ранг: %d - %d", '_rankRange' => "Ранг: %d - %d",
'_showXmore' => "Показать на %d больше", '_showXmore' => "Показать на %d больше",
'n_a' => "нет",
'normal' => "Обычный",
'special' => "Особый",
'currentArea' => '<current area>', 'currentArea' => '<current area>',
'discovered' => "Изучается путём освоения местности", 'discovered' => "Изучается путём освоения местности",
'ppm' => "(Срабатывает %s раз в минуту)", 'ppm' => "(Срабатывает %s раз в минуту)",

View File

@@ -47,7 +47,6 @@ $lang = array(
'gains' => "获得", 'gains' => "获得",
'login' => "登录", 'login' => "登录",
'forum' => "论坛", 'forum' => "论坛",
'n_a' => "n/a",
'siteRep' => "站点声望", 'siteRep' => "站点声望",
'yourRepHistory'=> "您的声望历史", 'yourRepHistory'=> "您的声望历史",
'aboutUs' => "关于我们 & 联系我们", 'aboutUs' => "关于我们 & 联系我们",
@@ -1490,6 +1489,11 @@ $lang = array(
'_seeMore' => "[See more]", '_seeMore' => "[See more]",
'_rankRange' => "排名: %d - %d", '_rankRange' => "排名: %d - %d",
'_showXmore' => "[Show %d More]", '_showXmore' => "[Show %d More]",
'n_a' => "n/a",
'normal' => "普通",
'special' => "特殊",
'currentArea' => '<当前区域>', 'currentArea' => '<当前区域>',
'discovered' => "通过发现学习", 'discovered' => "通过发现学习",
'ppm' => "%s每分钟触发几率", 'ppm' => "%s每分钟触发几率",

View File

@@ -24,7 +24,7 @@ class SpellPage extends GenericPage
protected $rangeName = ''; protected $rangeName = '';
protected $range = ''; protected $range = '';
protected $gcd = ''; protected $gcd = '';
protected $gcdCat = ''; // todo (low): nyi; find out how this works [n/a; normal; ..] protected $gcdCat = '';
protected $school = ''; protected $school = '';
protected $dispel = ''; protected $dispel = '';
protected $mechanic = ''; protected $mechanic = '';
@@ -352,6 +352,18 @@ class SpellPage extends GenericPage
$this->headIcons = [$this->subject->getField('iconString'), $this->subject->getField('stackAmount') ?: ($this->subject->getField('procCharges') > 1 ? $this->subject->getField('procCharges') : '')]; $this->headIcons = [$this->subject->getField('iconString'), $this->subject->getField('stackAmount') ?: ($this->subject->getField('procCharges') > 1 ? $this->subject->getField('procCharges') : '')];
$this->redButtons = $redButtons; $this->redButtons = $redButtons;
$this->infobox = $infobox; $this->infobox = $infobox;
$this->gcdCat = match((int)$this->subject->getField('startRecoveryCategory'))
{
133 => Lang::spell('normal'),
330, // Mounts
1156, // Heart of the Phoenix
1159, // Ignis Grab and Slag Pot
1164, // Kessel Run Elek
1173, // Birmingham Test Spells
1178, // Stealth (Druid Cat, Rogue, Hunter Cat Pets) + Charge (Warrior)
1244 => Lang::spell('special'), // Argent Tournament Vehicle Jousting Abilities
default => '' // n/a
};
// minRange exists.. prepend // minRange exists.. prepend
if ($_ = $this->subject->getField('rangeMinHostile')) if ($_ = $this->subject->getField('rangeMinHostile'))

View File

@@ -88,23 +88,23 @@ endif;
</tr> </tr>
<tr> <tr>
<th style="border-left: 0; border-top: 0"><?=Lang::game('duration');?></th> <th style="border-left: 0; border-top: 0"><?=Lang::game('duration');?></th>
<td width="100%" style="border-top: 0"><?=($this->duration ?: '<span class="q0">'.Lang::main('n_a').'</span>');?></td> <td width="100%" style="border-top: 0"><?=($this->duration ?: '<span class="q0">'.Lang::spell('n_a').'</span>');?></td>
</tr> </tr>
<tr> <tr>
<th style="border-left: 0"><?=Lang::game('school'); ?></th> <th style="border-left: 0"><?=Lang::game('school'); ?></th>
<td width="100%" style="border-top: 0"><?=($this->school ?: '<span class="q0">'.Lang::main('n_a').'</span>');?></td> <td width="100%" style="border-top: 0"><?=($this->school ?: '<span class="q0">'.Lang::spell('n_a').'</span>');?></td>
</tr> </tr>
<tr> <tr>
<th style="border-left: 0"><?=Lang::game('mechanic');?></th> <th style="border-left: 0"><?=Lang::game('mechanic');?></th>
<td width="100%" style="border-top: 0"><?=($this->mechanic ?:'<span class="q0">'.Lang::main('n_a').'</span>');?></td> <td width="100%" style="border-top: 0"><?=($this->mechanic ?:'<span class="q0">'.Lang::spell('n_a').'</span>');?></td>
</tr> </tr>
<tr> <tr>
<th style="border-left: 0"><?=Lang::game('dispelType');?></th> <th style="border-left: 0"><?=Lang::game('dispelType');?></th>
<td width="100%" style="border-top: 0"><?=($this->dispel ?: '<span class="q0">'.Lang::main('n_a').'</span>');?></td> <td width="100%" style="border-top: 0"><?=($this->dispel ?: '<span class="q0">'.Lang::spell('n_a').'</span>');?></td>
</tr> </tr>
<tr> <tr>
<th style="border-bottom: 0; border-left: 0"><?=Lang::spell('_gcdCategory');?></th> <th style="border-bottom: 0; border-left: 0"><?=Lang::spell('_gcdCategory');?></th>
<td style="border-bottom: 0"><?=($this->gcdCat ?: '<span class="q0">'.Lang::main('n_a').'</span>');?></td> <td style="border-bottom: 0"><?=($this->gcdCat ?: '<span class="q0">'.Lang::spell('n_a').'</span>');?></td>
</tr> </tr>
</table> </table>
</td> </td>
@@ -123,7 +123,7 @@ endif;
</tr> </tr>
<tr> <tr>
<th><?=Lang::spell('_cooldown');?></th> <th><?=Lang::spell('_cooldown');?></th>
<td><?=($this->cooldown ?: '<span class="q0">'.Lang::main('n_a').'</span>');?></td> <td><?=($this->cooldown ?: '<span class="q0">'.Lang::spell('n_a').'</span>');?></td>
</tr> </tr>
<tr> <tr>
<th><dfn title="<?=Lang::spell('_globCD').'">'.Lang::spell('_gcd');?></dfn></th> <th><dfn title="<?=Lang::spell('_globCD').'">'.Lang::spell('_gcd');?></dfn></th>