Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update cardstates after creating token from prototype #5676

Merged
merged 3 commits into from
Jul 24, 2024
Merged

Update cardstates after creating token from prototype #5676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7dde37
Hotfix for Toggo rock
Jul 22, 2024
96d9ffb
Force update cardstate
Jul 23, 2024
ca2873d
Clean up
Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions forge-game/src/main/java/forge/game/ability/effects/TokenEffectBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ protected TokenCreateTable makeTokenTable(TokenCreateTable tokenTable, final boo

for (int i = 0; i < cellAmount; i++) {
Card tok = new CardCopyService(prototype).copyCard(true);
// disconnect from prototype
tok.getStates().forEach(cs -> tok.getState(cs).resetOriginalHost());
// Crafty Cutpurse would change under which control it does enter,
// but it shouldn't change who creates the token
tok.setOwner(creator);
Expand Down
37 changes: 20 additions & 17 deletions forge-game/src/main/java/forge/game/card/CardState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package forge.game.card;

import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;

Expand Down Expand Up @@ -748,30 +747,34 @@ public void addIntrinsicKeywords(Collection<KeywordInterface> intrinsicKeywords2
}
}

public ImmutableList<CardTraitBase> getTraits() {
return ImmutableList.<CardTraitBase>builder()
.addAll(manaAbilities)
.addAll(nonManaAbilities)
.addAll(triggers)
.addAll(replacementEffects)
.addAll(staticAbilities)
.build();
}

public void resetOriginalHost() {
for (final CardTraitBase ctb : getTraits()) {
if (ctb.isIntrinsic()) {
ctb.setCardState(this);
}
}
}

public void updateChangedText() {
final List<CardTraitBase> allAbs = ImmutableList.<CardTraitBase>builder()
.addAll(manaAbilities)
.addAll(nonManaAbilities)
.addAll(triggers)
.addAll(replacementEffects)
.addAll(staticAbilities)
.build();
for (final CardTraitBase ctb : allAbs) {
for (final CardTraitBase ctb : getTraits()) {
if (ctb.isIntrinsic()) {
ctb.changeText();
}
}
}

public void changeTextIntrinsic(Map<String,String> colorMap, Map<String,String> typeMap) {
final List<CardTraitBase> allAbs = ImmutableList.<CardTraitBase>builder()
.addAll(manaAbilities)
.addAll(nonManaAbilities)
.addAll(triggers)
.addAll(replacementEffects)
.addAll(staticAbilities)
.build();
for (final CardTraitBase ctb : allAbs) {
for (final CardTraitBase ctb : getTraits()) {
if (ctb.isIntrinsic()) {
ctb.changeTextIntrinsic(colorMap, typeMap);
}
Expand Down
2 changes: 1 addition & 1 deletion forge-gui/res/cardsfolder/e/eriette_the_beguiler.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Types:Legendary Creature Human Warlock
PT:4/4
K:Lifelink
T:Mode$ Attached | ValidSource$ Aura.YouCtrl | TargetRelativeToSource$ Permanent.nonLand+OppCtrl+cmcLEX | TriggerZones$ Battlefield | Execute$ TrigGainControl | TriggerDescription$ Whenever an Aura you control becomes attached to a nonland permanent an opponent controls with mana value less than or equal to that Aura's mana value, gain control of that permanent for as long as that Aura is attached to it.
SVar:TrigGainControl:DB$ GainControl | NewController$ You | Defined$ TriggeredTarget | Duration$ UntilSourceUnattached
SVar:TrigGainControl:DB$ GainControl | NewController$ You | Defined$ TriggeredTarget | LoseControl$ UntilSourceUnattached
SVar:X:Count$CardManaCost
DeckHas:Ability$LifeGain
DeckNeeds:Type$Aura
Expand Down
Loading