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

Merge branch 'noAbilities' into 'master'

Browse Source 
Fix NoAbilities failing for basic land types

See merge request core-developers/forge!4424
This commit is contained in:
Michael Kamensky
2021-04-10 04:12:07 +00:00
parent a4a58d9a06 eb6d168d50
commit 63d660d152
3 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2730,6 +2730,27 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
return false;
}
public boolean hasNoAbilities() {
if (!getUnhiddenKeywords().isEmpty()) {
return false;
}
if (!getStaticAbilities().isEmpty()) {
return false;
}
if (!getReplacementEffects().isEmpty()) {
return false;
}
if (!getTriggers().isEmpty()) {
return false;
}
for (SpellAbility sa : getSpellAbilities()) {
if (!(sa instanceof SpellPermanent)) {
return false;
}
}
return true;
}
public void updateSpellAbilities(List<SpellAbility> list, CardState state, Boolean mana) {
if (hasRemoveIntrinsic()) {
list.clear();

2
forge-game/src/main/java/forge/game/card/CardProperty.java
View File

@@ -1749,7 +1749,7 @@ public class CardProperty {
return false;
}
} else if (property.equals("NoAbilities")) {
if (!((card.getAbilityText().trim().equals("") || card.isFaceDown()) && (card.getUnhiddenKeywords().isEmpty()))) {
if (!card.hasNoAbilities()) {
return false;
}
} else if (property.equals("HasCounters")) {

15
forge-game/src/main/java/forge/game/card/CardState.java
View File

@@ -198,7 +198,6 @@ public class CardState extends GameObject implements IHasSVars {
public final String getBasePowerString() {
return (null == basePowerString) ? "" + getBasePower() : basePowerString;
}
public final String getBaseToughnessString() {
return (null == baseToughnessString) ? "" + getBaseToughness() : baseToughnessString;
}
@@ -207,7 +206,6 @@ public class CardState extends GameObject implements IHasSVars {
public final void setBasePowerString(final String s) {
basePowerString = s;
}
public final void setBaseToughnessString(final String s) {
baseToughnessString = s;
}
@@ -313,7 +311,9 @@ public class CardState extends GameObject implements IHasSVars {
return Iterables.filter(getSpellAbilities(), SpellAbilityPredicates.isIntrinsic());
}
public final SpellAbility getFirstAbility() {
return Iterables.getFirst(getIntrinsicSpellAbilities(), null);
}
public final SpellAbility getFirstSpellAbility() {
return Iterables.getFirst(getNonManaAbilities(), null);
}
@@ -321,7 +321,6 @@ public class CardState extends GameObject implements IHasSVars {
public final boolean hasSpellAbility(final SpellAbility sa) {
return getSpellAbilities().contains(sa);
}
public final boolean hasSpellAbility(final int id) {
for (SpellAbility sa : getSpellAbilities()) {
if (id == sa.getId()) {
@@ -379,10 +378,6 @@ public class CardState extends GameObject implements IHasSVars {
}
}
public final SpellAbility getFirstAbility() {
return Iterables.getFirst(getIntrinsicSpellAbilities(), null);
}
public final FCollectionView<Trigger> getTriggers() {
FCollection<Trigger> result = new FCollection<>(triggers);
card.updateTriggers(result, this);
@@ -467,7 +462,6 @@ public class CardState extends GameObject implements IHasSVars {
public final boolean hasReplacementEffect(final ReplacementEffect re) {
return getReplacementEffects().contains(re);
}
public final boolean hasReplacementEffect(final int id) {
for (final ReplacementEffect r : getReplacementEffects()) {
if (id == r.getId()) {
@@ -492,9 +486,8 @@ public class CardState extends GameObject implements IHasSVars {
public final String getSVar(final String var) {
if (sVars.containsKey(var)) {
return sVars.get(var);
} else {
return "";
}
return "";
}
public final boolean hasSVar(final String var) {
if (var == null) {