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

Spells/Misc

Browse Source 
* display dbc definitions before articles on detail pages
 * fixed logic when displaying skill step numbers
 * made custom spell columns for linked spells and stack rules localizable
This commit is contained in:
Sarjuuk
2020-04-17 00:39:12 +02:00
parent 08c98bc8ee
commit 92a1016a0f
9 changed files with 173 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
includes/types/spell.class.php
View File

@@ -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;

57
static/js/global.js
View File

@@ -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) {

26
static/js/locale_dede.js
View File

@@ -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 */
};

26
static/js/locale_enus.js
View File

@@ -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 */
};

24
static/js/locale_eses.js
View File

@@ -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 */
};

26
static/js/locale_frfr.js
View File

@@ -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 */
};

26
static/js/locale_ruru.js
View File

@@ -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 */
};

26
static/js/locale_zhcn.js
View File

@@ -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 */
};

8
template/pages/detail-page-generic.tpl.php
View File

@@ -22,10 +22,6 @@
<h1<?=(isset($this->expansion) ? ' class="h1-icon"><span class="icon-'.$this->expansion.'-right">'.$this->name.'</span>' : '>'.$this->name); ?></h1>
<?php
$this->brick('article');
$this->brick('mapper');
if (isset($this->extraText)):
?>
<div id="text-generic" class="left"></div>
@@ -40,6 +36,10 @@ if (isset($this->extraText)):
<?php
endif;
$this->brick('article');
$this->brick('mapper');
if (!empty($this->transfer)):
echo " <div class=\"pad\"></div>\n ".$this->transfer."\n";
endif;