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

fix update spieler.php and graphic.tpl + fix edit forum for player without forum access + fix send resouces + more updates for farmlist (still not 100%)

Browse Source
This commit is contained in:
unknown
2012-04-09 14:37:32 +03:00
parent acf620f833
commit 17ab0ae696
9 changed files with 56 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Automation.php
+3 -1
View File
@@ -1742,8 +1742,10 @@ private function loyaltyRegeneration() {
if($data['t11'] > 0){
if ($isoasis != 0) {
if ($database->canConquerOasis($data['from'],$data['to'])) {
if($unitssend_def[1] == '0,0,0,0,0,0,0,0,0,0' and $unitssend_def[2] == '0,0,0,0,0,0,0,0,0,0' and $unitssend_def[3] == '0,0,0,0,0,0,0,0,0,0' and $unitssend_def[4] == '0,0,0,0,0,0,0,0,0,0' and $unitssend_def[5] == '0,0,0,0,0,0,0,0,0,0'){
$database->conquerOasis($data['from'],$data['to']);
$info_chief = $hero_pic.",Your hero has conquered this oasis and gained ".$heroxp." XP";
$info_chief = $hero_pic.",Your hero has conquered this oasis";
}
} else {
$OasisInfo = $database->getOasisInfo($data['to']);
if ($OasisInfo['conqured'] != 0) {
GameEngine/Market.php
+3 -3
View File
@@ -107,7 +107,7 @@ class Market {
$timetaken = $generator->procDistanceTime($coor,$village->coor,$session->tribe,0);
$reference = $database->sendResource($resource[0],$resource[1],$resource[2],$resource[3],$reqMerc,0);
$database->modifyResource($village->wid,$resource[0],$resource[1],$resource[2],$resource[3],0);
$database->addMovement(0,$village->wid,$id,$reference,time()+$timetaken);
$database->addMovement(0,$village->wid,$id,$reference,time(),time()+$timetaken);
$logging->addMarketLog($village->wid,1,array($resource[0],$resource[1],$resource[2],$resource[3],$id));
}
}
@@ -169,8 +169,8 @@ class Market {
$mytime = $generator->procDistanceTime($hiscoor,$village->coor,$session->tribe,0);
$targettribe = $database->getUserField($database->getVillageField($infoarray['vref'],"owner"),"tribe",0);
$histime = $generator->procDistanceTime($village->coor,$hiscoor,$targettribe,0);
$database->addMovement(0,$village->wid,$infoarray['vref'],$mysendid,$mytime+time());
$database->addMovement(0,$infoarray['vref'],$village->wid,$hissendid,$histime+time());
$database->addMovement(0,$village->wid,$infoarray['vref'],$mysendid,time(),$mytime+time());
$database->addMovement(0,$infoarray['vref'],$village->wid,$hissendid,time(),$histime+time());
$resource = array(1=>0,0,0,0);
$resource[$infoarray['wtype']] = $infoarray['wamt'];
$database->modifyResource($village->wid,$resource[1],$resource[2],$resource[3],$resource[4],0);