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

- Added Scrounge.

Browse Source
This commit is contained in:
Sloth
2012-12-06 14:47:57 +00:00
parent 978323745f
commit fd78277f93
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@@ -8572,6 +8572,7 @@ res/cardsfolder/s/scroll_of_griselbrand.txt -text
res/cardsfolder/s/scroll_of_origins.txt -text res/cardsfolder/s/scroll_of_origins.txt -text
res/cardsfolder/s/scroll_rack.txt svneol=native#text/plain res/cardsfolder/s/scroll_rack.txt svneol=native#text/plain
res/cardsfolder/s/scroll_thief.txt svneol=native#text/plain res/cardsfolder/s/scroll_thief.txt svneol=native#text/plain
res/cardsfolder/s/scrounge.txt -text
res/cardsfolder/s/scrubland.txt svneol=native#text/plain res/cardsfolder/s/scrubland.txt svneol=native#text/plain
res/cardsfolder/s/scryb_ranger.txt svneol=native#text/plain res/cardsfolder/s/scryb_ranger.txt svneol=native#text/plain
res/cardsfolder/s/scryb_sprites.txt svneol=native#text/plain res/cardsfolder/s/scryb_sprites.txt svneol=native#text/plain

10
res/cardsfolder/s/scrounge.txt Normal file
View File

@@ -0,0 +1,10 @@
Name:Scrounge
ManaCost:2 B
Types:Sorcery
Text:no text
A:SP$ ChangeZone | Cost$ 2 B | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Opponent | Hidden$ True | ChangeType$ Artifact.TargetedPlayerCtrl | ChangeNum$ 1 | GainControl$ True | IsCurse$ True | Chooser$ Targeted | IsCurse$ True | SpellDescription$ Target opponent chooses an artifact card in his or her graveyard. Put that card onto the battlefield under your control.
SVar:Rarity:Uncommon
SVar:Picture:http://www.wizards.com/global/images/magic/general/scrounge.jpg
SetInfo:DST|Uncommon|http://magiccards.info/scans/en/ds/53.jpg
Oracle:Target opponent chooses an artifact card in his or her graveyard. Put that card onto the battlefield under your control.
End

9
src/main/java/forge/card/abilityfactory/ai/ChangeZoneAi.java
View File

@@ -1066,6 +1066,7 @@ public class ChangeZoneAi extends SpellAiLogic {
final Target tgt = sa.getTarget(); final Target tgt = sa.getTarget();
final Card card = sa.getSourceCard(); final Card card = sa.getSourceCard();
final boolean defined = sa.hasParam("Defined"); final boolean defined = sa.hasParam("Defined");
final Player activator = sa.getActivatingPlayer();
if (tgt != null) { if (tgt != null) {
if (!tgt.getTargetPlayers().isEmpty()) { if (!tgt.getTargetPlayers().isEmpty()) {
@@ -1146,7 +1147,7 @@ public class ChangeZoneAi extends SpellAiLogic {
return true; return true;
} }
}); });
if (player.isHuman() && sa.hasParam("GainControl")) { if (player.isHuman() && sa.hasParam("GainControl") && activator.equals(ai)) {
fetchList = CardLists.filter(fetchList, new Predicate<Card>() { fetchList = CardLists.filter(fetchList, new Predicate<Card>() {
@Override @Override
public boolean apply(final Card c) { public boolean apply(final Card c) {
@@ -1171,7 +1172,11 @@ public class ChangeZoneAi extends SpellAiLogic {
} else if (ZoneType.Hand.equals(destination) && CardLists.getNotType(fetchList, "Creature").size() == 0) { } else if (ZoneType.Hand.equals(destination) && CardLists.getNotType(fetchList, "Creature").size() == 0) {
c = chooseCreature(ai, fetchList); c = chooseCreature(ai, fetchList);
} else if (ZoneType.Battlefield.equals(destination) || ZoneType.Graveyard.equals(destination)) { } else if (ZoneType.Battlefield.equals(destination) || ZoneType.Graveyard.equals(destination)) {
c = CardFactoryUtil.getBestAI(fetchList); if (!activator.equals(ai) && sa.hasParam("GainControl")) {
c = CardFactoryUtil.getWorstAI(fetchList);
} else {
c = CardFactoryUtil.getBestAI(fetchList);
}
} else { } else {
// Don't fetch another tutor with the same name // Don't fetch another tutor with the same name
List<Card> sameNamed = CardLists.filter(fetchList, Predicates.not(CardPredicates.nameEquals(card.getName()))); List<Card> sameNamed = CardLists.filter(fetchList, Predicates.not(CardPredicates.nameEquals(card.getName())));