github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some minor changes/fixes.

Browse source
This commit is contained in:
LevelX2 2013-05-11 20:08:51 +02:00
parent e0ff641952
commit 22bdb209ab
4 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Mage.Sets/src/mage/sets/dragonsmaze/CatchRelease.java
View file

@ -36,11 +36,8 @@ import mage.Constants.CardType;
import mage.Constants.Duration; import mage.Constants.Duration;
import mage.Constants.Outcome; import mage.Constants.Outcome;
import mage.Constants.Rarity; import mage.Constants.Rarity;
import mage.Constants.Zone;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.MustBlockSourceEffect;
import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.UntapTargetEffect;
import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect;
import mage.abilities.effects.common.continious.GainControlTargetEffect; import mage.abilities.effects.common.continious.GainControlTargetEffect;
@ -59,7 +56,6 @@ import mage.players.Player;
import mage.target.Target; import mage.target.Target;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetControlledPermanent;
import mage.target.common.TargetCreaturePermanent;
/** /**
* *
@ -149,11 +145,11 @@ class ReleaseSacrificeEffect extends OneShotEffect<ReleaseSacrificeEffect> {
target4.setRequired(true); target4.setRequired(true);
target5.setRequired(true); target5.setRequired(true);
target1.setNotTarget(true); target1.setNotTarget(false);
target2.setNotTarget(true); target2.setNotTarget(false);
target3.setNotTarget(true); target3.setNotTarget(false);
target4.setNotTarget(true); target4.setNotTarget(false);
target5.setNotTarget(true); target5.setNotTarget(false);
if (target1.canChoose(player.getId(), game)) { if (target1.canChoose(player.getId(), game)) {
while (!target1.isChosen() && target1.canChoose(player.getId(), game)) { while (!target1.isChosen() && target1.canChoose(player.getId(), game)) {

10
Mage.Sets/src/mage/sets/dragonsmaze/NivixCyclops.java
View file

@ -88,20 +88,14 @@ public class NivixCyclops extends CardImpl<NivixCyclops> {
@Override @Override
public NivixCyclops copy() { public NivixCyclops copy() {
return new NivixCyclops(this); return new NivixCyclops(this);
} }
@Override
public List<String> getRules() {
List<String> rules = new ArrayList<String>();
rules.add("Whenever you cast an instant or sorcery spell, Nivix Cyclops gets +3/+0 until end of turn and it can attack as though it didn't have defender.");
return rules;
}
} }
class AsThoughNoDefenderEffect extends AsThoughEffectImpl<AsThoughNoDefenderEffect> { class AsThoughNoDefenderEffect extends AsThoughEffectImpl<AsThoughNoDefenderEffect> {
public AsThoughNoDefenderEffect() { public AsThoughNoDefenderEffect() {
super(Constants.AsThoughEffectType.ATTACK, Constants.Duration.EndOfTurn, Constants.Outcome.Benefit); super(Constants.AsThoughEffectType.ATTACK, Constants.Duration.EndOfTurn, Constants.Outcome.Benefit);
staticText ="and it can attack as though it didn't have defender";
} }
public AsThoughNoDefenderEffect(final AsThoughNoDefenderEffect effect) { public AsThoughNoDefenderEffect(final AsThoughNoDefenderEffect effect) {

4
Mage/src/mage/target/Target.java
View file

@ -49,6 +49,10 @@ public interface Target extends Serializable {
boolean doneChosing(); boolean doneChosing();
void clearChosen(); void clearChosen();
boolean isNotTarget(); boolean isNotTarget();
// controlls if it will be checked, if the target can be targeted from source
// true = check for protection
// false = do not check for protection
void setNotTarget(boolean notTarget); void setNotTarget(boolean notTarget);
// methods for targets // methods for targets

1
Mage/src/mage/target/TargetPermanent.java
View file

@ -78,6 +78,7 @@ public class TargetPermanent<T extends TargetPermanent<T>> extends TargetObject<
return canTarget(source.getControllerId(), id, source, game); return canTarget(source.getControllerId(), id, source, game);
} }
@Override
public boolean canTarget(UUID controllerId, UUID id, Ability source, Game game) { public boolean canTarget(UUID controllerId, UUID id, Ability source, Game game) {
Permanent permanent = game.getPermanent(id); Permanent permanent = game.getPermanent(id);
if (permanent != null) { if (permanent != null) {