fix: ww can be built to 51 without construction plan in a loop

#337
This commit is contained in:
Martin Ambrus
2017-11-26 14:11:55 +01:00
parent 72599065a9
commit 43b7e6c9b0
3 changed files with 103 additions and 51 deletions
+1 -1
View File
@@ -98,7 +98,7 @@ $greatwarehouse1 = getTypeCount(38);
$greatgranary1 = getTypeCount(39);
$greatworkshop1 = getTypeCount(42);
$residenceOrPalaceInProgress = $building->residenceOfPalaceBuildInProgress($village->wid);
$residenceOrPalaceInProgress = $building->residenceOfPalaceBuildInProgress();
$residenceBuildInProgress = $residenceOrPalaceInProgress['residence'];
$palaceBuildInProgress = $residenceOrPalaceInProgress['palace'];
+1 -25
View File
@@ -8,31 +8,7 @@ if ( $wwlevel >= 50 ) {
$needed_plan = 0;
}
$wwbuildingplan = 0;
$villages = $database->getVillagesID( $session->uid );
foreach ( $villages as $village1 ) {
$plan = count( $database->getOwnArtefactInfoByType2( $village1, 11 ) );
if ( $plan > 0 ) {
$wwbuildingplan = 1;
}
}
if ( $session->alliance != 0 ) {
$alli_users = $database->getUserByAlliance( $session->alliance );
foreach ( $alli_users as $users ) {
$villages = $database->getVillagesID( $users['id'] );
if ( $users['id'] != $session->uid ) {
foreach ( $villages as $village1 ) {
$plan = count( $database->getOwnArtefactInfoByType2( $village1, 11 ) );
if ( $plan > 0 ) {
$wwbuildingplan += 1;
}
}
}
}
}
if ( $wwbuildingplan > $needed_plan ) {
if ( $building->allowWwUpgrade() ) {
if ( $bindicate == 1 ) {
echo "<p><span class=\"none\">" . MAX_LEVEL . "</span></p>";
} else if ( $bindicate == 10 ) {