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

- Merge latest trunk to SplitCards

Browse Source
This commit is contained in:
swordshine
2013-03-05 04:46:24 +00:00
parent d1a3a929b6 7c1fb7966c
commit f7122d31c3
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/cardsfolder/m/mirrorweave.txt
View File

@@ -4,6 +4,7 @@ Types:Instant
A:SP$ Pump | Cost$ 2 WU WU | ValidTgts$ Creature.nonLegendary | TgtPrompt$ Choose target nonlegendary creature | AILogic$ Pump | RememberObjects$ Targeted | SubAbility$ MirrorweaveClone | StackDescription$ None | SpellDescription$ Each other creature becomes a copy of target nonlegendary creature until end of turn. A:SP$ Pump | Cost$ 2 WU WU | ValidTgts$ Creature.nonLegendary | TgtPrompt$ Choose target nonlegendary creature | AILogic$ Pump | RememberObjects$ Targeted | SubAbility$ MirrorweaveClone | StackDescription$ None | SpellDescription$ Each other creature becomes a copy of target nonlegendary creature until end of turn.
SVar:MirrorweaveClone:DB$ RepeatEach | UseImprinted$ True | RepeatCards$ Creature.IsNotRemembered | RepeatSubAbility$ DBCopy | SubAbility$ DBCleanup SVar:MirrorweaveClone:DB$ RepeatEach | UseImprinted$ True | RepeatCards$ Creature.IsNotRemembered | RepeatSubAbility$ DBCopy | SubAbility$ DBCleanup
SVar:DBCopy:DB$ Clone | Defined$ Remembered | CloneTarget$ Imprinted | Duration$ UntilEndOfTurn SVar:DBCopy:DB$ Clone | Defined$ Remembered | CloneTarget$ Imprinted | Duration$ UntilEndOfTurn
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
SVar:Picture:http://www.wizards.com/global/images/magic/general/mirrorweave.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/mirrorweave.jpg
Oracle:Each other creature becomes a copy of target nonlegendary creature until end of turn. Oracle:Each other creature becomes a copy of target nonlegendary creature until end of turn.
SetInfo:SHM Rare SetInfo:SHM Rare

10
src/main/java/forge/Card.java
View File

@@ -6891,6 +6891,13 @@ public class Card extends GameEntity implements Comparable<Card> {
else if (list.get(1) != this) { else if (list.get(1) != this) {
return false; return false;
} }
} else if (property.equals("ThisTurnCast")) {
for (final Card card : CardUtil.getThisTurnCast("Card", source)) {
if (this.equals(card)) {
return true;
}
}
return false;
} else if (property.startsWith("sharesTypeWith")) { } else if (property.startsWith("sharesTypeWith")) {
if (!this.sharesTypeWith(source)) { if (!this.sharesTypeWith(source)) {
return false; return false;
@@ -7523,7 +7530,8 @@ public class Card extends GameEntity implements Comparable<Card> {
} }
for (final String type : this.getType()) { for (final String type : this.getType()) {
if (type.equals("AllCreatureTypes") && c1.hasACreatureType()) { if (type.equals("AllCreatureTypes")
&& (c1.hasACreatureType() || c1.typeContains("AllCreatureTypes"))) {
return true; return true;
} }
if (forge.card.CardType.isACreatureType(type) && c1.isType(type)) { if (forge.card.CardType.isACreatureType(type) && c1.isType(type)) {

2
src/main/java/forge/game/ai/ComputerUtilMana.java
View File

@@ -156,7 +156,7 @@ public class ComputerUtilMana {
break; break;
} }
} }
} else if (costParts[nPart].contains("/")) { } else if (costParts[nPart].contains("2/")) {
colorChoice = costParts[nPart].replace("2/", ""); colorChoice = costParts[nPart].replace("2/", "");
} else if (costParts[nPart].length() > 1) { } else if (costParts[nPart].length() > 1) {
colorChoice = costParts[nPart].substring(0, 1); colorChoice = costParts[nPart].substring(0, 1);