external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch 'temp_dev6' into 'master'"

Browse Source 
This reverts merge request !499
This commit is contained in:
Sol
2018-05-01 01:11:29 +00:00
parent 64e8dd35c2
commit 1a3308017a
19 changed files with 22 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-ai/src/main/java/forge/ai/ComputerUtil.java
View File

@@ -2216,9 +2216,7 @@ public class ComputerUtil {
}
return ComputerUtilCard.getBestAI(list);
} else {
// TODO: This is just picking randomly amongst already picked things. It should probably pick the worst instead.
List<Object> a = Arrays.asList(votes.keySet().toArray());
return a.get(MyRandom.getRandom().nextInt(a.size()));
return Iterables.getFirst(votes.keySet(), null);
}
case "Protection":
if (votes.isEmpty()) {

12
forge-ai/src/main/java/forge/ai/ComputerUtilMana.java
View File

@@ -134,11 +134,7 @@ public class ComputerUtilMana {
Collections.sort(orderedCards, new Comparator<Card>() {
@Override
public int compare(final Card card1, final Card card2) {
int result = Integer.compare(manaCardMap.get(card1), manaCardMap.get(card2));
if(result == 0) {
result = Float.compare(card1.getTimestamp(), card2.getTimestamp());
}
return result;
return Integer.compare(manaCardMap.get(card1), manaCardMap.get(card2));
}
});
@@ -312,7 +308,7 @@ public class ComputerUtilMana {
}
// select which abilities may be used for each shard
ListMultimap<ManaCostShard, SpellAbility> sourcesForShards = ComputerUtilMana.groupAndOrderToPayShards(ai, manaAbilityMap, cost);
Multimap<ManaCostShard, SpellAbility> sourcesForShards = ComputerUtilMana.groupAndOrderToPayShards(ai, manaAbilityMap, cost);
sortManaAbilities(sourcesForShards);
@@ -862,6 +858,7 @@ public class ComputerUtilMana {
}
AiController aic = ((PlayerControllerAi)ai.getController()).getAi();
int chanceToReserve = aic.getIntProperty(AiProps.RESERVE_MANA_FOR_MAIN2_CHANCE);
PhaseType curPhase = ai.getGame().getPhaseHandler().getPhase();
@@ -880,8 +877,7 @@ public class ComputerUtilMana {
// obey mana reservations for Main 2; otherwise, obey mana reservations depending on the "chance to reserve"
// AI profile variable.
if (sa.getSVar("LowPriorityAI").equals("")) {
float chanceToReserve = aic.getFloatProperty(AiProps.RESERVE_MANA_FOR_MAIN2_CHANCE);
if (MyRandom.getRandom().nextDouble() >= chanceToReserve) {
if (chanceToReserve == 0 || MyRandom.getRandom().nextInt(100) >= chanceToReserve) {
return false;
}
}

1
forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java
View File

@@ -5,7 +5,6 @@ import java.util.List;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import forge.ai.ComputerUtilAbility;
import forge.ai.ComputerUtilCard;

1
forge-ai/src/main/java/forge/ai/ability/ChoosePlayerAi.java
View File

@@ -2,7 +2,6 @@ package forge.ai.ability;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import forge.ai.ComputerUtil;
import forge.ai.SpellAbilityAi;
import forge.game.player.Player;

1
forge-ai/src/main/java/forge/ai/ability/CountersMoveAi.java
View File

@@ -2,7 +2,6 @@ package forge.ai.ability;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import forge.ai.ComputerUtil;
import forge.ai.ComputerUtilCard;
import forge.ai.SpellAbilityAi;

1
forge-ai/src/main/java/forge/ai/ability/CountersPutAllAi.java
View File

@@ -2,7 +2,6 @@ package forge.ai.ability;
import com.google.common.base.Predicate;
import com.google.common.collect.Lists;
import forge.ai.ComputerUtil;
import forge.ai.ComputerUtilCost;
import forge.ai.ComputerUtilMana;

1
forge-ai/src/main/java/forge/ai/ability/CountersRemoveAi.java
View File

@@ -1,7 +1,6 @@
package forge.ai.ability;
import com.google.common.base.Predicates;
import forge.ai.ComputerUtil;
import forge.ai.ComputerUtilCard;
import forge.ai.ComputerUtilMana;

1
forge-ai/src/main/java/forge/ai/ability/LegendaryRuleAi.java
View File

@@ -1,7 +1,6 @@
package forge.ai.ability;
import com.google.common.collect.Iterables;
import forge.ai.SpellAbilityAi;
import forge.game.card.Card;
import forge.game.card.CounterType;

1
forge-ai/src/main/java/forge/ai/ability/ManifestAi.java
View File

@@ -1,7 +1,6 @@
package forge.ai.ability;
import com.google.common.collect.Maps;
import forge.ai.ComputerUtil;
import forge.ai.ComputerUtilMana;
import forge.ai.SpellAbilityAi;

1
forge-ai/src/main/java/forge/ai/ability/PhasesAi.java
View File

@@ -1,7 +1,6 @@
package forge.ai.ability;
import com.google.common.base.Predicates;
import forge.ai.ComputerUtil;
import forge.ai.ComputerUtilCard;
import forge.ai.SpellAbilityAi;

1
forge-ai/src/main/java/forge/ai/ability/RepeatEachAi.java
View File

@@ -1,7 +1,6 @@
package forge.ai.ability;
import com.google.common.base.Predicate;
import forge.ai.ComputerUtilCard;
import forge.ai.SpecialCardAi;
import forge.ai.SpellAbilityAi;

1
forge-ai/src/main/java/forge/ai/ability/ScryAi.java
View File

@@ -1,7 +1,6 @@
package forge.ai.ability;
import com.google.common.base.Predicates;
import forge.ai.ComputerUtilMana;
import forge.ai.SpellAbilityAi;
import forge.game.ability.ApiType;

1
forge-ai/src/main/java/forge/ai/ability/SetStateAi.java
View File

@@ -1,7 +1,6 @@
package forge.ai.ability;
import com.google.common.base.Predicate;
import forge.ai.ComputerUtilCard;
import forge.ai.SpellAbilityAi;
import forge.card.CardSplitType;