External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-26 05:22:02 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implemented Heliod's Punishment, Hydra's Growth, Ilysian Caryatid, Impending Doom and Incendiary Oracle. Fixed Irreverent Revelers.

Browse source
This commit is contained in:
LevelX2 2020-01-11 22:11:44 +01:00
parent 38ab692aa0
commit 946aff50a2
9 changed files with 410 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Mage/src/main/java/mage/abilities/effects/common/DontUntapInControllersUntapStepTargetEffect.java
View file

@ -1,5 +1,3 @@
package mage.abilities.effects.common;
import java.util.UUID;
@ -15,7 +13,7 @@ import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
/**
*
*
* @author BetaSteward_at_googlemail.com
*/
public class DontUntapInControllersUntapStepTargetEffect extends ContinuousRuleModifyingEffectImpl {
@ -43,7 +41,7 @@ public class DontUntapInControllersUntapStepTargetEffect extends ContinuousRuleM
MageObject mageObject = game.getObject(source.getSourceId());
Permanent permanentToUntap = game.getPermanent((event.getTargetId()));
if (permanentToUntap != null && mageObject != null) {
return permanentToUntap.getLogName() + " doesn't untap (" + mageObject.getLogName() + ')';
return permanentToUntap.getIdName() + " doesn't untap (" + mageObject.getIdName() + ')';
}
return null;
}
@ -52,7 +50,7 @@ public class DontUntapInControllersUntapStepTargetEffect extends ContinuousRuleM
public boolean checksEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.UNTAP;
}
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
if (game.getTurn().getStepType() == PhaseStep.UNTAP) {
@ -70,11 +68,11 @@ public class DontUntapInControllersUntapStepTargetEffect extends ContinuousRuleM
@Override
public String getText(Mode mode) {
if (staticText != null) {
return staticText;
}
return "Target " + mode.getTargets().get(0).getTargetName()
+ " doesn't untap during its controller's untap step" + (getDuration().toString().isEmpty() ? "":" " + getDuration());
if (staticText != null) {
return staticText;
}
return "Target " + mode.getTargets().get(0).getTargetName()
+ " doesn't untap during its controller's untap step" + (getDuration().toString().isEmpty() ? "" : " " + getDuration());
}
}

1
Mage/src/main/java/mage/counters/CounterType.java
View file

@ -125,6 +125,7 @@ public enum CounterType {
STORAGE("storage"),
STRIFE("strife"),
STUDY("study"),
TASK("task"),
THEFT("theft"),
TIDE("tide"),
TIME("time"),