Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Reworking triggered ability text generation to allow for ability words and flavor words to be added more easily (#8010)

Browse source 
* refactor all instances of getRule in triggered abilities using new getTriggerPrefix method

* updated triggered ability rules generation

* renamed method

* fixed a test failure

* some more refactoring

* simplified some instances of ability word usage
This commit is contained in:
Evan Kranzler 2021-07-15 07:46:38 -04:00 • committed by GitHub
parent 0a31110164
commit ca80806400
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
398 changed files with 946 additions and 989 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Mage/src/main/java/mage/abilities/common/BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility.java
View file

@ -14,7 +14,6 @@ import mage.game.permanent.Permanent;
import java.util.UUID;
/**
*
* @author North, Loki
*/
public class BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility extends TriggeredAbilityImpl {
@ -51,23 +50,23 @@ public class BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility extends Triggered
@Override
public boolean checkTrigger(GameEvent event, Game game) {
for (CombatGroup group : game.getCombat().getGroups()) {
if (group.getAttackers().contains(sourceId)){
if (filter == null){
if (group.getAttackers().contains(sourceId)) {
if (filter == null) {
return group.getBlocked();
}
for (UUID uuid : group.getBlockers()){
for (UUID uuid : group.getBlockers()) {
Permanent permanent = game.getPermanentOrLKIBattlefield(uuid);
if (filter.match(permanent, game)){
if (filter.match(permanent, game)) {
return true;
}
}
} else if (group.getBlockers().contains(sourceId)){
if (filter == null){
} else if (group.getBlockers().contains(sourceId)) {
if (filter == null) {
return true;
}
for (UUID uuid : group.getAttackers()){
for (UUID uuid : group.getAttackers()) {
Permanent permanent = game.getPermanentOrLKIBattlefield(uuid);
if (filter.match(permanent, game)){
if (filter.match(permanent, game)) {
return true;
}
}
@ -81,7 +80,12 @@ public class BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility extends Triggered
if (rule != null) {
return rule;
}
return "Whenever {this} blocks or becomes blocked by one or more " + (filter != null ? filter.getMessage() : "creatures") + ", " + super.getRule();
return super.getRule();
}
@Override
public String getTriggerPhrase() {
return "Whenever {this} blocks or becomes blocked by one or more " + (filter != null ? filter.getMessage() : "creatures") + ", ";
}
@Override