From 00360e55d2ad5660e37e86d331f9c6c3f40a796c Mon Sep 17 00:00:00 2001 From: swordshine Date: Sat, 26 May 2018 13:02:23 +0800 Subject: [PATCH] - Added some cards --- .../src/main/java/forge/game/CardTraitBase.java | 6 +++++- .../src/main/java/forge/game/card/CardProperty.java | 4 ++++ forge-gui/res/cardsfolder/upcoming/arena_rector.txt | 11 +++++++++++ .../res/cardsfolder/upcoming/aurora_champion.txt | 7 +++++++ forge-gui/res/cardsfolder/upcoming/brightling.txt | 12 ++++++++++++ 5 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 forge-gui/res/cardsfolder/upcoming/arena_rector.txt create mode 100644 forge-gui/res/cardsfolder/upcoming/aurora_champion.txt create mode 100644 forge-gui/res/cardsfolder/upcoming/brightling.txt diff --git a/forge-game/src/main/java/forge/game/CardTraitBase.java b/forge-game/src/main/java/forge/game/CardTraitBase.java index d3ff7689545..b59c994a80c 100644 --- a/forge-game/src/main/java/forge/game/CardTraitBase.java +++ b/forge-game/src/main/java/forge/game/CardTraitBase.java @@ -314,7 +314,11 @@ public abstract class CardTraitBase extends GameObject implements IHasCardView { list.addAll(p.getCardsIn(presentZone)); } } - + if (presentPlayer.equals("Any")) { + for (final Player p : this.getHostCard().getController().getAllies()) { + list.addAll(p.getCardsIn(presentZone)); + } + } list = CardLists.getValidCards(list, sIsPresent.split(","), this.getHostCard().getController(), this.getHostCard(), null); int right = 1; diff --git a/forge-game/src/main/java/forge/game/card/CardProperty.java b/forge-game/src/main/java/forge/game/card/CardProperty.java index d1d83fe6c1a..682825fe282 100644 --- a/forge-game/src/main/java/forge/game/card/CardProperty.java +++ b/forge-game/src/main/java/forge/game/card/CardProperty.java @@ -132,6 +132,10 @@ public class CardProperty { if (!controller.equals(sourceController)) { return false; } + } else if (property.startsWith("YourTeamCtrl")) { + if (controller.getTeam() != sourceController.getTeam()) { + return false; + } } else if (property.startsWith("YouDontCtrl")) { if (controller.equals(sourceController)) { return false; diff --git a/forge-gui/res/cardsfolder/upcoming/arena_rector.txt b/forge-gui/res/cardsfolder/upcoming/arena_rector.txt new file mode 100644 index 00000000000..7033368ff34 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/arena_rector.txt @@ -0,0 +1,11 @@ +Name:Arena Rector +ManaCost:3 W +Types:Creature Human Cleric +PT:1/2 +T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigExile | OptionalDecider$ TriggeredCardController | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you may exile it. If you do, search your library for a planeswalker card, put that card onto the battlefield, then shuffle your library. +SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | Defined$ TriggeredCard | SubAbility$ DBReturn +SVar:DBReturn:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Planeswalker.YouOwn | ChangeNum$ 1 +SVar:SacMe:4 +SVar:RemRandomDeck:True +DeckNeeds:Type$Planeswalker +Oracle:When Arena Rector dies, you may exile it. If you do, search your library for a planeswalker card, put that card onto the battlefield, then shuffle your library. diff --git a/forge-gui/res/cardsfolder/upcoming/aurora_champion.txt b/forge-gui/res/cardsfolder/upcoming/aurora_champion.txt new file mode 100644 index 00000000000..dd922ad75df --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/aurora_champion.txt @@ -0,0 +1,7 @@ +Name:Aurora Champion +ManaCost:2 W +Types:Creature Elf Warrior +PT:3/2 +T:Mode$ Attacks | ValidCard$ Card.Self | IsPresent$ Warrior.Other+YourTeamCtrl | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME attacks, if your team controls another Warrior, tap target creature. +SVar:TrigTap:DB$ Tap | ValidTgts$ Creature | TgtPrompt$ Select target creature +Oracle:Whenever Aurora Champion attacks, if your team controls another Warrior, tap target creature. diff --git a/forge-gui/res/cardsfolder/upcoming/brightling.txt b/forge-gui/res/cardsfolder/upcoming/brightling.txt new file mode 100644 index 00000000000..e38fef20862 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/brightling.txt @@ -0,0 +1,12 @@ +Name:Brightling +ManaCost:1 W W +Types:Creature Shapeshifter +PT:3/3 +A:AB$ Pump | Cost$ W | KW$ Vigilance | Defined$ Self | SpellDescription$ CARDNAME gains vigilance until end of turn. +A:AB$ Pump | Cost$ W | KW$ Lifelink | Defined$ Self | SpellDescription$ CARDNAME gains lifelink until end of turn. +A:AB$ ChangeZone | Cost$ W | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand. +A:AB$ Pump | Cost$ 1 | Subability$ ABChoice | SpellDescription$ CARDNAME gets +1/-1 or -1/+1 until end of turn. +SVar:ABChoice:DB$ GenericChoice | Defined$ You | Choices$ ABPump1,ABPump2 +SVar:ABPump1:DB$ Pump | Defined$ Self | NumAtt$ +1 | NumDef$ -1 | SpellDescription$ +1/-1 +SVar:ABPump2:DB$ Pump | Defined$ Self | NumAtt$ -1 | NumDef$ +1 | SpellDescription$ -1/+1 +Oracle:{W|: Brightling gains vigilance until end of turn.\n{W}: Brightling gains lifelink until end of turn.\n{W}: Return Brightling to its owner's hand.\n{1}: Brightling gets +1/-1 or -1/+1 until end of turn