(WIP) Replacing blocking/blocked by predicates (#8729)

* replaced blocking/blocked by predicates

* added test for knight of dusk (currently fails)

* added source parameter to filters and everything else that needs it

* some changes to various predicates

* test fix

* small changes to filter code

* merge fix

* fixed a test failure

* small change to Karn, Scion of Urza

* removed sourceId from filter methods and other similar places

* added new getobject method to fix some test failures

* a few more fixes

* fixed merge conflicts

* merge fix
This commit is contained in:
Evan Kranzler 2022-03-23 18:45:02 -04:00 committed by GitHub
parent 53877424a0
commit 80e11b2052
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1719 changed files with 3384 additions and 3325 deletions

View file

@ -1,5 +1,6 @@
package mage.cards;
import mage.abilities.Ability;
import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.game.Game;
@ -28,7 +29,7 @@ public interface Cards extends Set<UUID>, Serializable {
Set<Card> getCards(FilterCard filter, Game game);
Set<Card> getCards(FilterCard filter, UUID sourceId, UUID playerId, Game game);
Set<Card> getCards(FilterCard filter, UUID playerId, Ability source, Game game);
String getValue(Game game);
@ -40,7 +41,7 @@ public interface Cards extends Set<UUID>, Serializable {
int count(FilterCard filter, UUID playerId, Game game);
int count(FilterCard filter, UUID sourceId, UUID playerId, Game game);
int count(FilterCard filter, UUID playerId, Ability source, Game game);
Cards copy();