external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-14 09:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '406.3' into 'master'

Browse Source 
406.3 extended

See merge request core-developers/forge!6207
This commit is contained in:
Michael Kamensky
2022-02-11 03:29:14 +00:00
parent c8c90c26ab a1b3a2e40b
commit a8c18a28f4
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-ai/src/main/java/forge/ai/AiAttackController.java
View File

@@ -728,10 +728,6 @@ public class AiAttackController {
// because creatures not chosen can't attack.
if (!nextTurn) {
for (final Card attacker : this.attackers) {
if (!CombatUtil.canAttack(attacker, defender)) {
attackersLeft.remove(attacker);
continue;
}
boolean mustAttack = false;
// TODO this might result into trying to attack the wrong player
if (attacker.isGoaded()) {

3
forge-game/src/main/java/forge/game/ability/effects/DigEffect.java
View File

@@ -392,6 +392,9 @@ public class DigEffect extends SpellAbilityEffect {
if (sa.hasParam("ExileFaceDown")) {
c.turnFaceDown(true);
}
if (sa.hasParam("WithMayLook")) {
c.addMayLookFaceDownExile(c.getOwner());
}
if (sa.hasParam("Imprint")) {
host.addImprintedCard(c);
}

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

@@ -3253,6 +3253,11 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
return view.mayPlayerLook(player.getView());
}
public final void addMayLookFaceDownExile(final Player p) {
mayLookFaceDownExile.add(p);
updateMayLook();
}
public final void addMayLookAt(final long timestamp, final Iterable<Player> list) {
PlayerCollection plist = new PlayerCollection(list);
mayLook.put(timestamp, plist);

2
forge-gui/res/cardsfolder/c/clone_shell.txt
View File

@@ -3,7 +3,7 @@ ManaCost:5
Types:Artifact Creature Shapeshifter
PT:2/2
T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ Imprint — When Clone Shell enters the battlefield, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library in any order.
SVar:TrigDig:DB$ Dig | Defined$ You | DigNum$ 4 | DestinationZone$ Exile | ExileFaceDown$ True | Imprint$ True
SVar:TrigDig:DB$ Dig | Defined$ You | DigNum$ 4 | DestinationZone$ Exile | ExileFaceDown$ True | WithMayLook$ True | Imprint$ True
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigFaceUp | TriggerDescription$ When CARDNAME dies, turn the exiled card face up. If it's a creature card, put it onto the battlefield under your control.
SVar:TrigFaceUp:DB$ SetState | Defined$ Imprinted | SubAbility$ DBChangeZone | Mode$ TurnFace
SVar:DBChangeZone:DB$ ChangeZone | Defined$ Imprinted | Origin$ Exile | Destination$ Battlefield | ConditionDefined$ Imprinted | ConditionPresent$ Creature | GainControl$ True | SubAbility$ DBCleanup

2
forge-gui/res/cardsfolder/upcoming/the_dragon_kami_reborn_dragon_kamis_egg.txt
View File

@@ -3,7 +3,7 @@ ManaCost:2 G
Types:Enchantment Saga
K:Saga:3:DBHatching,DBHatching,DBTransform
SVar:DBHatching:DB$ GainLife | Defined$ You | LifeAmount$ 2 | SubAbility$ DBDig | SpellDescription$ You gain 2 life. Look at the top three cards of your library. Exile one of them face down with a hatching counter on it, then put the rest on the bottom of your library in any order.
SVar:DBDig:DB$ Dig | DigNum$ 3 | ChangeNum$ 1 | DestinationZone$ Exile | ExileWithCounter$ HATCHING | ExileFaceDown$ True
SVar:DBDig:DB$ Dig | DigNum$ 3 | ChangeNum$ 1 | DestinationZone$ Exile | ExileWithCounter$ HATCHING | ExileFaceDown$ True | WithMayLook$ True
SVar:DBTransform:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBReturn | SpellDescription$ Exile this Saga, then return it to the battlefield transformed under your control.
SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | Transformed$ True | GainControl$ True | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True