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

Fix package name.

Browse Source 
Also, fix cast triggers not resolving during simulation.
This commit is contained in:
Myrd
2015-01-31 17:30:50 +00:00
parent 3d1f812a26
commit 8dedbf083d
7 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.gitattributes vendored
View File

@@ -147,11 +147,11 @@ forge-ai/src/main/java/forge/ai/ability/UntapAi.java -text
forge-ai/src/main/java/forge/ai/ability/UntapAllAi.java -text forge-ai/src/main/java/forge/ai/ability/UntapAllAi.java -text
forge-ai/src/main/java/forge/ai/ability/VoteAi.java -text forge-ai/src/main/java/forge/ai/ability/VoteAi.java -text
forge-ai/src/main/java/forge/ai/ability/ZoneExchangeAi.java -text forge-ai/src/main/java/forge/ai/ability/ZoneExchangeAi.java -text
forge-ai/src/main/java/simulation/GameCopier.java -text forge-ai/src/main/java/forge/ai/simulation/GameCopier.java -text
forge-ai/src/main/java/simulation/GameSimulator.java -text forge-ai/src/main/java/forge/ai/simulation/GameSimulator.java -text
forge-ai/src/main/java/simulation/GameStateEvaluator.java -text forge-ai/src/main/java/forge/ai/simulation/GameStateEvaluator.java -text
forge-ai/src/main/java/simulation/PossibleTargetSelector.java -text forge-ai/src/main/java/forge/ai/simulation/PossibleTargetSelector.java -text
forge-ai/src/main/java/simulation/SpellAbilityPicker.java -text forge-ai/src/main/java/forge/ai/simulation/SpellAbilityPicker.java -text
forge-core/.classpath -text forge-core/.classpath -text
forge-core/.project -text forge-core/.project -text
forge-core/.settings/org.eclipse.core.resources.prefs -text forge-core/.settings/org.eclipse.core.resources.prefs -text

2
forge-ai/src/main/java/forge/ai/AiController.java
View File

@@ -28,7 +28,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import simulation.SpellAbilityPicker;
import com.esotericsoftware.minlog.Log; import com.esotericsoftware.minlog.Log;
import com.google.common.base.Function; import com.google.common.base.Function;
@@ -36,6 +35,7 @@ import com.google.common.base.Predicate;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import forge.ai.simulation.SpellAbilityPicker;
import forge.card.CardStateName; import forge.card.CardStateName;
import forge.card.CardType; import forge.card.CardType;
import forge.card.MagicColor; import forge.card.MagicColor;

4
forge-ai/src/main/java/simulation/GameCopier.java → forge-ai/src/main/java/forge/ai/simulation/GameCopier.java
View File

@@ -1,4 +1,4 @@
package simulation; package forge.ai.simulation;
import java.util.*; import java.util.*;
import java.util.Map.Entry; import java.util.Map.Entry;
@@ -69,6 +69,8 @@ public class GameCopier {
newGame.getTriggerHandler().clearSuppression(TriggerType.ChangesZone); newGame.getTriggerHandler().clearSuppression(TriggerType.ChangesZone);
newGame.getAction().checkStateEffects(true); //ensure state based effects and triggers are updated newGame.getAction().checkStateEffects(true); //ensure state based effects and triggers are updated
newGame.getTriggerHandler().resetActiveTriggers();
return newGame; return newGame;
} }

6
forge-ai/src/main/java/simulation/GameSimulator.java → forge-ai/src/main/java/forge/ai/simulation/GameSimulator.java
View File

@@ -1,4 +1,4 @@
package simulation; package forge.ai.simulation;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@@ -99,10 +99,8 @@ public class GameSimulator {
if (!c.getOwner().getController().isAI()) { if (!c.getOwner().getController().isAI()) {
continue; continue;
} }
debugPrint(c.getName()+"->");
if (c.getName().equals(origHostCard.getName())) { if (c.getName().equals(origHostCard.getName())) {
for (SpellAbility cSa : c.getSpellAbilities()) { for (SpellAbility cSa : c.getSpellAbilities()) {
debugPrint(" "+cSa);
if (cSa.getDescription().equals(sa.getDescription())) { if (cSa.getDescription().equals(sa.getDescription())) {
return cSa; return cSa;
} }
@@ -159,7 +157,9 @@ public class GameSimulator {
@Override @Override
public void run() { public void run() {
final Set<Card> allAffectedCards = new HashSet<Card>(); final Set<Card> allAffectedCards = new HashSet<Card>();
simGame.getStack().addAllTriggeredAbilitiesToStack();
do { do {
debugPrint("Resolving:" + simGame.getStack().peekAbility());
// Resolve the top effect on the stack. // Resolve the top effect on the stack.
simGame.getStack().resolveStack(); simGame.getStack().resolveStack();
// Evaluate state based effects as a result of resolving stack. // Evaluate state based effects as a result of resolving stack.

2
forge-ai/src/main/java/simulation/GameStateEvaluator.java → forge-ai/src/main/java/forge/ai/simulation/GameStateEvaluator.java
View File

@@ -1,4 +1,4 @@
package simulation; package forge.ai.simulation;
import forge.ai.ComputerUtilCard; import forge.ai.ComputerUtilCard;
import forge.game.Game; import forge.game.Game;

2
forge-ai/src/main/java/simulation/PossibleTargetSelector.java → forge-ai/src/main/java/forge/ai/simulation/PossibleTargetSelector.java
View File

@@ -1,4 +1,4 @@
package simulation; package forge.ai.simulation;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

2
forge-ai/src/main/java/simulation/SpellAbilityPicker.java → forge-ai/src/main/java/forge/ai/simulation/SpellAbilityPicker.java
View File

@@ -1,4 +1,4 @@
package simulation; package forge.ai.simulation;
import java.util.ArrayList; import java.util.ArrayList;