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

- Updated isType("Land") to isLand().

Browse Source
This commit is contained in:
jendave
2011-08-07 01:31:24 +00:00
parent 0e6b13ddde
commit d39f59b718
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/forge/Card.java
View File

@@ -2738,7 +2738,7 @@ public class Card extends MyObservable {
String incR[] = Restriction.split("\\."); // Inclusive restrictions are Card types String incR[] = Restriction.split("\\."); // Inclusive restrictions are Card types
if (incR[0].equals("Spell") && isType("Land")) if (incR[0].equals("Spell") && isLand())
return false; return false;
if (incR[0].equals("Permanent") && (isInstant() || isType("Sorcery"))) if (incR[0].equals("Permanent") && (isInstant() || isType("Sorcery")))
return false; return false;

2
src/forge/RunTest.java
View File

@@ -34,7 +34,7 @@ public class RunTest
c = cf.getCard("Bayou", null); c = cf.getCard("Bayou", null);
check("17", c.getManaCost().equals("")); check("17", c.getManaCost().equals(""));
check("18", c.isType("Land")); check("18", c.isLand());
check("19", c.isType("Swamp")); check("19", c.isType("Swamp"));
check("20", c.isType("Forest")); check("20", c.isType("Forest"));

4
src/forge/card/cardFactory/CardFactory.java
View File

@@ -158,7 +158,7 @@ public class CardFactory implements NewConstants {
card2 = CardFactory_Planeswalkers.getCard(in, in.getName(), in.getOwner()); card2 = CardFactory_Planeswalkers.getCard(in, in.getName(), in.getOwner());
return card2; return card2;
} else if (in.isType("Land")) { } else if (in.isLand()) {
Card card2 = new Card(); Card card2 = new Card();
card2 = CardFactory_Lands.getCard(in, in.getName(), in.getOwner()); card2 = CardFactory_Lands.getCard(in, in.getName(), in.getOwner());
@@ -826,7 +826,7 @@ public class CardFactory implements NewConstants {
card2 = CardFactory_Equipment.getCard(card, cardName, owner); card2 = CardFactory_Equipment.getCard(card, cardName, owner);
} else if (card.isType("Planeswalker")) { } else if (card.isType("Planeswalker")) {
card2 = CardFactory_Planeswalkers.getCard(card, cardName, owner); card2 = CardFactory_Planeswalkers.getCard(card, cardName, owner);
} else if (card.isType("Land")) { } else if (card.isLand()) {
card2 = CardFactory_Lands.getCard(card, cardName, owner); card2 = CardFactory_Lands.getCard(card, cardName, owner);
} else if (card.isInstant()) { } else if (card.isInstant()) {
card2 = CardFactory_Instants.getCard(card, cardName, owner); card2 = CardFactory_Instants.getCard(card, cardName, owner);

12
src/forge/card/cardFactory/CardFactory_Sorceries.java
View File

@@ -1482,24 +1482,24 @@ public class CardFactory_Sorceries {
CardList list = AllZoneUtil.getPlayerHand(AllZone.ComputerPlayer); CardList list = AllZoneUtil.getPlayerHand(AllZone.ComputerPlayer);
list.shuffle(); list.shuffle();
if(list.size() == 0) return; if (list.size() == 0) return;
Card c1 = list.get(0); Card c1 = list.get(0);
list.remove(c1); list.remove(c1);
c1.getController().discard(c1, null); c1.getController().discard(c1, null);
if(list.size() == 0) return; if (list.size() == 0) return;
Card c2 = list.get(0); Card c2 = list.get(0);
list.remove(c2); list.remove(c2);
c2.getController().discard(c2, null); c2.getController().discard(c2, null);
if(c1.isType("Land")) { if (c1.isLand()) {
AllZone.HumanPlayer.gainLife(3, card); AllZone.HumanPlayer.gainLife(3, card);
} }
if(c2.isType("Land")) { if (c2.isLand()) {
AllZone.HumanPlayer.gainLife(3, card); AllZone.HumanPlayer.gainLife(3, card);
} }
@@ -1518,7 +1518,7 @@ public class CardFactory_Sorceries {
c.getController().discard(c, null); c.getController().discard(c, null);
if (c.isType("Land")) { if (c.isLand()) {
AllZone.ComputerPlayer.gainLife(3, card); AllZone.ComputerPlayer.gainLife(3, card);
} }
@@ -1530,7 +1530,7 @@ public class CardFactory_Sorceries {
c2.getController().discard(c2, null); c2.getController().discard(c2, null);
if (c2.isType("Land")) { if (c2.isLand()) {
AllZone.ComputerPlayer.gainLife(3, card); AllZone.ComputerPlayer.gainLife(3, card);
} }
} }