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

- Added Condition to AF ChangeZone.

Browse Source 
- Converted Gift of Estates.
This commit is contained in:
jendave
2011-08-07 00:59:41 +00:00
parent 6c45c0c19f
commit b5864606a9
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/cardsfolder/gift_of_estates.txt
View File

@@ -2,7 +2,7 @@ Name:Gift of Estates
ManaCost:1 W ManaCost:1 W
Types:Sorcery Types:Sorcery
Text:no text Text:no text
A:SP$ ChangeZone | Cost$ 1 W | IsPresent$ Land.YouCtrl | PresentCompare$ LTX | Origin$ Library | Destination$ Hand | ChangeType$ Plains | ChangeNum$ 3 | SpellDescription$ If an opponent controls more lands than you, search your library for up to three Plains cards and put them into your hand. A:SP$ ChangeZone | Cost$ 1 W | ConditionPresent$ Land.YouCtrl | ConditionCompare$ LTX | Origin$ Library | Destination$ Hand | ChangeType$ Plains | ChangeNum$ 3 | SpellDescription$ If an opponent controls more lands than you, search your library for up to three Plains cards and put them into your hand.
SVar:X:Count$Valid Land.YouDontCtrl SVar:X:Count$Valid Land.YouDontCtrl
SVar:Rarity:Uncommon SVar:Rarity:Uncommon
SVar:Picture:http://resources.wizards.com/magic/cards/9ed/en-us/card84504.jpg SVar:Picture:http://resources.wizards.com/magic/cards/9ed/en-us/card84504.jpg

27
src/forge/card/abilityFactory/AbilityFactory_ChangeZone.java
View File

@@ -186,11 +186,23 @@ public class AbilityFactory_ChangeZone {
HashMap<String,String> params = af.getMapParams(); HashMap<String,String> params = af.getMapParams();
String origin = params.get("Origin"); String origin = params.get("Origin");
if (!AbilityFactory.checkConditional(params, sa)){
AbilityFactory.resolveSubAbility(sa);
return;
}
if (isHidden(origin, params.containsKey("Hidden")) && !params.containsKey("Ninjutsu")) if (isHidden(origin, params.containsKey("Hidden")) && !params.containsKey("Ninjutsu"))
changeHiddenOriginResolve(af, sa); changeHiddenOriginResolve(af, sa);
else if (isKnown(origin) || params.containsKey("Ninjutsu")) else if (isKnown(origin) || params.containsKey("Ninjutsu"))
changeKnownOriginResolve(af, sa); changeKnownOriginResolve(af, sa);
if (af.hasSubAbility()){
Ability_Sub abSub = sa.getSubAbility();
if (abSub != null)
abSub.resolve();
}
} }
// ************************************************************************************* // *************************************************************************************
@@ -555,12 +567,6 @@ public class AbilityFactory_ChangeZone {
if ((origin.contains("Library") && !destination.equals("Library")) || params.containsKey("Shuffle")) if ((origin.contains("Library") && !destination.equals("Library")) || params.containsKey("Shuffle"))
player.shuffle(); player.shuffle();
if (af.hasSubAbility()){
Ability_Sub abSub = sa.getSubAbility();
if (abSub != null)
abSub.resolve();
}
} }
private static void changeHiddenOriginResolveAI(AbilityFactory af, SpellAbility sa, Player player){ private static void changeHiddenOriginResolveAI(AbilityFactory af, SpellAbility sa, Player player){
@@ -658,13 +664,6 @@ public class AbilityFactory_ChangeZone {
else else
GuiUtils.getChoice(picked, new String[]{ "<Nothing>" } ); GuiUtils.getChoice(picked, new String[]{ "<Nothing>" } );
} }
if (af.hasSubAbility()){
Ability_Sub abSub = sa.getSubAbility();
if (abSub != null){
abSub.resolve();
}
}
} }
// *********** Utility functions for Hidden ******************** // *********** Utility functions for Hidden ********************
@@ -1198,7 +1197,7 @@ public class AbilityFactory_ChangeZone {
if (af.hasSubAbility()){ if (af.hasSubAbility()){
Ability_Sub abSub = sa.getSubAbility(); Ability_Sub abSub = sa.getSubAbility();
if (abSub != null){ if (abSub != null){
abSub.resolve(); //moved to general resolve
} }
else{ else{
String DrawBack = af.getMapParams().get("SubAbility"); String DrawBack = af.getMapParams().get("SubAbility");