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

Merge pull request #29 from Bogdacutu/master

Browse Source 
Battle fix
This commit is contained in:
yi12345
2012-05-20 13:01:50 -07:00
parent 3b578fbee7 44aff68677
commit 586a713b70
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Automation.php
+10 -3
View File
@@ -1194,7 +1194,14 @@ class Automation {
}
}
}
if ($isoasis == 0) {
$database->modifyResource($data["to"], $steal[0], $steal[1], $steal[2], $steal[3], false);
$this->pruneResource();
} else {
$database->modifyOasisResource($data["to"], $steal[0], $steal[1], $steal[2], $steal[3], false);
$this->pruneOResource();
}
//work out time of return
$start = ($owntribe-1)*10+1;
@@ -1999,9 +2006,9 @@ $crannyimg = "<img src=\"gpack/travian_default/img/g/g23.gif\" height=\"30\" wid
$reference = $database->sendResource($steal[0],$steal[1],$steal[2],$steal[3],0,0);
$isoasis1 = $database->isVillageOases($to['wref']);
if ($isoasis1 == 0){
$database->modifyResource($to['wref'],$steal[0],$steal[1],$steal[2],$steal[3],0);
//$database->modifyResource($to['wref'],$steal[0],$steal[1],$steal[2],$steal[3],0);
}else{
$database->modifyOasisResource($to['wref'],$steal[0],$steal[1],$steal[2],$steal[3],0);
//$database->modifyOasisResource($to['wref'],$steal[0],$steal[1],$steal[2],$steal[3],0);
}
$database->addMovement(6,$to['wref'],$from['wref'],$reference,time(),$endtime);
//$database->updateVillage($to['wref']);
install/include/multihunter.php
+2 -2
View File
@@ -1,9 +1,9 @@
<?php
include ("../../GameEngine/config.php");
include ("../../GameEngine/Database.php");
include ("../../GameEngine/Admin/database.php");
include ("../../GameEngine/config.php");
include ("../../GameEngine/Lang/" . LANG . ".php");
mysql_connect(SQL_SERVER, SQL_USER, SQL_PASS);
install/include/oasis.php
+2 -2
View File
@@ -1,9 +1,9 @@
<?php
include ("../../GameEngine/config.php");
include ("../../GameEngine/Database.php");
include ("../../GameEngine/Admin/database.php");
include ("../../GameEngine/config.php");
mysql_connect(SQL_SERVER, SQL_USER, SQL_PASS);