xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-07-15 09:06:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

more fixes and changes

Browse Source
This commit is contained in:
unknown
2012-06-25 03:12:17 +03:00
parent ba3eba0cc7
commit 337717bcb1
14 changed files with 51 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Account.php
+1 -1
View File
@@ -203,7 +203,7 @@ class Account {
private function Logout() {
global $session,$database;
unset($_SESSION['wid']);
$database->activeModify($session->username,1);
$database->activeModify(addslashes($session->username),1);
$database->UpdateOnline("logout") or die(mysql_error());
$session->Logout();
}
GameEngine/Automation.php
+7 -2
View File
@@ -1322,7 +1322,7 @@ class Automation {
}
$dead['hero']='0';
if($unitlist){
$dead['hero']+=$battlepart['deadherodef'][$DefenderID];
$dead['hero']+=$battlepart['deadherodef'];
$database->modifyUnit($data['to'],array("hero"),array($battlepart['deadherodef']),array(0));
}
//kill other defence in village
@@ -1335,7 +1335,11 @@ class Automation {
$tribe = 4;
}
$start = ($tribe-1)*10+1;
$totalreinfunits = 0;
for($i=1;$i<=50;$i++) {
$totalreinfunits += $enforce['u'.$i];
}
if($totalreinfunits > 0){
if($tribe == 1){ $rom='1'; } else if($tribe == 2){ $ger='1'; }else if($tribe == 3){ $gal='1'; }else if($tribe == 4){ $nat='1'; } else { $natar='1'; }
for($i=$start;$i<=($start+9);$i++) {
if($enforce['u'.$i]>'0'){
@@ -1349,6 +1353,7 @@ class Automation {
$dead[$i]='0';
}
}
}
if($enforce['hero']>'0'){
$database->modifyEnforce($enforce['id'],"hero",$battlepart['deadheroref'][$enforce['id']],0);
$dead['hero']+=$battlepart['deadheroref'][$enforce['id']];
GameEngine/Battle.php
+10 -10
View File
@@ -232,7 +232,7 @@ class Battle {
if($Defender['hero'] != 0)
{
//exit($DefenderID);
$defhero[$DefenderWref] = $this->getBattleHero($DefenderID);
$defenderhero = $this->getBattleHero($DefenderID);
}
$DefendersAll = $database->getEnforceVillage($DefenderWref,0);
@@ -344,8 +344,8 @@ class Battle {
$units['Def_unit'][$y] = $Defender['u'.$y];
}
if ($Defender['hero'] != 0){
$dp += $defhero[$DefenderWref]['di'] * 35;
$dp = $dp * $defhero[$DefenderWref]['db'];
$dp += $defenderhero['di'] * 35;
$dp = $dp * $defenderhero['db'];
}
$DefendersAll = $database->getEnforceVillage($DefenderWref,0);
if(!empty($DefendersAll)){
@@ -377,10 +377,10 @@ class Battle {
if($Defender['hero'] != 0)
{
$units['Def_unit']['hero'] = $Defender['hero'];
$cdp += $defhero[$DefenderWref]['dc'];
$dp += $defhero[$DefenderWref]['di'];
$dp = $dp * $defhero[$DefenderWref]['db'];
$cdp = $cdp * $defhero[$DefenderWref]['db'];
$cdp += $defenderhero['dc'];
$dp += $defenderhero['di'];
$dp = $dp * $defenderhero['db'];
$cdp = $cdp * $defenderhero['db'];
}
$DefendersAll = $database->getEnforceVillage($DefenderWref,0);
if(!empty($DefendersAll)){
@@ -627,7 +627,7 @@ class Battle {
if ($units['Def_unit']['hero']>0)
{
$_result=mysql_query("select * from " . TB_PREFIX . "hero where `dead`='0' and `heroid`='".$defhero[$DefenderWref]['heroid']."'");
$_result=mysql_query("select * from " . TB_PREFIX . "hero where `dead`='0' and `heroid`='".$defenderhero['heroid']."'");
$fdb = mysql_fetch_array($_result);
$hero_id=$fdb['heroid'];
$hero_health=$fdb['health'];
@@ -635,13 +635,13 @@ class Battle {
if ($hero_health<=$damage_health or $damage_health>90)
{
//hero die
$result['deadherodef'][$defhero[$DefenderWref]['uid']] = 1;
$result['deadherodef'] = 1;
mysql_query("update " . TB_PREFIX . "hero set `dead`='1' where `heroid`='".$hero_id."'");
mysql_query("update " . TB_PREFIX . "hero set `health`='0' where `heroid`='".$hero_id."'");
}
else
{
$result['deadherodef'][$defhero[$DefenderWref]['uid']] = 0;
$result['deadherodef'] = 0;
mysql_query("update " . TB_PREFIX . "hero set `health`=`health`-".$damage_health." where `heroid`='".$hero_id."'");
}
}
GameEngine/Database/db_MYSQL.php
+1 -1
View File
@@ -330,7 +330,7 @@ class MYSQL_DB {
$q = "INSERT IGNORE INTO " . TB_PREFIX . "online (name, uid, time, sit) VALUES ('$name', '$uid', " . time() . ", 1)";
return mysql_query($q, $this->connection);
} else {
$q = "DELETE FROM " . TB_PREFIX . "online WHERE name ='" . $session->username . "'";
$q = "DELETE FROM " . TB_PREFIX . "online WHERE name ='" . addslashes($session->username) . "'";
return mysql_query($q, $this->connection);
}
}
GameEngine/Market.php
+1 -6
View File
@@ -95,13 +95,8 @@ class Market {
$reqMerc = ceil((array_sum($resource)-0.1)/$this->maxcarry);
if($this->merchantAvail() != 0 && $reqMerc <= $this->merchantAvail()) {
if(isset($post['x']) && isset($post['y']) && $post['x'] != "" && $post['y'] != "") {
$coor = array('x'=>$post['x'], 'y'=>$post['y']);
$id = $generator->getBaseID($coor['x'],$coor['y']);
}else if(isset($post['dname']) && $post['dname'] != "") {
$id = $database->getVillageByName($post['dname']);
$id = $post['getwref'];
$coor = $database->getCoor($id);
}
if($database->getVillageState($id)) {
$timetaken = $generator->procDistanceTime($coor,$village->coor,$session->tribe,0);
$res = $resource[0]+$resource[1]+$resource[2]+$resource[3];
GameEngine/Message.php
+3 -3
View File
@@ -40,9 +40,9 @@ class Message {
break;
case "m2":
if ($post['an'] == "[ally]"){
$this->sendAMessage($post['be'],$post['message']);
$this->sendAMessage($post['be'],addslashes($post['message']));
}else{
$this->sendMessage($post['an'],$post['be'],$post['message']);
$this->sendMessage($post['an'],$post['be'],addslashes($post['message']));
}
header("Location: nachrichten.php?t=2");
break;
@@ -474,7 +474,7 @@ class Message {
$welcomemsg = preg_replace("'%ALLI%'", $database->countAlli(), $welcomemsg);
$welcomemsg = preg_replace("'%SERVER_NAME%'", SERVER_NAME, $welcomemsg);
$welcomemsg = "[message]".$welcomemsg."[/message]";
return $database->sendMessage($uid, 5, WEL_TOPIC, $welcomemsg, 0, 0, 0, 0, 0);
return $database->sendMessage($uid, 5, WEL_TOPIC, addslashes($welcomemsg), 0, 0, 0, 0, 0);
}
private function wordCensor($text) {