From 9c21f195f95351ac1af9ee1e62872202eb0b6ce3 Mon Sep 17 00:00:00 2001 From: swordshine Date: Thu, 12 Sep 2019 16:04:55 +0800 Subject: [PATCH 1/6] Fix Sorcerous Spyglass --- forge-gui/res/cardsfolder/s/sorcerous_spyglass.txt | 8 +++++--- forge-gui/res/cardsfolder/t/tishana_voice_of_thunder.txt | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/forge-gui/res/cardsfolder/s/sorcerous_spyglass.txt b/forge-gui/res/cardsfolder/s/sorcerous_spyglass.txt index ad67deb0e03..a5f6ecdaa0e 100644 --- a/forge-gui/res/cardsfolder/s/sorcerous_spyglass.txt +++ b/forge-gui/res/cardsfolder/s/sorcerous_spyglass.txt @@ -1,9 +1,11 @@ Name:Sorcerous Spyglass ManaCost:2 Types:Artifact -T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPeek | TriggerDescription$ As CARDNAME enters the battlefield, look at an opponent's hand, then choose any card name. -SVar:TrigPeek:DB$ RevealHand | ValidTgts$ Opponent | TgtPrompt$ Select an opponent | SubAbility$ DBNameCard -SVar:DBNameCard:DB$ NameCard | Defined$ You +K:ETBReplacement:Other:ChoosePlayer +SVar:ChoosePlayer:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent to look at the hand: | SubAbility$ DBLook | SpellDescription$ As CARDNAME enters the battlefield, choose a creature type. +SVar:DBLook:DB$ RevealHand | Defined$ ChosenPlayer | SubAbility$ DBNameCard +SVar:DBNameCard:DB$ NameCard | Defined$ You | SubAbility$ DBClear +SVar:DBClear:DB$ Cleanup | ClearChosenPlayer$ True S:Mode$ CantBeActivated | ValidCard$ Card.NamedCard | NonMana$ True | Description$ Activated abilities of sources with the chosen name can't be activated unless they're mana abilities. AI:RemoveDeck:Random # TODO: Might improve AI logic to support it (the AI needs to pick cards that actually have activated nonmana abilities on them) diff --git a/forge-gui/res/cardsfolder/t/tishana_voice_of_thunder.txt b/forge-gui/res/cardsfolder/t/tishana_voice_of_thunder.txt index 7a22bbc3077..ea9a18c4ae3 100644 --- a/forge-gui/res/cardsfolder/t/tishana_voice_of_thunder.txt +++ b/forge-gui/res/cardsfolder/t/tishana_voice_of_thunder.txt @@ -1,7 +1,7 @@ Name:Tishana, Voice of Thunder ManaCost:5 G U Types:Legendary Creature Merfolk Shaman -PT:0/0 +PT:*/* S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | References$ X | Description$ CARDNAME's power and toughness are each equal to the number of cards in your hand. S:Mode$ Continuous | Affected$ You | SetMaxHandSize$ Unlimited | Description$ You have no maximum hand size. T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card for each creature you control. From 6d7d3d0306e4866c84ddd23e71ed3822062df058 Mon Sep 17 00:00:00 2001 From: swordshine Date: Thu, 12 Sep 2019 16:08:28 +0800 Subject: [PATCH 2/6] more fixes --- forge-gui/res/cardsfolder/s/sorcerous_spyglass.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-gui/res/cardsfolder/s/sorcerous_spyglass.txt b/forge-gui/res/cardsfolder/s/sorcerous_spyglass.txt index a5f6ecdaa0e..0af77016b06 100644 --- a/forge-gui/res/cardsfolder/s/sorcerous_spyglass.txt +++ b/forge-gui/res/cardsfolder/s/sorcerous_spyglass.txt @@ -2,7 +2,7 @@ Name:Sorcerous Spyglass ManaCost:2 Types:Artifact K:ETBReplacement:Other:ChoosePlayer -SVar:ChoosePlayer:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent to look at the hand: | SubAbility$ DBLook | SpellDescription$ As CARDNAME enters the battlefield, choose a creature type. +SVar:ChoosePlayer:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent to look at the hand: | SubAbility$ DBLook | SpellDescription$ As CARDNAME enters the battlefield, look at an opponent's hand, then choose any card name. SVar:DBLook:DB$ RevealHand | Defined$ ChosenPlayer | SubAbility$ DBNameCard SVar:DBNameCard:DB$ NameCard | Defined$ You | SubAbility$ DBClear SVar:DBClear:DB$ Cleanup | ClearChosenPlayer$ True @@ -11,4 +11,4 @@ AI:RemoveDeck:Random # TODO: Might improve AI logic to support it (the AI needs to pick cards that actually have activated nonmana abilities on them) AI:RemoveDeck:All SVar:Picture:http://www.wizards.com/global/images/magic/general/sorcerous_spyglass.jpg -Oracle:As Sorcerous Spyglass enters the battlefield, look at an opponent's hand, then choose any card name. Activated abilities of sources with the chosen name can't be activated unless they're mana abilities. \ No newline at end of file +Oracle:As Sorcerous Spyglass enters the battlefield, look at an opponent's hand, then choose any card name.\nActivated abilities of sources with the chosen name can't be activated unless they're mana abilities. From 46dc8b73ea38ae1ad5cbb92a6e487f8cee06b7ca Mon Sep 17 00:00:00 2001 From: swordshine Date: Thu, 12 Sep 2019 16:50:03 +0800 Subject: [PATCH 3/6] Add two Adamant cards --- .../res/cardsfolder/upcoming/garenbrig_paladin.txt | 9 +++++++++ forge-gui/res/cardsfolder/upcoming/outmuscle.txt | 10 ++++++++++ 2 files changed, 19 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/garenbrig_paladin.txt create mode 100644 forge-gui/res/cardsfolder/upcoming/outmuscle.txt diff --git a/forge-gui/res/cardsfolder/upcoming/garenbrig_paladin.txt b/forge-gui/res/cardsfolder/upcoming/garenbrig_paladin.txt new file mode 100644 index 00000000000..312b34ca1d5 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/garenbrig_paladin.txt @@ -0,0 +1,9 @@ +Name:Garenbrig Paladin +ManaCost:4 G +Types:Creature Giant Knight +PT:4/4 +R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | Adamant$ Green | ReplaceWith$ ETBAddCounter | Description$ Adamant — If at least three red mana was spent to cast this spell, CARDNAME enters the battlefield with a +1/+1 counter on it. +SVar:ETBAddCounter:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ MoveToPlay +SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard +K:CantBeBlockedBy Creature.powerLE2 +Oracle:Adamant — If at least three green mana was spent to cast this spell, Garenbrig Paladin enters the battlefield with a +1/+1 counter on it.\nGarenbrig Paladin can't be blocked by creatures with power 2 or less. diff --git a/forge-gui/res/cardsfolder/upcoming/outmuscle.txt b/forge-gui/res/cardsfolder/upcoming/outmuscle.txt new file mode 100644 index 00000000000..6a9a28753c0 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/outmuscle.txt @@ -0,0 +1,10 @@ +Name:Outmuscle +ManaCost:3 G +Types:Sorcery +A:SP$ PutCounter | Cost$ 3 G | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Choose target creature you control | RememberTargets$ True | CounterType$ P1P1 | CounterNum$ 1 | AILogic$ Fight | SubAbility$ DBFight | SpellDescription$ Put a +1/+1 counter on target creature you control, then it fights with a creature you don't control. Adamant — If at least three green mana was spent to cast this spell, the creature you control gets indestructible until end of turn. +SVar:DBFight:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature.YouDontCtrl | AILogic$ Always | TgtPrompt$ Choose target creature you don't control | SubAbility$ DBPump +SVar:DBPump:DB$ Pump | Defined$ Remembered | KW$ Indestructible | ConditionCheckSVar$ X | References$ X | SubAbility$ DBCleanup +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True +SVar:X:Count$Adamant.Green.1.0 +DeckHas:Ability$Counters +Oracle:Put a +1/+1 counter on target creature you control, then it fights with a creature you don't control.\nAdamant — If at least three green mana was spent to cast this spell, the creature you control gets indestructible until end of turn. \ No newline at end of file From c3a5491a6bbb268194471b734a5dc577a2d3d12f Mon Sep 17 00:00:00 2001 From: swordshine Date: Thu, 12 Sep 2019 22:35:04 +0800 Subject: [PATCH 4/6] Update Garenbrig Paladin --- forge-gui/res/cardsfolder/upcoming/garenbrig_paladin.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/cardsfolder/upcoming/garenbrig_paladin.txt b/forge-gui/res/cardsfolder/upcoming/garenbrig_paladin.txt index 312b34ca1d5..cdb510b7e22 100644 --- a/forge-gui/res/cardsfolder/upcoming/garenbrig_paladin.txt +++ b/forge-gui/res/cardsfolder/upcoming/garenbrig_paladin.txt @@ -2,7 +2,7 @@ Name:Garenbrig Paladin ManaCost:4 G Types:Creature Giant Knight PT:4/4 -R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | Adamant$ Green | ReplaceWith$ ETBAddCounter | Description$ Adamant — If at least three red mana was spent to cast this spell, CARDNAME enters the battlefield with a +1/+1 counter on it. +R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | Adamant$ Green | ReplaceWith$ ETBAddCounter | Description$ Adamant — If at least three green mana was spent to cast this spell, CARDNAME enters the battlefield with a +1/+1 counter on it. SVar:ETBAddCounter:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ MoveToPlay SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard K:CantBeBlockedBy Creature.powerLE2 From b56e2ec3c361b5a7633c49d4094e86bbaf285404 Mon Sep 17 00:00:00 2001 From: swordshine Date: Fri, 13 Sep 2019 11:18:15 +0800 Subject: [PATCH 5/6] Fix the name of Syr Elenora, the Discerning --- .../res/cardsfolder/upcoming/syr_elenora_the_discerning.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-gui/res/cardsfolder/upcoming/syr_elenora_the_discerning.txt b/forge-gui/res/cardsfolder/upcoming/syr_elenora_the_discerning.txt index 192e3e9383c..2759d1c9345 100644 --- a/forge-gui/res/cardsfolder/upcoming/syr_elenora_the_discerning.txt +++ b/forge-gui/res/cardsfolder/upcoming/syr_elenora_the_discerning.txt @@ -1,4 +1,4 @@ -Name:Syr Elenora the Discerning +Name:Syr Elenora, the Discerning ManaCost:3 U U Types:Legendary Creature Human Knight PT:*/4 @@ -8,4 +8,4 @@ AI:RemoveDeck:All T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card. SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 S:Mode$ RaiseCost | ValidTarget$ Card.Self | Activator$ Player.Opponent | Type$ Spell | Amount$ 2 | Description$ Spells your opponents cast that target CARDNAME cost {2} more to cast. -Oracle:Syr Elenora the Discerning's power is equal to the number of cards in your hand.\nWhen Syr Elenora enters the battlefield, draw a card.\nSpells your opponents cast that target Syr Elenora cost {2} more to cast. +Oracle:Syr Elenora, the Discerning's power is equal to the number of cards in your hand.\nWhen Syr Elenora enters the battlefield, draw a card.\nSpells your opponents cast that target Syr Elenora cost {2} more to cast. From 229688f26fa9f8ec63bd42ac95633c9a639fc16b Mon Sep 17 00:00:00 2001 From: CCTV-1 Date: Fri, 13 Sep 2019 18:37:58 +0800 Subject: [PATCH 6/6] update translation --- forge-gui/res/languages/zh-CN.properties | 62 ++++++++++++------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/forge-gui/res/languages/zh-CN.properties b/forge-gui/res/languages/zh-CN.properties index 20d705477b4..b23a8408ba6 100644 --- a/forge-gui/res/languages/zh-CN.properties +++ b/forge-gui/res/languages/zh-CN.properties @@ -938,35 +938,35 @@ nlTheme=设置显示的组件使用的外观主题。 nlVibrateAfterLongPress=启用长按触发震动，例如长按缩放卡牌图片。 nlVibrateWhenLosingLife=启用当玩家在游戏中失去生命或收到伤害时震动。 #MatchScreen.java -lblPlayers=Players -lblLog=Log -lblDev=Dev -lblStack=Stack -lblMustWaitPriority=Must wait for priority... +lblPlayers=玩家列表 +lblLog=日志 +lblDev=开发者工具 +lblStack=堆叠 +lblMustWaitPriority=等待获得优先权 #FDeckEditor.java -lblImportFromClipboard=Import from Clipboard -lblSaveAs=Save As... -lblNameNewCopyDeck=Enter name for new copy of deck -lblRenameDeck=Rename Deck -lblNewNameDeck=Enter new name for deck -lblDeleteDeck=Delete Deck -lblDelete=Delete -lblConfirmDelete=Are you sure you want to delete -lblNameNewDeck=Enter name for new deck -lblSaveChangesCurrentDeck=Save changes to current deck? -lblAddFavorites=Add to Favorites -lblRemoveFavorites=Remove from Favorites -lblChangePreferredArt=Change Preferred Art -lblSelectPreferredArt=Select preferred art for -lblTo=to -lblAvatar=Avatar -lblCards=Cards -lblPlanes=Planes -lblSchemes=Schemes -lblToMainDeck=to Main Deck -lblHowMany=how many? -lblInventory=Inventory -lblCollection=Collection -lblCatalog=Catalog -lblCommanders=Commanders -lblOathbreakers=Oathbreakers \ No newline at end of file +lblImportFromClipboard=从剪切板导入 +lblSaveAs=保存到 +lblNameNewCopyDeck=输入新的套牌副本的名称 +lblRenameDeck=重命名套牌 +lblNewNameDeck=输入新套牌的名称 +lblDeleteDeck=删除套牌 +lblDelete=删除 +lblConfirmDelete=确定要删除吗 +lblNameNewDeck=输入新套牌的名称 +lblSaveChangesCurrentDeck=保存当前更改到套牌？ +lblAddFavorites=添加到收藏夹 +lblRemoveFavorites=从收藏夹删除 +lblChangePreferredArt=改变首选卡图 +lblSelectPreferredArt=选择首选的卡图版本 +lblTo=到 +lblAvatar=头像 +lblCards=卡牌 +lblPlanes=时空 +lblSchemes=阴谋 +lblToMainDeck=到主牌 +lblHowMany=多少？ +lblInventory=库存 +lblCollection=珍藏 +lblCatalog=目录 +lblCommanders=指挥官 +lblOathbreakers=破誓者 \ No newline at end of file