Merge remote-tracking branch 'remotes/core/master'

forge-gui/res/cardsfolder/s/sorcerous_spyglass.txt

@@ -1,12 +1,14 @@
 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, 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
 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)
 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.
+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.

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.

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 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
+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.

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.

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.

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
+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=破誓者