FP culture spotting fix.

This commit is contained in:
marcins78
2013-03-01 16:52:17 +00:00
parent 45ee70d043
commit 79e93a3d91

View File

@@ -985,10 +985,10 @@ public class ModifiersLogic implements ModifiersEnvironment, ModifiersQuerying {
}
int result = 0;
for (Culture spottableCulturesBasedOnCardsOnCard : spottableCulturesBasedOnCards)
for (Modifier modifier : getModifiers(gameState, ModifierEffect.SPOT_MODIFIER))
if (modifier.canSpotCulture(gameState, this, spottableCulturesBasedOnCardsOnCard, playerId))
result++;
for (Culture spottableCulturesBasedOnCardsOnCard : spottableCulturesBasedOnCards) {
if (canSpotCulture(gameState, playerId, spottableCulturesBasedOnCardsOnCard))
result++;
}
for (Modifier modifier : getModifiers(gameState, ModifierEffect.SPOT_MODIFIER))
result += modifier.getFPCulturesSpotCountModifier(gameState, this, playerId);
@@ -996,6 +996,13 @@ public class ModifiersLogic implements ModifiersEnvironment, ModifiersQuerying {
return result;
}
private boolean canSpotCulture(GameState gameState, String playerId, Culture culture) {
for (Modifier modifier : getModifiers(gameState, ModifierEffect.SPOT_MODIFIER))
if (!modifier.canSpotCulture(gameState, this, culture, playerId))
return false;
return true;
}
@Override
public int getNumberOfSpottableShadowCultures(GameState gameState, String playerId) {
Set<Culture> spottableCulturesBasedOnCards = new HashSet<Culture>();