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

Enchantments

Browse Source 
* forgot notFound message
 * added Enchantments Tab to Spell Detail Page
This commit is contained in:
Sarjuuk
2015-08-03 22:30:11 +02:00
parent 7ac0601f88
commit a5f13325c0
8 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
includes/types/item.class.php
View File

@@ -569,7 +569,8 @@ class ItemList extends BaseType
$x .= '<table width="100%"><tr>'; $x .= '<table width="100%"><tr>';
// Class // Class
$x .= '<td>'.Lang::item('inventoryType', $_slot).'</td>'; if ($_slot)
$x .= '<td>'.Lang::item('inventoryType', $_slot).'</td>';
// Subclass // Subclass
if ($_class == ITEM_CLASS_ARMOR && $_subClass > 0) if ($_class == ITEM_CLASS_ARMOR && $_subClass > 0)

1
localization/locale_dede.php
View File

@@ -394,6 +394,7 @@ $lang = array(
'enchantment' => array( 'enchantment' => array(
'details' => "Details", 'details' => "Details",
'activation' => "Aktivierung", 'activation' => "Aktivierung",
'notFound' => "Diese Verzauberung existiert nicht.",
'types' => array( 'types' => array(
1 => "Zauber (Auslösung)", 3 => "Zauber (Anlegen)", 7 => "Zauber (Benutzen)", 8 => "Prismatischer Sockel", 1 => "Zauber (Auslösung)", 3 => "Zauber (Anlegen)", 7 => "Zauber (Benutzen)", 8 => "Prismatischer Sockel",
5 => "Statistik", 2 => "Waffenschaden", 6 => "DPS", 4 => "Verteidigung" 5 => "Statistik", 2 => "Waffenschaden", 6 => "DPS", 4 => "Verteidigung"

1
localization/locale_enus.php
View File

@@ -389,6 +389,7 @@ $lang = array(
'enchantment' => array( 'enchantment' => array(
'details' => "Details", 'details' => "Details",
'activation' => "Activation", 'activation' => "Activation",
'notFound' => "This enchantment doesn't exist.",
'types' => array( 'types' => array(
1 => "Proc Spell", 3 => "Equip Spell", 7 => "Use Spell", 8 => "Prismatic Socket", 1 => "Proc Spell", 3 => "Equip Spell", 7 => "Use Spell", 8 => "Prismatic Socket",
5 => "Statistics", 2 => "Weapon Damage", 6 => "DPS", 4 => "Defense" 5 => "Statistics", 2 => "Weapon Damage", 6 => "DPS", 4 => "Defense"

1
localization/locale_eses.php
View File

@@ -395,6 +395,7 @@ $lang = array(
'enchantment' => array( 'enchantment' => array(
'details' => "Detalles", 'details' => "Detalles",
'activation' => "Activación", 'activation' => "Activación",
'notFound' => "Este encantamiento no existe.",
'types' => array( 'types' => array(
1 => "[Proc Spell]", 3 => "[Equip Spell]", 7 => "[Use Spell]", 8 => "Ranura prismática", 1 => "[Proc Spell]", 3 => "[Equip Spell]", 7 => "[Use Spell]", 8 => "Ranura prismática",
5 => "Atributos", 2 => "Daño de arma", 6 => "DPS", 4 => "Defensa" 5 => "Atributos", 2 => "Daño de arma", 6 => "DPS", 4 => "Defensa"

1
localization/locale_frfr.php
View File

@@ -394,6 +394,7 @@ $lang = array(
'enchantment' => array( 'enchantment' => array(
'details' => "En détail", 'details' => "En détail",
'activation' => "Activation", 'activation' => "Activation",
'notFound' => "Cet enchantement n'existe pas.",
'types' => array( 'types' => array(
1 => "[Proc Spell]", 3 => "[Equip Spell]", 7 => "[Use Spell]", 8 => "Châsse prismatique", 1 => "[Proc Spell]", 3 => "[Equip Spell]", 7 => "[Use Spell]", 8 => "Châsse prismatique",
5 => "Statistiques", 2 => "Dégâts d'arme", 6 => "DPS", 4 => "Défense" 5 => "Statistiques", 2 => "Dégâts d'arme", 6 => "DPS", 4 => "Défense"

1
localization/locale_ruru.php
View File

@@ -394,6 +394,7 @@ $lang = array(
'enchantment' => array( 'enchantment' => array(
'details' => "Подробности", 'details' => "Подробности",
'activation' => "Активации", 'activation' => "Активации",
'notFound' => "Такой улучшение не существует.",
'types' => array( 'types' => array(
1 => "[Proc Spell]", 3 => "[Equip Spell]", 7 => "[Use Spell]", 8 => "Бесцветное гнездо", 1 => "[Proc Spell]", 3 => "[Equip Spell]", 7 => "[Use Spell]", 8 => "Бесцветное гнездо",
5 => "Характеристики", 2 => "Урон оружия", 6 => "УВС", 4 => "Защита" 5 => "Характеристики", 2 => "Урон оружия", 6 => "УВС", 4 => "Защита"

7
pages/enchantment.php
View File

@@ -95,9 +95,10 @@ class EnchantmentPage extends GenericPage
case 7: case 7:
$sArr = $this->subject->getField('spells')[$i]; $sArr = $this->subject->getField('spells')[$i];
$spl = $this->subject->getRelSpell($sArr[0]); $spl = $this->subject->getRelSpell($sArr[0]);
$this->effects[$i]['name'] = User::isInGroup(U_GROUP_EMPLOYEE) ? sprintf(Util::$dfnString, 'Type: '.$_ty, Lang::item('trigger', $sArr[1])) : Lang::item('trigger', $sArr[1]); $this->effects[$i]['name'] = User::isInGroup(U_GROUP_EMPLOYEE) ? sprintf(Util::$dfnString, 'Type: '.$_ty, Lang::item('trigger', $sArr[1])) : Lang::item('trigger', $sArr[1]);
$this->effects[$i]['proc'] = $sArr[3]; $this->effects[$i]['proc'] = $sArr[3];
$this->effects[$i]['icon'] = array( $this->effects[$i]['value'] = $_qty ?: null;
$this->effects[$i]['icon'] = array(
'name' => !$spl ? Util::ucFirst(Lang::game('spell')).' #'.$sArr[0] : Util::localizedString($spl, 'name'), 'name' => !$spl ? Util::ucFirst(Lang::game('spell')).' #'.$sArr[0] : Util::localizedString($spl, 'name'),
'id' => $sArr[0], 'id' => $sArr[0],
'count' => $sArr[2] 'count' => $sArr[2]

19
pages/spell.php
View File

@@ -1124,6 +1124,25 @@ class SpellPage extends GenericPage
$this->extendGlobalData($tbItem->getJSGlobals(GLOBALINFO_SELF)); $this->extendGlobalData($tbItem->getJSGlobals(GLOBALINFO_SELF));
} }
// tab: enchantments
$conditions = array(
'OR',
['AND', ['type1', [1, 3, 7]], ['object1', $this->typeId]],
['AND', ['type2', [1, 3, 7]], ['object2', $this->typeId]],
['AND', ['type3', [1, 3, 7]], ['object3', $this->typeId]]
);
$enchList = new EnchantmentList($conditions);
if (!$enchList->error)
{
$this->lvTabs[] = array(
'file' => 'enchantment',
'data' => $enchList->getListviewData(),
'params' => []
);
$this->extendGlobalData($enchList->getJSGlobals());
}
// find associated NPC, Item and merge results // find associated NPC, Item and merge results
// taughtbypets (unused..?) // taughtbypets (unused..?)
// taughtbyquest (usually the spell casted as quest reward teaches something; exclude those seplls from taughtBySpell) // taughtbyquest (usually the spell casted as quest reward teaches something; exclude those seplls from taughtBySpell)