External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-10 12:52:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[LCI] Implement Starving Revenant (#11378)

Browse source
This commit is contained in:
Susucre 2023-11-02 15:17:30 +01:00 • committed by GitHub
parent 3c837e9dff
commit bab07a421d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 242 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Mage/src/main/java/mage/players/Player.java
View file

@ -1108,7 +1108,48 @@ public interface Player extends MageItem, Copyable<Player> {
boolean scry(int value, Ability source, Game game);
boolean surveil(int value, Ability source, Game game);
/**
* result of the doSurveil action.
* Sometimes more info is needed for the caller after the surveil is done.
*/
class SurveilResult {
private final boolean surveilled;
private final int numberInGraveyard; // how many cards were put into the graveyard
private final int numberOnTop; // how many cards were put into the graveyard
private SurveilResult(boolean surveilled, int inGrave, int onTop) {
this.surveilled = surveilled;
this.numberInGraveyard = inGrave;
this.numberOnTop = onTop;
}
public static SurveilResult noSurveil() {
return new SurveilResult(false, 0, 0);
}
public static SurveilResult surveil(int inGrave, int onTop) {
return new SurveilResult(true, inGrave, onTop);
}
public boolean hasSurveilled() {
return this.surveilled;
}
public int getNumberPutInGraveyard() {
return this.numberInGraveyard;
}
public int getNumberPutOnTop() {
return this.numberOnTop;
}
}
SurveilResult doSurveil(int value, Ability source, Game game);
default boolean surveil(int value, Ability source, Game game) {
SurveilResult result = doSurveil(value, source, game);
return result.hasSurveilled();
}
/**
* Only used for test player for pre-setting targets

17
Mage/src/main/java/mage/players/PlayerImpl.java
View file

@ -287,13 +287,13 @@ public abstract class PlayerImpl implements Player, Serializable {
}
for (Entry<UUID, Map<MageIdentifier, ManaCosts<ManaCost>>> entry : player.getCastSourceIdManaCosts().entrySet()) {
this.castSourceIdManaCosts.put(entry.getKey(), new HashMap<>());
for(Entry<MageIdentifier, ManaCosts<ManaCost>> subEntry : entry.getValue().entrySet()) {
for (Entry<MageIdentifier, ManaCosts<ManaCost>> subEntry : entry.getValue().entrySet()) {
this.castSourceIdManaCosts.get(entry.getKey()).put(subEntry.getKey(), subEntry.getValue() == null ? null : subEntry.getValue().copy());
}
}
for (Entry<UUID, Map<MageIdentifier, Costs<Cost>>> entry : player.getCastSourceIdCosts().entrySet()) {
this.castSourceIdCosts.put(entry.getKey(), new HashMap<>());
for(Entry<MageIdentifier, Costs<Cost>> subEntry : entry.getValue().entrySet()) {
for (Entry<MageIdentifier, Costs<Cost>> subEntry : entry.getValue().entrySet()) {
this.castSourceIdCosts.get(entry.getKey()).put(subEntry.getKey(), subEntry.getValue() == null ? null : subEntry.getValue().copy());
}
}
@ -381,13 +381,13 @@ public abstract class PlayerImpl implements Player, Serializable {
}
for (Entry<UUID, Map<MageIdentifier, ManaCosts<ManaCost>>> entry : player.getCastSourceIdManaCosts().entrySet()) {
this.castSourceIdManaCosts.put(entry.getKey(), new HashMap<>());
for(Entry<MageIdentifier, ManaCosts<ManaCost>> subEntry : entry.getValue().entrySet()) {
for (Entry<MageIdentifier, ManaCosts<ManaCost>> subEntry : entry.getValue().entrySet()) {
this.castSourceIdManaCosts.get(entry.getKey()).put(subEntry.getKey(), subEntry.getValue() == null ? null : subEntry.getValue().copy());
}
}
for (Entry<UUID, Map<MageIdentifier, Costs<Cost>>> entry : player.getCastSourceIdCosts().entrySet()) {
this.castSourceIdCosts.put(entry.getKey(), new HashMap<>());
for(Entry<MageIdentifier, Costs<Cost>> subEntry : entry.getValue().entrySet()) {
for (Entry<MageIdentifier, Costs<Cost>> subEntry : entry.getValue().entrySet()) {
this.castSourceIdCosts.get(entry.getKey()).put(subEntry.getKey(), subEntry.getValue() == null ? null : subEntry.getValue().copy());
}
}
@ -3551,7 +3551,7 @@ public abstract class PlayerImpl implements Player, Serializable {
}
// ALTERNATIVE COST FROM dynamic effects
for(MageIdentifier identifier : getCastSourceIdWithAlternateMana().getOrDefault(copy.getSourceId(), new HashSet<>())) {
for (MageIdentifier identifier : getCastSourceIdWithAlternateMana().getOrDefault(copy.getSourceId(), new HashSet<>())) {
ManaCosts alternateCosts = getCastSourceIdManaCosts().get(copy.getSourceId()).get(identifier);
Costs<Cost> costs = getCastSourceIdCosts().get(copy.getSourceId()).get(identifier);
@ -5134,14 +5134,15 @@ public abstract class PlayerImpl implements Player, Serializable {
}
@Override
public boolean surveil(int value, Ability source, Game game) {
public SurveilResult doSurveil(int value, Ability source, Game game) {
GameEvent event = new GameEvent(GameEvent.EventType.SURVEIL, getId(), source, getId(), value, true);
if (game.replaceEvent(event)) {
return false;
return SurveilResult.noSurveil();
}
game.informPlayers(getLogName() + " surveils " + event.getAmount() + CardUtil.getSourceLogName(game, source));
Cards cards = new CardsImpl();
cards.addAllCards(getLibrary().getTopCards(game, event.getAmount()));
int totalCount = cards.size();
if (!cards.isEmpty()) {
TargetCard target = new TargetCard(0, cards.size(), Zone.LIBRARY,
new FilterCard("card" + (cards.size() == 1 ? "" : "s")
@ -5152,7 +5153,7 @@ public abstract class PlayerImpl implements Player, Serializable {
putCardsOnTopOfLibrary(cards, game, source, true);
}
game.fireEvent(new GameEvent(GameEvent.EventType.SURVEILED, getId(), source, getId(), event.getAmount(), true));
return true;
return SurveilResult.surveil(totalCount - cards.size(), cards.size());
}
@Override