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

Update the implementation of trigger replacing ABILITY text.

Browse Source
This commit is contained in:
Lyu Zong-Hong
2021-07-10 15:22:55 +09:00
parent dd6dc739fb
commit d5149293da
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/ability/effects/RollDiceEffect.java
View File

@@ -28,7 +28,7 @@ public class RollDiceEffect extends SpellAbilityEffect {
String [] kv = ab.split(":"); String [] kv = ab.split(":");
String desc = sa.getAdditionalAbility(kv[0]).getDescription(); String desc = sa.getAdditionalAbility(kv[0]).getDescription();
if (!desc.isEmpty()) { if (!desc.isEmpty()) {
sb.append("\n\n").append(desc); sb.append("\n").append(desc);
} }
} }
} }

4
forge-game/src/main/java/forge/game/trigger/Trigger.java
View File

@@ -193,13 +193,13 @@ public abstract class Trigger extends TriggerReplacementBase {
if (ApiType.Charm.equals(sa.getApi())) { if (ApiType.Charm.equals(sa.getApi())) {
saDesc = sa.getStackDescription(); saDesc = sa.getStackDescription();
} else { } else {
saDesc = sa.getDescription(); saDesc = sa.toString();
} }
} else if (ApiType.Charm.equals(sa.getApi())) { } else if (ApiType.Charm.equals(sa.getApi())) {
// use special formating, can be used in Card Description // use special formating, can be used in Card Description
saDesc = CharmEffect.makeFormatedDescription(sa); saDesc = CharmEffect.makeFormatedDescription(sa);
} else { } else {
saDesc = sa.getDescription(); saDesc = sa.toString();
} }
// string might have leading whitespace // string might have leading whitespace
saDesc = saDesc.trim(); saDesc = saDesc.trim();

1
forge-game/src/main/java/forge/game/trigger/WrappedAbility.java
View File

@@ -67,7 +67,6 @@ public class WrappedAbility extends Ability {
sa = sa0; sa = sa0;
sa.setTrigger(regtrig0); sa.setTrigger(regtrig0);
decider = decider0; decider = decider0;
sa.setDescription(this.getStackDescription());
} }
public SpellAbility getWrappedAbility() { public SpellAbility getWrappedAbility() {

4
forge-gui/res/cardsfolder/upcoming/aberrant_mind_sorceror.txt
View File

@@ -2,9 +2,9 @@ Name:Aberrant Mind Sorcerer
ManaCost:4 U ManaCost:4 U
Types:Creature Human Elf Shaman Types:Creature Human Elf Shaman
PT:3/4 PT:3/4
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigPump | TriggerDescription$ Psionic Spells – When CARDNAME enters the battlefield, choose target instant or sorcery card in your graveyard, then roll a d20. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigPump | TriggerDescription$ Psionic Spells – When CARDNAME enters the battlefield, choose target instant or sorcery card in your graveyard, then ABILITY
SVar:TrigPump:DB$ Pump | ValidTgts$ Instant.YouOwn,Sorcery.YouOwn | TgtZone$ Graveyard | TgtPrompt$ Choose target instant or sorcery card in your graveyard | SubAbility$ DBRollDice SVar:TrigPump:DB$ Pump | ValidTgts$ Instant.YouOwn,Sorcery.YouOwn | TgtZone$ Graveyard | TgtPrompt$ Choose target instant or sorcery card in your graveyard | SubAbility$ DBRollDice
SVar:DBRollDice:DB$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:DBLibrary,10-20:DBHand SVar:DBRollDice:DB$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:DBLibrary,10-20:DBHand | SpellDescription$ roll a d20.
SVar:DBLibrary:DB$ ChangeZone | Defined$ Targeted | Origin$ Graveyard | Destination$ Library | LibraryPosition$ 0 | Optional$ True | SpellDescription$ 1-9 VERT You may put that card on top of your library. SVar:DBLibrary:DB$ ChangeZone | Defined$ Targeted | Origin$ Graveyard | Destination$ Library | LibraryPosition$ 0 | Optional$ True | SpellDescription$ 1-9 VERT You may put that card on top of your library.
SVar:DBHand:DB$ ChangeZone | Defined$ Targeted | Origin$ Graveyard | Destination$ Hand | SpellDescription$ 10-20 VERT Return that card to your hand. SVar:DBHand:DB$ ChangeZone | Defined$ Targeted | Origin$ Graveyard | Destination$ Hand | SpellDescription$ 10-20 VERT Return that card to your hand.
Oracle:Psionic Spells — When Aberrant Mind Sorcerer enters the battlefield, choose target instant or sorcery card in your graveyard, then roll a d20.\n1-9 | You may put that card on top of your library.\n10-20 | Return that card to your hand. Oracle:Psionic Spells — When Aberrant Mind Sorcerer enters the battlefield, choose target instant or sorcery card in your graveyard, then roll a d20.\n1-9 | You may put that card on top of your library.\n10-20 | Return that card to your hand.