From 47919ed84b3371ba5f9c64a74786ed1f4f96cc33 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 21 Apr 2012 02:40:57 +0300 Subject: [PATCH] fix rat from questmaster, more fix for icon for reports, fix hero in type 3 of report, fix reinforcement from questmaster in rallypoint and now when hero lose 90% health or more in one battle he die --- GameEngine/Automation.php | 12 +++++++-- GameEngine/Battle.php | 2 +- Templates/Ajax/quest_core.tpl | 3 ++- Templates/Build/16.tpl | 35 ++++++++++++++++++++++++ Templates/Build/16_incomming.tpl | 46 ++++++++++++++++++++++++++++++++ Templates/Notice/3.tpl | 14 +++++----- Templates/Notice/3x.tpl | 14 +++++----- Templates/Notice/8.tpl | 9 ++++--- 8 files changed, 113 insertions(+), 22 deletions(-) diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php index 7603f2c7..416ad10a 100644 --- a/GameEngine/Automation.php +++ b/GameEngine/Automation.php @@ -2086,8 +2086,16 @@ $crannyimg = "query_return($q); - foreach($dataarray as $data) { + if($data['from']==0){ + $to = $database->getMInfo($data['to']); + $database->addEnforce($data); + $reinf = $database->getEnforce($data['to'],$data['from']); + $database->modifyEnforce($reinf['id'],31,1,1); + $data_fail = '0,0,4,1,0,0,0,0,0,0,0,0,0,0'; + $database->addNotice($to['owner'],$to['wref'],$targetally,8,'village of the elders reinforcement '.addslashes($to['name']).'',$data_fail,$AttackArrivalTime); + $database->setMovementProc($data['moveid']); + }else{ //set base things $owntribe = $database->getUserField($database->getVillageField($data['from'],"owner"),"tribe",0); $targettribe = $database->getUserField($database->getVillageField($data['to'],"owner"),"tribe",0); @@ -2133,7 +2141,7 @@ $crannyimg = "setMovementProc($data['moveid']); - + } } if(file_exists("GameEngine/Prevention/sendreinfunits.txt")) { @unlink("GameEngine/Prevention/sendreinfunits.txt"); diff --git a/GameEngine/Battle.php b/GameEngine/Battle.php index 6205249a..c1b8bde5 100644 --- a/GameEngine/Battle.php +++ b/GameEngine/Battle.php @@ -508,7 +508,7 @@ class Battle { $hero_health=$fdb['health']; $damage_health=round(100*$result[1]); //exit($damage_health."|".$hero_health."|".$atkhero['heroid']); - if ($hero_health<=$damage_health) + if ($hero_health<=$damage_health or $damage_health>90) { //hero die $result['casualties_attacker']['11'] = 1; diff --git a/Templates/Ajax/quest_core.tpl b/Templates/Ajax/quest_core.tpl index cf6ca697..bda1f794 100644 --- a/Templates/Ajax/quest_core.tpl +++ b/Templates/Ajax/quest_core.tpl @@ -99,7 +99,8 @@ if (isset($qact)){ //Get 200 Crop $database->modifyResource($session->villages[0],0,0,0,-200,1); //Give Reward - $database->modifyUnit($session->villages[0],array(31),array(1),array(1)); + $attack = $database->addAttack(0,1,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0); + $database->addMovement(3,0,$session->villages[0],$attack,time(),time()+12600/INCREASE_SPEED); } else{ $NoCrop="No Enough Crop!"; } diff --git a/Templates/Build/16.tpl b/Templates/Build/16.tpl index 0776aef2..38cb869a 100644 --- a/Templates/Build/16.tpl +++ b/Templates/Build/16.tpl @@ -42,6 +42,7 @@ if($units_incoming >= 1){ if(count($village->enforcetome) > 0) { foreach($village->enforcetome as $enforce) { $colspan = 10+$enforce['hero']; + if($enforce['from']!=0){ echo ""; echo "
getMapCheck($enforce['from'])."\">".$database->getVillageField($enforce['from'],"name")." "; @@ -74,6 +75,40 @@ if($units_incoming >= 1){
Upkeep
".$technology->getUpkeep($enforce,$tribe)."\"Crop\"per hour
Send back
"; + }else{ + echo " + "; + $tribe = 4; + $start = ($tribe-1)*10+1; + $end = ($tribe*10); + echo ""; + for($i=$start;$i<=($end);$i++) { + echo ""; + } + if($enforce['hero']!=0){ + echo ""; + } + echo ""; + for($i=$start;$i<=($start+9);$i++) { + if($enforce['u'.$i] == 0) { + echo ""; + } + if($enforce['hero']!=0){ + echo ""; + } + echo " + "; + + echo "
+ Taskmaster"; + echo " village of the elders troops"; + echo "
 getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />\"Hero\"
Troops"; + } + else { + echo ""; + } + echo $enforce['u'.$i]."".$enforce['hero']."
Upkeep
".$technology->getUpkeep($enforce,$tribe)."\"Crop\"per hour
Send back
"; + } } } if(count($village->enforcetoyou) > 0) { diff --git a/Templates/Build/16_incomming.tpl b/Templates/Build/16_incomming.tpl index fc959e1c..19998470 100644 --- a/Templates/Build/16_incomming.tpl +++ b/Templates/Build/16_incomming.tpl @@ -19,6 +19,7 @@ if ($units[$y]['sort_type']==3){ } if($units[$y]['attack_type'] != 1){ + if($units[$y]['from'] != 0){ echo ""; echo "
getMapCheck($units[$y]['from'])."\">".$database->getVillageField($units[$y]['from'],"name")." "; @@ -62,6 +63,51 @@ if ($units[$y]['sort_type']==3){
"; + }else{ + echo " + "; + $tribe = 4; + $start = ($tribe-1)*10+1; + $end = ($tribe*10); + echo ""; + for($i=$start;$i<=($end);$i++) { + echo ""; + } + echo ""; + for($i=$start;$i<=($end);$i++) { + $totalunits = $units[$y]['t1']+$units[$y]['t2']+$units[$y]['t3']+$units[$y]['t4']+$units[$y]['t5']+$units[$y]['t6']+$units[$y]['t7']+$units[$y]['t8']+$units[$y]['t9']+$units[$y]['t10']+$units[$y]['t11']; + if($totalunits > $building->getTypeLevel(16)){ + echo ""; + }else{ + if($units[$y]['t'.$i] == 0) { + echo ""; + }else{ + echo ""; + } + } + } + echo ""; + echo ' + + + + + + "; + echo "
+ village of the elders"; + echo "Taskmaster's troops"; + echo "
 getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
Troops?0?
Arrival +
'.$generator->getTimeFormat($units[$y]['endtime']-time()).' h
'; + $datetime = $generator->procMtime($units[$y]['endtime']); + echo "
"; + if($datetime[0] != "today") { + echo "on ".$datetime[0]." "; + } + echo "at ".$datetime[1]."
+ +
"; + } } }else if ($units[$y]['sort_type']==4){ if ($units[$y]['attack_type']==1){ diff --git a/Templates/Notice/3.tpl b/Templates/Notice/3.tpl index a22a9d89..9c4bb995 100644 --- a/Templates/Notice/3.tpl +++ b/Templates/Notice/3.tpl @@ -5,7 +5,7 @@ ## GIT HUB REV ## ############################################################ $dataarray = explode(",",$message->readingNotice['data']); -if($dataarray[147]!='' or $dataarray!=0){$colspan="11";}else{$colspan="10";} +if($dataarray[151]!='' or $dataarray!=0){$colspan="11";}else{$colspan="10";} ?> @@ -39,7 +39,7 @@ $start = ($tribe-1)*10+1; for($i=$start;$i<=($start+9);$i++) { echo ""; } -if ($dataarray[147]!="" or $dataarray[147]!=0){ +if ($dataarray[151]!="" or $dataarray[151]!=0){ echo ""; } echo ""; @@ -51,8 +51,8 @@ for($i=3;$i<=12;$i++) { echo ""; } } -if ($dataarray[147]!="" or $dataarray[147]!=0){ - echo ""; +if ($dataarray[151]!="" or $dataarray[151]!=0){ + echo ""; } echo ""; for($i=13;$i<=22;$i++) { @@ -63,9 +63,9 @@ for($i=13;$i<=22;$i++) { echo ""; } } -if ($dataarray[147]!="" or $dataarray[147]!=0){ - if ($dataarray[148]==0){$tdclass='class="none"';} - echo ""; +if ($dataarray[151]!="" or $dataarray[151]!=0){ + if ($dataarray[152]==0){$tdclass='class="none"';} + echo ""; } echo ""; ?>
getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />\"Hero\"
Troops".$dataarray[$i]."$dataarray[147]$dataarray[151]
Casualties".$dataarray[$i]."$dataarray[148]$dataarray[152]
diff --git a/Templates/Notice/3x.tpl b/Templates/Notice/3x.tpl index b0dadf4f..a69b49b5 100644 --- a/Templates/Notice/3x.tpl +++ b/Templates/Notice/3x.tpl @@ -8,7 +8,7 @@ $topic = $database->getNotice2($_GET['id'], 'topic'); $time = $database->getNotice2($_GET['id'], 'time'); $data = $database->getNotice2($_GET['id'], 'data'); $dataarray = explode(",",$data); -if($dataarray[147]!='' or $dataarray!=0){$colspan="11";}else{$colspan="10";} +if($dataarray[151]!='' or $dataarray!=0){$colspan="11";}else{$colspan="10";} ?> @@ -42,7 +42,7 @@ $start = ($tribe-1)*10+1; for($i=$start;$i<=($start+9);$i++) { echo ""; } -if ($dataarray[147]!="" or $dataarray[147]!=0){ +if ($dataarray[151]!="" or $dataarray[151]!=0){ echo ""; } echo ""; @@ -54,8 +54,8 @@ for($i=3;$i<=12;$i++) { echo ""; } } -if ($dataarray[147]!="" or $dataarray[147]!=0){ - echo ""; +if ($dataarray[151]!="" or $dataarray[151]!=0){ + echo ""; } echo ""; for($i=13;$i<=22;$i++) { @@ -66,9 +66,9 @@ for($i=13;$i<=22;$i++) { echo ""; } } -if ($dataarray[147]!="" or $dataarray[147]!=0){ - if ($dataarray[148]==0){$tdclass='class="none"';} - echo ""; +if ($dataarray[151]!="" or $dataarray[151]!=0){ + if ($dataarray[152]==0){$tdclass='class="none"';} + echo ""; } echo ""; ?>
getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />\"Hero\"
Troops".$dataarray[$i]."$dataarray[147]$dataarray[151]
Casualties".$dataarray[$i]."$dataarray[148]$dataarray[152]
diff --git a/Templates/Notice/8.tpl b/Templates/Notice/8.tpl index 3a5f0f79..b9974bae 100644 --- a/Templates/Notice/8.tpl +++ b/Templates/Notice/8.tpl @@ -1,5 +1,6 @@ readingNotice['data']); +if($dataarray[13]!='' or $dataarray!=0){$colspan="11";}else{$colspan="10";} ?> @@ -21,7 +22,7 @@ $dataarray = explode(",",$message->readingNotice['data']);
- +getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; } +if($dataarray[13]!=0){ echo ""; +} echo ""; for($i=3;$i<13;$i++) { $unitarray['u'.($i-3+$start).''] = $dataarray[$i]; @@ -41,9 +44,7 @@ $unitarray['u'.($i-3+$start).''] = $dataarray[$i]; echo ""; } } -if($dataarray[13] == 0) { - echo ""; -} else { +if($dataarray[13] != 0) { echo ""; $unitarray['hero'] = 1; }
sender">getUserField($dataarray[1],"username",0); ?> from the village getMapCheck($dataarray[0])."'>".$database->getVillageField($dataarray[0],name).""; ?>
sender">getUserField($dataarray[1],"username",0); ?> from the village getMapCheck($dataarray[0])."'>".$database->getVillageField($dataarray[0],name).""; ?>
 
Troops".$dataarray[$i]."0".$dataarray[13]."