diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php index ad52ec14..cf0b8fad 100644 --- a/GameEngine/Automation.php +++ b/GameEngine/Automation.php @@ -965,7 +965,13 @@ private function loyaltyRegeneration() { } //NEED TO SEND A RAPPORTAGE!!! $data2 = ''.$database->getVillageField($enforce['from'],"owner").','.$to['wref'].','.addslashes($to['name']).','.$tribe.''.$life.''.$notlife.''; + if($notlife == 0){ $database->addNotice($database->getVillageField($enforce['from'],"owner"),$from['wref'],$ownally,15,'Reinforcement in '.addslashes($to['name']).' was attacked',$data2,$AttackArrivalTime); + }else if($life > $notlife){ + $database->addNotice($database->getVillageField($enforce['from'],"owner"),$from['wref'],$ownally,16,'Reinforcement in '.addslashes($to['name']).' was attacked',$data2,$AttackArrivalTime); + }else{ + $database->addNotice($database->getVillageField($enforce['from'],"owner"),$from['wref'],$ownally,17,'Reinforcement in '.addslashes($to['name']).' was attacked',$data2,$AttackArrivalTime); + } //delete reinf sting when its killed all. if($wrong=='0'){ $database->deleteReinf($enforce['id']); } } @@ -1837,15 +1843,23 @@ $crannyimg = "addNotice($to['owner'],$to['wref'],$targetally,0,''.addslashes($from['name']).' scouts '.addslashes($to['name']).'',$data2,$AttackArrivalTime); break; + }else if($unitsdead_att == $unitssend_att){ + $database->addNotice($to['owner'],$to['wref'],$targetally,20,''.addslashes($from['name']).' scouts '.addslashes($to['name']).'',$data2,$AttackArrivalTime); + break; + }else{ + $database->addNotice($to['owner'],$to['wref'],$targetally,21,''.addslashes($from['name']).' scouts '.addslashes($to['name']).'',$data2,$AttackArrivalTime); + break; + } } } } @@ -1868,7 +1882,7 @@ $crannyimg = "procDistanceTime($from,$to,min($speeds),1) + $AttackArrivalTime; //$endtime = $this->procDistanceTime($from,$to,min($speeds),1) + time(); if($type == 1) { - $database->addNotice($from['owner'],$to['wref'],$ownally,0,''.addslashes($from['name']).' scouts '.addslashes($to['name']).'',$data2,$AttackArrivalTime); + $database->addNotice($from['owner'],$to['wref'],$ownally,18,''.addslashes($from['name']).' scouts '.addslashes($to['name']).'',$data2,$AttackArrivalTime); }else { if ($totaldead_att == 0){ $database->addNotice($from['owner'],$to['wref'],$ownally,1,''.addslashes($from['name']).' attacks '.addslashes($to['name']).'',$data2,$AttackArrivalTime); @@ -1899,7 +1913,7 @@ $crannyimg = "setMovementProc($data['moveid']); if($type == 1){ - $database->addNotice($from['owner'],$to['wref'],$ownally,0,''.addslashes($from['name']).' scouts '.addslashes($to['name']).'',$data_fail,$AttackArrivalTime); + $database->addNotice($from['owner'],$to['wref'],$ownally,19,addslashes($from['name']).' scouts '.addslashes($to['name']).'',$data_fail,$AttackArrivalTime); }else{ $database->addNotice($from['owner'],$to['wref'],$ownally,3,''.addslashes($from['name']).' attacks '.addslashes($to['name']).'',$data_fail,$AttackArrivalTime); } diff --git a/Templates/Alliance/attack-attacker.tpl b/Templates/Alliance/attack-attacker.tpl index e1dcc4ed..579b08a0 100644 --- a/Templates/Alliance/attack-attacker.tpl +++ b/Templates/Alliance/attack-attacker.tpl @@ -1,6 +1,6 @@ alliance AND $limit ORDER BY time DESC LIMIT 20"); $query = mysql_num_rows($sql); $outputList = ''; @@ -29,7 +29,11 @@ if($ntype==4 || $ntype==5 || $ntype==6 || $ntype==7){ } $outputList .= ""; $type = (isset($_GET['t']) && $_GET['t'] == 5)? $archive : $ntype; + if($type==18 or $type==19){ + $outputList .= ""; + }else{ $outputList .= ""; + } $outputList .= ""; $outputList .= "
"; if($ntype==0){ $nn = " scouts "; }else{ $nn = " attacks "; } diff --git a/Templates/Alliance/attack-defender.tpl b/Templates/Alliance/attack-defender.tpl index 8a77b848..ce537d9f 100644 --- a/Templates/Alliance/attack-defender.tpl +++ b/Templates/Alliance/attack-defender.tpl @@ -1,6 +1,6 @@ alliance AND $limit ORDER BY time DESC LIMIT 20"); $query = mysql_num_rows($sql); $outputList = ''; @@ -30,7 +30,11 @@ if($ntype==4 || $ntype==5 || $ntype==6 || $ntype==7){ } $outputList .= ""; $type = (isset($_GET['t']) && $_GET['t'] == 5)? $archive : $ntype; + if($type==20 or $type==21){ + $outputList .= ""; + }else{ $outputList .= ""; + } $outputList .= ""; $outputList .= "
"; if($ntype==0){ $nn = " scouts "; }else{ $nn = " attacks "; } diff --git a/Templates/Alliance/attacks.tpl b/Templates/Alliance/attacks.tpl index 0194de51..b5991047 100644 --- a/Templates/Alliance/attacks.tpl +++ b/Templates/Alliance/attacks.tpl @@ -27,7 +27,7 @@ include("alli_menu.tpl"); include "Templates/Alliance/attack-defender.tpl"; }else{ $prefix = "".TB_PREFIX."ndata"; -$limit = "ntype!=8 AND ntype!=9 AND ntype!=10 AND ntype!=11 AND ntype!=12 AND ntype!=13 AND ntype!=15"; +$limit = "ntype!=8 AND ntype!=9 AND ntype!=10 AND ntype!=11 AND ntype!=12 AND ntype!=13 AND ntype!=14 AND ntype!=15 AND ntype!=16 AND ntype!=17"; $sql = mysql_query("SELECT * FROM $prefix WHERE ally = $session->alliance AND $limit ORDER BY time DESC LIMIT 20"); $query = mysql_num_rows($sql); $outputList = ''; @@ -57,7 +57,11 @@ if($ntype==4 || $ntype==5 || $ntype==6 || $ntype==7){ } $outputList .= ""; $type = (isset($_GET['t']) && $_GET['t'] == 5)? $archive : $ntype; + if($type==18 or $type==19 or $type==20 or $type==21){ + $outputList .= ""; + }else{ $outputList .= ""; + } $outputList .= ""; $outputList .= "
"; if($ntype==0){ $nn = " scouts "; }else{ $nn = " attacks "; } @@ -82,7 +86,7 @@ if($ntype==4 || $ntype==5 || $ntype==6 || $ntype==7){ } } $getUserAlly = $database->getUserField($getUser,alliance,0); - }else if($ntype==1 or $ntype==2 or $ntype==3){ + }else if($ntype==1 or $ntype==2 or $ntype==3 or $ntype==18 or $ntype==19){ $getUserAlly = $database->getUserField($dataarray[28],alliance,0); }else{ $getUserAlly = $database->getUserField($dataarray[0],alliance,0); diff --git a/Templates/Map/vilview.tpl b/Templates/Map/vilview.tpl index d96d4ffa..42399868 100644 --- a/Templates/Map/vilview.tpl +++ b/Templates/Map/vilview.tpl @@ -149,7 +149,7 @@ if($oasis['owner'] == 2){ if($session->uid == $database->getVillage($_GET['d'])){ $limit = "ntype=0 and ntype=4 and ntype=5 and ntype=6 and ntype=7"; }else{ - $limit = "ntype!=8 and ntype!=9 and ntype!=10 and ntype!=11 and ntype!=12 and ntype!=13 and ntype!=14"; + $limit = "ntype!=8 and ntype!=9 and ntype!=10 and ntype!=11 and ntype!=12 and ntype!=13 and ntype!=14 AND ntype!=15 AND ntype!=16 AND ntype!=17"; } $toWref = $_GET['d']; if($session->alliance!=0){ @@ -160,7 +160,11 @@ while($row = mysql_fetch_array($result)){ $dataarray = explode(",",$row['data']); $type = $row['ntype']; echo ""; +if($type==18 or $type==19 or $type==20 or $type==21){ + echo "\"".$topic."\""; + }else{ echo " "; + } $date = $generator->procMtime($row['time']); echo "".$date[0]." ".date('H:i',$row['time'])." "; echo ""; @@ -180,7 +184,11 @@ while($row = mysql_fetch_array($result)){ $dataarray = explode(",",$row['data']); $type = $row['ntype']; echo ""; +if($type==18 or $type==19 or $type==20 or $type==21){ + echo "\"".$topic."\""; + }else{ echo " "; + } $date = $generator->procMtime($row['time']); echo "".$date[0]." ".date('H:i',$row['time'])." "; echo ""; @@ -238,9 +246,9 @@ while($row = mysql_fetch_array($result)){ uid == $database->getVillage($_GET['d'])){ - $limit = "ntype=0 and ntype=4 and ntype=5 and ntype=6 and ntype=7"; + $limit = "ntype=0 and ntype=4 and ntype=5 and ntype=6 and ntype=7 and ntype=20 and ntype=21"; }else{ - $limit = "ntype!=8 and ntype!=9 and ntype!=10 and ntype!=11 and ntype!=12 and ntype!=13 and ntype!=14"; + $limit = "ntype!=8 and ntype!=9 and ntype!=10 and ntype!=11 and ntype!=12 and ntype!=13 and ntype!=14 and ntype!=15 and ntype!=16 and ntype!=17"; } $toWref = $_GET['d']; if($session->alliance!=0){ @@ -251,7 +259,11 @@ while($row = mysql_fetch_array($result)){ $dataarray = explode(",",$row['data']); $type = $row['ntype']; echo ""; +if($type==18 or $type==19 or $type==20 or $type==21){ + echo "\"".$topic."\""; + }else{ echo " "; + } $date = $generator->procMtime($row['time']); echo "".$date[0]." ".date('H:i',$row['time'])." "; echo ""; @@ -271,7 +283,11 @@ while($row = mysql_fetch_array($result)){ $dataarray = explode(",",$row['data']); $type = $row['ntype']; echo ""; +if($type==18 or $type==19 or $type==20 or $type==21){ + echo "\"".$topic."\""; + }else{ echo " "; + } $date = $generator->procMtime($row['time']); echo "".$date[0]." ".date('H:i',$row['time'])." "; echo ""; @@ -358,7 +374,7 @@ while($row = mysql_fetch_array($result)){ if($session->uid == $database->getVillage($_GET['d'])){ $limit = "ntype=0 and ntype=4 and ntype=5 and ntype=6 and ntype=7"; }else{ - $limit = "ntype!=8 and ntype!=9 and ntype!=10 and ntype!=11 and ntype!=12 and ntype!=13 and ntype!=14"; + $limit = "ntype!=8 and ntype!=9 and ntype!=10 and ntype!=11 and ntype!=12 and ntype!=13 and ntype!=14 AND ntype!=15 AND ntype!=16 AND ntype!=17"; } $toWref = $_GET['d']; if($session->alliance!=0){ @@ -369,7 +385,24 @@ while($row = mysql_fetch_array($result)){ $dataarray = explode(",",$row['data']); $type = $row['ntype']; echo ""; +if($type==18 or $type==19 or $type==20 or $type==21){ + echo "\"".$topic."\""; + }else{ echo " "; + } + $date = $generator->procMtime($row['time']); + echo "".$date[0]." ".date('H:i',$row['time'])." "; + echo ""; +} +while($row = mysql_fetch_array($result)){ + $dataarray = explode(",",$row['data']); + $type = $row['ntype']; + echo ""; +if($type==18 or $type==19 or $type==20 or $type==21){ + echo "\"".$topic."\""; + }else{ + echo " "; + } $date = $generator->procMtime($row['time']); echo "".$date[0]." ".date('H:i',$row['time'])." "; echo ""; @@ -389,7 +422,11 @@ while($row = mysql_fetch_array($result)){ $dataarray = explode(",",$row['data']); $type = $row['ntype']; echo ""; +if($type==18 or $type==19 or $type==20 or $type==21){ + echo "\"".$topic."\""; + }else{ echo " "; + } $date = $generator->procMtime($row['time']); echo "".$date[0]." ".date('H:i',$row['time'])." "; echo ""; diff --git a/Templates/Notice/16.tpl b/Templates/Notice/16.tpl new file mode 100644 index 00000000..fb1c7aaa --- /dev/null +++ b/Templates/Notice/16.tpl @@ -0,0 +1,57 @@ +readingNotice['data']); +?> + + + + + + + + + procMtime($message->readingNotice['time']); ?> + + + + + + +
Subject:readingNotice['topic']; ?>
Sent:on at ".$date[1]; ?> hour
+ + + + + + + + + +getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=4;$i<=13;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=14;$i<=23;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> + +
Defender">getUserField($dataarray[0],"username",0); ?> in the village getVillageField($dataarray[1],"name"); ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+
\ No newline at end of file diff --git a/Templates/Notice/17.tpl b/Templates/Notice/17.tpl new file mode 100644 index 00000000..fb1c7aaa --- /dev/null +++ b/Templates/Notice/17.tpl @@ -0,0 +1,57 @@ +readingNotice['data']); +?> + + + + + + + + + procMtime($message->readingNotice['time']); ?> + + + + + + +
Subject:readingNotice['topic']; ?>
Sent:on at ".$date[1]; ?> hour
+ + + + + + + + + +getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=4;$i<=13;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=14;$i<=23;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> + +
Defender">getUserField($dataarray[0],"username",0); ?> in the village getVillageField($dataarray[1],"name"); ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+
\ No newline at end of file diff --git a/Templates/Notice/18.tpl b/Templates/Notice/18.tpl new file mode 100644 index 00000000..fa565f44 --- /dev/null +++ b/Templates/Notice/18.tpl @@ -0,0 +1,283 @@ +readingNotice['data']); +?> + + + + + + + + + procMtime($message->readingNotice['time']); ?> + + + + + + +
Subject:readingNotice['topic']; ?>
Sent:on at ".$date[1]; ?> hour
+ + + + + + + + + +getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=3;$i<=12;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=13;$i<=22;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} + +echo ""; +if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram +?> + + + + + + + + + +
Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
Information + Ram + +
Information + Catapult + +
Information + Chief + +
Information + + +
+ + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=35;$i<=44;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=45;$i<=54;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + + + + + + + + + + + +getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=56;$i<=65;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=66;$i<=75;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=77;$i<=86;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=87;$i<=96;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=98;$i<=107;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=108;$i<=117;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=119;$i<=128;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=129;$i<=138;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + +
\ No newline at end of file diff --git a/Templates/Notice/18x.tpl b/Templates/Notice/18x.tpl new file mode 100644 index 00000000..c2c560e7 --- /dev/null +++ b/Templates/Notice/18x.tpl @@ -0,0 +1,286 @@ +getNotice2($_GET['id'], 'topic'); +$time = $database->getNotice2($_GET['id'], 'time'); +$data = $database->getNotice2($_GET['id'], 'data'); +$dataarray = explode(",",$data); +?> + + + + + + + + + procMtime($time); ?> + + + + + + +
Subject:
Sent:on at ".$date[1]; ?> hour
+ + + + + + + + + +getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=3;$i<=12;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=13;$i<=22;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} + +echo ""; +if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram +?> + + + + + + + + + +
Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
Information + Ram + +
Information + Catapult + +
Information + Chief + +
Information + + +
+ + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=35;$i<=44;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=45;$i<=54;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + + + + + + + + + + + +getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=56;$i<=65;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=66;$i<=75;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=77;$i<=86;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=87;$i<=96;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=98;$i<=107;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=108;$i<=117;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=119;$i<=128;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=129;$i<=138;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + +
\ No newline at end of file diff --git a/Templates/Notice/19.tpl b/Templates/Notice/19.tpl new file mode 100644 index 00000000..f9153dae --- /dev/null +++ b/Templates/Notice/19.tpl @@ -0,0 +1,256 @@ +readingNotice['data']); +?> + + + + + + + + + procMtime($message->readingNotice['time']); ?> + + + + + + +
Subject:readingNotice['topic']; ?>
Sent:on at ".$date[1]; ?> hour
+ + + + + + + + + +getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=3;$i<=12;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=13;$i<=22;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} + +echo ""; +?> +
Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=35;$i<=44;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=45;$i<=54;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops?".$dataarray[$i]."
Casualties?".$dataarray[$i]."
+ + + + + + + + + + + + +getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=56;$i<=65;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=66;$i<=75;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops?".$dataarray[$i]."
Casualties?".$dataarray[$i]."
+ + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=77;$i<=86;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=87;$i<=96;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops?".$dataarray[$i]."
Casualties?".$dataarray[$i]."
+ + + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=98;$i<=107;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=108;$i<=117;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops?".$dataarray[$i]."
Casualties?".$dataarray[$i]."
+ + + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=119;$i<=128;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=129;$i<=138;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops?".$dataarray[$i]."
Casualties?".$dataarray[$i]."
+ + +
\ No newline at end of file diff --git a/Templates/Notice/19x.tpl b/Templates/Notice/19x.tpl new file mode 100644 index 00000000..6fe502f6 --- /dev/null +++ b/Templates/Notice/19x.tpl @@ -0,0 +1,259 @@ +getNotice2($_GET['id'], 'topic'); +$time = $database->getNotice2($_GET['id'], 'time'); +$data = $database->getNotice2($_GET['id'], 'data'); +$dataarray = explode(",",$data); +?> + + + + + + + + + procMtime($time); ?> + + + + + + +
Subject:
Sent:on at ".$date[1]; ?> hour
+ + + + + + + + + +getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=3;$i<=12;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=13;$i<=22;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} + +echo ""; +?> +
Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=35;$i<=44;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=45;$i<=54;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops?".$dataarray[$i]."
Casualties?".$dataarray[$i]."
+ + + + + + + + + + + + +getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=56;$i<=65;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=66;$i<=75;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops?".$dataarray[$i]."
Casualties?".$dataarray[$i]."
+ + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=77;$i<=86;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=87;$i<=96;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops?".$dataarray[$i]."
Casualties?".$dataarray[$i]."
+ + + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=98;$i<=107;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=108;$i<=117;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops?".$dataarray[$i]."
Casualties?".$dataarray[$i]."
+ + + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=119;$i<=128;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=129;$i<=138;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops?".$dataarray[$i]."
Casualties?".$dataarray[$i]."
+ + +
\ No newline at end of file diff --git a/Templates/Notice/20.tpl b/Templates/Notice/20.tpl new file mode 100644 index 00000000..fa565f44 --- /dev/null +++ b/Templates/Notice/20.tpl @@ -0,0 +1,283 @@ +readingNotice['data']); +?> + + + + + + + + + procMtime($message->readingNotice['time']); ?> + + + + + + +
Subject:readingNotice['topic']; ?>
Sent:on at ".$date[1]; ?> hour
+ + + + + + + + + +getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=3;$i<=12;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=13;$i<=22;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} + +echo ""; +if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram +?> + + + + + + + + + +
Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
Information + Ram + +
Information + Catapult + +
Information + Chief + +
Information + + +
+ + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=35;$i<=44;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=45;$i<=54;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + + + + + + + + + + + +getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=56;$i<=65;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=66;$i<=75;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=77;$i<=86;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=87;$i<=96;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=98;$i<=107;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=108;$i<=117;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=119;$i<=128;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=129;$i<=138;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + +
\ No newline at end of file diff --git a/Templates/Notice/20x.tpl b/Templates/Notice/20x.tpl new file mode 100644 index 00000000..c2c560e7 --- /dev/null +++ b/Templates/Notice/20x.tpl @@ -0,0 +1,286 @@ +getNotice2($_GET['id'], 'topic'); +$time = $database->getNotice2($_GET['id'], 'time'); +$data = $database->getNotice2($_GET['id'], 'data'); +$dataarray = explode(",",$data); +?> + + + + + + + + + procMtime($time); ?> + + + + + + +
Subject:
Sent:on at ".$date[1]; ?> hour
+ + + + + + + + + +getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=3;$i<=12;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=13;$i<=22;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} + +echo ""; +if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram +?> + + + + + + + + + +
Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
Information + Ram + +
Information + Catapult + +
Information + Chief + +
Information + + +
+ + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=35;$i<=44;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=45;$i<=54;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + + + + + + + + + + + +getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=56;$i<=65;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=66;$i<=75;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=77;$i<=86;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=87;$i<=96;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=98;$i<=107;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=108;$i<=117;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=119;$i<=128;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=129;$i<=138;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + +
\ No newline at end of file diff --git a/Templates/Notice/21.tpl b/Templates/Notice/21.tpl new file mode 100644 index 00000000..fa565f44 --- /dev/null +++ b/Templates/Notice/21.tpl @@ -0,0 +1,283 @@ +readingNotice['data']); +?> + + + + + + + + + procMtime($message->readingNotice['time']); ?> + + + + + + +
Subject:readingNotice['topic']; ?>
Sent:on at ".$date[1]; ?> hour
+ + + + + + + + + +getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=3;$i<=12;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=13;$i<=22;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} + +echo ""; +if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram +?> + + + + + + + + + +
Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
Information + Ram + +
Information + Catapult + +
Information + Chief + +
Information + + +
+ + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=35;$i<=44;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=45;$i<=54;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + + + + + + + + + + + +getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=56;$i<=65;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=66;$i<=75;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=77;$i<=86;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=87;$i<=96;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=98;$i<=107;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=108;$i<=117;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=119;$i<=128;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=129;$i<=138;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + +
\ No newline at end of file diff --git a/Templates/Notice/21x.tpl b/Templates/Notice/21x.tpl new file mode 100644 index 00000000..c2c560e7 --- /dev/null +++ b/Templates/Notice/21x.tpl @@ -0,0 +1,286 @@ +getNotice2($_GET['id'], 'topic'); +$time = $database->getNotice2($_GET['id'], 'time'); +$data = $database->getNotice2($_GET['id'], 'data'); +$dataarray = explode(",",$data); +?> + + + + + + + + + procMtime($time); ?> + + + + + + +
Subject:
Sent:on at ".$date[1]; ?> hour
+ + + + + + + + + +getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=3;$i<=12;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=13;$i<=22;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} + +echo ""; +if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram +?> + + + + + + + + + +
Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
Information + Ram + +
Information + Catapult + +
Information + Chief + +
Information + + +
+ + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=35;$i<=44;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=45;$i<=54;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + + + + + + + + + + + +getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=56;$i<=65;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=66;$i<=75;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=77;$i<=86;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=87;$i<=96;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=98;$i<=107;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=108;$i<=117;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + + + + + + + + + + + + + getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; +} +echo ""; +for($i=119;$i<=128;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +echo ""; +for($i=129;$i<=138;$i++) { + if($dataarray[$i] == 0) { + echo ""; + } + else { + echo ""; + } +} +?> +
Defender + getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
+ + +
\ No newline at end of file diff --git a/Templates/Notice/9.tpl b/Templates/Notice/9.tpl index b61bfc9f..88229cea 100644 --- a/Templates/Notice/9.tpl +++ b/Templates/Notice/9.tpl @@ -1,285 +1,4 @@ readingNotice['data']); -?> - - - - - - - - - procMtime($message->readingNotice['time']); ?> - - - - - - -
Subject:readingNotice['topic']; ?>
Sent:on at ".$date[1]; ?> hour
- - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=3;$i<=12;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=13;$i<=22;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} - -echo ""; -if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram -?> - - - - - - - - - -
Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
Information - Ram - -
Information - Catapult - -
Information - Chief - -
Information - - -
Bounty -
Lumber | Clay | Iron | Crop
carry
-
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=35;$i<=44;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=45;$i<=54;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=56;$i<=65;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=66;$i<=75;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=77;$i<=86;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=87;$i<=96;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=98;$i<=107;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=108;$i<=117;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=119;$i<=128;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=129;$i<=138;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - -
\ No newline at end of file +$archive = $database->getNotice2($_GET['id'], 'archive'); +include("".$archive.".tpl"); +?> \ No newline at end of file diff --git a/Templates/Notice/9x.tpl b/Templates/Notice/9x.tpl index 3f1d5503..97750ece 100644 --- a/Templates/Notice/9x.tpl +++ b/Templates/Notice/9x.tpl @@ -1,288 +1,4 @@ getNotice2($_GET['id'], 'topic'); -$time = $database->getNotice2($_GET['id'], 'time'); -$data = $database->getNotice2($_GET['id'], 'data'); -$dataarray = explode(",",$data); -?> - - - - - - - - - procMtime($time); ?> - - - - - - -
Subject:
Sent:on at ".$date[1]; ?> hour
- - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=3;$i<=12;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=13;$i<=22;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} - -echo ""; -if ($dataarray[139]!='' and $dataarray[140]!=''){ //ram -?> - - - - - - - - - -
Attacker">getUserField($dataarray[0],"username",0); ?> from the village getVillageField($dataarray[1],"name"); ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
Information - Ram - -
Information - Catapult - -
Information - Chief - -
Information - - -
Bounty -
Lumber | Clay | Iron | Crop
carry
-
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=35;$i<=44;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=45;$i<=54;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - -getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=56;$i<=65;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=66;$i<=75;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=77;$i<=86;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=87;$i<=96;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=98;$i<=107;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=108;$i<=117;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - - - - - - - - - - - - - getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" />"; -} -echo ""; -for($i=119;$i<=128;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -echo ""; -for($i=129;$i<=138;$i++) { - if($dataarray[$i] == 0) { - echo ""; - } - else { - echo ""; - } -} -?> -
Defender - getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).' from the village '.stripslashes($dataarray[30]).''; } else { echo"Reinforcement"; } ?>
 
