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 Prossh, Skyraider of Kher

Browse Source
This commit is contained in:
swordshine
2014-05-28 14:03:13 +00:00
parent 30e67c4556
commit f08f4fec26
5 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -951,7 +951,7 @@ public class CardFactoryUtil {
if (sq[0].equals("YouDrewThisTurn")) return doXMath(c.getController().getNumDrawnThisTurn(), m, c);
if (sq[0].equals("OppDrewThisTurn")) return doXMath(c.getController().getOpponent().getNumDrawnThisTurn(), m, c);
if (sq[0].equals("FirstSpellTotalManaSpent")) return doXMath(c.getFirstSpellAbility().getTotalManaSpent(), m, c);
if (sq[0].equals("StormCount")) return doXMath(game.getStack().getCardsCastThisTurn().size() - 1, m, c);
if (sq[0].equals("DamageDoneThisTurn")) return doXMath(c.getDamageDoneThisTurn(), m, c);
if (sq[0].equals("BloodthirstAmount")) return doXMath(c.getController().getBloodthirstAmount(), m, c);

9
forge-game/src/main/java/forge/game/spellability/SpellAbility.java
View File

@@ -90,6 +90,7 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
private boolean delve = false;
private boolean offering = false;
private boolean morphup = false;
private int totalManaSpent = 0;
/** The pay costs. */
private Cost payCosts = null;
@@ -1757,4 +1758,12 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
}
}
public void setTotalManaSpent(int totManaSpent) {
this.totalManaSpent = totManaSpent;
}
public int getTotalManaSpent() {
return this.totalManaSpent;
}
}

17
forge-game/src/main/java/forge/game/zone/MagicStack.java
View File

@@ -288,9 +288,11 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
this.frozenStack.push(si);
return;
}
int totManaSpent = sp.getPayingMana().size();
if ((sp instanceof AbilityTriggered) || (sp instanceof AbilityStatic)) {
// TODO: make working triggered ability
sp.setTotalManaSpent(totManaSpent);
AbilityUtils.resolve(sp);
} else {
for (OptionalCost s : sp.getOptionalCosts()) {
@@ -301,14 +303,16 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
} else {
if (sp.isMultiKicker()) {
final Cost costMultikicker = new Cost(sp.getMultiKickerManaCost(), false);
boolean hasPaid = false;
do {
int mkMagnitude = source.getKickerMagnitude();
String prompt = String.format("Multikicker for %s\r\nTimes Kicked: %d\r\n", source, mkMagnitude );
hasPaid = activator.getController().payManaOptional(source, costMultikicker, sp, prompt, ManaPaymentPurpose.Multikicker);
if( hasPaid )
if (hasPaid) {
source.addMultiKickerMagnitude(1);
totManaSpent += sp.getPayingMana().size();
// TODO: paying mana is replaced by multikicker cost, this should be fixed in the future
}
} while( hasPaid );
}
if (sp.isSpell() && source.isCreature() && Iterables.any(activator.getCardsIn(ZoneType.Battlefield),
@@ -323,6 +327,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
hasPaid = activator.getController().payManaOptional(source, costPseudoKicker, sp, prompt, ManaPaymentPurpose.Multikicker);
if (hasPaid) {
source.addPseudoMultiKickerMagnitude(1);
totManaSpent += 1;
}
} while (hasPaid);
if (source.getPseudoKickerMagnitude() > 0) {
@@ -357,12 +362,14 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
final Cost costReplicate = new Cost(source.getManaCost(), false);
boolean hasPaid = false;
int replicateCMC = source.getManaCost().getCMC();
do {
String prompt = String.format("Replicate for %s\r\nTimes Replicated: %d\r\n", source, magnitude);
hasPaid = activator.getController().payManaOptional(source, costReplicate, sp, prompt, ManaPaymentPurpose.Replicate);
if( hasPaid )
if (hasPaid) {
magnitude++;
totManaSpent += replicateCMC;
}
} while( hasPaid );
// Replicate Trigger
String effect = String.format("AB$ CopySpellAbility | Cost$ 0 | Defined$ SourceFirstSpell | Amount$ %d", magnitude);
@@ -375,6 +382,8 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
}
}
sp.setTotalManaSpent(totManaSpent);
// Copied spells aren't cast per se so triggers shouldn't run for them.
HashMap<String, Object> runParams = new HashMap<String, Object>();
if (!(sp instanceof AbilityStatic) && !sp.isCopied()) {