diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php
index acb4685e..b879f380 100644
--- a/GameEngine/Automation.php
+++ b/GameEngine/Automation.php
@@ -2649,7 +2649,7 @@ $crannyimg = "
setMovementProc($data['moveid']);
- if($chiefing_village != 1 && $village_destroyed != 1){
+ if($chiefing_village != 1){
$database->addMovement(4,$to['wref'],$from['wref'],$data['ref'],$AttackArrivalTime,$endtime);
// send the bounty on type 6.
if($type !== 1)
@@ -2663,7 +2663,7 @@ $crannyimg = "
modifyPointsAlly($targetally,'RR',$totalstolentaken );
$database->modifyPointsAlly($ownally,'RR',$totalstolengain);
}
- }else if($chiefing_village == 1){
+ }else{
$database->addEnforce2($data,$owntribe,$troopsdead1,$troopsdead2,$troopsdead3,$troopsdead4,$troopsdead5,$troopsdead6,$troopsdead7,$troopsdead8,$troopsdead9,$troopsdead10,$troopsdead11);
}
}
diff --git a/Templates/Build/avaliable.tpl b/Templates/Build/avaliable.tpl
index 3d7ff282..63996f70 100644
--- a/Templates/Build/avaliable.tpl
+++ b/Templates/Build/avaliable.tpl
@@ -256,7 +256,7 @@ if($id != 39 && $id != 40) {
tribe == 3 && $trapper == 0 ) {
-//include("soon/trapper.tpl");
+ include("soon/trapper.tpl");
}
if($mainbuilding < 10 && $warehouse < 10 && $village->capital == 0 && $largeA['owner'] == $session->uid || $normalA['vref'] == $village->wid ) {
include("soon/greatwarehouse.tpl");
@@ -286,7 +286,27 @@ if($academy == 0 && ($mainbuilding <= 2 || $barrack <= 2)) {
include("soon/academy.tpl");
}
if($embassy == 0 || $mainbuilding >= 2 && $mainbuilding <= 4) {
- include("soon/palace.tpl");
+//loop search village user
+$query = mysql_query("SELECT * FROM ".TB_PREFIX."vdata WHERE owner = ".$user."");
+while($villaggi_array = mysql_fetch_array($query)){
+
+ //loop structure village
+ $query1 = mysql_query("SELECT * FROM ".TB_PREFIX."fdata WHERE vref = ".$villaggi_array['wref']."");
+ $strutture= mysql_fetch_array($query1);
+
+//search Castle in array structure village
+$test = in_array(26,$strutture);
+if ($test){
+ break;
+ }
+
+}
+
+
+//if Castle no ready include palace.tpl
+if (!$test){
+ include("soon/palace.tpl");
+}
}
if($blacksmith == 0 && ($academy <= 2 || $mainbuilding <= 2)) {
include("soon/blacksmith.tpl");
diff --git a/anmelden.php b/anmelden.php
index e61ba47e..3f0a8215 100644
--- a/anmelden.php
+++ b/anmelden.php
@@ -69,8 +69,8 @@ if(REG_OPEN == true){ ?>
|
-
-
+
+ Warning: password with & can cause problems!
getError('pw'); ?>
|
@@ -78,62 +78,28 @@ if(REG_OPEN == true){ ?>
+
+
+  |
+  |
+
+
+ |
+ |
+ |
+
+
+ |
+ |
+ |
+
+
+ |
+ |
+ |
+
+
+