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

Fix non* targeting restrictions (e.g. nonland)

Browse Source
This commit is contained in:
drdev
2014-10-13 04:10:05 +00:00
parent 84da2570d8
commit 5c6d9736b2
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-core/src/main/java/forge/card/CardType.java
View File

@@ -199,6 +199,10 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
if (subtypes.contains(t)) { if (subtypes.contains(t)) {
return true; return true;
} }
char firstChar = t.charAt(0);
if (Character.isLowerCase(firstChar)) {
t = Character.toUpperCase(firstChar) + t.substring(1); //ensure string is proper case for enum types
}
CoreType type = stringToCoreType.get(t); CoreType type = stringToCoreType.get(t);
if (type != null) { if (type != null) {
return hasType(type); return hasType(type);

3
forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java
View File

@@ -292,7 +292,6 @@ public class SpellAbilityRestriction extends SpellAbilityVariables {
} }
public final boolean checkOtherRestrictions(final Card c, final SpellAbility sa, final Player activator) { public final boolean checkOtherRestrictions(final Card c, final SpellAbility sa, final Player activator) {
final Game game = activator.getGame(); final Game game = activator.getGame();
if (this.getCardsInHand() != -1) { if (this.getCardsInHand() != -1) {
@@ -398,7 +397,6 @@ public class SpellAbilityRestriction extends SpellAbilityVariables {
if (!Expressions.compare(svarValue, this.getsVarOperator(), operandValue)) { if (!Expressions.compare(svarValue, this.getsVarOperator(), operandValue)) {
return false; return false;
} }
} }
if (this.getsVarToCheck() != null) { if (this.getsVarToCheck() != null) {
@@ -408,7 +406,6 @@ public class SpellAbilityRestriction extends SpellAbilityVariables {
if (!Expressions.compare(svarValue, this.getsVarOperator(), operandValue)) { if (!Expressions.compare(svarValue, this.getsVarOperator(), operandValue)) {
return false; return false;
} }
} }
return true; return true;
} }

5
forge-gui/src/main/java/forge/match/input/InputSelectTargets.java
View File

@@ -104,9 +104,8 @@ public final class InputSelectTargets extends InputSyncronizedBase {
if (!tgt.isUniqueTargets() && targetDepth.containsKey(card)) { if (!tgt.isUniqueTargets() && targetDepth.containsKey(card)) {
return false; return false;
} }
// leave this in temporarily, there some seriously wrong things going on here //If the card is not a valid target
// Can be targeted doesn't check if the target is a valid type, only if a card is generally "targetable"
if (!card.canBeTargetedBy(sa)) { if (!card.canBeTargetedBy(sa)) {
showMessage(sa.getHostCard() + " - Cannot target this card (Shroud? Protection? Restrictions)."); showMessage(sa.getHostCard() + " - Cannot target this card (Shroud? Protection? Restrictions).");
return false; return false;