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

CardFactoryUtil & PhaseHandler: moved Bushido into Trigger

Browse Source
This commit is contained in:
Hanmac
2016-07-21 16:02:29 +00:00
parent 4710684a2e
commit 4abfb4fe8b
3 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-game/src/main/java/forge/game/ability/effects/BecomesBlockedEffect.java
View File

@@ -44,11 +44,6 @@ public class BecomesBlockedEffect extends SpellAbilityEffect {
runParams.put("Blockers", new ArrayList<Card>());
runParams.put("NumBlockers", 0);
game.getTriggerHandler().runTrigger(TriggerType.AttackerBlocked, runParams, false);
// Bushido
for (final SpellAbility ab : CardFactoryUtil.getBushidoEffects(c)) {
game.getStack().add(ab);
}
}
}
}

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

@@ -2071,26 +2071,6 @@ public class CardFactoryUtil {
return types.size();
}
public static List<SpellAbility> getBushidoEffects(final Card c) {
final List<SpellAbility> list = new ArrayList<SpellAbility>();
for (final String kw : c.getKeywords()) {
if (kw.contains("Bushido")) {
final String[] parse = kw.split(" ");
final String s = parse[1];
final int magnitude = Integer.parseInt(s);
String description = String.format("Bushido %d (When this blocks or becomes blocked, it gets +%d/+%d until end of turn).", magnitude, magnitude, magnitude);
String regularPart = String.format("AB$ Pump | Cost$ 0 | Defined$ CardUID_%d | NumAtt$ +%d | NumDef$ +%d | StackDescription$ %s", c.getId(), magnitude, magnitude, description);
SpellAbility ability = AbilityFactory.getAbility(regularPart, c);
ability.setDescription(ability.getStackDescription());
ability.setTrigger(true); // can be copied by Strionic Resonator
list.add(ability);
}
}
return list;
}
/**
* <p>
* getNeededXDamage.
@@ -2535,6 +2515,9 @@ public class CardFactoryUtil {
else if (keyword.startsWith("Rampage")) {
addTriggerAbility(keyword, card, null);
}
else if (keyword.startsWith("Bushido")) {
addTriggerAbility(keyword, card, null);
}
else if (keyword.equals("Evolve")) {
final String evolveTrigger = "Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | "
+ " ValidCard$ Creature.YouCtrl+Other | EvolveCondition$ True | "
@@ -2895,6 +2878,36 @@ public class CardFactoryUtil {
public static void addTriggerAbility(final String keyword, final Card card, final KeywordsChange kws) {
final boolean intrinsic = kws == null;
if (keyword.startsWith("Bushido")) {
final String[] k = keyword.split(" ", 2);
final String n = k[1];
final String name = "Bushido" + n;
final String trigBlock = "Mode$ Blocks | ValidCard$ Card.Self | Execute$ Trig" + name + "Pump | Secondary$ True"
+ " | TriggerDescription$ "+ keyword + " (" + Keyword.getInstance(keyword).getReminderText() + ")";
final String trigBlocked = "Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ Trig" + name + "Pump | Secondary$ True "
+ " | TriggerDescription$ "+ keyword + " (" + Keyword.getInstance(keyword).getReminderText() + ")";
String pumpStr = "DB$ Pump | Defined$ Self | NumAtt$ " + n + " | NumDef$ " + n;
if ("X".equals(n)) {
pumpStr = "DB$ Pump | Defined$ Self | NumAtt$ " + name + " | NumDef$ " + name + " | References$ "+ name;
card.setSVar(name, "Count$Valid Creature.attacking");
}
card.setSVar("Trig" + name + "Pump", pumpStr);
final Trigger bushidoTrigger1 = TriggerHandler.parseTrigger(trigBlock, card, intrinsic);
final Trigger bushidoTrigger2 = TriggerHandler.parseTrigger(trigBlocked, card, intrinsic);
final Trigger cardTrigger1 = card.addTrigger(bushidoTrigger1);
final Trigger cardTrigger2 = card.addTrigger(bushidoTrigger2);
if (!intrinsic) {
kws.addTrigger(cardTrigger1);
kws.addTrigger(cardTrigger2);
}
}
if (keyword.equals("Cascade")) {
final StringBuilder trigScript = new StringBuilder(
"Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigCascade | Secondary$ " +

10
forge-game/src/main/java/forge/game/phase/PhaseHandler.java
View File

@@ -650,9 +650,6 @@ public class PhaseHandler implements java.io.Serializable {
}
if (!c1.getDamageHistory().getCreatureBlockedThisCombat()) {
for (final SpellAbility ab : CardFactoryUtil.getBushidoEffects(c1)) {
game.getStack().add(ab);
}
// Run triggers
final HashMap<String, Object> runParams = new HashMap<String, Object>();
runParams.put("Blocker", c1);
@@ -693,13 +690,6 @@ public class PhaseHandler implements java.io.Serializable {
game.getTriggerHandler().runTrigger(TriggerType.AttackerBlockedByCreature, runParams2, false);
}
if (!a.getDamageHistory().getCreatureGotBlockedThisCombat()) {
// Bushido
for (final SpellAbility ab : CardFactoryUtil.getBushidoEffects(a)) {
game.getStack().add(ab);
}
}
a.getDamageHistory().setCreatureGotBlockedThisCombat(true);
}