Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix cards, negative amount, search from anywhere to location (#1475) 

* Rename `MagicAmountParser.getX` to `getXSign`

* Fix bug in Deathgorge Scavenger

* Add `MagicAmount.getPositiveAmount`

* Use `getPositiveAmount` where appropriate

* Correct `getPositiveAmount(MagicEvent)`

* Fix sacrifice choice in Heart-Piercer Manticore

* Change `MagicSearchToLocationEvent` to search from anywhere instead of
just library

* Add missing `stream()` call

* Add executeEvent in Entrancing Melody

* Fix missing new

* Fix Search for Azcanta

* Remove getPositiveAmount special case

* Revert countEachProduct back

* Fix error in Search for Azcanta
master
Ada Joule 2018-02-23 08:38:41 +07:00 committed by Melvin Zhang
parent 636bcab645
commit 12d2845018
12 changed files with 53 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/Magarena/scripts/Deathgorge_Scavenger.groovy
View File

@ -5,7 +5,7 @@ def action = {
if (it.hasType(MagicType.Creature)) {
game.doAction(new ChangeLifeAction(event.getPlayer(), 2));
} else {
game.doAction(new ChangeTurnPTAction(event.getRefPermanent(), 1, 1));
game.doAction(new ChangeTurnPTAction(event.getPermanent(), 1, 1));
}
});
}

7
release/Magarena/scripts/Entrancing_Melody.groovy
View File

@ -1,5 +1,6 @@
[
new MagicSpellCardEvent() {
@Override
public MagicEvent getEvent(final MagicCardOnStack cardOnStack,final MagicPayedCost payedCost) {
final int x = payedCost.getX();
return new MagicEvent(
@ -13,6 +14,12 @@
"PN gains control of target creature with converted mana cost ${x}\$."
);
}
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
event.processTargetPermanent(game, {
game.doAction(new GainControlAction(event.getPlayer(), it));
});
}
}
]

2
release/Magarena/scripts/Heart_Piercer_Manticore.groovy
View File

@ -11,7 +11,7 @@ def damageAction = {
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent, final MagicPayedCost payedCost) {
return new MagicEvent(
permanent,
new MagicMayChoice(ANOTHER_CREATURE_YOU_CONTROL),
new MagicMayChoice(new MagicTargetChoice("another creature to sacrifice")),
this,
"PN may\$ sacrifice another creature PN controls\$."
);

35
release/Magarena/scripts/Search_for_Azcanta.groovy
View File

@ -1,14 +1,22 @@
def transformAction = {
final MagicGame game, final MagicEvent event ->
if (event.isYes()) {
game.doAction(new TransformAction(event.getPermanent()));
}
}
def putIntoGraveyardAction = {
final MagicGame game, final MagicEvent event ->
if (event.isYes()) {
game.doAction(new ShiftCardAction(event.getRefCard(), MagicLocationType.OwnersLibrary, MagicLocationType.Graveyard));
}
}
def transformAction = {
final MagicGame game, final MagicEvent event ->
if (event.isYes()) {
game.doAction(new TransformAction(event.getPermanent()));
if (event.getPlayer().getGraveyard().size() >= 7) {
game.addEvent(new MagicEvent(
event.getSource(),
new MagicMayChoice("Transfrom ${event.getPermanent()}"),
transformAction,
"PN may\$ transform SN."
));
}
}
@ -28,23 +36,16 @@ def transformAction = {
}
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
final MagicPlayer player = event.getPlayer();
final MagicCard topCard = player.getLibrary().getCardAtTop();
game.doAction(new LookAction(topCard, player, "top card of your library"));
final MagicCard topCard = event.getPlayer().getLibrary().getCardAtTop();
game.doAction(new LookAction(topCard, event.getPlayer(), "top card of your library"));
game.addEvent(new MagicEvent(
event.getSource(),
new MagicMayChoice("Put the card into your graveyard?"),
topCard,
putIntoGraveyardAction,
"PN may\$ put it into PN's graveyard."
));
if (player.getGraveyard().size() >= 7) {
game.addEvent(new MagicEvent(
event.getSource(),
new MagicMayChoice("Transfrom ${event.getPermanent()}"),
transformAction,
"PN may\$ transform SN."
));
}
}
}
]

4
src/magic/model/MagicAbility.java
View File

