diff --git a/includes/types/spell.class.php b/includes/types/spell.class.php index 54dcb4f6..d6c7c993 100644 --- a/includes/types/spell.class.php +++ b/includes/types/spell.class.php @@ -2427,6 +2427,7 @@ class SpellListFilter extends Filter 19 => [parent::CR_FLAG, 'attributes0', SPELL_ATTR0_LEVEL_DAMAGE_CALCULATION ], // scaling 20 => [parent::CR_CALLBACK, 'cbReagents', ], // has Reagents [yn] 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 27 => [parent::CR_FLAG, 'attributes1', SPELL_ATTR1_CHANNELED_1, true ], // channeled [yn] 28 => [parent::CR_NUMERIC, 'castTime', NUM_CAST_FLOAT ], // casttime [num] diff --git a/localization/locale_dede.php b/localization/locale_dede.php index a7ec2b48..c69dfd03 100644 --- a/localization/locale_dede.php +++ b/localization/locale_dede.php @@ -46,7 +46,6 @@ $lang = array( 'gains' => "Belohnungen", 'login' => "Login", 'forum' => "Forum", - 'n_a' => "n. v.", 'siteRep' => "Ruf", 'yourRepHistory'=> "Dein Ruf-Verlauf", 'aboutUs' => "Über Aowow", @@ -1490,6 +1489,11 @@ $lang = array( '_seeMore' => "Mehr anzeigen", '_rankRange' => "Rang: %d - %d", '_showXmore' => "Zeige %d weitere", + + 'n_a' => "n. v.", + 'normal' => "Normal", + 'special' => "Besonders", + 'currentArea' => '<Momentanes Gebiet>', 'discovered' => "Durch Geistesblitz erlernt", 'ppm' => "(%s Auslösungen pro Minute)", diff --git a/localization/locale_enus.php b/localization/locale_enus.php index 35e78121..dca37d71 100644 --- a/localization/locale_enus.php +++ b/localization/locale_enus.php @@ -46,7 +46,6 @@ $lang = array( 'gains' => "Gains", 'login' => "Login", 'forum' => "Forum", - 'n_a' => "n/a", 'siteRep' => "Reputation", 'yourRepHistory'=> "Your Reputation History", 'aboutUs' => "About us & contact", @@ -1490,6 +1489,11 @@ $lang = array( '_seeMore' => "See more", '_rankRange' => "Rank: %d - %d", '_showXmore' => "Show %d More", + + 'n_a' => "n/a", + 'normal' => "Normal", + 'special' => "Special", + 'currentArea' => '<current area>', 'discovered' => "Learned via discovery", 'ppm' => "(%s procs per minute)", diff --git a/localization/locale_eses.php b/localization/locale_eses.php index c92bc30a..477d8120 100644 --- a/localization/locale_eses.php +++ b/localization/locale_eses.php @@ -46,7 +46,6 @@ $lang = array( 'gains' => "Ganancias", 'login' => "Ingresar", 'forum' => "Foro", - 'n_a' => "n/d", 'siteRep' => "Reputación", 'yourRepHistory'=> "Tu Historial de Reputación", 'aboutUs' => "Sobre Aowow", @@ -1490,6 +1489,11 @@ $lang = array( '_seeMore' => "Más información", '_rankRange' => "Rango: %d - %d", '_showXmore' => "Mostrar %d más", + + 'n_a' => "n/d", + 'normal' => "Normal", + 'special' => "Especial", + 'currentArea' => '<current area>', 'discovered' => "Aprendido via descubrimiento", 'ppm' => "(%s procs por minuto)", diff --git a/localization/locale_frfr.php b/localization/locale_frfr.php index 1c7845b2..f31c917b 100644 --- a/localization/locale_frfr.php +++ b/localization/locale_frfr.php @@ -46,7 +46,6 @@ $lang = array( 'gains' => "Gains", 'login' => "[Login]", 'forum' => "Forum", - 'n_a' => "n/d", 'siteRep' => "Réputation", 'yourRepHistory'=> "Votre historique de réputation", 'aboutUs' => "À propos de Aowow", @@ -1490,6 +1489,11 @@ $lang = array( '_seeMore' => "[See more]", '_rankRange' => "Rang : %d - %d", '_showXmore' => "En afficher %d de plus", + + 'n_a' => "n/d", + 'normal' => "Standard", + 'special' => "Spécial", + 'currentArea' => '<current area>', 'discovered' => "Appris via une découverte", 'ppm' => "(%s déclenchements par minute)", diff --git a/localization/locale_ruru.php b/localization/locale_ruru.php index 8f1d8a5d..f212cf23 100644 --- a/localization/locale_ruru.php +++ b/localization/locale_ruru.php @@ -46,7 +46,6 @@ $lang = array( 'gains' => "Бонус", 'login' => "[Login]", 'forum' => "Форум", - 'n_a' => "нет", 'siteRep' => "Репутация", 'yourRepHistory'=> "История вашей репутации", 'aboutUs' => "О Aowow", @@ -1490,6 +1489,11 @@ $lang = array( '_seeMore' => "[See more]", '_rankRange' => "Ранг: %d - %d", '_showXmore' => "Показать на %d больше", + + 'n_a' => "нет", + 'normal' => "Обычный", + 'special' => "Особый", + 'currentArea' => '<current area>', 'discovered' => "Изучается путём освоения местности", 'ppm' => "(Срабатывает %s раз в минуту)", diff --git a/localization/locale_zhcn.php b/localization/locale_zhcn.php index 2cb39fff..a14fefb9 100644 --- a/localization/locale_zhcn.php +++ b/localization/locale_zhcn.php @@ -47,7 +47,6 @@ $lang = array( 'gains' => "获得", 'login' => "登录", 'forum' => "论坛", - 'n_a' => "n/a", 'siteRep' => "站点声望", 'yourRepHistory'=> "您的声望历史", 'aboutUs' => "关于我们 & 联系我们", @@ -1490,6 +1489,11 @@ $lang = array( '_seeMore' => "[See more]", '_rankRange' => "排名: %d - %d", '_showXmore' => "[Show %d More]", + + 'n_a' => "n/a", + 'normal' => "普通", + 'special' => "特殊", + 'currentArea' => '<当前区域>', 'discovered' => "通过发现学习", 'ppm' => "%s每分钟触发几率", diff --git a/pages/spell.php b/pages/spell.php index fb6e2ab9..77ebcdbe 100644 --- a/pages/spell.php +++ b/pages/spell.php @@ -24,7 +24,7 @@ class SpellPage extends GenericPage protected $rangeName = ''; protected $range = ''; protected $gcd = ''; - protected $gcdCat = ''; // todo (low): nyi; find out how this works [n/a; normal; ..] + protected $gcdCat = ''; protected $school = ''; protected $dispel = ''; 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->redButtons = $redButtons; $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 if ($_ = $this->subject->getField('rangeMinHostile')) diff --git a/template/pages/spell.tpl.php b/template/pages/spell.tpl.php index 7804e999..9f7b023c 100644 --- a/template/pages/spell.tpl.php +++ b/template/pages/spell.tpl.php @@ -88,23 +88,23 @@ endif; - duration ?: ''.Lang::main('n_a').'');?> + duration ?: ''.Lang::spell('n_a').'');?> - school ?: ''.Lang::main('n_a').'');?> + school ?: ''.Lang::spell('n_a').'');?> - mechanic ?:''.Lang::main('n_a').'');?> + mechanic ?:''.Lang::spell('n_a').'');?> - dispel ?: ''.Lang::main('n_a').'');?> + dispel ?: ''.Lang::spell('n_a').'');?> - gcdCat ?: ''.Lang::main('n_a').'');?> + gcdCat ?: ''.Lang::spell('n_a').'');?> @@ -123,7 +123,7 @@ endif; - cooldown ?: ''.Lang::main('n_a').'');?> + cooldown ?: ''.Lang::spell('n_a').'');?> '.Lang::spell('_gcd');?>