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

Card: remove CantEquip

Browse Source
This commit is contained in:
Hanmac
2018-11-21 10:39:08 +01:00
parent df83e7c783
commit cde486cfa0
4 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -1460,8 +1460,7 @@ public class Card extends GameEntity implements Comparable<Card> {
int i = 0; int i = 0;
for (KeywordInterface inst : keywords) { for (KeywordInterface inst : keywords) {
String keyword = inst.getOriginal(); String keyword = inst.getOriginal();
if (keyword.startsWith("CantEquip") if (keyword.startsWith("SpellCantTarget")) {
|| keyword.startsWith("SpellCantTarget")) {
continue; continue;
} }
// format text changes // format text changes
@@ -5199,18 +5198,6 @@ public class Card extends GameEntity implements Comparable<Card> {
if (!isCreature() || !isInPlay()) { if (!isCreature() || !isInPlay()) {
return false; return false;
} }
for(KeywordInterface inst : equip.getKeywords()) {
String kw = inst.getOriginal();
if(!kw.startsWith("CantEquip")) {
continue;
}
final String[] k = kw.split(":");
final String[] restrictions = k[1].split(",");
if (isValid(restrictions, equip.getController(), equip, null)) {
return false;
}
}
return true; return true;
} }
@@ -5219,7 +5206,6 @@ public class Card extends GameEntity implements Comparable<Card> {
if (!isLand() || !isInPlay() || fort.isLand()) { if (!isLand() || !isInPlay() || fort.isLand()) {
return false; return false;
} }
return true; return true;
} }

3
forge-gui/res/cardsfolder/g/gate_smasher.txt
View File

@@ -1,9 +1,8 @@
Name:Gate Smasher Name:Gate Smasher
ManaCost:3 ManaCost:3
Types:Artifact Equipment Types:Artifact Equipment
Text:CARDNAME can be attached only to a creature with toughness 4 or greater.
K:Equip:3 K:Equip:3
K:CantEquip:Creature.toughnessLT4 S:Mode$ CantAttach | ValidCard$ Card.Self | Target$ Creature.toughnessLT4 | Description$ CARDNAME can be attached only to a creature with toughness 4 or greater.
S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 3 | AddKeyword$ Trample | Description$ Equipped creature gets +3/+0 and has trample. S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 3 | AddKeyword$ Trample | Description$ Equipped creature gets +3/+0 and has trample.
AI:RemoveDeck:Random AI:RemoveDeck:Random
SVar:Picture:http://www.wizards.com/global/images/magic/general/gate_smasher.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/gate_smasher.jpg

3
forge-gui/res/cardsfolder/k/kondas_banner.txt
View File

@@ -1,9 +1,8 @@
Name:Konda's Banner Name:Konda's Banner
ManaCost:2 ManaCost:2
Types:Legendary Artifact Equipment Types:Legendary Artifact Equipment
Text:CARDNAME can be attached only to a legendary creature.
K:CantEquip:Creature.nonLegendary
K:Equip:2 K:Equip:2
S:Mode$ CantAttach | ValidCard$ Card.Self | Target$ Creature.nonLegendary | Description$ CARDNAME can be attached only to a legendary creature.
S:Mode$ Continuous | Affected$ Creature.SharesColorWith Equipped | AddPower$ 1 | AddToughness$ 1 | Description$ Creatures that share a color with equipped creature get +1/+1. S:Mode$ Continuous | Affected$ Creature.SharesColorWith Equipped | AddPower$ 1 | AddToughness$ 1 | Description$ Creatures that share a color with equipped creature get +1/+1.
S:Mode$ Continuous | Affected$ Creature.sharesCreatureTypeWith Equipped | AddPower$ 1 | AddToughness$ 1 | Description$ Creatures that share a creature type with equipped creature get +1/+1. S:Mode$ Continuous | Affected$ Creature.sharesCreatureTypeWith Equipped | AddPower$ 1 | AddToughness$ 1 | Description$ Creatures that share a creature type with equipped creature get +1/+1.
AI:RemoveDeck:Random AI:RemoveDeck:Random

3
forge-gui/res/cardsfolder/o/o_naginata.txt
View File

@@ -1,9 +1,8 @@
Name:O-Naginata Name:O-Naginata
ManaCost:1 ManaCost:1
Types:Artifact Equipment Types:Artifact Equipment
Text:CARDNAME can be attached only to a creature with power 3 or greater.
K:Equip:2 K:Equip:2
K:CantEquip:Creature.powerLT3 S:Mode$ CantAttach | ValidCard$ Card.Self | Target$ Creature.powerLT3 | Description$ CARDNAME can be attached only to a creature with power 3 or greater.
S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 3 | AddKeyword$ Trample | Description$ Equipped creature gets +3/+0 and has trample. S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 3 | AddKeyword$ Trample | Description$ Equipped creature gets +3/+0 and has trample.
SVar:Picture:http://www.wizards.com/global/images/magic/general/o_naginata.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/o_naginata.jpg
Oracle:O-Naginata can be attached only to a creature with power 3 or greater.\nEquipped creature gets +3/+0 and has trample.\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.) Oracle:O-Naginata can be attached only to a creature with power 3 or greater.\nEquipped creature gets +3/+0 and has trample.\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)