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

Merge branch 'master' of https://github.com/jjayers99/forge-updates

Browse Source
This commit is contained in:
jjayers99
2023-04-10 06:57:09 -04:00
parent 2e7b663bd5 bf9d2343bd
commit b38e66c02c
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-game/src/main/java/forge/game/card/CardProperty.java
View File

@@ -1961,7 +1961,8 @@ public class CardProperty {
} else if (property.startsWith("Triggered")) {
if (spellAbility instanceof SpellAbility) {
final String key = property.substring(9);
Object o = ((SpellAbility)spellAbility).getTriggeringObject(AbilityKey.fromString(key));
SpellAbility sa = (SpellAbility) spellAbility;
Object o = sa.getRootAbility().getTriggeringObject(AbilityKey.fromString(key));
boolean found = false;
if (o != null) {
if (o instanceof CardCollection) {
@@ -1979,7 +1980,8 @@ public class CardProperty {
} else if (property.startsWith("NotTriggered")) {
final String key = property.substring("NotTriggered".length());
if (spellAbility instanceof SpellAbility) {
if (card.equals(((SpellAbility)spellAbility).getTriggeringObject(AbilityKey.fromString(key)))) {
SpellAbility sa = (SpellAbility) spellAbility;
if (card.equals(sa.getRootAbility().getTriggeringObject(AbilityKey.fromString(key)))) {
return false;
}
} else {

12
forge-gui/res/cardsfolder/upcoming/flitting_guerrilla.txt Normal file
View File

@@ -0,0 +1,12 @@
Name:Flitting Guerrilla
ManaCost:2 B
Types:Creature Faerie Rogue
PT:2/2
K:Flying
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME dies, each player mills two cards. Then you may exile CARDNAME. When you do, put target creature or battle card from your graveyard on top of your library. (To mill two cards, a player puts the top two cards of their library into their graveyard.)
SVar:TrigMill:DB$ Mill | Defined$ Player | NumCards$ 2 | SubAbility$ DBImmediateTrig
SVar:DBImmediateTrig:DB$ ImmediateTrigger | Execute$ TrigChangeZone | UnlessCost$ ExileAnyGrave<1/Card.TriggeredNewCard> | UnlessPayer$ You | UnlessSwitched$ True | TriggerDescription$ Then you may exile CARDNAME. When you do, put target creature or battle card from your graveyard on top of your library.
SVar:TrigChangeZone:DB$ ChangeZone | ValidTgts$ Creature.YouOwn,Battle.YouOwn | TgtPrompt$ Select target creature or battle card from your graveyard | Origin$ Graveyard | Destination$ Library | LibraryPosition$ 0
DeckHas:Ability$Mill|Graveyard
DeckHints:Type$Battle
Oracle:Flying\nWhen Flitting Guerrilla dies, each player mills two cards. Then you may exile Flitting Guerrilla. When you do, put target creature or battle card from your graveyard on top of your library. (To mill two cards, a player puts the top two cards of their library into their graveyard.)