diff --git a/includes/types/spell.class.php b/includes/types/spell.class.php index 90afb22d..25e895fe 100644 --- a/includes/types/spell.class.php +++ b/includes/types/spell.class.php @@ -2085,13 +2085,13 @@ class SpellList extends BaseType $grn = (int)(($ylw + $gry) / 2); $org = $this->curTpl['learnedAt']; - if (($org && $ylw < $org) || $ylw >= $gry) + if ($ylw < $org) $ylw = 0; - if (($org && $grn < $org) || $grn >= $gry) + if ($grn < $org || $grn < $ylw) $grn = 0; - if (($grn && $org >= $grn) || $org >= $gry) + if ($org >= $ylw || $org >= $grn || $org >= $gry) $org = 0; return $gry > 1 ? [$org, $ylw, $grn, $gry] : null; diff --git a/static/js/global.js b/static/js/global.js index 138511e7..7af78310 100644 --- a/static/js/global.js +++ b/static/js/global.js @@ -11812,7 +11812,7 @@ Listview.templates = { })); - /* Aowow - we do not use FA + /* Aowow - we do not use FontAwesome $WH.ae(ovlName, $WH.g_createButton(null, null, { 'class': 'fa fa-fw fa-clipboard', 'float': false, @@ -12816,12 +12816,10 @@ Listview.templates = { return Listview.funcBox.assocArrCmp(a.skill, b.skill, g_spell_skills); } }, - /* aowow - todo: localize he next three cols - */ + /* AoWoW: custom start */ { id: 'stackRules', - name: 'Behaviour', + name: LANG.asr_behaviour, type: 'text', width: '20%', hidden: true, @@ -12836,15 +12834,15 @@ Listview.templates = { switch (spell.stackRule) { case 3: - buff2 = '(strongest effect is applied)'; + buff2 = LANG.asr_strongest_effect; case 0: - buff = 'coexist'; // without condition + buff = LANG.asr_coexist; // without condition break; case 2: case 4: - buff2 = spell.stackRule == 2 ? '(from same caster)' : '(strongest effect is applied)'; + buff2 = spell.stackRule == 2 ? LANG.asr_same_owner : LANG.asr_strongest_effect; case 1: - buff = 'exclusive'; // without condition + buff = LANG.asr_exclusive; // without condition break; } @@ -12873,14 +12871,14 @@ Listview.templates = { var buff = ''; switch (spell.stackRule) { case 3: - buff += '(strongest effect is applied)'; + buff += LANG.asr_strongest_effect; case 0: - buff += ' coexist'; + buff += ' ' + LANG.asr_coexist; break; case 2: - buff += '(from same caster)'; + buff += LANG.asr_same_owner; case 1: - buff += ' exclusive'; + buff += ' ' + LANG.asr_exclusive; break; } @@ -12892,7 +12890,7 @@ Listview.templates = { }, { id: 'linkedTrigger', - name: 'Triggers', + name: LANG.ls_trigger, type: 'text', width: '50%', hidden: true, @@ -12907,13 +12905,13 @@ Listview.templates = { switch (spell.linked[2]) { case 0: - buff = trigger > 0 ? 'When Spell is casted' : 'When Aura is removed'; + buff = trigger > 0 ? LANG.ls_onCast : LANG.ls_onAuraRemove; break; case 1: - buff = 'When Spell hits the target(s)'; + buff = LANG.ls_onSpellHit; break; case 2: - buff = 'When Aura is applied and removed'; + buff = LANG.ls_onAuraApply; break; } @@ -12925,7 +12923,7 @@ Listview.templates = { a.href = '?spell=' + Math.abs(trigger); if (g_pageInfo.typeId == Math.abs(trigger)) { // ponts to self a.className = 'q1'; - $WH.st(a, 'This'); + $WH.st(a, LANG.ls_self); } else { var item = g_spells[Math.abs(trigger)]; @@ -12952,7 +12950,7 @@ Listview.templates = { buff = ''; if (g_pageInfo.typeId == Math.abs(trigger)) { - buff += 'This'; + buff += LANG.ls_self; } else { buff += g_spells[Math.abs(trigger)]['name_' + Locale.getName()]; @@ -12960,13 +12958,13 @@ Listview.templates = { switch (spell.linked[2]) { case 0: - buff += trigger > 0 ? ' When Spell is casted' : ' When Aura is removed'; + buff += trigger > 0 ? ' ' + LANG.ls_onCast : ' ' + LANG.ls_onAuraRemove; break; case 1: - buff += ' When Spell hits the target(s)'; + buff += ' ' + LANG.ls_onSpellHit; break; case 2: - buff += ' When Aura is applied and removed'; + buff += ' ' + LANG.ls_onAuraApply; break; } @@ -12999,7 +12997,7 @@ Listview.templates = { }, { id: 'linkedEffect', - name: 'Effects', + name: LANG.ls_effects, type: 'text', width: '50%', hidden: true, @@ -13015,10 +13013,10 @@ Listview.templates = { switch (spell.linked[2]) { case 0: case 1: - buff = effect > 0 ? 'Spell is triggered' : 'Spells Auras are removed'; + buff = effect > 0 ? LANG.ls_onTrigger : LANG.ls_onAuraRemove; break; case 2: - buff = effect > 0 ? 'Spells Auras are applied or removed' : 'Immunity against Spell is applied or cleared '; + buff = effect > 0 ? LANG.ls_onAuraApply : LANG.ls_onImmune; break; } @@ -13030,7 +13028,7 @@ Listview.templates = { a.href = '?spell=' + Math.abs(effect); if (g_pageInfo.typeId == Math.abs(effect)) { // ponts to self a.className = 'q1'; - $WH.st(a, 'This'); + $WH.st(a, LANG.ls_self); } else { var item = g_spells[Math.abs(effect)]; @@ -13057,7 +13055,7 @@ Listview.templates = { buff = ''; if (g_pageInfo.typeId == Math.abs(effect)) { - buff += 'This'; + buff += LANG.ls_self; } else { buff += g_spells[Math.abs(effect)]['name_' + Locale.getName()]; @@ -13066,10 +13064,10 @@ Listview.templates = { switch (spell.linked[2]) { case 0: case 1: - buff += effect > 0 ? ' Spell is triggered' : ' Spells Auras are removed'; + buff += effect > 0 ? ' ' + LANG.ls_onTrigger : ' ' + LANG.ls_onAuraRemove; break; case 2: - buff += effect > 0 ? ' Spells Auras are applied or removed' : ' Immunity against Spell is applied or cleared '; + buff += effect > 0 ? ' ' + LANG.ls_onAuraApply : ' ' + LANG.ls_onImmune; break; } @@ -13100,6 +13098,7 @@ Listview.templates = { return 0; } } + /* AoWoW: custom end */ ], getItemLink: function(spell) { diff --git a/static/js/locale_dede.js b/static/js/locale_dede.js index 01033015..8e0188f7 100644 --- a/static/js/locale_dede.js +++ b/static/js/locale_dede.js @@ -4797,8 +4797,28 @@ var LANG = { targetstate: "Zielzustand" }, - /* custom */ + /* AoWoW: start custom */ + // Conditions note_condition: "Jede einzelne, der hier aufgeführte Bedingungen, muss erfüllt sein um die Gesamtbedingung zu erfüllen.", - note_condition_group: "Eine beliebige, der hier aufgeführte Gruppen, muss vollständig erfüllt sein um die Gesamtbedingung zu erfüllen." - /* end custom */ + note_condition_group: "Eine beliebige, der hier aufgeführte Gruppen, muss vollständig erfüllt sein um die Gesamtbedingung zu erfüllen.", + + // Aura Stack Rules + asr_behaviour: "Verhalten", + asr_coexist: "koexistierend", + asr_exclusive: "ausschließend", + asr_same_owner: "(selber Spieler)", + asr_strongest_effect: "(stärkster Effekt)", + + // Linked Spells + ls_trigger: "Auslöser", + ls_self: "Selbst", + ls_effects: "Effekte", + ls_onCast: "Wenn Zauber gewirkt wird", + ls_onAuraRemove: "Wenn Aura endet", + ls_onAuraApply: "Wenn Aura angewandt wird oder endet", + ls_onSpellHit: "Wenn Zauber trifft", + ls_onTrigger: "Wenn Zauber ausgelöst wird", + ls_onImmune: "Wenn Immunität gegen diesen Zauber beginnt oder endet", + + /* AoWoW: end custom */ }; diff --git a/static/js/locale_enus.js b/static/js/locale_enus.js index 2b5b7c1c..b5faad74 100644 --- a/static/js/locale_enus.js +++ b/static/js/locale_enus.js @@ -4844,8 +4844,28 @@ var LANG = { targetstate: "Target state" }, - /* custom */ + /* AoWoW: start custom */ + // Conditions note_condition: "Every one of these conditions must be met to satisfy the requirement.", - note_condition_group: "Any one of these groups must be met in full to satisfy the requirement." - /* end custom */ + note_condition_group: "Any one of these groups must be met in full to satisfy the requirement.", + + // Aura Stack Rules + asr_behaviour: "Behaviour", + asr_coexist: "coexist", + asr_exclusive: "exclusive", + asr_same_owner: "(from same caster)", + asr_strongest_effect: "(strongest effect is applied)", + + // Linked Spells + ls_trigger: "Triggers", + ls_self: "This", + ls_effects: "Effects", + ls_onCast: "When Spell is cast", + ls_onAuraRemove: "When Aura is removed", + ls_onAuraApply: "When Spells Aura is applied or removed", + ls_onSpellHit: "When Spell hits the target(s)", + ls_onTrigger: "When Spell is triggered", + ls_onImmune: "When immunity against Spell is applied or cleared", + + /* AoWoW: end custom */ }; diff --git a/static/js/locale_eses.js b/static/js/locale_eses.js index d151340e..f3d3f9c0 100644 --- a/static/js/locale_eses.js +++ b/static/js/locale_eses.js @@ -4800,6 +4800,28 @@ var LANG = { targetstate: "Estado del Objetivo" }, + /* AoWoW: start custom */ + // Conditions note_condition: "Cada una de estas condiciones se deben cumplir para satisfacer el requerimiento", - note_condition_group: "Cualquiera de estos grupos de cumplir en totalidad para satisfacer el requerimiento" + note_condition_group: "Cualquiera de estos grupos de cumplir en totalidad para satisfacer el requerimiento", + + // Aura Stack Rules + asr_behaviour: "Behaviour", + asr_coexist: "coexist", + asr_exclusive: "exclusive", + asr_same_owner: "(from same caster)", + asr_strongest_effect: "(strongest effect is applied)", + + // Linked Spells + ls_trigger: "Triggers", + ls_self: "This", + ls_effects: "Effects", + ls_onCast: "When Spell is cast", + ls_onAuraRemove: "When Aura is removed", + ls_onAuraApply: "When Spells Aura is applied or removed", + ls_onSpellHit: "When Spell hits the target(s)", + ls_onTrigger: "When Spell is triggered", + ls_onImmune: "When immunity against Spell is applied or cleared", + + /* AoWoW: end custom */ }; diff --git a/static/js/locale_frfr.js b/static/js/locale_frfr.js index d0a483df..8177262c 100644 --- a/static/js/locale_frfr.js +++ b/static/js/locale_frfr.js @@ -4799,8 +4799,28 @@ var LANG = { targetstate: "État de la cible" }, - /* custom */ + /* AoWoW: start custom */ + // Conditions note_condition: "Every one of these conditions must be met to satisfy the requirement.", - note_condition_group: "Any one of these groups must be met in full to satisfy the requirement." - /* end custom */ + note_condition_group: "Any one of these groups must be met in full to satisfy the requirement.", + + // Aura Stack Rules + asr_behaviour: "Behaviour", + asr_coexist: "coexist", + asr_exclusive: "exclusive", + asr_same_owner: "(from same caster)", + asr_strongest_effect: "(strongest effect is applied)", + + // Linked Spells + ls_trigger: "Triggers", + ls_self: "This", + ls_effects: "Effects", + ls_onCast: "When Spell is cast", + ls_onAuraRemove: "When Aura is removed", + ls_onAuraApply: "When Spells Aura is applied or removed", + ls_onSpellHit: "When Spell hits the target(s)", + ls_onTrigger: "When Spell is triggered", + ls_onImmune: "When immunity against Spell is applied or cleared", + + /* AoWoW: end custom */ }; diff --git a/static/js/locale_ruru.js b/static/js/locale_ruru.js index 8cd184d5..d70d5461 100644 --- a/static/js/locale_ruru.js +++ b/static/js/locale_ruru.js @@ -4801,8 +4801,28 @@ var LANG = { targetstate: "Состояние цели" }, - /* custom */ + /* AoWoW: start custom */ + // Conditions note_condition: "Every one of these conditions must be met to satisfy the requirement.", - note_condition_group: "Any one of these groups must be met in full to satisfy the requirement." - /* end custom */ + note_condition_group: "Any one of these groups must be met in full to satisfy the requirement.", + + // Aura Stack Rules + asr_behaviour: "Behaviour", + asr_coexist: "coexist", + asr_exclusive: "exclusive", + asr_same_owner: "(from same caster)", + asr_strongest_effect: "(strongest effect is applied)", + + // Linked Spells + ls_trigger: "Triggers", + ls_self: "This", + ls_effects: "Effects", + ls_onCast: "When Spell is cast", + ls_onAuraRemove: "When Aura is removed", + ls_onAuraApply: "When Spells Aura is applied or removed", + ls_onSpellHit: "When Spell hits the target(s)", + ls_onTrigger: "When Spell is triggered", + ls_onImmune: "When immunity against Spell is applied or cleared", + + /* AoWoW: end custom */ }; diff --git a/static/js/locale_zhcn.js b/static/js/locale_zhcn.js index 01519cbf..77912441 100644 --- a/static/js/locale_zhcn.js +++ b/static/js/locale_zhcn.js @@ -4824,8 +4824,28 @@ var LANG = { targetstate: "目标状态" }, - /* custom */ + /* AoWoW: start custom */ + // Conditions note_condition: "每一个条件必须满足要求。", - note_condition_group: "Any one of these groups must be met in full to satisfy the requirement." // enUS - /* end custom */ + note_condition_group: "Any one of these groups must be met in full to satisfy the requirement.", + + // Aura Stack Rules + asr_behaviour: "Behaviour", + asr_coexist: "coexist", + asr_exclusive: "exclusive", + asr_same_owner: "(from same caster)", + asr_strongest_effect: "(strongest effect is applied)", + + // Linked Spells + ls_trigger: "Triggers", + ls_self: "This", + ls_effects: "Effects", + ls_onCast: "When Spell is cast", + ls_onAuraRemove: "When Aura is removed", + ls_onAuraApply: "When Spells Aura is applied or removed", + ls_onSpellHit: "When Spell hits the target(s)", + ls_onTrigger: "When Spell is triggered", + ls_onImmune: "When immunity against Spell is applied or cleared", + + /* AoWoW: end custom */ }; diff --git a/template/pages/detail-page-generic.tpl.php b/template/pages/detail-page-generic.tpl.php index 954f119d..6d470d86 100644 --- a/template/pages/detail-page-generic.tpl.php +++ b/template/pages/detail-page-generic.tpl.php @@ -22,10 +22,6 @@ expansion) ? ' class="h1-icon">'.$this->name.'' : '>'.$this->name); ?> brick('article'); - - $this->brick('mapper'); - if (isset($this->extraText)): ?>
@@ -40,6 +36,10 @@ if (isset($this->extraText)): brick('article'); + + $this->brick('mapper'); + if (!empty($this->transfer)): echo "
\n ".$this->transfer."\n"; endif;