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

- FRF: Added Channel Harm

Browse Source
This commit is contained in:
swordshine
2015-01-16 07:26:08 +00:00
parent 72a33daf87
commit a27bd64d5d
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-game/src/main/java/forge/game/ability/AbilityUtils.java
View File

@@ -275,14 +275,16 @@ public class AbilityUtils {
String validDefined = defined.substring("Valid ".length()); String validDefined = defined.substring("Valid ".length());
list = CardLists.getValidCards(game.getCardsIn(ZoneType.Battlefield), validDefined.split(","), hostCard.getController(), hostCard); list = CardLists.getValidCards(game.getCardsIn(ZoneType.Battlefield), validDefined.split(","), hostCard.getController(), hostCard);
} }
else if (defined.startsWith("ValidHand ")) {
String validDefined = defined.substring("ValidHand ".length());
list = CardLists.getValidCards(game.getCardsIn(ZoneType.Hand), validDefined.split(","), hostCard.getController(), hostCard);
}
else if (defined.startsWith("ValidAll ")) { else if (defined.startsWith("ValidAll ")) {
String validDefined = defined.substring("ValidAll ".length()); String validDefined = defined.substring("ValidAll ".length());
list = CardLists.getValidCards(game.getCardsInGame(), validDefined.split(","), hostCard.getController(), hostCard); list = CardLists.getValidCards(game.getCardsInGame(), validDefined.split(","), hostCard.getController(), hostCard);
} }
else if (defined.startsWith("Valid")) {
String[] s = defined.split(" ");
String zone = s[0].substring("Valid".length());
String validDefined = s[1];
list = CardLists.getValidCards(game.getCardsIn(ZoneType.smartValueOf(zone)), validDefined.split(","), hostCard.getController(), hostCard);
}
else { else {
return cards; return cards;
} }

8
forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java
View File

@@ -15,6 +15,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import com.google.common.collect.Iterables;
public class DamageDealEffect extends SpellAbilityEffect { public class DamageDealEffect extends SpellAbilityEffect {
/* (non-Javadoc) /* (non-Javadoc)
@@ -74,6 +76,12 @@ public class DamageDealEffect extends SpellAbilityEffect {
final boolean divideOnResolution = sa.hasParam("DividerOnResolution"); final boolean divideOnResolution = sa.hasParam("DividerOnResolution");
List<GameObject> tgts = getTargets(sa); List<GameObject> tgts = getTargets(sa);
if (sa.hasParam("OptionalDecider")) {
Player decider = Iterables.getFirst(AbilityUtils.getDefinedPlayers(sa.getHostCard(), sa.getParam("OptionalDecider"), sa), null);
if (decider != null && !decider.getController().confirmAction(sa, null, "Do you want to deal " + dmg + " damage to " + tgts + " ?")) {
return;
}
}
// Right now for Fireball, maybe later for other stuff // Right now for Fireball, maybe later for other stuff
if (sa.hasParam("DivideEvenly")) { if (sa.hasParam("DivideEvenly")) {

9
forge-gui/res/cardsfolder/p/pyrrhic_revival.txt
View File

@@ -1,12 +1,7 @@
Name:Pyrrhic Revival Name:Pyrrhic Revival
ManaCost:3 WB WB WB ManaCost:3 WB WB WB
Types:Sorcery Types:Sorcery
A:SP$ Effect | Cost$ 3 WB WB WB | Name$ Pyrrhic Revival Effect | ReplacementEffects$ PyrrhicEvent | Triggers$ RemoveEffect | SVars$ PyrrhicAddExtraCounter,PyrrhicMoveToBattlefield,PyrrhicCleanup | References$ PyrrhicAddExtraCounter,PyrrhicMoveToBattlefield,PyrrhicCleanup | ImprintCards$ Self | SubAbility$ DBChangeZoneAll | SpellDescription$ Each player returns each creature card from his or her graveyard to the battlefield with an additional -1/-1 counter on it. A:SP$ ChangeZone | Cost$ 3 WB WB WB | Origin$ Graveyard | Destination$ Battlefield | WithCounters$ M1M1_1 | Defined$ ValidGraveyard Creature | SpellDescription$ Each player returns each creature card from his or her graveyard to the battlefield with an additional -1/-1 counter on it.
SVar:PyrrhicEvent:Event$ Moved | Origin$ Graveyard | Destination$ Battlefield | ValidCard$ Creature | ReplaceWith$ PyrrhicAddExtraCounter | Description$ Each creature enters the battlefield with an additional -1/-1 counters on it. SVar:RemAIDeck:True
SVar:PyrrhicAddExtraCounter:AB$ PutCounter | Cost$ 0 | ETB$ True | Defined$ ReplacedCard | CounterType$ M1M1 | CounterNum$ 1 | SubAbility$ PyrrhicMoveToBattlefield
SVar:PyrrhicMoveToBattlefield:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ ReplacedCard
SVar:RemoveEffect:Mode$ ChangesZone | Origin$ Stack | Destination$ Any | Static$ True | ValidCard$ Card.IsImprinted | Execute$ PyrrhicCleanup
SVar:PyrrhicCleanup:DB$ ChangeZone | Origin$ Command | Destination$ Exile | Defined$ Self
SVar:DBChangeZoneAll:DB$ ChangeZoneAll | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Creature
SVar:Picture:http://www.wizards.com/global/images/magic/general/pyrrhic_revival.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/pyrrhic_revival.jpg
Oracle:Each player returns each creature card from his or her graveyard to the battlefield with an additional -1/-1 counter on it. Oracle:Each player returns each creature card from his or her graveyard to the battlefield with an additional -1/-1 counter on it.