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

Merge branch 'lynde' into 'master'

Browse Source 
MIC: Lynde and support

See merge request core-developers/forge!5451
This commit is contained in:
Michael Kamensky
2021-09-29 03:47:17 +00:00
parent 63bfa9aefb 9e84e2b359
commit fded22318f
3 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,6 +122,9 @@ public class AttachEffect extends SpellAbilityEffect {
continue; continue;
attachment.attachToEntity(attachTo); attachment.attachToEntity(attachTo);
if (sa.hasParam("RememberAttached") && attachment.isAttachedToEntity(attachTo)) {
source.addRemembered(attachment);
}
} }
if (source.isAura() && sa.isSpell()) { if (source.isAura() && sa.isSpell()) {

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

@@ -3427,6 +3427,9 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
public final boolean isAttachedToEntity() { public final boolean isAttachedToEntity() {
return entityAttachedTo != null; return entityAttachedTo != null;
} }
public final boolean isAttachedToEntity(final GameEntity e) {
return (entityAttachedTo == e);
}
public final Card getAttachedTo() { public final Card getAttachedTo() {
if (entityAttachedTo instanceof Card) { if (entityAttachedTo instanceof Card) {

16
forge-gui/res/cardsfolder/upcoming/lynde_cheerful_tormentor.txt Normal file
View File

@@ -0,0 +1,16 @@
Name:Lynde, Cheerful Tormentor
ManaCost:1 U B R
Types:Legendary Creature Human Warlock
PT:2/4
K:Deathtouch
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Curse.YouOwn | Execute$ TrigDelayedTrig | TriggerDescription$ Whenever a curse is put into your graveyard from the battlefield, return it to the battlefield attached to you at the beginning of the next end step.
SVar:TrigDelayedTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execute$ TrigReturn | RememberObjects$ TriggeredNewCardLKICopy | TriggerDescription$ Whenever a curse is put into your graveyard from the battlefield, return it to the battlefield attached to you at the beginning of the next end step.
SVar:TrigReturn:DB$ ChangeZone | Defined$ DelayTriggerRememberedLKI | Origin$ Graveyard | Destination$ Battlefield | AttachedToPlayer$ You
T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigChooseCurse | TriggerZones$ Battlefield | OptionalDecider$ You | IsPresent$ Curse.AttachedTo You | TriggerDescription$ At the beginning of your upkeep, you may attach a Curse attached to you to one of your opponents. If you do, draw two cards.
SVar:TrigChooseCurse:DB$ ChooseCard | Choices$ Curse.AttachedTo You | ChoiceTitle$ Select a curse attached to you | SubAbility$ DBChooseOpponent
SVar:DBChooseOpponent:DB$ ChoosePlayer | ConditionDefined$ ChosenCard | ConditionPresent$ Card | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Select an opponent to attach the curse to | SubAbility$ DBAttach
SVar:DBAttach:DB$ Attach | Object$ ChosenCard | Defined$ ChosenPlayer | RememberAttached$ True | SubAbility$ DBDraw |
SVar:DBDraw:DB$ Draw | ConditionDefined$ Remembered | ConditionPresent$ Curse.AttachedTo ChosenPlayer | Defined$ You | NumCards$ 2 | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True | ClearChosenPlayer$ True | ClearRemembered$ True
DeckNeeds:Type$Curse
Oracle:Deathtouch\nWhenever a Curse is put into your graveyard from the battlefield, return it to the battlefield attached to you at the beginning of the next end step.\nAt the beginning of your upkeep, you may attach a Curse attached to you to one of your opponents. If you do, draw two cards.