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

Bug fix for an infinite loop with some cases of the WheneverKeyword. Added Admonition Angel and Midsummer Revel

Browse Source
This commit is contained in:
jendave
2011-08-06 05:21:13 +00:00
parent 282dc51d0a
commit 16346f685d
5 changed files with 129 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/card-pictures.txt
View File

@@ -38,6 +38,8 @@ snow_covered_mountain.jpg http://www.wizards.com/global/images/magic/gene
snow_covered_mountain1.jpg http://www.wizards.com/global/images/magic/general/snow_covered_mountain.jpg snow_covered_mountain1.jpg http://www.wizards.com/global/images/magic/general/snow_covered_mountain.jpg
snow_covered_mountain2.jpg http://www.magickartenmarkt.de/img/cards/Ice_Age/snow_covered_mountain.jpg snow_covered_mountain2.jpg http://www.magickartenmarkt.de/img/cards/Ice_Age/snow_covered_mountain.jpg
snow_covered_mountain3.jpg http://www.magickartenmarkt.de/img/cards/Ice_Age/snow_covered_mountain.jpg snow_covered_mountain3.jpg http://www.magickartenmarkt.de/img/cards/Ice_Age/snow_covered_mountain.jpg
admonition_angel.jpg http://www.wizards.com/global/images/magic/general/admonition_angel.jpg
midsummer_revel.jpg http://www.wizards.com/global/images/magic/general/midsummer_revel.jpg
abyssal_horror.jpg http://www.wizards.com/global/images/magic/general/abyssal_horror.jpg abyssal_horror.jpg http://www.wizards.com/global/images/magic/general/abyssal_horror.jpg
deathgreeter.jpg http://www.wizards.com/global/images/magic/general/deathgreeter.jpg deathgreeter.jpg http://www.wizards.com/global/images/magic/general/deathgreeter.jpg
disciple_of_the_vault.jpg http://www.wizards.com/global/images/magic/general/disciple_of_the_vault.jpg disciple_of_the_vault.jpg http://www.wizards.com/global/images/magic/general/disciple_of_the_vault.jpg

15
res/cards.txt
View File

@@ -1,3 +1,18 @@
Admonition Angel
3 W W W
Creature Angel
no text
6/6
Flying
WheneverKeyword:EntersBattleField:Type/Land:Play:MoveFrom-Play-Exiled:NormalInput/Specific/NotSelf:ASAP:No_Condition:Initiator - OwnedByController!AttachTarget:Landfall <20> Whenever a land enters the battlefield under your control, you may exile target nonland permanent other than Admonition Angel.
WheneverKeyword:LeavesBattleField:Self:Any:MoveFrom-Exiled-Play:All/AttachedCards:ASAP:No_Condition:No Special Condition:When Admonition Angel leaves the battlefield, return all cards exiled with it to the battlefield under their owners' control.
Midsummer Revel
3 G G
Enchantment
no text
WheneverKeyword:BeginningOfUpkeep:No_Initiator:Play:CustomCounter.VERSE/1:Self:ASAP:Yes_No:ControllerUpkeep:At the beginning of your upkeep, you may put a verse counter on Midsummer Revel.
Ifh-Biff Efreet Ifh-Biff Efreet
2 G G 2 G G
Creature Efreet Creature Efreet

25
src/forge/CardFactory.java
View File

