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

Merge pull request #414 from Shadowss/patch-85

Browse Source 
fix report scout by Natars. Now report player can see and fix to conquer...
This commit is contained in:
yi12345
2013-10-31 05:30:22 -07:00
parent cd5d96437b accd510961
commit 44ffc5d613
1 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Automation.php
+24 -17
View File
@@ -2376,14 +2376,19 @@ class Automation {
} }
if($data['t11'] > 0){ if($data['t11'] > 0){
if ($isoasis != 0) { if ($isoasis != 0) {
if ($database->canConquerOasis($data['from'],$data['to'])) { 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'){ $troopcount = $database->countOasisTroops($data['to']);
$database->conquerOasis($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'){
$info_chief = $hero_pic.",Your hero has conquered this oasis"; if ($troopcount==0) {
} $database->conquerOasis($data['from'],$data['to']);
} else { $info_chief = $hero_pic.",Your hero has conquered this oasis";
$OasisInfo = $database->getOasisInfo($data['to']); }
elseif ($heroxp == 0) {
$info_chief = $hero_pic.",Your hero had nothing to kill therfore gains no XP at all";
} else $info_chief = $hero_pic.",Your hero gained ".$heroxp." XP";
} else {
$OasisInfo = $database->getOasisInfo($data['to']);
if ($OasisInfo['conqured'] != 0) { if ($OasisInfo['conqured'] != 0) {
$Oloyaltybefore = $OasisInfo['loyalty']; $Oloyaltybefore = $OasisInfo['loyalty'];
$database->modifyOasisLoyalty($data['to']); $database->modifyOasisLoyalty($data['to']);
@@ -2637,15 +2642,17 @@ $wallimg = "<img src=\"".GP_LOCATE."img/g/g3".$targettribe."Icon.gif\" height=\"
} }
} }
$endtime += $AttackArrivalTime; $endtime += $AttackArrivalTime;
if($type == 1) { if($type == 1) {
$database->addNotice($from['owner'],$to['wref'],$ownally,18,''.addslashes($from['name']).' scouts '.addslashes($to['name']).'',$data2,$AttackArrivalTime); if($from['owner'] == 3) {
}else { $database->addNotice($to['owner'],$to['wref'],$targetally,0,''.addslashes($from['name']).' scouts '.addslashes($to['name']).'',$data2,$AttackArrivalTime);
if ($totaldead_att == 0 && $totaltraped_att == 0){ } else $database->addNotice($from['owner'],$to['wref'],$ownally,18,''.addslashes($from['name']).' scouts '.addslashes($to['name']).'',$data2,$AttackArrivalTime);
$database->addNotice($from['owner'],$to['wref'],$ownally,1,''.addslashes($from['name']).' attacks '.addslashes($to['name']).'',$data2,$AttackArrivalTime); }else {
}else{ if ($totaldead_att == 0 && $totaltraped_att == 0){
$database->addNotice($from['owner'],$to['wref'],$ownally,2,''.addslashes($from['name']).' attacks '.addslashes($to['name']).'',$data2,$AttackArrivalTime); $database->addNotice($from['owner'],$to['wref'],$ownally,1,''.addslashes($from['name']).' attacks '.addslashes($to['name']).'',$data2,$AttackArrivalTime);
} }else{
} $database->addNotice($from['owner'],$to['wref'],$ownally,2,''.addslashes($from['name']).' attacks '.addslashes($to['name']).'',$data2,$AttackArrivalTime);
}
}
$database->setMovementProc($data['moveid']); $database->setMovementProc($data['moveid']);
if($chiefing_village != 1){ if($chiefing_village != 1){