Skip to content
Permalink
Browse files

Misc/Fixes

 * resolve two additional spell effects (11, 44)
 * fixed overzealous find/replace in Loot::iterate()
 * fixed wrong placeholder for type 32 in Conditions System
  • Loading branch information
Sarjuuk committed Dec 1, 2018
1 parent cc5be52 commit da1946df0fb6216ce5065b1846842634404057b6
@@ -44,8 +44,8 @@ public function &iterate()
{
reset($this->results);
foreach ($this->results as $k => ['id' => $id])
yield $id => $this->results[$k];
foreach ($this->results as $k => $__)
yield $k => $this->results[$k];
}
public function getResult()
@@ -628,7 +628,6 @@ public function getByItem($entry, $maxResults = CFG_SQL_LIMIT_DEFAULT, $lootTabl
$this->results[$tabId] = [$data[0], $tabData];
}
return true;
}
}
@@ -1227,6 +1227,7 @@
'_collapseAll' => "Alle einklappen",
'_expandAll' => "Alle ausklappen",
'_transfer' => 'Dieser Zauber wird mit <a href="?spell=%d" class="q%d icontiny tinyspecial" style="background-image: url('.STATIC_URL.'/images/wow/icons/tiny/%s.gif)">%s</a> vertauscht, wenn Ihr zur <span class="icon-%s">%s</span> wechselt.',
'currentArea' => '&lt;Momentanes Gebiet&gt;',
'discovered' => "Durch Geistesblitz erlernt",
'ppm' => "%s Auslösungen pro Minute",
'procChance' => "Procchance",
@@ -1227,6 +1227,7 @@
'_collapseAll' => "Collapse All",
'_expandAll' => "Expand All",
'_transfer' => 'This spell will be converted to <a href="?spell=%d" class="q%d icontiny tinyspecial" style="background-image: url('.STATIC_URL.'/images/wow/icons/tiny/%s.gif)">%s</a> if you transfer to <span class="icon-%s">%s</span>.',
'currentArea' => '&lt;current area&gt;',
'discovered' => "Learned via discovery",
'ppm' => "%s procs per minute",
'procChance' => "Proc chance",
@@ -1227,6 +1227,7 @@
'_collapseAll' => "Contraer todo",
'_expandAll' => "Expandier todo",
'_transfer' => 'Este hechizo será convertido a <a href="?spell=%d" class="q%d icontiny tinyspecial" style="background-image: url('.STATIC_URL.'/images/wow/icons/tiny/%s.gif)">%s</a> si lo transfieres a la <span class="icon-%s">%s</span>.',
'currentArea' => '&lt;current area&gt;',
'discovered' => "Aprendido via descubrimiento",
'ppm' => "%s procs por minuto",
'procChance' => "Probabilidad de que accione",
@@ -1227,6 +1227,7 @@
'_collapseAll' => "Replier Tout",
'_expandAll' => "Déplier Tout",
'_transfer' => 'Cet sort sera converti en <a href="?spell=%d" class="q%d icontiny tinyspecial" style="background-image: url('.STATIC_URL.'/images/wow/icons/tiny/%s.gif)">%s</a> si vous transférez en <span class="icon-%s">%s</span>.',
'currentArea' => '&lt;current area&gt;',
'discovered' => "Appris via une découverte",
'ppm' => "%s déclenchements par minute",
'procChance' => "Chance",
@@ -1227,6 +1227,7 @@
'_collapseAll' => "Свернуть все",
'_expandAll' => "Развернуть все",
'_transfer' => 'Этот предмет превратится в <a href="?spell=%d" class="q%d icontiny tinyspecial" style="background-image: url('.STATIC_URL.'/images/wow/icons/tiny/%s.gif)">%s</a>, если вы перейдете за <span class="icon-%s">%s</span>.',
'currentArea' => '&lt;current area&gt;',
'discovered' => "Изучается путём освоения местности",
'ppm' => "Срабатывает %s раз в минуту",
'procChance' => "Шанс срабатывания",
@@ -1227,6 +1227,7 @@
'_collapseAll' => "折叠全部",
'_expandAll' => "展开全部",
'_transfer' => '这个法术将被转换到<a href="?spell=%d" class="q%d icontiny tinyspecial" style="background-image: url('.STATIC_URL.'/images/wow/icons/tiny/%s.gif)">%s</a>,如果你转移到<span class="icon-%s">%s</span>。',
'currentArea' => '&lt;current area&gt;',
'discovered' => "Learned via discovery",
'ppm' => "%s每分钟触发几率",
'procChance' => "触发几率",
@@ -1687,6 +1687,16 @@ private function createEffects(&$infobox, &$redButtons)
$foo['name'] .= ' ('.$_.')';
break;
case 11: // Bind
if (!$effMV && User::isInGroup(U_GROUP_EMPLOYEE))
$foo['name'] .= sprintf(Util::$dfnString, 'MiscValue'.Lang::main('colon').$effMV, '(current zone)');
else if (!$effMV)
$foo['name'] .= '('.Lang::spell('currentArea').')';
else if ($_ = ZoneList::getName($effMV))
$foo['name'] .= '(<a href="?zone='.$effMV.'">'.$_.'</a>)';
else
$foo['name'] .= Util::ucFirst(Lang::game('zone')).' #'.$effMV;;
break;
case 16: // QuestComplete
if ($_ = QuestList::getName($effMV))
$foo['name'] .= '(<a href="?quest='.$effMV.'">'.$_.'</a>)';
@@ -1794,6 +1804,7 @@ private function createEffects(&$infobox, &$redButtons)
$foo['name'] .= ' ('.$_.')';
break;
case 44: // Learn Skill Step
case 118: // Require Skill
if ($_ = SkillList::getName($effMV))
$foo['name'] .= '(<a href="?skill='.$effMV.'">'.$_.'</a>)';
}
else // create mask from id and resolve in case 32
entry[1] = (1 << entry[1]);
case 32: param[0] = _listing(entry[1], g_world_object_types, '$1'); break;
case 32: param[0] = _listing(entry[1], g_world_object_types, '$2'); break;
case 36: break;
case 27:
case 37:

0 comments on commit da1946d

Please sign in to comment.
You can’t perform that action at this time.