@ -1731,8 +1731,8 @@ public enum MagicAbility {
protected void addAbilityImpl(final MagicAbilityStore card, final Matcher arg) {
final String[] ptStr = ARG.ptStr(arg);
final MagicPowerToughness pt = new MagicPowerToughness(
MagicAmountParser.getX(ptStr[0], 1),
MagicAmountParser.getX(ptStr[1], 1)
MagicAmountParser.getXSign(ptStr[0], 1),
MagicAmountParser.getXSign(ptStr[1], 1)
);
final MagicTargetFilter<MagicPermanent> affected = MagicTargetFilterFactory.Permanent(ARG.wordrun(arg));
final MagicAmount count = MagicAmountParser.build(ARG.wordrun2(arg));

8
src/magic/model/MagicAmount.java
View File

@ -10,6 +10,14 @@ public abstract class MagicAmount {
return getAmount(event.getSource(), event.getPlayer());
}
public int getPositiveAmount(final MagicSource source, final MagicPlayer player) {
return Math.max(getAmount(source, player), 0);
}
public int getPositiveAmount(final MagicEvent event) {
return Math.max(getAmount(event), 0);
}
public boolean isConstant() {
return false;
}

2
src/magic/model/MagicAmountParser.java
View File

@ -140,7 +140,7 @@ public enum MagicAmountParser {
public abstract MagicAmount toAmount(final Matcher arg);
public static final int getX(final String text, final int X) {
public static final int getXSign(final String text, final int X) {
if (text.equalsIgnoreCase("x")) {
return X;
} else if (text.equalsIgnoreCase("-x")) {

2
src/magic/model/event/MagicHandCastActivation.java
View File

@ -141,7 +141,7 @@ public class MagicHandCastActivation extends MagicActivation<MagicCard> implemen
new MagicPayManaCostEvent(
source,
source.getGameCost().reduce(
amount.getAmount(source, source.getController())
amount.getPositiveAmount(source, source.getController())
)
)
);

8
src/magic/model/event/MagicRuleEventAction.java
View File

@ -570,7 +570,7 @@ public enum MagicRuleEventAction {
final MagicAmount count = MagicAmountParser.build(ARG.wordrun(matcher));
final MagicTargetFilter<MagicTarget> filter = ARG.targetsParse(matcher);
return (game, event) -> {
final int amount = count.getAmount(event);
final int amount = count.getPositiveAmount(event);
game.logAppendValue(event.getPlayer(), amount);
for (final MagicTarget target : ARG.targets(event, matcher, filter)) {
game.doAction(new DealDamageAction(
@ -1111,7 +1111,7 @@ public enum MagicRuleEventAction {
final MagicAmount count = ARG.each(matcher);
final MagicTargetFilter<MagicPlayer> filter = ARG.playersParse(matcher);
return (game, event) -> {
final int multiplier = count.getAmount(event);
final int multiplier = count.getPositiveAmount(event);
final int total = amount.getAmount(event) * multiplier;
if (count != MagicAmountFactory.One) {
game.logAppendValue(event.getPlayer(), total);
@ -1140,7 +1140,7 @@ public enum MagicRuleEventAction {
final MagicAmount eachCount = ARG.each(matcher);
final MagicTargetFilter<MagicPlayer> filter = ARG.playersParse(matcher);
return (game, event) -> {
final int multiplier = eachCount.getAmount(event);
final int multiplier = eachCount.getPositiveAmount(event);
final int total = lifeCount.getAmount(event) * multiplier;
if (eachCount != MagicAmountFactory.One) {
game.logAppendValue(event.getPlayer(), total);
@ -3178,7 +3178,7 @@ public enum MagicRuleEventAction {
final MagicAmount eachCount = ARG.each(matcher);
final MagicTargetFilter<MagicPlayer> filter = ARG.playersParse(matcher);
return (game, event) -> {
final int multiplier = eachCount.getAmount(event);
final int multiplier = eachCount.getPositiveAmount(event);
final int total = amount * multiplier;
for (final MagicPlayer it : ARG.players(event, matcher, filter)) {
game.doAction(new ChangeCountersAction(it, MagicCounterType.Energy, total));

12
src/magic/model/event/MagicSearchToLocationEvent.java
View File

@ -50,7 +50,9 @@ public class MagicSearchToLocationEvent extends MagicEvent {
if (event.isNo()) {
// do nothing
} else if (event.getChosen()[0] instanceof MagicCardChoiceResult) {
game.doAction(new ShuffleLibraryAction(event.getPlayer()));
if (event.getCardChoice().stream().anyMatch(MagicCard::isInLibrary)) {
game.doAction(new ShuffleLibraryAction(event.getPlayer()));
}
event.processChosenCards(game, (final MagicCard card) -> {
if (revealed) {
game.logAppendMessage(
@ -59,11 +61,13 @@ public class MagicSearchToLocationEvent extends MagicEvent {
);
game.doAction(new AIRevealAction(card));
}
game.doAction(new ShiftCardAction(card,MagicLocationType.OwnersLibrary, toLocation));
game.doAction(new ShiftCardAction(card, card.getLocation(), toLocation));
});
} else {
game.doAction(new ShuffleLibraryAction(event.getPlayer()));
event.processTargetCard(game, (final MagicCard card) -> {
if (card.isInLibrary()) {
game.doAction(new ShuffleLibraryAction(event.getPlayer()));
}
if (revealed) {
game.logAppendMessage(
event.getPlayer(),
@ -71,7 +75,7 @@ public class MagicSearchToLocationEvent extends MagicEvent {
);
game.doAction(new AIRevealAction(card));
}
game.doAction(new ShiftCardAction(card, MagicLocationType.OwnersLibrary, toLocation));
game.doAction(new ShiftCardAction(card, card.getLocation(), toLocation));
});
}
};

2
src/magic/model/mstatic/MagicStatic.java
View File

@ -102,7 +102,7 @@ public abstract class MagicStatic extends MagicDummyModifier implements MagicCha
return new MagicStatic(MagicLayer.ModPT, affected) {
@Override
public void modPowerToughness(final MagicPermanent source, final MagicPermanent permanent, final MagicPowerToughness pt) {
final int amt = count.getAmount(source, source.getController());
final int amt = count.getPositiveAmount(source, source.getController());
pt.add(given.power() * amt, given.toughness() * amt);
}
};

2
src/magic/model/trigger/EntersWithCounterTrigger.java
View File

@ -43,7 +43,7 @@ public class EntersWithCounterTrigger extends EntersBattlefieldTrigger {
@Override
public MagicEvent executeTrigger(final MagicGame game, final MagicPermanent permanent, final MagicPayedCost payedCost) {
final int total = amount * count.getAmount(permanent, permanent.getController());
final int total = amount * count.getPositiveAmount(permanent, permanent.getController());
if (cond.accept(permanent)) {
game.doAction(ChangeCountersAction.Enters(
permanent,