diff --git a/cronjobs/index_data.php b/cronjobs/index_data.php index 769ffcf..307e617 100644 --- a/cronjobs/index_data.php +++ b/cronjobs/index_data.php @@ -22,7 +22,7 @@ $dataSources = array( 'lastfm' => 60, 'sc2ranks' => 43200, 'steam' => 3600, - 'wow' => 43200, + 'wow' => 0 //43200, ); if(file_exists($CACHE_FILE)) { @@ -171,6 +171,18 @@ function steam() { } function wow() { + $CLASSES = array( + 6 => 'deathknight', + 5 => 'priest', + 11 => 'druid', + 4 => 'rogue', + 8 => 'mage', + 7 => 'shaman', + 1 => 'warrior', + 9 => 'warlock', + 3 => 'hunter', + ); + $benchmark_start = time(); $characters = array( 'Gaffer' => false, @@ -188,7 +200,7 @@ function wow() { // build our mutli curl request $mh = curl_multi_init(); foreach($characters as $character=>$data) { - $url = sprintf('http://us.battle.net/api/wow/character/crushridge/%s?fields=progression', + $url = sprintf('http://us.battle.net/api/wow/character/crushridge/%s?fields=progression,talents', $character); $characters[$character] = curl_prep($url); @@ -217,17 +229,32 @@ function wow() { $leastN = 1000; $leastH = 1000; foreach($bosses as $boss) { + if($boss->normalKills == -1) $boss->normalKills = 0; if(($boss->normalKills + $boss->heroicKills) < $leastN) $leastN = $boss->normalKills + $boss->heroicKills; if($boss->heroicKills < $leastH) $leastH = $boss->heroicKills; } + + //find our active talent tree + $spec = null; + foreach($json->talents as $talent) { + if(isset($talent->selected)) { + $spec = $talent; + break; + } + } $characterData[$character] = array( 'name' => $character, 'level' => $json->level, - 'class' => $json->class, - 'progression' => array('n' => $leastN, 'h' => $leastH), + 'class' => $CLASSES[$json->class], + 'progression' => $leastH > 0 ? $leastH * 100 : $leastN, + 'armory' => sprintf('http://us.battle.net/wow/en/character/crushridge/%s/advanced',$character), + 'spec_icon' => $talent->icon, + 'spec_name' => $talent->name, ); } + + usort(&$characterData,'progression_sort'); return $characterData; } @@ -270,4 +297,8 @@ function github_sort($a, $b) { return strtotime($a->pushed_at) < strtotime($b->pushed_at); } +function progression_sort($a, $b) { + return $a['progression'] < $b['progression']; +} + ?> \ No newline at end of file diff --git a/public_html/index.php b/public_html/index.php index 69e50e3..9061166 100644 --- a/public_html/index.php +++ b/public_html/index.php @@ -13,7 +13,7 @@ $links = $db->query("SELECT id,url,text,status,released_date FROM wia_links WHER Who is Andrew? - + @@ -71,14 +71,14 @@ $links = $db->query("SELECT id,url,text,status,released_date FROM wia_links WHER

random

fetch_object()) { - $link_text = $link->text; - - $link_text = preg_replace('/\[/','',$link_text); - $link_text = preg_replace('/\]/','',$link_text); - - echo '

' . $link_text . '

' . "\n"; - } +while($link = $links->fetch_object()) { + $link_text = $link->text; + + $link_text = preg_replace('/\[/','',$link_text); + $link_text = preg_replace('/\]/','',$link_text); + + echo '

' . $link_text . '

' . "\n"; +} ?>
@@ -126,14 +126,22 @@ $links = $db->query("SELECT id,url,text,status,released_date FROM wia_links WHER World of Warcraft - Veincane, - Gaffer, - Ttg, - Getburnt, - Levita, - Toppazz, - Toopro, - Notgaffer.

+ + +wow as $character) { + echo sprintf(' ' . "\n",$character->armory,$character->class,$character->name); +} +?> + + +wow as $character) { + echo sprintf(' ' . "\n",$character->spec_icon,$character->class,$character->spec_name); +} +?> + +
%s
%s