|
|
@ -290,7 +290,9 @@ public class Mine extends AbstractGameObject { |
|
|
|
if (treeRank < 1) |
|
|
|
if (treeRank < 1) |
|
|
|
return false; |
|
|
|
return false; |
|
|
|
|
|
|
|
|
|
|
|
if (guildUnderMineLimit(playerGuild.getNation(), treeRank) == false) { |
|
|
|
// We check the limit against only the player guild right now
|
|
|
|
|
|
|
|
// each guild (even within a nation) is limited by the nation tree
|
|
|
|
|
|
|
|
if (guildUnderMineLimit(playerGuild, treeRank) == false) { |
|
|
|
ErrorPopupMsg.sendErrorMsg(playerCharacter, "Your nation cannot support another mine."); |
|
|
|
ErrorPopupMsg.sendErrorMsg(playerCharacter, "Your nation cannot support another mine."); |
|
|
|
return false; |
|
|
|
return false; |
|
|
|
} |
|
|
|
} |
|
|
@ -304,10 +306,11 @@ public class Mine extends AbstractGameObject { |
|
|
|
|
|
|
|
|
|
|
|
mineCnt += Mine.getMinesForGuild(playerGuild.getObjectUUID()).size(); |
|
|
|
mineCnt += Mine.getMinesForGuild(playerGuild.getObjectUUID()).size(); |
|
|
|
|
|
|
|
|
|
|
|
for (Guild guild : playerGuild.getSubGuildList()) |
|
|
|
// Only count mines for a specific guild
|
|
|
|
mineCnt += Mine.getMinesForGuild(guild.getObjectUUID()).size(); |
|
|
|
//for (Guild guild : playerGuild.getSubGuildList())
|
|
|
|
|
|
|
|
// mineCnt += Mine.getMinesForGuild(guild.getObjectUUID()).size();
|
|
|
|
|
|
|
|
|
|
|
|
return mineCnt <= tolRank; |
|
|
|
return mineCnt <= (tolRank * 2); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public boolean changeProductionType(Resource resource) { |
|
|
|
public boolean changeProductionType(Resource resource) { |
|
|
|