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

Connive ability - fixed game error on usage (NPE), fixed game freeze on disconnect, fixed miss LKI related code;

Browse source
This commit is contained in:
Oleg Agafonov 2023-05-09 15:36:33 +04:00
parent 3c66dc8706
commit a315171ca4
6 changed files with 54 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/cards/k/KamizObscuraOculus.java
View file

@ -73,8 +73,8 @@ class KamizConniveEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source));
return permanent != null && ConniveSourceEffect.connive(permanent, 1, source, game);
Permanent permanent = game.getPermanentOrLKIBattlefield(getTargetPointer().getFirst(game, source));
return ConniveSourceEffect.connive(permanent, 1, source, game);
}
}

16
Mage.Sets/src/mage/cards/l/LethalScheme.java
View file

@ -116,10 +116,18 @@ class LethalSchemeEffect extends OneShotEffect {
player.choose(Outcome.Neutral, choiceForThisLoop, game);
String choice = choiceForThisLoop.getChoice();
Permanent choicePermanent = permanents.stream().filter(permanent -> permanent.getIdName().equals(choice)).findFirst().get();
ConniveSourceEffect.connive(choicePermanent, 1, source, game);
permanents.remove(choicePermanent);
Permanent choicePermanent = permanents
.stream()
.filter(permanent -> permanent.getIdName().equals(choice))
.findFirst()
.orElse(null);
if (choicePermanent != null) {
ConniveSourceEffect.connive(choicePermanent, 1, source, game);
permanents.remove(choicePermanent);
} else {
// no choices, e.g. disconnection
break;
}
}
}
return true;

4
Mage.Sets/src/mage/cards/m/MaskOfTheSchemer.java
View file

@ -71,10 +71,10 @@ class MaskOfTheSchemerEffect extends OneShotEffect {
if (equipment == null || damage < 1) {
return false;
}
Permanent permanent = game.getPermanent(equipment.getAttachedTo());
Permanent permanent = game.getPermanentOrLKIBattlefield(equipment.getAttachedTo());
if (permanent == null) {
return false;
}
return permanent != null && ConniveSourceEffect.connive(permanent, damage, source, game);
return ConniveSourceEffect.connive(permanent, damage, source, game);
}
}

4
Mage.Sets/src/mage/cards/o/ObscuraConfluence.java
View file

@ -79,8 +79,8 @@ class ObscuraConfluenceConniveEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source));
return permanent != null && ConniveSourceEffect.connive(permanent, 1, source, game);
Permanent permanent = game.getPermanentOrLKIBattlefield(getTargetPointer().getFirst(game, source));
return ConniveSourceEffect.connive(permanent, 1, source, game);
}
}

2
Mage.Sets/src/mage/cards/r/RaffineSchemingSeer.java
View file

@ -85,7 +85,7 @@ class RaffineSchemingSeerEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source));
Permanent permanent = game.getPermanentOrLKIBattlefield(getTargetPointer().getFirst(game, source));
if (permanent == null) {
return false;
}

45
Mage/src/main/java/mage/abilities/effects/keyword/ConniveSourceEffect.java
View file

@ -14,12 +14,31 @@ import mage.players.Player;
import mage.util.CardUtil;
/**
* 701.47. Connive
* <p>
* 701.47a Certain abilities instruct a permanent to connive. To do so, that permanent’s controller draws a card,
* then discards a card. If a nonland card is discarded this way, that player puts a +1/+1 counter on the
* conniving permanent.
* <p>
* 701.47b A permanent “connives” after the process described in rule 701.47a is complete, even if some or
* all of those actions were impossible.
* <p>
* 701.47c If a permanent changes zones before an effect causes it to connive, its last known information is
* used to determine which object connived and who controlled it.
* <p>
* 701.47d If multiple permanents are instructed to connive at the same time, the first player in APNAP order
* who controls one or more of those permanents chooses one of them and it connives. Then if any permanents
* remain on the battlefield which have been instructed to connive and have not done so, this process is repeated.
* <p>
* 701.47e Connive N is a variant of connive. The permanent’s controller draws N cards, discards N cards, then
* puts a number of +1/+1 counters on the permanent equal to the number of nonland cards discarded this way.
*
* @author TheElk801
*/
public class ConniveSourceEffect extends OneShotEffect {
private final String selfName;
private final ReflexiveTriggeredAbility ability;
private final ReflexiveTriggeredAbility ability; // apply ability after connived
public ConniveSourceEffect() {
this("it");
@ -48,31 +67,37 @@ public class ConniveSourceEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Permanent permanent = source.getSourcePermanentIfItStillExists(game);
// 701.47c If a permanent changes zones before an effect causes it to connive,
// its last known information is used to determine which object connived and who controlled it.
Permanent permanent = source.getSourcePermanentOrLKI(game);
boolean connived = connive(permanent, 1, source, game);
if (ability != null) {
if (ability != null && connived) {
game.fireReflexiveTriggeredAbility(ability, source);
}
return connived || ability != null;
return connived;
}
/**
* @param permanent must use game.getPermanentOrLKIBattlefield in parent method due rules
* @param amount
* @param source
* @param game
* @return
*/
public static boolean connive(Permanent permanent, int amount, Ability source, Game game) {
if (amount < 1) {
return false;
}
boolean permanentStillOnBattlefield;
if (permanent == null) {
// If the permanent was killed, get last known information
permanent = (Permanent) game.getLastKnownInformation(source.getSourceId(), Zone.BATTLEFIELD);
permanentStillOnBattlefield = false;
} else {
permanentStillOnBattlefield = true;
return false;
}
boolean permanentStillOnBattlefield = game.getState().getZone(permanent.getId()) == Zone.BATTLEFIELD;
Player player = game.getPlayer(permanent.getControllerId());
if (player == null) {
return false;
}
player.drawCards(amount, source, game);
int counters = player
.discard(amount, false, false, source, game)