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

- Added Marble Priest and Talruum Piper.

Browse Source
This commit is contained in:
Sloth
2013-02-16 08:24:18 +00:00
parent 585ffc4e00
commit 16fab3ff87
4 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@@ -6290,6 +6290,7 @@ res/cardsfolder/m/maraxus.txt -text
res/cardsfolder/m/maraxus_of_keld.txt svneol=native#text/plain
res/cardsfolder/m/marble_chalice.txt svneol=native#text/plain
res/cardsfolder/m/marble_diamond.txt svneol=native#text/plain
res/cardsfolder/m/marble_priest.txt -text
res/cardsfolder/m/marble_titan.txt svneol=native#text/plain
res/cardsfolder/m/marcadian_bazaar.txt -text
res/cardsfolder/m/march_of_souls.txt svneol=native#text/plain
@@ -10501,6 +10502,7 @@ res/cardsfolder/t/talrand_sky_summoner.txt -text
res/cardsfolder/t/talrands_invocation.txt -text
res/cardsfolder/t/talruum_champion.txt svneol=native#text/plain
res/cardsfolder/t/talruum_minotaur.txt svneol=native#text/plain
res/cardsfolder/t/talruum_piper.txt -text
res/cardsfolder/t/talus_paladin.txt svneol=native#text/plain
res/cardsfolder/t/tamanoa.txt svneol=native#text/plain
res/cardsfolder/t/tamiyo_the_moon_sage.txt -text

12
res/cardsfolder/m/marble_priest.txt Normal file
View File

@@ -0,0 +1,12 @@
Name:Marble Priest
ManaCost:5
Types:Artifact Creature Cleric
Text:no text
PT:3/3
K:All Walls able to block CARDNAME do so.
S:Mode$ PreventDamage | Source$ Wall | Target$ Card.Self | CombatDamage$ True | Description$ Prevent all combat damage that would be dealt to CARDNAME by Walls.
SVar:Rarity:Uncommon
SVar:Picture:http://www.wizards.com/global/images/magic/general/marble_priest.jpg
SetInfo:LEG|Uncommon|http://magiccards.info/scans/en/lg/231.jpg
Oracle:All Walls able to block Marble Priest do so.\nPrevent all combat damage that would be dealt to Marble Priest by Walls.
End

11
res/cardsfolder/t/talruum_piper.txt Normal file
View File

@@ -0,0 +1,11 @@
Name:Talruum Piper
ManaCost:4 R
Types:Creature Minotaur
Text:no text
PT:3/3
K:All creatures with flying able to block CARDNAME do so.
SVar:Rarity:Uncommon
SVar:Picture:http://www.wizards.com/global/images/magic/general/talruum_piper.jpg
SetInfo:VIS|Uncommon|http://magiccards.info/scans/en/vi/98.jpg
Oracle:All creatures with flying able to block Talruum Piper do so.
End

8
src/main/java/forge/game/phase/CombatUtil.java
View File

@@ -505,8 +505,10 @@ public class CombatUtil {
final List<Card> attackersWithLure = new ArrayList<Card>();
for (final Card attacker : attackers) {
if (attacker.hasStartOfKeyword("All creatures able to block CARDNAME do so.")
|| (attacker.hasStartOfKeyword("CARDNAME must be blocked if able.") && combat.getBlockers(attacker)
.isEmpty())) {
|| (attacker.hasStartOfKeyword("All Walls able to block CARDNAME do so.") && blocker.isType("Wall"))
|| (attacker.hasStartOfKeyword("All creatures with flying able to block CARDNAME do so.") && blocker.hasKeyword("Flying"))
|| (attacker.hasStartOfKeyword("CARDNAME must be blocked if able.")
&& combat.getBlockers(attacker).isEmpty())) {
attackersWithLure.add(attacker);
}
}
@@ -579,6 +581,8 @@ public class CombatUtil {
// if the attacker has no lure effect, but the blocker can block another
// attacker with lure, the blocker can't block the former
if (!attacker.hasKeyword("All creatures able to block CARDNAME do so.")
&& !(attacker.hasStartOfKeyword("All Walls able to block CARDNAME do so.") && blocker.isType("Wall"))
&& !(attacker.hasStartOfKeyword("All creatures with flying able to block CARDNAME do so.") && blocker.hasKeyword("Flying"))
&& !(attacker.hasKeyword("CARDNAME must be blocked if able.") && combat.getBlockers(attacker).isEmpty())
&& !(blocker.getMustBlockCards() != null && blocker.getMustBlockCards().contains(attacker))
&& CombatUtil.mustBlockAnAttacker(blocker, combat)) {