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

Merge branch 'validblocker' into 'master'

Browse Source 
Fix ValidBlocker

See merge request core-developers/forge!5067
This commit is contained in:
Michael Kamensky
2021-07-20 09:06:42 +00:00
parent 9c9531ff8c ec08814230
commit 719eb4f64f
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
forge-game/src/main/java/forge/game/staticability/StaticAbilityCantAttackBlock.java
View File

@@ -92,7 +92,7 @@ public class StaticAbilityCantAttackBlock {
} }
/** /**
* returns true if attacker can be blocked by blocker * returns true if attacker can't be blocked by blocker
* @param stAb * @param stAb
* @param attacker * @param attacker
* @param blocker * @param blocker
@@ -104,9 +104,10 @@ public class StaticAbilityCantAttackBlock {
return false; return false;
} }
if (stAb.hasParam("ValidBlocker")) { if (stAb.hasParam("ValidBlocker")) {
boolean stillblock = true;
for (final String v : stAb.getParam("ValidBlocker").split(",")) { for (final String v : stAb.getParam("ValidBlocker").split(",")) {
if (blocker.isValid(v, host.getController(), host, stAb)) { if (blocker.isValid(v, host.getController(), host, stAb)) {
boolean stillblock = false; stillblock = false;
//Dragon Hunter check //Dragon Hunter check
if (v.contains("withoutReach") && blocker.hasStartOfKeyword("IfReach")) { if (v.contains("withoutReach") && blocker.hasStartOfKeyword("IfReach")) {
for (KeywordInterface inst : blocker.getKeywords()) { for (KeywordInterface inst : blocker.getKeywords()) {
@@ -120,13 +121,14 @@ public class StaticAbilityCantAttackBlock {
} }
} }
} }
if (!stillblock) {
break;
}
}
}
if (stillblock) { if (stillblock) {
return false; return false;
} }
} else {
return false;
}
}
} }
// relative valid relative to each other // relative valid relative to each other
if (!stAb.matchesValidParam("ValidAttackerRelative", attacker, blocker)) { if (!stAb.matchesValidParam("ValidAttackerRelative", attacker, blocker)) {

2
forge-gui/res/cardsfolder/u/unexpected_windfall.txt
View File

@@ -1,7 +1,7 @@
Name:Unexpected Windfall Name:Unexpected Windfall
ManaCost:2 R R ManaCost:2 R R
Types:Instant Types:Instant
A:SP$ Draw | Cost$ 3 R Discard<1/Card/card> | CostDesc$ As an additional cost to cast this spell, discard a card. | NumCards$ 2 | Defined$ You | SubAbility$ DBToken | SpellDescription$ Draw two cards and create two Treasure tokens. (They're artifacts with "{T}, Sacrifice this artifact: Add one mana of any color.") A:SP$ Draw | Cost$ 2 R R Discard<1/Card/card> | CostDesc$ As an additional cost to cast this spell, discard a card. | NumCards$ 2 | Defined$ You | SubAbility$ DBToken | SpellDescription$ Draw two cards and create two Treasure tokens. | StackDescription$ SpellDescription
SVar:DBToken:DB$ Token | TokenAmount$ 2 | TokenScript$ c_a_treasure_sac | TokenOwner$ You SVar:DBToken:DB$ Token | TokenAmount$ 2 | TokenScript$ c_a_treasure_sac | TokenOwner$ You
DeckHas:Ability$Discard DeckHas:Ability$Discard
DeckHints:Keyword$Madness & Ability$Delirium DeckHints:Keyword$Madness & Ability$Delirium