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

Merge branch 'slashfix' into 'master'

Browse Source 
add CardProperty IsNotCommander (fixes Slash the Ranks for AI)

See merge request core-developers/forge!3332
This commit is contained in:
Hans Mackowiak
2020-11-04 19:46:14 +00:00
parent b664c2393e 85357aba2c
commit a59071dbd6
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1779,6 +1779,10 @@ public class CardProperty {
if (!card.isCommander()) { if (!card.isCommander()) {
return false; return false;
} }
} else if (property.equals("IsNotCommander")) {
if (card.isCommander()) {
return false;
}
} else if (property.startsWith("NotedFor")) { } else if (property.startsWith("NotedFor")) {
final String key = property.substring("NotedFor".length()); final String key = property.substring("NotedFor".length());
for (String note : sourceController.getNotesForName(key)) { for (String note : sourceController.getNotesForName(key)) {

4
forge-gui/res/cardsfolder/upcoming/slash_the_ranks.txt
View File

@@ -1,7 +1,5 @@
Name:Slash the Ranks Name:Slash the Ranks
ManaCost:3 W W ManaCost:3 W W
Types:Sorcery Types:Sorcery
A:SP$ PumpAll | Cost$ 3 W W | ValidCards$ Permanent.IsCommander | RememberAllPumped$ True | SubAbility$ Destroy | SpellDescription$ Destroy all creatures and planeswalkers except for commanders. A:SP$ DestroyAll | Cost$ 3 W W | ValidCards$ Creature.IsNotCommander,Planeswalker.IsNotCommander | SpellDescription$ Destroy all creatures and planeswalkers except for commanders.
SVar:Destroy:DB$ DestroyAll | ValidCards$ Creature.IsNotRemembered,Planeswalker.IsNotRemembered | SubAbility$ DBCleanup | StackDescription$ None
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
Oracle:Destroy all creatures and planeswalkers except for commanders. Oracle:Destroy all creatures and planeswalkers except for commanders.

2
forge-gui/src/main/java/forge/card/CardScriptParser.java
View File

@@ -446,7 +446,7 @@ public final class CardScriptParser {
"hasActivatedAbility", "hasManaAbility", "hasActivatedAbility", "hasManaAbility",
"hasNonManaActivatedAbility", "NoAbilities", "HasCounters", "hasNonManaActivatedAbility", "NoAbilities", "HasCounters",
"wasNotCast", "ChosenType", "IsNotChosenType", "IsCommander", "wasNotCast", "ChosenType", "IsNotChosenType", "IsCommander",
"IsRenowned", "IsNotRenowned"); "IsNotCommander","IsRenowned", "IsNotRenowned");
private static final Set<String> VALID_EXCLUSIVE_STARTSWITH = ImmutableSortedSet private static final Set<String> VALID_EXCLUSIVE_STARTSWITH = ImmutableSortedSet
.of("named", "notnamed", "OwnedBy", "ControlledBy", .of("named", "notnamed", "OwnedBy", "ControlledBy",
"ControllerControls", "AttachedTo", "EnchantedBy", "ControllerControls", "AttachedTo", "EnchantedBy",