external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up (#4295)

Browse Source
This commit is contained in:
tool4ever
2023-12-05 13:36:23 +01:00
committed by GitHub
parent 8b93cd9243
commit 1ece8e6668
6 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/ability/effects/UntapAllEffect.java
View File

@@ -45,8 +45,8 @@ public class UntapAllEffect extends SpellAbilityEffect {
untapper = c.getController();
}
if (c.untap(true)) {
untapMap.computeIfAbsent(untapper, i -> new CardCollection()).add(c);
if (sa.hasParam("RememberUntapped")) card.addRemembered(c);
untapMap.computeIfAbsent(untapper, i -> new CardCollection()).add(c);
if (sa.hasParam("RememberUntapped")) card.addRemembered(c);
}
}

1
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -1290,7 +1290,6 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
craft.setExiledBy(cause.getActivatingPlayer());
}
}
}
public final List<Integer> getStoredRolls() {

4
forge-game/src/main/java/forge/game/zone/MagicStack.java
View File

@@ -244,7 +244,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
}
if (sp.isManaAbility()) { // Mana Abilities go straight through
if (!sp.isCopied()) {
if (!sp.isCopied() && !sp.isTrigger()) {
// Copied abilities aren't activated, so they shouldn't change these values
source.addAbilityActivated(sp);
}
@@ -320,7 +320,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
return;
}
if (sp.isAbility() && !sp.isCopied()) {
if (sp.isAbility() && !sp.isCopied() && !sp.isTrigger()) {
source.addAbilityActivated(sp);
}

2
forge-gui/res/cardsfolder/r/river_herald_guide.txt
View File

@@ -2,7 +2,7 @@ Name:River Herald Guide
ManaCost:2 G
Types:Creature Merfolk Scout
PT:3/1
K:Viligance
K:Vigilance
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExplore | TriggerDescription$ When CARDNAME enters the battlefield, it explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back on top or into your graveyard.)
SVar:TrigExplore:DB$ Explore
DeckHas:Ability$Counters

3
forge-gui/src/main/java/forge/interfaces/IGameController.java
View File

@@ -30,8 +30,7 @@ public interface IGameController {
void selectPlayer(PlayerView playerView, ITriggerEvent triggerEvent);
boolean selectCard(CardView cardView,
List<CardView> otherCardViewsToSelect, ITriggerEvent triggerEvent);
boolean selectCard(CardView cardView, List<CardView> otherCardViewsToSelect, ITriggerEvent triggerEvent);
void selectAbility(SpellAbilityView sa);

1
forge-gui/src/main/java/forge/player/HumanCostDecision.java
View File

@@ -413,7 +413,6 @@ public class HumanCostDecision extends CostDecisionMakerBase {
final CardCollection exiled = new CardCollection();
final String required = sharedType ? " (must share a card type)" : "";
final List<Card> chosen = controller.chooseCardsForZoneChange(ZoneType.Exile, origin, ability, typeList,
mandatory ? nNeeded : 0, nNeeded, null, cost.toString(nNeeded) + required,
null);