@@ -9710,6 +9710,31 @@ public class CardFactory implements NewConstants {
spell.setBeforePayMana(new Input_PayManaCost(spell)); spell.setBeforePayMana(new Input_PayManaCost(spell));
}//*************** END ************ END ************************** }//*************** END ************ END **************************
//*************** START *********** START **************************
if(cardName.equals("Midsummer Revel")) {
final SpellAbility ability = new Ability(card, "G") {
@Override
public boolean canPlayAI() {
if(card.getCounters(Counters.VERSE) > 0) return true;
return false;
}
@Override
public void resolve() {
for(int i = 0; i < card.getCounters(Counters.VERSE); i++) {
CardFactoryUtil.makeToken("Beast", "G 3 3 Beast", card, "G", new String[] {
"Creature", "Beast"}, 3, 3, new String[] {""});
}
AllZone.GameAction.sacrifice(card);
}
};
card.addSpellAbility(ability);
ability.setStackDescription(cardName
+ " puts X 3/3 green Beast creature tokens onto the battlefield");
ability.setDescription("G, Sacrifice Midsummer Revel: Put X 3/3 green Beast creature tokens onto the battlefield, where X is the number of verse counters on Midsummer Revel.");
}//*************** END ************ END **************************
//*************** START *********** START ************************** //*************** START *********** START **************************
else if(cardName.equals("Thoughtseize") || cardName.equals("Distress")) { else if(cardName.equals("Thoughtseize") || cardName.equals("Distress")) {

3
src/forge/Counters.java
View File

@@ -35,7 +35,8 @@ public enum Counters {
QUEST(), QUEST(),
SPORE(), SPORE(),
TIME(), TIME(),
TOWER("tower"); TOWER("tower"),
VERSE();
private String name; private String name;

98
src/forge/GameAction.java
View File

@@ -1079,6 +1079,14 @@ public class GameAction {
}); });
} }
if(Specific[i+2].equals("NotSelf")) {
Cards_inPlay = Cards_inPlay.filter(new CardListFilter() {
public boolean addCard(Card c) {
if(!c.equals(F_card)) return true;
return false;
}
});
}
Restriction_Count[0]++; Restriction_Count[0]++;
} }
if(F_card.getController().equals(Constant.Player.Human)) if(F_card.getController().equals(Constant.Player.Human))
@@ -1122,6 +1130,7 @@ public class GameAction {
public void execute() { public void execute() {
Targets_Multi[index[0]] = ability.getTargetPlayer(); Targets_Multi[index[0]] = ability.getTargetPlayer();
if(Targets_Multi[index[0]] == null) Targets_Multi[index[0]] = ability.getTargetCard(); if(Targets_Multi[index[0]] == null) Targets_Multi[index[0]] = ability.getTargetCard();
if(F_k[8].contains("AttachTarget")) F_card.attachCard((Card) Targets_Multi[index[0]]);
index[0]++; index[0]++;
if(F_Multiple_Targets == 1) AllZone.Stack.updateObservers(); if(F_Multiple_Targets == 1) AllZone.Stack.updateObservers();
} }
@@ -1168,6 +1177,39 @@ public class GameAction {
if(Check_if_All_Targets(F_card, F_k).size() > 0) StackDescription = StackDescription + "all specified permanents get" + F_Amount[0] + " +1/+1 counters"; if(Check_if_All_Targets(F_card, F_k).size() > 0) StackDescription = StackDescription + "all specified permanents get" + F_Amount[0] + " +1/+1 counters";
else StackDescription = StackDescription + F_TargetCard[y] + " gets " + F_Amount[0] + " +1/+1 counters"; else StackDescription = StackDescription + F_TargetCard[y] + " gets " + F_Amount[0] + " +1/+1 counters";
} }
// CustomCounters.(What Counter)/Amount
if(Effect[y].contains("CustomCounter")) {
Command Proper_resolve = new Command() {
private static final long serialVersionUID = 151367344511590317L;
public void execute() {
if(Whenever_Go(F_card,F_k) == true) {
String PossibleCounter = (F_k[4].split("/")[0]).replaceFirst("CustomCounter.", "");
Counters Counter = null;
for(int i = 0; i < Counters.values().length ; i++) {
if(Counters.values()[i].toString().equals(PossibleCounter))
Counter = Counters.values()[i];
}
CardList All = Check_if_All_Targets(F_card, F_k);
if(All.size() > 0) {
for(int i = 0; i < All.size(); i++) {
if(AllZone.GameAction.isCardInZone(All.get(i),Required_Zone) || F_Zones.equals("Any"))
All.get(i).addCounter(Counter, F_Amount[0]);
}
}
if(AllZone.GameAction.isCardInZone(F_TargetCard[F_Target],Required_Zone) || F_Zones.equals("Any"))
F_TargetCard[F_Target].addCounter(Counter, F_Amount[0]);
}
};
};
Command_Effects[F_Target] = Proper_resolve;
if(Check_if_All_Targets(F_card, F_k).size() > 0) StackDescription = StackDescription + "all specified permanents get" + F_Amount[0] + " +1/+1 counters";
else StackDescription = StackDescription + F_TargetCard[y] + " gets " + F_Amount[0] +
" " + (F_k[4].split("/")[0]).replaceFirst("CustomCounter.", "") + " counters";
}
// StatsPumpEOT/Power/Toughness // StatsPumpEOT/Power/Toughness
if(Effect[y].contains("StatsPumpEOT")) { if(Effect[y].contains("StatsPumpEOT")) {
@@ -1474,8 +1516,6 @@ public class GameAction {
if(ZoneConditions[z].contains("Exiled")) PZones[z] = AllZone.getZone(Constant.Zone.Removed_From_Play, card.getController()); if(ZoneConditions[z].contains("Exiled")) PZones[z] = AllZone.getZone(Constant.Zone.Removed_From_Play, card.getController());
// if(ZoneConditions[z].contains("Sideboard")) PZones[z] = AllZone.getZone(Constant.Zone.Sideboard, card.getController()); // if(ZoneConditions[z].contains("Sideboard")) PZones[z] = AllZone.getZone(Constant.Zone.Sideboard, card.getController());
} }
final String[] F_ZoneConditions = ZoneConditions;
final PlayerZone[] F_PZones = PZones;
Command Proper_resolve = new Command() { Command Proper_resolve = new Command() {
private static final long serialVersionUID = 151367344511590317L; private static final long serialVersionUID = 151367344511590317L;
@@ -1484,7 +1524,7 @@ public class GameAction {
CardList All = Check_if_All_Targets(F_card, F_k); CardList All = Check_if_All_Targets(F_card, F_k);
if(All.size() > 0) { if(All.size() > 0) {
for(int i = 0; i < All.size(); i++) { for(int i = 0; i < All.size(); i++) {
AllZone.GameAction.moveTo(F_PZones[2], All.get(i)); AllZone.GameAction.moveTo(Whenever_GetMoveToZone(All.get(i), F_k)[1], All.get(i));
checkStateEffects(); // For Legendaries checkStateEffects(); // For Legendaries
} }
} }
@@ -1492,26 +1532,29 @@ public class GameAction {
Card NewSearch[] = Search(F_card,F_TriggeringCard, F_k,Custom_Strings); Card NewSearch[] = Search(F_card,F_TriggeringCard, F_k,Custom_Strings);
if(NewSearch[0] != null) { if(NewSearch[0] != null) {
for(int i = 0; i < NewSearch.length; i++) { for(int i = 0; i < NewSearch.length; i++) {
AllZone.GameAction.moveTo(F_PZones[2], NewSearch[i]); AllZone.GameAction.moveTo(Whenever_GetMoveToZone(NewSearch[i], F_k)[1], NewSearch[i]);
checkStateEffects(); // For Legendaries checkStateEffects(); // For Legendaries
} }
} else { } else {
if(!F_ZoneConditions[1].equals("Any")) { if(F_TargetCard[F_Target] == null) {
if(AllZone.GameAction.isCardInZone(F_TargetCard[F_Target],F_PZones[1])) { for(int z = 0; z < Targets_Multi.length; z++) {
AllZone.GameAction.moveTo(F_PZones[2], F_TargetCard[F_Target]); F_TargetCard[F_Target] = (Card) Targets_Multi[z];
checkStateEffects(); // For Legendaries if(AllZone.GameAction.isCardInZone(F_TargetCard[F_Target],Whenever_GetMoveToZone(F_TargetCard[F_Target], F_k)[0])) {
} AllZone.GameAction.moveTo(Whenever_GetMoveToZone(F_TargetCard[F_Target], F_k)[1], F_TargetCard[F_Target]);
} else if(F_TargetCard[F_Target] != null) { checkStateEffects(); // For Legendaries
AllZone.GameAction.moveTo(F_PZones[2], F_TargetCard[F_Target]); }
checkStateEffects(); // For Legendaries }
} else if(AllZone.GameAction.isCardInZone(F_TargetCard[F_Target],Whenever_GetMoveToZone(F_TargetCard[F_Target], F_k)[0])) {
AllZone.GameAction.moveTo(Whenever_GetMoveToZone(F_TargetCard[F_Target], F_k)[1], F_TargetCard[F_Target]);
checkStateEffects(); // For Legendaries
}
} }
}
} }
} }
} }
}; };
Command_Effects[F_Target] = Proper_resolve; Command_Effects[F_Target] = Proper_resolve;
if(Check_if_All_Targets(F_card, F_k).size() > 0) StackDescription = StackDescription + " moves to all specified permanents from " + ZoneConditions[1] + " to " + ZoneConditions[2] + " zone"; if(Check_if_All_Targets(F_card, F_k).size() > 0) StackDescription = StackDescription + " moves to all specified permanents from " + ZoneConditions[1] + " to " + ZoneConditions[2] + " zone";
else if(F_TargetCard[y] != null) StackDescription = StackDescription + F_TargetCard[y] + " moves from " + ZoneConditions[1] + " to " + ZoneConditions[2] + " zone"; else if(F_TargetCard[y] != null) StackDescription = StackDescription + F_TargetCard[y] + " moves from " + ZoneConditions[1] + " to " + ZoneConditions[2] + " zone";
else { else {
String[] SD = Search_Description(F_TriggeringCard ,k, Custom_Strings); String[] SD = Search_Description(F_TriggeringCard ,k, Custom_Strings);
@@ -1577,6 +1620,27 @@ public class GameAction {
} }
} }
PlayerZone[] Whenever_GetMoveToZone (Card Target, String[] Keyword_Details) {
String Zones = Keyword_Details[4];
String[] Zone = Zones.split("-");
PlayerZone[] Required_Zone = new PlayerZone[2];
if(Zone[1].contains("Hand")) Required_Zone[0] = AllZone.getZone(Constant.Zone.Hand, Target.getController());
if(Zone[1].contains("Graveyard")) Required_Zone[0] = AllZone.getZone(Constant.Zone.Graveyard, Target.getController());
if(Zone[1].contains("Play") || Zones.equals("Any")) Required_Zone[0] = AllZone.getZone(Constant.Zone.Play, Target.getController());
if(Zone[1].contains("Library")) Required_Zone[0] = AllZone.getZone(Constant.Zone.Library, Target.getController());
if(Zone[1].contains("Exiled")) Required_Zone[0] = AllZone.getZone(Constant.Zone.Removed_From_Play, Target.getController());
// if(Zone[1].contains("Sideboard")) Required_Zone[0] = AllZone.getZone(Constant.Zone.Sideboard, Target.getController());
if(Zone[2].contains("Hand")) Required_Zone[1] = AllZone.getZone(Constant.Zone.Hand, Target.getController());
if(Zone[2].contains("Graveyard")) Required_Zone[1] = AllZone.getZone(Constant.Zone.Graveyard, Target.getController());
if(Zone[2].contains("Play") || Zones.equals("Any")) Required_Zone[1] = AllZone.getZone(Constant.Zone.Play, Target.getController());
if(Zone[2].contains("Library")) Required_Zone[1] = AllZone.getZone(Constant.Zone.Library, Target.getController());
if(Zone[2].contains("Exiled")) Required_Zone[1] = AllZone.getZone(Constant.Zone.Removed_From_Play, Target.getController());
// if(Zone[2].contains("Sideboard")) Required_Zone[1] = AllZone.getZone(Constant.Zone.Sideboard, Target.getController());
return Required_Zone;
}
CardList Check_if_All_Targets (final Card Triggering_Card, String[] Keyword_Details) { CardList Check_if_All_Targets (final Card Triggering_Card, String[] Keyword_Details) {
CardList Cards_inPlay = new CardList(); CardList Cards_inPlay = new CardList();
if(Keyword_Details[5].contains("All") && Keyword_Details[4] != "Null") { if(Keyword_Details[5].contains("All") && Keyword_Details[4] != "Null") {
@@ -1601,6 +1665,11 @@ public class GameAction {
return false; return false;
} }
}); });
}
if(AllTargets[i2+1].contains("AttachedCards")) {
Cards_inPlay.clear();
Cards_inPlay.addAll(Triggering_Card.getAttachedCards());
} }
Restriction_Count[0]++; Restriction_Count[0]++;
} }
@@ -1857,7 +1926,6 @@ public class GameAction {
else AllZone.Stack.add(ability); else AllZone.Stack.add(ability);
} }
} }
AllZone.Stack.updateObservers();
} }
} }
// Whenever Keyword // Whenever Keyword