Troops0".$dataarray[$i]."
Casualties0".$dataarray[$i]."
- - -
\ No newline at end of file +$archive = $database->getNotice2($_GET['id'], 'archive'); +include("".$archive."x.tpl"); +?> \ No newline at end of file diff --git a/Templates/Notice/all.tpl b/Templates/Notice/all.tpl index ac3f57c9..09db6472 100644 --- a/Templates/Notice/all.tpl +++ b/Templates/Notice/all.tpl @@ -1,5 +1,5 @@
noticearray[$i-1]['id']."\" /> "; $type = (isset($_GET['t']) && $_GET['t'] == 5)? $message->noticearray[$i-1]['archive'] : $message->noticearray[$i-1]['ntype']; + if($type==15 or $type==16 or $type==17){ + $type = $type-11; echo "\"".$noticeClass[$type]."\""; + }else if($type==18 or $type==19 or $type==20 or $type==21){ + echo "\"".$noticeClass[$type]."\""; + }else{ + echo "\"".$noticeClass[$type]."\""; + } echo "
noticearray[$i-1]['id']."\">".$message->noticearray[$i-1]['topic']." "; if($message->noticearray[$i-1]['viewed'] == 0) { echo "(new)"; diff --git a/berichte.php b/berichte.php index 3587bee3..12d99ed5 100644 --- a/berichte.php +++ b/berichte.php @@ -92,7 +92,7 @@ if($_GET['aid']!=0){ $ally = $database->getNotice2($_GET['id'], 'ally'); if($session->alliance==$ally){ $type = $database->getNotice2($_GET['id'], 'ntype'); - if($type==0 or $type==1 or $type==2 or $type==3 or $type==4 or $type==5 or $type==6 or $type==7 or $type==9){ + if($type!=10 or $type!=11 or $type!=12 or $type!=13 or $type!=14 or $type!=15 or $type!=16 or $type!=17){ include("Templates/Notice/".$type."x.tpl"); } } @@ -108,7 +108,7 @@ if($_GET['aid']!=0){ include("Templates/Notice/".$type.".tpl"); }else if($session->alliance==$ally){ $type = $database->getNotice2($_GET['id'], 'ntype'); - if($type==0 or $type==1 or $type==2 or $type==3 or $type==4 or $type==5 or $type==6 or $type==7 or $type==9){ + if($type!=10 or $type!=11 or $type!=12 or $type!=13 or $type!=14 or $type!=15 or $type!=16 or $type!=17){ include("Templates/Notice/".$type."x.tpl"); } } diff --git a/gpack/travian_default/img/scouts/18.gif b/gpack/travian_default/img/scouts/18.gif new file mode 100644 index 00000000..18817d87 Binary files /dev/null and b/gpack/travian_default/img/scouts/18.gif differ diff --git a/gpack/travian_default/img/scouts/19.gif b/gpack/travian_default/img/scouts/19.gif new file mode 100644 index 00000000..656b9fac Binary files /dev/null and b/gpack/travian_default/img/scouts/19.gif differ diff --git a/gpack/travian_default/img/scouts/20.gif b/gpack/travian_default/img/scouts/20.gif new file mode 100644 index 00000000..573c08b8 Binary files /dev/null and b/gpack/travian_default/img/scouts/20.gif differ diff --git a/gpack/travian_default/img/scouts/21.gif b/gpack/travian_default/img/scouts/21.gif new file mode 100644 index 00000000..227e33eb Binary files /dev/null and b/gpack/travian_default/img/scouts/21.gif differ