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

- Replaced some instances of af.getHostCard() with sa.getSourceCard().

Browse Source
This commit is contained in:
Sloth
2012-05-14 11:47:16 +00:00
parent 7e4e0e0cf9
commit 98eb42a382
3 changed files with 29 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/forge/card/abilityfactory/AbilityFactoryAlterLife.java
View File

@@ -212,7 +212,7 @@ public class AbilityFactoryAlterLife {
public static String gainLifeStackDescription(final AbilityFactory af, final SpellAbility sa) {
final HashMap<String, String> params = af.getMapParams();
final StringBuilder sb = new StringBuilder();
final int amount = AbilityFactory.calculateAmount(af.getHostCard(), params.get("LifeAmount"), sa);
final int amount = AbilityFactory.calculateAmount(sa.getSourceCard(), params.get("LifeAmount"), sa);
if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard().getName()).append(" - ");
@@ -278,7 +278,7 @@ public class AbilityFactoryAlterLife {
source.setSVar("PayX", Integer.toString(xPay));
lifeAmount = xPay;
} else {
lifeAmount = AbilityFactory.calculateAmount(af.getHostCard(), amountStr, sa);
lifeAmount = AbilityFactory.calculateAmount(sa.getSourceCard(), amountStr, sa);
}
// don't use it if no life to gain
@@ -427,7 +427,7 @@ public class AbilityFactoryAlterLife {
public static void gainLifeResolve(final AbilityFactory af, final SpellAbility sa) {
final HashMap<String, String> params = af.getMapParams();
final int lifeAmount = AbilityFactory.calculateAmount(af.getHostCard(), params.get("LifeAmount"), sa);
final int lifeAmount = AbilityFactory.calculateAmount(sa.getSourceCard(), params.get("LifeAmount"), sa);
ArrayList<Player> tgtPlayers;
final Target tgt = sa.getTarget();
@@ -607,7 +607,7 @@ public class AbilityFactoryAlterLife {
static String loseLifeStackDescription(final AbilityFactory af, final SpellAbility sa) {
final HashMap<String, String> params = af.getMapParams();
final StringBuilder sb = new StringBuilder();
final int amount = AbilityFactory.calculateAmount(af.getHostCard(), params.get("LifeAmount"), sa);
final int amount = AbilityFactory.calculateAmount(sa.getSourceCard(), params.get("LifeAmount"), sa);
if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard().getName()).append(" - ");
@@ -664,7 +664,7 @@ public class AbilityFactoryAlterLife {
// TODO handle proper calculation of X values based on Cost and what
// would be paid
int amount = AbilityFactory.calculateAmount(af.getHostCard(), amountStr, sa);
int amount = AbilityFactory.calculateAmount(sa.getSourceCard(), amountStr, sa);
if (amountStr.equals("X") && source.getSVar(amountStr).equals("Count$xPaid")) {
// Set PayX here to maximum value.
@@ -831,7 +831,7 @@ public class AbilityFactoryAlterLife {
public static void loseLifeResolve(final AbilityFactory af, final SpellAbility sa) {
final HashMap<String, String> params = af.getMapParams();
final int lifeAmount = AbilityFactory.calculateAmount(af.getHostCard(), params.get("LifeAmount"), sa);
final int lifeAmount = AbilityFactory.calculateAmount(sa.getSourceCard(), params.get("LifeAmount"), sa);
ArrayList<Player> tgtPlayers;
@@ -1036,7 +1036,7 @@ public class AbilityFactoryAlterLife {
*/
private static void poisonResolve(final AbilityFactory af, final SpellAbility sa) {
final HashMap<String, String> params = af.getMapParams();
final int amount = AbilityFactory.calculateAmount(af.getHostCard(), params.get("Num"), sa);
final int amount = AbilityFactory.calculateAmount(sa.getSourceCard(), params.get("Num"), sa);
ArrayList<Player> tgtPlayers;
@@ -1068,7 +1068,7 @@ public class AbilityFactoryAlterLife {
private static String poisonStackDescription(final AbilityFactory af, final SpellAbility sa) {
final HashMap<String, String> params = af.getMapParams();
final StringBuilder sb = new StringBuilder();
final int amount = AbilityFactory.calculateAmount(af.getHostCard(), params.get("Num"), sa);
final int amount = AbilityFactory.calculateAmount(sa.getSourceCard(), params.get("Num"), sa);
if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard()).append(" - ");
@@ -1135,7 +1135,7 @@ public class AbilityFactoryAlterLife {
*/
private static boolean poisonCanPlayAI(final AbilityFactory af, final SpellAbility sa) {
final Cost abCost = sa.getPayCosts();
final Card source = af.getHostCard();
final Card source = sa.getSourceCard();
final HashMap<String, String> params = af.getMapParams();
// int humanPoison = AllZone.getHumanPlayer().getPoisonCounters();
// int humanLife = AllZone.getHumanPlayer().getLife();
@@ -1316,7 +1316,7 @@ public class AbilityFactoryAlterLife {
private static String setLifeStackDescription(final AbilityFactory af, final SpellAbility sa) {
final HashMap<String, String> params = af.getMapParams();
final StringBuilder sb = new StringBuilder();
final int amount = AbilityFactory.calculateAmount(af.getHostCard(), params.get("LifeAmount"), sa);
final int amount = AbilityFactory.calculateAmount(sa.getSourceCard(), params.get("LifeAmount"), sa);
if (!(sa instanceof AbilitySub)) {
sb.append(sa.getSourceCard()).append(" -");
@@ -1391,7 +1391,7 @@ public class AbilityFactoryAlterLife {
source.setSVar("PayX", Integer.toString(xPay));
amount = xPay;
} else {
amount = AbilityFactory.calculateAmount(af.getHostCard(), amountStr, sa);
amount = AbilityFactory.calculateAmount(sa.getSourceCard(), amountStr, sa);
}
// prevent run-away activations - first time will always return true
@@ -1475,7 +1475,7 @@ public class AbilityFactoryAlterLife {
source.setSVar("PayX", Integer.toString(xPay));
amount = xPay;
} else {
amount = AbilityFactory.calculateAmount(af.getHostCard(), amountStr, sa);
amount = AbilityFactory.calculateAmount(sa.getSourceCard(), amountStr, sa);
}
if (source.getName().equals("Eternity Vessel")
@@ -1527,7 +1527,7 @@ public class AbilityFactoryAlterLife {
private static void setLifeResolve(final AbilityFactory af, final SpellAbility sa) {
final HashMap<String, String> params = af.getMapParams();
final int lifeAmount = AbilityFactory.calculateAmount(af.getHostCard(), params.get("LifeAmount"), sa);
final int lifeAmount = AbilityFactory.calculateAmount(sa.getSourceCard(), params.get("LifeAmount"), sa);
ArrayList<Player> tgtPlayers;
final Target tgt = sa.getTarget();

6
src/main/java/forge/card/abilityfactory/AbilityFactoryAnimate.java
View File

@@ -178,7 +178,7 @@ public final class AbilityFactoryAnimate {
*/
private static String animateStackDescription(final AbilityFactory af, final SpellAbility sa) {
final HashMap<String, String> params = af.getMapParams();
final Card host = af.getHostCard();
final Card host = sa.getSourceCard();
final Map<String, String> svars = host.getSVars();
int power = -1;
@@ -481,7 +481,7 @@ public final class AbilityFactoryAnimate {
private static void animateResolve(final AbilityFactory af, final SpellAbility sa) {
final HashMap<String, String> params = af.getMapParams();
final Card source = sa.getSourceCard();
final Card host = af.getHostCard();
final Card host = sa.getSourceCard();
final Map<String, String> svars = host.getSVars();
long timest = -1;
String animateRemembered = null;
@@ -1113,7 +1113,7 @@ public final class AbilityFactoryAnimate {
*/
private static void animateAllResolve(final AbilityFactory af, final SpellAbility sa) {
final HashMap<String, String> params = af.getMapParams();
final Card host = af.getHostCard();
final Card host = sa.getSourceCard();
final Map<String, String> svars = host.getSVars();
long timest = -1;

32
src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
View File

@@ -237,12 +237,6 @@ public final class AbilityFactoryChangeZone {
if ((tgt != null) && !tgt.canTgtPlayer()) {
sa.getTarget().setZone(origin);
}
if (!(sa instanceof AbilitySub)) {
if (origin.contains(ZoneType.Battlefield) || params.get("Destination").equals("Battlefield")) {
af.getHostCard().setSVar("PlayMain1", "TRUE");
}
}
}
/**
@@ -427,7 +421,7 @@ public final class AbilityFactoryChangeZone {
// Fetching should occur fairly often as it helps cast more spells, and
// have access to more mana
final Cost abCost = af.getAbCost();
final Card source = af.getHostCard();
final Card source = sa.getSourceCard();
final HashMap<String, String> params = af.getMapParams();
ZoneType origin = null;
if (params.containsKey("Origin")) {
@@ -645,7 +639,7 @@ public final class AbilityFactoryChangeZone {
final HashMap<String, String> params = af.getMapParams();
final StringBuilder sb = new StringBuilder();
final Card host = af.getHostCard();
final Card host = sa.getSourceCard();
if (!(sa instanceof AbilitySub)) {
sb.append(host.getName()).append(" -");
@@ -872,13 +866,13 @@ public final class AbilityFactoryChangeZone {
// moving onto
// choosing
// a card{
GuiUtils.chooseOneOrNone(af.getHostCard().getName() + " - Looking at Library",
GuiUtils.chooseOneOrNone(sa.getSourceCard().getName() + " - Looking at Library",
player.getCardsIn(ZoneType.Library).toArray());
}
// Look at opponents hand before moving onto choosing a card
if (origin.contains(ZoneType.Hand) && player.isComputer()) {
GuiUtils.chooseOneOrNone(af.getHostCard().getName() + " - Looking at Opponent's Hand", player
GuiUtils.chooseOneOrNone(sa.getSourceCard().getName() + " - Looking at Opponent's Hand", player
.getCardsIn(ZoneType.Hand).toArray());
}
fetchList = AbilityFactory.filterListByType(fetchList, params.get("ChangeType"), sa);
@@ -927,7 +921,7 @@ public final class AbilityFactoryChangeZone {
c.setTapped(true);
}
if (params.containsKey("GainControl")) {
c.addController(af.getHostCard());
c.addController(sa.getSourceCard());
}
if (params.containsKey("AttachedTo")) {
@@ -1113,7 +1107,7 @@ public final class AbilityFactoryChangeZone {
c.tap();
}
if (params.containsKey("GainControl")) {
c.addController(af.getHostCard());
c.addController(sa.getSourceCard());
}
if (params.containsKey("AttachedTo")) {
@@ -1164,7 +1158,7 @@ public final class AbilityFactoryChangeZone {
}
if (!ZoneType.Battlefield.equals(destination) && !"Card".equals(type) && !defined) {
final String picked = af.getHostCard().getName() + " - Computer picked:";
final String picked = sa.getSourceCard().getName() + " - Computer picked:";
if (fetched.size() > 0) {
GuiUtils.chooseOne(picked, fetched.toArray());
} else {
@@ -1288,7 +1282,7 @@ public final class AbilityFactoryChangeZone {
private static boolean changeKnownOriginCanPlayAI(final AbilityFactory af, final SpellAbility sa) {
// Retrieve either this card, or target Cards in Graveyard
final Cost abCost = af.getAbCost();
final Card source = af.getHostCard();
final Card source = sa.getSourceCard();
final HashMap<String, String> params = af.getMapParams();
final ZoneType origin = ZoneType.smartValueOf(params.get("Origin"));
@@ -1761,7 +1755,7 @@ public final class AbilityFactoryChangeZone {
final HashMap<String, String> params = af.getMapParams();
final StringBuilder sb = new StringBuilder();
final Card host = af.getHostCard();
final Card host = sa.getSourceCard();
if (!(sa instanceof AbilitySub)) {
sb.append(host.getName()).append(" -");
@@ -1978,7 +1972,7 @@ public final class AbilityFactoryChangeZone {
tgtC.setTapped(true);
}
if (params.containsKey("GainControl")) {
tgtC.addController(af.getHostCard());
tgtC.addController(sa.getSourceCard());
}
if (params.containsKey("AttachedTo")) {
final ArrayList<Card> list = AbilityFactory.getDefinedCards(sa.getSourceCard(),
@@ -2548,7 +2542,7 @@ public final class AbilityFactoryChangeZone {
// TODO build Stack Description will need expansion as more cards are
// added
final StringBuilder sb = new StringBuilder();
final Card host = af.getHostCard();
final Card host = sa.getSourceCard();
if (!(sa instanceof AbilitySub)) {
sb.append(host.getName()).append(" -");
@@ -2632,7 +2626,7 @@ public final class AbilityFactoryChangeZone {
}
if (params.containsKey("GainControl")) {
c.addController(af.getHostCard());
c.addController(sa.getSourceCard());
Singletons.getModel().getGameAction().moveToPlay(c, sa.getActivatingPlayer());
} else {
final Card movedCard = Singletons.getModel().getGameAction().moveTo(destination, c, libraryPos);
@@ -2642,7 +2636,7 @@ public final class AbilityFactoryChangeZone {
}
if (remember != null) {
AllZoneUtil.getCardState(af.getHostCard()).addRemembered(c);
AllZoneUtil.getCardState(sa.getSourceCard()).addRemembered(c);
}
}