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/Tooltips

Browse Source 
* fixed parser for lastValue/gender-switch (previous pattern matched against that too)
 * also its a stupid idea to replace a var with itself
This commit is contained in:
Sarjuuk
2017-03-13 16:58:26 +01:00
parent 103251a537
commit ddce998cad
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -823,21 +823,21 @@ class SpellList extends BaseType
'switch' => null 'switch' => null
); );
// last value or gender -switch $[lg]ifText:elseText;
if (preg_match('/^([lg])([^:]*:[^;]*);/i', $varString, $m))
{
$len = strlen($m[0]);
$varParts['var'] = $m[1];
$varParts['switch'] = explode(':', $m[2]);
}
// basic variable ref (most common case) $(refSpell)?(var)(effIdx)? // basic variable ref (most common case) $(refSpell)?(var)(effIdx)?
if (preg_match('/^(\d*)([a-z])([123]?)\b/i', $varString, $m)) else if (preg_match('/^(\d*)([a-z])([123]?)\b/i', $varString, $m))
{ {
$len = strlen($m[0]); $len = strlen($m[0]);
$varParts['lookup'] = $m[1]; $varParts['lookup'] = $m[1];
$varParts['var'] = $m[2]; $varParts['var'] = $m[2];
$varParts['effIdx'] = $m[3]; $varParts['effIdx'] = $m[3];
} }
// last value or gender -switch $[lg]ifText:elseText;
else if (preg_match('/^([lg])([^:]*:[^;]*);/i', $varString, $m))
{
$len = strlen($m[0]);
$varParts['var'] = $m[1];
$varParts['switch'] = explode(':', $m[2]);
}
// variable ref /w formula $( (op) (oparg); )? (refSpell) ( (var) (effIdx) ) OR $(refSpell) ( (op) (oparg); )? ( (var) (effIdx) ) // variable ref /w formula $( (op) (oparg); )? (refSpell) ( (var) (effIdx) ) OR $(refSpell) ( (op) (oparg); )? ( (var) (effIdx) )
else if (preg_match('/^(([\+\-\*\/])(\d+);)?(\d*)(([\+\-\*\/])(\d+);)?([a-z])([123]?)\b/i', $varString, $m)) else if (preg_match('/^(([\+\-\*\/])(\d+);)?(\d*)(([\+\-\*\/])(\d+);)?([a-z])([123]?)\b/i', $varString, $m))
{ {
@@ -857,11 +857,11 @@ class SpellList extends BaseType
// description-, buff-parsing component // description-, buff-parsing component
// returns [min, max, minFulltext, maxFulltext, ratingId] // returns [min, max, minFulltext, maxFulltext, ratingId]
private function resolveVariableString($var, &$usesScalingRating) private function resolveVariableString($varParts, &$usesScalingRating)
{ {
$signs = ['+', '-', '/', '*', '%', '^']; $signs = ['+', '-', '/', '*', '%', '^'];
foreach ($var as $k => $v) foreach ($varParts as $k => $v)
$$k = $v; $$k = $v;
$result = [null]; $result = [null];