From 411e43fa4c0592c480d53cf9d224ad63a4a752b1 Mon Sep 17 00:00:00 2001 From: yi12345 Date: Thu, 8 Aug 2013 00:56:57 +0300 Subject: [PATCH] fix ranking --- GameEngine/Ranking.php | 16 +++++++++++----- Templates/Build/37_hero.tpl | 1 + Templates/Build/avaliable.tpl | 12 +++--------- Templates/Ranking/_notes/dwsync.xml | 4 ++++ Templates/Ranking/heroes.tpl | 2 +- Templates/Ranking/player_attack.tpl | 2 +- Templates/Ranking/player_defend.tpl | 2 +- statistiken.php | 1 + 8 files changed, 23 insertions(+), 17 deletions(-) create mode 100644 Templates/Ranking/_notes/dwsync.xml diff --git a/GameEngine/Ranking.php b/GameEngine/Ranking.php index d97d43f9..06b1af8f 100644 --- a/GameEngine/Ranking.php +++ b/GameEngine/Ranking.php @@ -11,7 +11,7 @@ class Ranking { - private $rankarray = array(); + public $rankarray = array(); private $rlastupdate; public function getRank() { @@ -45,7 +45,11 @@ break; case 8: $this->procHeroRankArray(); - $this->getStart($this->searchRank($session->uid, "userid")); + if($get['hero'] == 0) { + $this->getStart(1); + } else { + $this->getStart($this->searchRank($session->uid, "uid")); + } break; case 11: $this->procRankRaceArray(1); @@ -181,10 +185,12 @@ public function searchRank($name, $field) { while(1) { $key = key($this->rankarray); + for($key=0;$keyrankarray);$key++){ if($this->rankarray[$key][$field] == $name) { return $key; break; - } else { + } + } if(!next($this->rankarray)) { if($field != "userid"){ return $name; @@ -194,7 +200,7 @@ break; } } - } + } } @@ -478,7 +484,7 @@ foreach($array as $value) { $value['owner'] = $database->getUserField($value['uid'], "username", 0); $value['level']; - $vaule['name']; + $value['name']; $value['uid']; array_push($holder, $value); diff --git a/Templates/Build/37_hero.tpl b/Templates/Build/37_hero.tpl index efa5499c..ff79c426 100644 --- a/Templates/Build/37_hero.tpl +++ b/Templates/Build/37_hero.tpl @@ -12,6 +12,7 @@ include_once("GameEngine/Data/hero_full.php"); if (isset($_POST['name'])) { + $_POST['name'] = stripslashes($_POST['name']); mysql_query("UPDATE ".TB_PREFIX."hero SET `name`='".($_POST['name'])."' where `uid`='".$session->uid."'") or die("ERROR:".mysql_error()); $hero = mysql_query("SELECT * FROM " . TB_PREFIX . "hero WHERE `uid` = " . $session->uid . ""); $hero_info = mysql_fetch_array($hero); diff --git a/Templates/Build/avaliable.tpl b/Templates/Build/avaliable.tpl index 1a46ac05..97c1817e 100644 --- a/Templates/Build/avaliable.tpl +++ b/Templates/Build/avaliable.tpl @@ -84,12 +84,6 @@ $greatwarehouse1 = $database->getBuildingByType2($village->wid,38); $greatgranary1 = $database->getBuildingByType2($village->wid,39); $greatworkshop1 = $database->getBuildingByType2($village->wid,42); -foreach ($database->getJobs($_SESSION['wid']) as $bdata) { - $UnderConstruction = strtolower(str_replace(array(" ","'"),"",$building->procResType($bdata['type']))); - $$UnderConstruction = ($$UnderConstruction == 0 ? -1 : $$UnderConstruction); -} - - ?>

Construct new building

= 3 && $rallypoint >= 1 && $$UnderConstruction <> -1 && $id != 39 && $id != 40) { +if($hero == 0 && $hero1 == 0 && $mainbuilding >= 3 && $rallypoint >= 1 && $id != 39 && $id != 40) { include("avaliable/hero.tpl"); } //fix barracks -if($rallypoint >= 1 && $mainbuilding >= 3 && $barrack == 0 && $barrack1 == 0 && $$UnderConstruction <> -1 && $id != 39 && $id != 40) { +if($rallypoint >= 1 && $mainbuilding >= 3 && $barrack == 0 && $barrack1 == 0 && $id != 39 && $id != 40) { include("avaliable/barracks.tpl"); } if($mainbuilding >= 3 && $academy >= 1 && $armoury == 0 && $armoury1 == 0 && $id != 39 && $id != 40) { @@ -152,7 +146,7 @@ if($cropland >= 5 && $grainmill == 0 && $grainmill1 == 0 && $id != 39 && $id != include("avaliable/grainmill.tpl"); } //fix marketplace -if($granary >= 1 && $warehouse >= 1 && $mainbuilding >= 3 && $market == 0 && $market1 == 0 && $$UnderConstruction <> -1 && $id != 39 && $id != 40) { +if($granary >= 1 && $warehouse >= 1 && $mainbuilding >= 3 && $market == 0 && $market1 == 0 && $id != 39 && $id != 40) { include("avaliable/marketplace.tpl"); } if($mainbuilding >= 5 && $residence == 0 && $residence1 == 0 && $id != 39 && $id != 40 && $palace == 0) { diff --git a/Templates/Ranking/_notes/dwsync.xml b/Templates/Ranking/_notes/dwsync.xml new file mode 100644 index 00000000..305b35c9 --- /dev/null +++ b/Templates/Ranking/_notes/dwsync.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Templates/Ranking/heroes.tpl b/Templates/Ranking/heroes.tpl index 5c4baf2e..1470ed5f 100644 --- a/Templates/Ranking/heroes.tpl +++ b/Templates/Ranking/heroes.tpl @@ -46,7 +46,7 @@ $ranking = $ranking->getRank(); for($i = $start; $i < ($start + 20); $i++) { if(isset($ranking[$i]['name']) && $ranking[$i] != "pad") { - if($ranking[$i]['uid'] == $session->uid) { + if($i == $search) { echo ""; } else { echo ""; diff --git a/Templates/Ranking/player_attack.tpl b/Templates/Ranking/player_attack.tpl index 0318bf2a..0f77afb8 100644 --- a/Templates/Ranking/player_attack.tpl +++ b/Templates/Ranking/player_attack.tpl @@ -35,7 +35,7 @@ $search = $_SESSION['search']; $ranking = $ranking->getRank(); for($i=$start;$i<($start+20);$i++) { if(isset($ranking[$i]['username']) && $ranking[$i] != "pad") { - if($session->uid == $ranking[$i]['id']){ + if($i == $search){ echo ""; } else { diff --git a/Templates/Ranking/player_defend.tpl b/Templates/Ranking/player_defend.tpl index 66f81d90..21e942d2 100644 --- a/Templates/Ranking/player_defend.tpl +++ b/Templates/Ranking/player_defend.tpl @@ -35,7 +35,7 @@ $search = $_SESSION['search']; $ranking = $ranking->getRank(); for($i=$start;$i<($start+20);$i++) { if(isset($ranking[$i]['username']) && $ranking[$i] != "pad") { - if($session->uid == $ranking[$i]['id']){ + if($i == $search){ echo ""; } else { diff --git a/statistiken.php b/statistiken.php index 8fa8ab09..d7ae8137 100644 --- a/statistiken.php +++ b/statistiken.php @@ -15,6 +15,7 @@ include("GameEngine/Village.php"); $__start = $generator->pageLoadTimeStart(); if(isset($_GET['rank'])){ $_POST['rank']==$_GET['rank']; } $_GET['aid'] = $session->alliance; +$_GET['hero'] = count($database->getHero($session->uid)); $ranking->procRankReq($_GET); $ranking->procRank($_POST); if(isset($_GET['newdid'])) {