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

convert Berserk to SA_Restriction

Browse Source
This commit is contained in:
jendave
2011-08-06 23:51:14 +00:00
parent 74fc268568
commit a273bfe991
2 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/forge/PhaseUtil.java
View File

@@ -454,16 +454,4 @@ public class PhaseUtil {
|| phase.equals(Constant.Phase.Draw) || phase.equals(Constant.Phase.Main1) || phase.equals(Constant.Phase.Draw) || phase.equals(Constant.Phase.Main1)
|| phase.equals(Constant.Phase.Combat_Begin); || phase.equals(Constant.Phase.Combat_Begin);
} }
public static boolean isBeforeCombatDamage() {
String phase = AllZone.Phase.getPhase();
return phase.equals(Constant.Phase.Untap) || phase.equals(Constant.Phase.Upkeep)
|| phase.equals(Constant.Phase.Draw) || phase.equals(Constant.Phase.Main1)
|| phase.equals(Constant.Phase.Combat_Begin)
|| phase.equals(Constant.Phase.Combat_Declare_Attackers)
|| phase.equals(Constant.Phase.Combat_Declare_Attackers_InstantAbility)
|| phase.equals(Constant.Phase.Combat_Declare_Blockers)
|| phase.equals(Constant.Phase.Combat_Declare_Blockers_InstantAbility)
|| phase.equals(Constant.Phase.Combat_FirstStrikeDamage);
}
} }

13
src/forge/card/cardFactory/CardFactory_Instants.java
View File

@@ -1563,8 +1563,9 @@ public class CardFactory_Instants {
//*************** START *********** START ************************** //*************** START *********** START **************************
else if(cardName.equals("Berserk")) { else if(cardName.equals("Berserk")) {
final SpellAbility spell = new Spell(card) { Cost cost = new Cost("G", cardName, false);
private static final long serialVersionUID = -4271469206538681785L; final SpellAbility spell = new Spell(card, cost, new Target(card, "TgtC")) {
private static final long serialVersionUID = 6480841474890362249L;
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
@@ -1597,12 +1598,6 @@ public class CardFactory_Instants {
AllZone.EndOfTurn.addUntil(untilEOT); AllZone.EndOfTurn.addUntil(untilEOT);
} }
}//resolve() }//resolve()
@Override
public boolean canPlay() {
CardList creatures = AllZoneUtil.getCreaturesInPlay();
return PhaseUtil.isBeforeCombatDamage() && creatures.size() > 0;
}
};//SpellAbility };//SpellAbility
// Do not remove SpellAbilities created by AbilityFactory or Keywords. // Do not remove SpellAbilities created by AbilityFactory or Keywords.
@@ -1611,6 +1606,8 @@ public class CardFactory_Instants {
card.setSVar("PlayMain1", "TRUE"); card.setSVar("PlayMain1", "TRUE");
String phase = AllZone.Phase.buildActivateString(Constant.Phase.Upkeep, Constant.Phase.Combat_Declare_Blockers_InstantAbility);
spell.getRestrictions().setActivatePhases(phase);
spell.setBeforePayMana(CardFactoryUtil.input_targetCreature(spell)); spell.setBeforePayMana(CardFactoryUtil.input_targetCreature(spell));
}//*************** END ************ END ************************** }//*************** END ************ END **************************