diff --git a/Templates/Build/16_incomming.tpl b/Templates/Build/16_incomming.tpl index 9b259db0..5a70367a 100644 --- a/Templates/Build/16_incomming.tpl +++ b/Templates/Build/16_incomming.tpl @@ -15,9 +15,11 @@ $res = mysql_fetch_array($res1); $timer = $y+1; if ($units[$y]['sort_type']==3){ if ($units[$y]['attack_type']==3){ - $actionType = "Attack on "; + $actionType = ATTACK_ON; } else if ($units[$y]['attack_type']==4){ - $actionType = "Raid on "; + $actionType = RAID_ON; + } else if ($units[$y]['attack_type']==2){ + $actionType = REINFORCEMENTFOR; } $reinfowner = $database->getVillageField($units[$y]['from'],"owner"); if($units[$y]['attack_type'] != 1){ @@ -30,7 +32,7 @@ if ($units[$y]['sort_type']==3){ echo ""; $tribe = $database->getUserField($database->getVillageField($units[$y]['from'],"owner"),"tribe",0); $start = ($tribe-1)*10+1; @@ -42,7 +44,7 @@ if ($units[$y]['sort_type']==3){ if($units[$y]['t11'] != 0 && $reinfowner == $session->uid) { echo ""; } - echo ""; + echo ""; for($i=1;$i<=$colspan;$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($units[$y]['attack_type'] == 2){ @@ -63,7 +65,7 @@ if ($units[$y]['sort_type']==3){ $artefact1 = count($database->getOwnUniqueArtefactInfo2($village->wid,3,1,1)); $artefact2 = count($database->getOwnUniqueArtefactInfo2($session->uid,3,2,0)); $total_artefact = $artefact + $artefact1 + $artefact2; - if($totalunits > $building->getTypeLevel(16) && $total_artefact == 0){ + if($total_artefact == 0){ echo ""; }else{ if($units[$y]['t'.$i] == 0) { @@ -78,15 +80,15 @@ if ($units[$y]['sort_type']==3){ echo ' - + @@ -105,7 +107,7 @@ if ($units[$y]['sort_type']==3){ for($i=$start;$i<=($end);$i++) { echo ""; } - echo ""; + echo ""; for($i=1;$i<=10;$i++) { echo ""; } @@ -113,15 +115,15 @@ if ($units[$y]['sort_type']==3){ echo ' - + @@ -131,15 +133,19 @@ if ($units[$y]['sort_type']==3){ } }else if ($units[$y]['sort_type']==4){ if ($units[$y]['attack_type']==1){ - $actionType = "Return from "; + $actionType = RETURNFROM; } else if ($units[$y]['attack_type']==2){ - $actionType = "Reinforcement for "; + $actionType = RETURNFROM; } else if ($units[$y]['attack_type']==3){ - $actionType = "Return from "; + $actionType = RETURNFROM; } else if ($units[$y]['attack_type']==4){ - $actionType = "Return from "; + $actionType = RETURNFROM; } - +$isoasis = $database->isVillageOases($units[$y]['from']); +if ($isoasis ==0){ +$from = $database->getMInfo($units[$y]['from']); +} else { +$from = $database->getOMInfo($units[$y]['from']);} $to = $database->getMInfo($units[$y]['vref']); ?> @@ -147,7 +153,7 @@ $to = $database->getMInfo($units[$y]['vref']); - + @@ -164,7 +170,7 @@ $to = $database->getMInfo($units[$y]['vref']); } ?> - + getMInfo($units[$y]['vref']); - + - + @@ -219,11 +225,11 @@ $total_for = count($oasis); for($y=0;$y < $total_for;$y++){ $timer = $y+1; if ($oasis[$y]['attack_type']==2){ - $actionType = "Reinforcement for "; + $actionType = REINFORCEMENTFOR; } else if ($oasis[$y]['attack_type']==3){ - $actionType = "Attack on "; + $actionType = ATTACK_ON; } else if ($oasis[$y]['attack_type']==4){ - $actionType = "Raid on "; + $actionType = RAID_ON; } $reinfowner = $database->getVillageField($oasis[$y]['from'],"owner"); if($oasis[$y]['t11'] != 0 && $reinfowner == $session->uid) { @@ -234,7 +240,7 @@ $timer = $y+1; echo "
getMapCheck($units[$y]['from'])."\">".$database->getVillageField($units[$y]['from'],"name")." "; - echo "getVillageField($units[$y]['from'],"owner")."\">".$database->getUserField($database->getVillageField($units[$y]['from'],"owner"),"username",0)."'s troops"; + echo "getMapCheck($units[$y]['to'])."\">".$actionType." ".$database->getVillageField($units[$y]['to'],"name").""; echo "
\"Hero\"
Troops
".TROOPS."?
Arrival'.ARRIVAL.'
'.$generator->getTimeFormat($units[$y]['endtime']-time()).' h
'; $datetime = $generator->procMtime($units[$y]['endtime']); echo "
"; if($datetime[0] != "today") { - echo "on ".$datetime[0]." "; + echo "".ON." ".$datetime[0]." "; } - echo "at ".$datetime[1]." hours
+ echo "".AT." ".$datetime[1]." ".HRS."
getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />
Troops
".TROOPS."?
Arrival'.ARRIVAL.'
'.$generator->getTimeFormat($units[$y]['endtime']-time()).' h
'; $datetime = $generator->procMtime($units[$y]['endtime']); echo "
"; if($datetime[0] != "today") { - echo "on ".$datetime[0]." "; + echo "".ON." ".$datetime[0]." "; } - echo "at ".$datetime[1]."
+ echo "".AT." ".$datetime[1]."
vname; ?>">">
Troops
Bounty
"> getMInfo($units[$y]['vref']);
Arrival "> ".$generator->getTimeFormat($units[$y]['endtime']-time())." h"; $datetime = $generator->procMtime($units[$y]['endtime']); - echo "
"; + echo "
"; if($datetime[0] != "today") { - echo "on ".$datetime[0]." "; + echo "".ON." ".$datetime[0]." "; } - echo "at ".$datetime[1]."
"; + echo "".AT." ".$datetime[1]."
"; ?>
"; $tribe = $database->getUserField($database->getVillageField($oasis[$y]['from'],"owner"),"tribe",0); $start = ($tribe-1)*10+1; @@ -246,7 +252,7 @@ $timer = $y+1; if($oasis[$y]['t11'] != 0 && $reinfowner == $session->uid) { echo ""; } - echo ""; + echo ""; for($i=1;$i<=$colspan;$i++) { $totalunits = $oasis[$y]['t1']+$oasis[$y]['t2']+$oasis[$y]['t3']+$oasis[$y]['t4']+$oasis[$y]['t5']+$oasis[$y]['t6']+$oasis[$y]['t7']+$oasis[$y]['t8']+$oasis[$y]['t9']+$oasis[$y]['t10']+$oasis[$y]['t11']; if($oasis[$y]['attack_type'] == 2){ @@ -282,15 +288,15 @@ $timer = $y+1; echo ' - + @@ -309,7 +315,7 @@ $to = $database->getMInfo($settlers[$x]['to']); - + @@ -323,7 +329,7 @@ $to = $database->getMInfo($settlers[$x]['to']); } ?> - + getMInfo($settlers[$x]['to']); - +
getMapCheck($oasis[$y]['from'])."\">".$database->getVillageField($oasis[$y]['from'],"name")." "; - echo "getVillageField($oasis[$y]['from'],"owner")."\">".$database->getUserField($database->getVillageField($oasis[$y]['from'],"owner"),"username",0)."'s troops"; + echo "getVillageField($oasis[$y]['from'],"owner")."\">".$database->getUserField($database->getVillageField($oasis[$y]['from'],"owner"),"username",0)."'s troopslll"; echo "
\"Hero\"
Troops
".TROOPS."
Arrival'.ARRIVAL.'
'.$generator->getTimeFormat($oasis[$y]['endtime']-time()).' h
'; $datetime = $generator->procMtime($oasis[$y]['endtime']); - echo "
"; + echo "
"; if($datetime[0] != "today") { - echo "on ".$datetime[0]." "; + echo "".ON." ".$datetime[0]." "; } - echo "at ".$datetime[1]." hours
+ echo "".AT." ".$datetime[1]." ".HRS."
vname; ?>
Troops
Arrival ".$generator->getTimeFormat($settlers[$x]['endtime']-time())." h"; $datetime = $generator->procMtime($settlers[$x]['endtime']); - echo "
"; + echo "
"; if($datetime[0] != "today") { - echo "on ".$datetime[0]." "; + echo "".ON." ".$datetime[0]." "; } - echo "at ".$datetime[1]."
"; + echo "".AT." ".$datetime[1]."
"; ?>
- \ No newline at end of file +