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

make TokenDoubler use new Replacement Effect

Browse Source
This commit is contained in:
Hanmac
2016-12-26 16:57:28 +00:00
parent d3723daa6d
commit e2eb916d72
6 changed files with 89 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-ai/src/main/java/forge/ai/GameState.java
View File

@@ -51,6 +51,7 @@ public abstract class GameState {
public abstract IPaperCard getPaperCard(String cardName);
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(String.format("humanlife=%d\n", humanLife));
@@ -269,9 +270,7 @@ public abstract class GameState {
Card c;
if (cardinfo[0].startsWith("t:")) {
String tokenStr = cardinfo[0].substring(2);
// TODO: Use a version of the API that doesn't return a list (i.e. these shouldn't be affected
// by doubling season, etc).
c = CardFactory.makeToken(CardFactory.TokenInfo.fromString(tokenStr), player).get(0);
c = CardFactory.makeOneToken(CardFactory.TokenInfo.fromString(tokenStr), player);
} else {
c = Card.fromPaperCard(getPaperCard(cardinfo[0]), player);
}

30
forge-ai/src/main/java/forge/ai/ability/TokenAi.java
View File

@@ -438,16 +438,16 @@ public class TokenAi extends SpellAbilityAi {
final String imageName = imageNames.get(MyRandom.getRandom().nextInt(imageNames.size()));
final CardFactory.TokenInfo tokenInfo = new CardFactory.TokenInfo(substitutedName, imageName,
cost, substitutedTypes, tokenKeywords, finalPower, finalToughness);
List<Card> tokens = CardFactory.makeToken(tokenInfo, ai);
if (tokens.isEmpty()) {
Card token = CardFactory.makeOneToken(tokenInfo, ai);
if (token == null) {
return null;
}
final Card c = tokens.get(0);
// Grant rule changes
if (tokenHiddenKeywords != null) {
for (final String s : tokenHiddenKeywords) {
c.addHiddenExtrinsicKeyword(s);
token.addHiddenExtrinsicKeyword(s);
}
}
@@ -455,8 +455,8 @@ public class TokenAi extends SpellAbilityAi {
if (tokenAbilities != null) {
for (final String s : tokenAbilities) {
final String actualAbility = host.getSVar(s);
final SpellAbility grantedAbility = AbilityFactory.getAbility(actualAbility, c);
c.addSpellAbility(grantedAbility);
final SpellAbility grantedAbility = AbilityFactory.getAbility(actualAbility, token);
token.addSpellAbility(grantedAbility);
}
}
@@ -464,10 +464,10 @@ public class TokenAi extends SpellAbilityAi {
if (tokenTriggers != null) {
for (final String s : tokenTriggers) {
final String actualTrigger = host.getSVar(s);
final Trigger parsedTrigger = TriggerHandler.parseTrigger(actualTrigger, c, true);
final Trigger parsedTrigger = TriggerHandler.parseTrigger(actualTrigger, token, true);
final String ability = host.getSVar(parsedTrigger.getMapParams().get("Execute"));
parsedTrigger.setOverridingAbility(AbilityFactory.getAbility(ability, c));
c.addTrigger(parsedTrigger);
parsedTrigger.setOverridingAbility(AbilityFactory.getAbility(ability, token));
token.addTrigger(parsedTrigger);
}
}
@@ -481,7 +481,7 @@ public class TokenAi extends SpellAbilityAi {
name = actualSVar.split(":")[0];
actualSVar = actualSVar.split(":")[1];
}
c.setSVar(name, actualSVar);
token.setSVar(name, actualSVar);
}
}
@@ -489,18 +489,18 @@ public class TokenAi extends SpellAbilityAi {
if (tokenStaticAbilities != null) {
for (final String s : tokenStaticAbilities) {
final String actualAbility = host.getSVar(s);
c.addStaticAbilityString(actualAbility);
c.addStaticAbility(actualAbility);
token.addStaticAbilityString(actualAbility);
token.addStaticAbility(actualAbility);
}
}
// Apply static abilities and prune dead tokens
final Game game = ai.getGame();
ComputerUtilCard.applyStaticContPT(game, c, null);
if (!notNull && c.getNetToughness() < 1) {
ComputerUtilCard.applyStaticContPT(game, token, null);
if (!notNull && token.getNetToughness() < 1) {
return null;
} else {
return c;
return token;
}
}
}

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

@@ -191,9 +191,7 @@ public class GameCopier {
private Card createCardCopy(Game newGame, Player newOwner, Card c) {
if (c.isToken() && !c.isEmblem()) {
String tokenStr = new CardFactory.TokenInfo(c).toString();
// TODO: Use a version of the API that doesn't return a list (i.e. these shouldn't be affected
// by doubling season, etc).
return CardFactory.makeToken(CardFactory.TokenInfo.fromString(tokenStr), newOwner).get(0);
return CardFactory.makeOneToken(CardFactory.TokenInfo.fromString(tokenStr), newOwner);
}
if (USE_FROM_PAPER_CARD && !c.isEmblem()) {
return Card.fromPaperCard(c.getPaperCard(), newOwner);