diff --git a/endpoints/spell/spell.php b/endpoints/spell/spell.php index 8196d1f3..d3945836 100644 --- a/endpoints/spell/spell.php +++ b/endpoints/spell/spell.php @@ -1437,7 +1437,7 @@ class SpellBaseResponse extends TemplateResponse implements ICache $scaling[1] = $this->subject->getField('effect'.$i.'BonusMultiplier'); continue; } - else + else if ($this->subject->getField('damageClass') == SPELL_DAMAGE_CLASS_MAGIC) $scaling[0] = $this->subject->getField('effect'.$i.'BonusMultiplier'); $allDoTs = false; @@ -1716,7 +1716,7 @@ class SpellBaseResponse extends TemplateResponse implements ICache if (in_array($i, $this->subject->canTriggerSpell()) && $procData['chance'] && $procData['chance'] < 100) { - $_footer['proc'] = $procData['chance'] < 0 ? Lang::spell('ppm', [Lang::nf(-$procData['chance'], 1)]) : Lang::spell('procChance') . $procData['chance'] . '%'; + $_footer['proc'] = $procData['chance'] < 0 ? Lang::spell('ppm', [-$procData['chance']]) : Lang::spell('procChance', [$procData['chance']]); if ($procData['cooldown']) $_footer['procCD'] = Lang::game('cooldown', [Util::formatTime($procData['cooldown'], true)]); } diff --git a/localization/locale_dede.php b/localization/locale_dede.php index f62d0677..2cc5dcb6 100644 --- a/localization/locale_dede.php +++ b/localization/locale_dede.php @@ -1661,8 +1661,8 @@ $lang = array( 'currentArea' => '<Momentanes Gebiet>', 'discovered' => "Durch Geistesblitz erlernt", - 'ppm' => "(%s Auslösungen pro Minute)", - 'procChance' => "Procchance: ", + 'ppm' => "(%.1f Auslösungen pro Minute)", + 'procChance' => "Procchance: %.4g%%", 'starter' => "Basiszauber", 'trainingCost' => "Trainingskosten: ", 'channeled' => "Kanalisiert", diff --git a/localization/locale_enus.php b/localization/locale_enus.php index bc658ca6..e15fae40 100644 --- a/localization/locale_enus.php +++ b/localization/locale_enus.php @@ -1661,8 +1661,8 @@ $lang = array( 'currentArea' => '<current area>', 'discovered' => "Learned via discovery", - 'ppm' => "(%s procs per minute)", - 'procChance' => "Proc chance: ", + 'ppm' => "(%.1f procs per minute)", + 'procChance' => "Proc chance: %.4g%%", 'starter' => "Starter spell", 'trainingCost' => "Training cost: ", 'channeled' => "Channeled", // SPELL_CAST_CHANNELED diff --git a/localization/locale_eses.php b/localization/locale_eses.php index 80f646a2..a8b20675 100644 --- a/localization/locale_eses.php +++ b/localization/locale_eses.php @@ -1661,8 +1661,8 @@ $lang = array( 'currentArea' => '<current area>', 'discovered' => "Aprendido via descubrimiento", - 'ppm' => "(%s procs por minuto)", - 'procChance' => "Probabilidad de que accione: ", + 'ppm' => "(%.1f procs por minuto)", + 'procChance' => "Probabilidad de que accione: %.4g%%", 'starter' => "Hechizo inicial", 'trainingCost' => "Costo de enseñanza: ", 'channeled' => "Canalizado", diff --git a/localization/locale_frfr.php b/localization/locale_frfr.php index 8224a965..26b363f9 100644 --- a/localization/locale_frfr.php +++ b/localization/locale_frfr.php @@ -1661,8 +1661,8 @@ $lang = array( 'currentArea' => '<current area>', 'discovered' => "Appris via une découverte", - 'ppm' => "(%s déclenchements par minute)", - 'procChance' => "Chance : ", + 'ppm' => "(%.1f déclenchements par minute)", + 'procChance' => "Chance : %.4g%%", 'starter' => "Sortilège initiaux", 'trainingCost' => "Coût d'entraînement : ", 'channeled' => "Canalisée", diff --git a/localization/locale_ruru.php b/localization/locale_ruru.php index 8555d957..c9bf049f 100644 --- a/localization/locale_ruru.php +++ b/localization/locale_ruru.php @@ -1661,8 +1661,8 @@ $lang = array( 'currentArea' => '<current area>', 'discovered' => "Изучается путём освоения местности", - 'ppm' => "(Срабатывает %s раз в минуту)", - 'procChance' => "Шанс срабатывания: ", + 'ppm' => "(Срабатывает %.1f раз в минуту)", + 'procChance' => "Шанс срабатывания: %.4g%%", 'starter' => "Начальное заклинание", 'trainingCost' => "Цена обучения: ", 'channeled' => "Направляемое", diff --git a/localization/locale_zhcn.php b/localization/locale_zhcn.php index fe4b5ce3..43b73336 100644 --- a/localization/locale_zhcn.php +++ b/localization/locale_zhcn.php @@ -1661,8 +1661,8 @@ $lang = array( 'currentArea' => '<当前区域>', 'discovered' => "通过发现学习", - 'ppm' => "%s每分钟触发几率", - 'procChance' => "触发几率:", + 'ppm' => "%.1f每分钟触发几率", + 'procChance' => "触发几率:%.4g%%", 'starter' => "初始法术", 'trainingCost' => "训练成本:", 'channeled' => "需引导", diff --git a/template/pages/enchantment.tpl.php b/template/pages/enchantment.tpl.php index 83f1350f..e759cff4 100644 --- a/template/pages/enchantment.tpl.php +++ b/template/pages/enchantment.tpl.php @@ -62,9 +62,9 @@ foreach ($this->effects as $i => $e): echo '
'; if ($e['proc'] < 0): - echo Lang::spell('ppm', [Lang::nf(-$e['proc'], 1)]); + echo Lang::spell('ppm', [-$e['proc']]); elseif ($e['proc'] < 100.0): - echo Lang::spell('procChance').Lang::main('colon').$e['proc'].'%'; + echo Lang::spell('procChance', [$e['proc']]); endif; endif;