- make offset optional, when converting list to mask

Items:
- fixed display of inventory type for robes and ranged weapons

Spells:
- parsing: $charLevel and $interactive are now properties of spell.
- parsing: fixed durations, passing the time-unit seperately to allow for evaluation of the actual value
- parsing: fixed gender-specific formating [ >male/female< to <male/female>]
- parsing: usage of is_numeric() instead of (float) as 0 is a fucking valid numeric (caused some formulas to not be evaluated *grrr*)
- parsing: lastValue-references now skip to the next previous \d instead of being stopped by random \w (like time units)
- implemented forgotten display of runes for spellCost
- fixed castTimes for most hunter shots (they are -1000 for some reason)
- fixed display of required stances (sometimes they are not actually required but show, when you are _allowed_ to use a spell in certain forms)
- improved formating of tooltips-js (no visual change)

ListViews:
- pass '_truncated' separately. there are nough cases in which 'note' gets send without truncated results

misc changes here and there
This commit is contained in:
Sarjuuk
2013-04-20 16:16:29 +02:00
parent f8b8ee218c
commit 1142220674
29 changed files with 174 additions and 150 deletions

View File

@@ -206,17 +206,18 @@ abstract class Filter
}
}
protected function list2Mask($list)
protected function list2Mask($list, $noOffset = false)
{
$mask = 0x0;
$o = $noOffset ? 0 : 1; // schoolMask requires this..?
if (is_array($list))
{
foreach ($list as $itm)
$mask += (1 << intVal($itm));
$mask += (1 << (intVal($itm) - $o));
}
else
$mask = (1 << intVal($list));
$mask = (1 << (intVal($list) - $o));
return $mask;
}
@@ -233,6 +234,9 @@ abstract class Filter
header('Location: http://'.$_SERVER['SERVER_NAME'].str_replace('index.php', '', $_SERVER['PHP_SELF']).'?'.$_SERVER['QUERY_STRING'].'='.$get);
}
// TODO: wrong wrong wrong!!
// 1) filter-Ids are different for each type; 2) (NOT) IN - subqueries will eat the mysql-server alive!
protected function createSQLForCommunity($cr)
{
switch ($cr[0])