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

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2018-04-24 17:51:34 +02:00
commit 26f4bf6867
5 changed files with 4129 additions and 3754 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3908
Mage.Client/src/main/resources/mage/client/deckeditor/pennydreadful.properties
View file

File diff suppressed because it is too large Load diff

6
Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/AusHighlander.java
View file

@ -131,7 +131,7 @@ public class AusHighlander extends Constructed {
|| cn.equals("Tinker")
|| cn.equals("Vampiric Tutor")
|| cn.equals("Yawgmoth's Will")
|| cn.equals("Mox Sapphire.")) {
|| cn.equals("Mox Sapphire")) {
totalPoints += 3;
invalid.put(cn, "3 points");
}
@ -143,7 +143,8 @@ public class AusHighlander extends Constructed {
|| cn.equals("Protean Hulk")
|| cn.equals("Skullclamp")
|| cn.equals("Strip Mine")
|| cn.equals("Tolarian Academy.")) {
|| cn.equals("Tolarian Academy")
|| cn.equals("Treasure Cruise")) {
totalPoints += 2;
invalid.put(cn, "2 points");
}
@ -178,7 +179,6 @@ public class AusHighlander extends Constructed {
|| cn.equals("Tainted Pact")
|| cn.equals("Time Spiral")
|| cn.equals("Timetwister")
|| cn.equals("Treasure Cruise")
|| cn.equals("True-Name Nemesis")
|| cn.equals("Umezawa's Jitte")
|| cn.equals("Wasteland")

3908
Mage.Server/src/main/resources/mage/deck/pennydreadful.properties
View file

File diff suppressed because it is too large Load diff

4
Mage.Sets/src/mage/cards/r/RonaDiscipleOfGix.java
View file

@ -121,9 +121,9 @@ class RonaDiscipleOfGixPlayNonLandEffect extends AsThoughEffectImpl {
public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) {
if (affectedControllerId.equals(source.getControllerId())) {
Card card = game.getCard(objectId);
MageObject sourceObject = source.getSourceObject(game);
MageObject sourceObject = game.getObject(source.getSourceId());
if (card != null && !card.isLand() && sourceObject != null) {
UUID exileId = CardUtil.getExileZoneId(game, source.getSourceId(), source.getSourceObjectZoneChangeCounter());
UUID exileId = CardUtil.getExileZoneId(game, source.getSourceId(), sourceObject.getZoneChangeCounter(game));
if (exileId != null) {
ExileZone exileZone = game.getState().getExile().getExileZone(exileId);
return exileZone != null && exileZone.contains(objectId);

57
Mage/src/main/java/mage/game/command/planes/TazeemPlane.java
View file

@ -30,21 +30,24 @@ package mage.game.command.planes;
import java.util.ArrayList;
import java.util.List;
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.common.ActivateIfConditionActivatedAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.condition.common.MainPhaseStackEmptyCondition;
import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
import mage.abilities.effects.Effect;
import mage.abilities.effects.RestrictionEffect;
import mage.abilities.effects.common.DrawCardSourceControllerEffect;
import mage.abilities.effects.common.RollPlanarDieEffect;
import mage.abilities.effects.common.combat.CantBlockAllEffect;
import mage.constants.Duration;
import mage.constants.TargetController;
import mage.constants.Zone;
import mage.filter.StaticFilters;
import mage.filter.common.FilterControlledLandPermanent;
import mage.filter.common.FilterCreaturePermanent;
import mage.game.Game;
import mage.game.command.Plane;
import mage.game.permanent.Permanent;
import mage.target.Target;
import mage.watchers.common.PlanarRollWatcher;
@ -54,22 +57,24 @@ import mage.watchers.common.PlanarRollWatcher;
*/
public class TazeemPlane extends Plane {
private static final String rule = "Creatures can't block";
public TazeemPlane() {
this.setName("Plane - Tazeem");
this.setExpansionSetCodeForImage("PCA");
// Creatures can't block
Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAllEffect(StaticFilters.FILTER_PERMANENT_CREATURES, Duration.WhileOnBattlefield));
Ability ability = new SimpleStaticAbility(Zone.COMMAND, new TazeemCantBlockAllEffect());
this.getAbilities().add(ability);
// Active player can roll the planar die: Whenever you roll {CHAOS}, draw a card for each land you control
Effect chaosEffect = new DrawCardSourceControllerEffect(new PermanentsOnBattlefieldCount(new FilterControlledLandPermanent()));
Target chaosTarget = null;
List<Effect> chaosEffects = new ArrayList<Effect>();
List<Effect> chaosEffects = new ArrayList<>();
chaosEffects.add(chaosEffect);
List<Target> chaosTargets = new ArrayList<Target>();
List<Target> chaosTargets = new ArrayList<>();
chaosTargets.add(chaosTarget);
ActivateIfConditionActivatedAbility chaosAbility = new ActivateIfConditionActivatedAbility(Zone.COMMAND, new RollPlanarDieEffect(chaosEffects, chaosTargets), new GenericManaCost(0), MainPhaseStackEmptyCondition.instance);
@ -79,3 +84,45 @@ public class TazeemPlane extends Plane {
this.getAbilities().add(new SimpleStaticAbility(Zone.ALL, new PlanarDieRollCostIncreasingEffect(chaosAbility.getOriginalId())));
}
}
class TazeemCantBlockAllEffect extends RestrictionEffect {
private FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures");
public TazeemCantBlockAllEffect() {
super(Duration.Custom);
this.filter = filter;
}
public TazeemCantBlockAllEffect(final TazeemCantBlockAllEffect effect) {
super(effect);
this.filter = effect.filter;
}
@Override
public boolean applies(Permanent permanent, Ability source, Game game) {
Plane cPlane = game.getState().getCurrentPlane();
if (cPlane == null || !cPlane.getName().equalsIgnoreCase("Plane - Tazeem")) {
return false;
}
return filter.match(permanent, source.getSourceId(), source.getControllerId(), game);
}
@Override
public boolean canBlock(Permanent attacker, Permanent blocker, Ability source, Game game) {
return false;
}
@Override
public TazeemCantBlockAllEffect copy() {
return new TazeemCantBlockAllEffect(this);
}
@Override
public String getText(Mode mode) {
StringBuilder sb = new StringBuilder();
sb.append(filter.getMessage()).append(" can't block");
return sb.toString();
}
}