From 8ab0f353105c915f16c4418dcaa5ec4fb7e5c44d Mon Sep 17 00:00:00 2001 From: Northmoc Date: Wed, 25 Nov 2020 08:24:00 -0500 Subject: [PATCH 1/4] fix back_for_more.txt --- forge-gui/res/cardsfolder/b/back_for_more.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/forge-gui/res/cardsfolder/b/back_for_more.txt b/forge-gui/res/cardsfolder/b/back_for_more.txt index 368297d8182..efcae18b7a5 100755 --- a/forge-gui/res/cardsfolder/b/back_for_more.txt +++ b/forge-gui/res/cardsfolder/b/back_for_more.txt @@ -1,6 +1,8 @@ Name:Back for More ManaCost:4 B G Types:Instant -A:SP$ ChangeZone | Cost$ 4 B G | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouOwn | SubAbility$ DBFight | StackDescription$ SpellDescription | SpellDescription$ Return target creature card from your graveyard to the battlefield. When you do, it fights up to one target creature you don't control. -SVar:DBFight:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Choose target creature you don't control | StackDescription$ None +A:SP$ ChangeZone | Cost$ 4 B G | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouOwn | SubAbility$ DBImmediateTrigger | StackDescription$ SpellDescription | SpellDescription$ Return target creature card from your graveyard to the battlefield. When you do, it fights up to one target creature you don't control. (Each deals damage equal to its power to the other.) +SVar:DBImmediateTrigger:DB$ ImmediateTrigger | RememberObjects$ Targeted | Execute$ DBFight | Secondary$ True | TriggerDescription$ When you do, it fights up to one target creature you don't control. (Each deals damage equal to its power to the other.) +SVar:DBFight:DB$ Fight | Defined$ DelayTriggerRemembered | ValidTgts$ Creature.YouDontCtrl | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Choose up to one target creature you don't control | StackDescription$ None +DeckHas:Ability$Graveyard Oracle:Return target creature card from your graveyard to the battlefield. When you do, it fights up to one target creature you don't control. (Each deals damage equal to its power to the other.) From d935da6f093586430fc406836f617c8ed0525f41 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Wed, 25 Nov 2020 10:00:59 -0500 Subject: [PATCH 2/4] master_of_cruelties.txt proper keyword --- forge-gui/res/cardsfolder/m/master_of_cruelties.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/cardsfolder/m/master_of_cruelties.txt b/forge-gui/res/cardsfolder/m/master_of_cruelties.txt index 94d0d04be8f..b66f2838428 100644 --- a/forge-gui/res/cardsfolder/m/master_of_cruelties.txt +++ b/forge-gui/res/cardsfolder/m/master_of_cruelties.txt @@ -7,6 +7,6 @@ K:Deathtouch K:CARDNAME can only attack alone. T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | ValidDefender$ Player | Execute$ TrigDamage | TriggerDescription$ Whenever CARDNAME attacks a player and isn't blocked, that player's life total becomes 1. CARDNAME assigns no combat damage this combat. SVar:TrigDamage:DB$ SetLife | Defined$ TriggeredDefender | LifeAmount$ 1 | SubAbility$ DBPump -SVar:DBPump:DB$ Pump | Defined$ Self | KW$ Prevent all combat damage that would be dealt by CARDNAME. | UntilEndOfCombat$ True +SVar:DBPump:DB$ Pump | Defined$ Self | KW$ HIDDEN CARDNAME assigns no combat damage | UntilEndOfCombat$ True SVar:MustBeBlocked:True Oracle:First strike, deathtouch\nMaster of Cruelties can only attack alone.\nWhenever Master of Cruelties attacks a player and isn't blocked, that player's life total becomes 1. Master of Cruelties assigns no combat damage this combat. From 453e725a5543927eb0fbd4211f3b97b1a8a63ee5 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Thu, 26 Nov 2020 07:04:25 -0500 Subject: [PATCH 3/4] typos --- .../src/main/java/forge/game/ability/AbilityFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/AbilityFactory.java b/forge-game/src/main/java/forge/game/ability/AbilityFactory.java index ab7bff7ac30..2ddddf62ee5 100644 --- a/forge-game/src/main/java/forge/game/ability/AbilityFactory.java +++ b/forge-game/src/main/java/forge/game/ability/AbilityFactory.java @@ -455,7 +455,7 @@ public final class AbilityFactory { Map leftMap = Maps.newHashMap(leftAbility.getMapParams()); AbilityRecordType leftType = AbilityRecordType.getRecordType(leftMap); ApiType leftApi = leftType.getApiTypeOf(leftMap); - leftMap.put("StackDecription", leftMap.get("SpellDescription")); + leftMap.put("StackDescription", leftMap.get("SpellDescription")); leftMap.put("SpellDescription", "Fuse (you may cast both halves of this card from your hand)."); leftMap.put("ActivationZone", "Hand"); @@ -465,7 +465,7 @@ public final class AbilityFactory { AbilityRecordType rightType = AbilityRecordType.getRecordType(leftMap); ApiType rightApi = leftType.getApiTypeOf(rightMap); - rightMap.put("StackDecription", rightMap.get("SpellDescription")); + rightMap.put("StackDescription", rightMap.get("SpellDescription")); rightMap.put("SpellDescription", ""); Cost totalCost = parseAbilityCost(leftState, leftMap, leftType); From 6e06625b4c325f38903f2c9697cdd446549e2b6f Mon Sep 17 00:00:00 2001 From: Northmoc Date: Thu, 26 Nov 2020 07:24:40 -0500 Subject: [PATCH 4/4] merchant_raiders.txt fix and clean up --- forge-gui/res/cardsfolder/upcoming/merchant_raiders.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/forge-gui/res/cardsfolder/upcoming/merchant_raiders.txt b/forge-gui/res/cardsfolder/upcoming/merchant_raiders.txt index 2de5dead70f..6ac4873ae23 100755 --- a/forge-gui/res/cardsfolder/upcoming/merchant_raiders.txt +++ b/forge-gui/res/cardsfolder/upcoming/merchant_raiders.txt @@ -2,8 +2,7 @@ Name:Merchant Raiders ManaCost:3 U Types:Creature Human Pirate PT:2/4 -T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME or another Pirate enters the battlefield under your control, tap up to one target creature. That creature doesn't untap during its controller's untap step for as long as you control CARDNAME. -T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Pirate.Other+YouCtrl | Execute$ TrigTap | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Pirate enters the battlefield under your control, tap up to one target creature. That creature doesn't untap during its controller's untap step for as long as you control CARDNAME. +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Pirate.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME or another Pirate enters the battlefield under your control, tap up to one target creature. That creature doesn't untap during its controller's untap step for as long as you control CARDNAME. SVar:TrigTap:DB$ Tap | ValidTgts$ Creature | TgtPrompt$ Select target creature | TargetMin$ 0 | TargetMax$ 1 | SubAbility$ DBPump SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN CARDNAME doesn't untap during your untap step. | UntilLoseControlOfHost$ True SVar:PlayMain1:TRUE