From 08129db336dd2ac596ea780b6f42326365e124a0 Mon Sep 17 00:00:00 2001 From: austinio7116 Date: Mon, 23 Sep 2019 06:18:32 +0100 Subject: [PATCH 1/2] Preparation for ELD draft format --- forge-gui/res/blockdata/blocks.txt | 3 +- forge-gui/res/blockdata/printsheets.txt | 35 ++- forge-gui/res/draft/rankings.txt | 249 ++++++++++++++++++ forge-gui/res/editions/Throne of Eldraine.txt | 44 ++-- 4 files changed, 307 insertions(+), 24 deletions(-) diff --git a/forge-gui/res/blockdata/blocks.txt b/forge-gui/res/blockdata/blocks.txt index 4c5c26be916..d4574f21b41 100644 --- a/forge-gui/res/blockdata/blocks.txt +++ b/forge-gui/res/blockdata/blocks.txt @@ -81,4 +81,5 @@ Ultimate Masters, 3/6/M19, UMA Ravnica Allegiance, 3/6/RNA, RNA War of the Spark, 3/6/WAR, WAR Modern Horizons, 3/6/WAR, MH1 -Core Set 2020, 3/6/M20, M20 \ No newline at end of file +Core Set 2020, 3/6/M20, M20 +Throne of Eldraine, 3/6/ELD, ELD \ No newline at end of file diff --git a/forge-gui/res/blockdata/printsheets.txt b/forge-gui/res/blockdata/printsheets.txt index e7091fba6c9..c4a4858616f 100644 --- a/forge-gui/res/blockdata/printsheets.txt +++ b/forge-gui/res/blockdata/printsheets.txt @@ -1553,4 +1553,37 @@ Evolving Wilds 13 Island|M20 13 Mountain|M20 13 Plains|M20 -13 Swamp|M20 \ No newline at end of file +13 Swamp|M20 + +[ELD Secret Cards] +Kenrith, the Returned King +Rowan, Fearless Sparkmage +Garrison Griffin +Rowan's Battleguard +Rowan's Stalwarts +Wind-Scarred Crag +Oko, the Trickster +Oko's Accomplices +Bramblefort Fink +Oko's Hospitality +Thornwood Falls +Mace of the Valiant +Silverwing Squadron +Faerie Formation +Shimmer Dragon +Workshop Elders +Chittering Witch +Taste of Death +Embereth Skyblazer +Steelbane Hydra +Thorn Mammoth +Alela, Artful Provocateur +Banish into Fable +Chulane, Teller of Tales +Gluttonous Troll +Knights' Charge +Korvold, Fae-Cursed King +Syr Gwyn, Hero of Ashvale +Arcane Signet +Tome of Legends +Command Tower \ No newline at end of file diff --git a/forge-gui/res/draft/rankings.txt b/forge-gui/res/draft/rankings.txt index bfc37204eb9..57d4e2b575a 100644 --- a/forge-gui/res/draft/rankings.txt +++ b/forge-gui/res/draft/rankings.txt @@ -1,4 +1,253 @@ //Rank|Name|Rarity|Set +#1|Garruk, Cursed Huntsman|M|ELD +#2|Harmonious Archon|M|ELD +#3|Murderous Rider|R|ELD +#4|Oko, Thief of Crowns|M|ELD +#5|Lochmere Serpent|R|ELD +#6|The Circle of Loyalty|M|ELD +#7|Brazen Borrower|M|ELD +#8|The Great Henge|M|ELD +#9|Bonecrusher Giant|R|ELD +#10|Stonecoil Serpent|R|ELD +#11|Opportunistic Dragon|R|ELD +#12|Clackbridge Troll|R|ELD +#13|Questing Beast|M|ELD +#14|Realm-Cloaked Giant|M|ELD +#15|Wicked Wolf|R|ELD +#16|Irencrag Pyromancer|R|ELD +#17|Feasting Troll King|R|ELD +#18|Rankle, Master of Pranks|M|ELD +#19|Gadwick, the Wizened|R|ELD +#20|Sundering Stroke|R|ELD +#21|Outlaws' Merriment|M|ELD +#22|The Royal Scions|M|ELD +#23|Yorvo, Lord of Garenbrig|R|ELD +#24|Linden, the Steadfast Queen|R|ELD +#25|Torbran, Thane of Red Fell|R|ELD +#26|Epic Downfall|U|ELD +#27|Stolen by the Fae|R|ELD +#28|Worthy Knight|R|ELD +#29|Wildborn Preserver|R|ELD +#30|Piper of the Swarm|R|ELD +#31|Lovestruck Beast|R|ELD +#32|Syr Alin, the Lion's Claw|U|ELD +#33|Faeburrow Elder|R|ELD +#34|Oathsworn Knight|R|ELD +#35|Robber of the Rich|M|ELD +#36|Embercleave|M|ELD +#37|Arcanist's Owl|U|ELD +#38|Acclaimed Contender|R|ELD +#39|Giant Killer|R|ELD +#40|Bake into a Pie|C|ELD +#41|Slaying Fire|U|ELD +#42|Maraleaf Pixie|U|ELD +#43|Syr Faren, the Hengehammer|U|ELD +#44|Rampart Smasher|U|ELD +#45|Archon of Absolution|U|ELD +#46|Grumgully, the Generous|U|ELD +#47|Bog Naughty|U|ELD +#48|Scorching Dragonfire|C|ELD +#49|Syr Carah, the Bold|U|ELD +#50|Savvy Hunter|U|ELD +#51|Inspiring Veteran|U|ELD +#52|Fireborn Knight|U|ELD +#53|Syr Konrad, the Grim|U|ELD +#54|Wintermoor Commander|U|ELD +#55|Return of the Wildspeaker|R|ELD +#56|Blacklance Paragon|R|ELD +#57|Loch Dragon|U|ELD +#58|Reave Soul|C|ELD +#59|Trapped in the Tower|C|ELD +#60|Shinechaser|U|ELD +#61|Steelclaw Lance|U|ELD +#62|Order of Midnight|U|ELD +#63|Charmed Sleep|C|ELD +#64|Resolute Rider|U|ELD +#65|Improbable Alliance|U|ELD +#66|Stormfist Crusader|R|ELD +#67|Fierce Witchstalker|C|ELD +#68|Elite Headhunter|U|ELD +#69|Syr Elenora, the Discerning|U|ELD +#70|Searing Barrage|C|ELD +#71|Covetous Urge|U|ELD +#72|Outmuscle|C|ELD +#73|Witch's Vengeance|R|ELD +#74|Oakhame Ranger|U|ELD +#75|Foulmire Knight|U|ELD +#76|Deathless Knight|U|ELD +#77|Vantress Gargoyle|R|ELD +#78|Thunderous Snapper|U|ELD +#79|Glass Casket|U|ELD +#80|Wandermare|U|ELD +#81|Ayara, First of Locthwain|R|ELD +#82|Charming Prince|R|ELD +#83|Keeper of Fables|U|ELD +#84|Animating Faerie|U|ELD +#85|Faerie Vandal|U|ELD +#86|Tome Raider|C|ELD +#87|Gilded Goose|R|ELD +#88|Fae of Wishes|R|ELD +#89|Shepherd of the Flock|U|ELD +#90|Mysterious Pathlighter|U|ELD +#91|Drown in the Loch|U|ELD +#92|Mirrormade|R|ELD +#93|Hypnotic Sprite|U|ELD +#94|Joust|U|ELD +#95|Beanstalk Giant|U|ELD +#96|Queen of Ice|C|ELD +#97|Hushbringer|R|ELD +#98|Mad Ratter|U|ELD +#99|Tempting Witch|C|ELD +#100|Ardenvale Tactician|C|ELD +#101|Oakhame Adversary|U|ELD +#102|Into the Story|U|ELD +#103|Trail of Crumbs|U|ELD +#104|Scalding Cauldron|C|ELD +#105|Sage of the Falls|U|ELD +#106|Foreboding Fruit|C|ELD +#107|Fabled Passage|R|ELD +#108|Castle Ardenvale|R|ELD +#109|Castle Locthwain|R|ELD +#110|The Cauldron of Eternity|M|ELD +#111|Rally for the Throne|U|ELD +#112|Giant Opportunity|U|ELD +#113|Redcap Melee|U|ELD +#114|Fervent Champion|R|ELD +#115|Doom Foretold|R|ELD +#116|Burning-Yard Trainer|U|ELD +#117|Once Upon a Time|R|ELD +#118|Turn into a Pumpkin|U|ELD +#119|Belle of the Brawl|U|ELD +#120|Run Away Together|C|ELD +#121|Youthful Knight|C|ELD +#122|Outflank|C|ELD +#123|Dwarven Mine|C|ELD +#124|Malevolent Noble|C|ELD +#125|Gingerbread Cabin|C|ELD +#126|Lucky Clover|U|ELD +#127|Castle Embereth|R|ELD +#128|Castle Vantress|R|ELD +#129|Overwhelmed Apprentice|U|ELD +#130|Lonesome Unicorn|C|ELD +#131|Clockwork Servant|U|ELD +#132|Ferocity of the Wilds|U|ELD +#133|The Magic Mirror|M|ELD +#134|Dance of the Manse|R|ELD +#135|Idyllic Grange|C|ELD +#136|Merchant of the Vale|C|ELD +#137|Edgewall Innkeeper|U|ELD +#138|Spinning Wheel|U|ELD +#139|Garenbrig Paladin|C|ELD +#140|Once and Future|U|ELD +#141|Enchanted Carriage|U|ELD +#142|Venerable Knight|U|ELD +#143|Smitten Swordmaster|C|ELD +#144|Midnight Clock|R|ELD +#145|Witch's Cottage|C|ELD +#146|Sporecap Spider|C|ELD +#147|Didn't Say Please|C|ELD +#148|Prized Griffin|C|ELD +#149|Flutterfox|C|ELD +#150|Thrill of Possibility|C|ELD +#151|Moonlit Scavengers|C|ELD +#152|Mystic Sanctuary|C|ELD +#153|So Tiny|C|ELD +#154|Kenrith's Transformation|U|ELD +#155|Steelgaze Griffin|C|ELD +#156|Bloodhaze Wolverine|C|ELD +#157|Unexplained Vision|C|ELD +#158|Garenbrig Carver|C|ELD +#159|Fortifying Provisions|C|ELD +#160|Giant's Skewer|C|ELD +#161|Castle Garenbrig|R|ELD +#162|Escape to the Wilds|R|ELD +#163|Forever Young|C|ELD +#164|Silverflame Squire|C|ELD +#165|Tuinvale Treefolk|C|ELD +#166|Henge Walker|C|ELD +#167|Redcap Raiders|C|ELD +#168|Revenge of Ravens|U|ELD +#169|Lost Legion|C|ELD +#170|Ogre Errant|C|ELD +#171|Skullknocker Ogre|U|ELD +#172|Wishclaw Talisman|R|ELD +#173|Brimstone Trebuchet|C|ELD +#174|Wicked Guardian|C|ELD +#175|Witch's Oven|U|ELD +#176|Rosethorn Acolyte|C|ELD +#177|Shambling Suit|U|ELD +#178|Silverflame Ritual|C|ELD +#179|Heraldic Banner|U|ELD +#180|Embereth Shieldbreaker|U|ELD +#181|Signpost Scarecrow|C|ELD +#182|Barrow Witches|C|ELD +#183|Merfolk Secretkeeper|C|ELD +#184|Rimrock Knight|C|ELD +#185|Festive Funeral|C|ELD +#186|Rosethorn Halberd|C|ELD +#187|Locthwain Paladin|C|ELD +#188|Mantle of Tides|C|ELD +#189|Vantress Paladin|C|ELD +#190|Cauldron's Gift|U|ELD +#191|Garenbrig Squire|C|ELD +#192|Mistford River Turtle|C|ELD +#193|Wolf's Quarry|C|ELD +#194|Raging Redcap|C|ELD +#195|Maraleaf Rider|C|ELD +#196|Insatiable Appetite|C|ELD +#197|Righteousness|U|ELD +#198|Opt|C|ELD +#199|Seven Dwarves|C|ELD +#200|Curious Pair|C|ELD +#201|Wildwood Tracker|C|ELD +#202|Faerie Guidemother|C|ELD +#203|Mystical Dispute|U|ELD +#204|Frogify|U|ELD +#205|Shining Armor|C|ELD +#206|Tournament Grounds|U|ELD +#207|Golden Egg|C|ELD +#208|Witching Well|C|ELD +#209|Crystal Slipper|C|ELD +#210|Weapon Rack|C|ELD +#211|Prophet of the Peak|C|ELD +#212|Crashing Drawbridge|C|ELD +#213|Fling|C|ELD +#214|Memory Theft|C|ELD +#215|Reaper of Night|C|ELD +#216|Sorcerer's Broom|U|ELD +#217|Ardenvale Paladin|C|ELD +#218|Bartered Cow|C|ELD +#219|Tall as a Beanstalk|C|ELD +#220|Barge In|C|ELD +#221|Knight of the Keep|C|ELD +#222|Jousting Dummy|C|ELD +#223|Corridor Monitor|C|ELD +#224|All That Glitters|U|ELD +#225|Embereth Paladin|C|ELD +#226|Eye Collector|C|ELD +#227|Wishful Merfolk|C|ELD +#228|Lash of Thorns|C|ELD +#229|Locthwain Gargoyle|C|ELD +#230|Fell the Pheasant|C|ELD +#231|Inquisitive Puppet|U|ELD +#232|Gingerbrute|C|ELD +#233|True Love's Kiss|C|ELD +#234|Weaselback Redcap|C|ELD +#235|Emry, Lurker of the Loch|R|ELD +#236|Blow Your House Down|C|ELD +#237|Return to Nature|C|ELD +#238|Flaxen Intruder|U|ELD +#239|Specter's Shriek|U|ELD +#240|Beloved Princess|C|ELD +#241|Claim the Firstborn|U|ELD +#242|Roving Keep|C|ELD +#243|Folio of Fancies|R|ELD +#244|Cauldron Familiar|U|ELD +#245|Irencrag Feat|R|ELD +#246|Fires of Invention|R|ELD +#247|Sorcerous Spyglass|R|ELD +#248|Happily Ever After|R|ELD +//Rank|Name|Rarity|Set #1|Nightpack Ambusher|R|M20 #2|Chandra, Awakened Inferno|M|M20 #3|Gargos, Vicious Watcher|R|M20 diff --git a/forge-gui/res/editions/Throne of Eldraine.txt b/forge-gui/res/editions/Throne of Eldraine.txt index 96a50f4671a..4835fff3aff 100644 --- a/forge-gui/res/editions/Throne of Eldraine.txt +++ b/forge-gui/res/editions/Throne of Eldraine.txt @@ -5,8 +5,8 @@ Name=Throne of Eldraine Code2=ELD MciCode=eld Type=Expansion -BoosterCovers=3 -Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand +BoosterCovers=5 +Booster=10 Common:!fromSheet("ELD Secret Cards"), 3 Uncommon:!fromSheet("ELD Secret Cards"), 1 RareMythic:!fromSheet("ELD Secret Cards"), 1 BasicLand [cards] 1 R Acclaimed Contender @@ -258,26 +258,26 @@ Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand 247 C Mystic Sanctuary 248 U Tournament Grounds 249 C Witch's Cottage -250 C Plains -251 C Plains -252 C Plains -253 C Plains -254 C Island -255 C Island -256 C Island -257 C Island -258 C Swamp -259 C Swamp -260 C Swamp -261 C Swamp -262 C Mountain -263 C Mountain -264 C Mountain -265 C Mountain -266 C Forest -267 C Forest -268 C Forest -269 C Forest +250 L Plains +251 L Plains +252 L Plains +253 L Plains +254 L Island +255 L Island +256 L Island +257 L Island +258 L Swamp +259 L Swamp +260 L Swamp +261 L Swamp +262 L Mountain +263 L Mountain +264 L Mountain +265 L Mountain +266 L Forest +267 L Forest +268 L Forest +269 L Forest 303 M Kenrith, the Returned King 304 M Rowan, Fearless Sparkmage 305 C Garrison Griffin From 9e778d9a694f477bbcd65247b8833c1375198738 Mon Sep 17 00:00:00 2001 From: CCTV-1 Date: Mon, 23 Sep 2019 17:21:47 +0800 Subject: [PATCH 2/2] update simplified chinese translation --- forge-gui/res/languages/zh-CN.properties | 124 +++++++++++------------ 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/forge-gui/res/languages/zh-CN.properties b/forge-gui/res/languages/zh-CN.properties index daa4f85a646..318e3d4c963 100644 --- a/forge-gui/res/languages/zh-CN.properties +++ b/forge-gui/res/languages/zh-CN.properties @@ -373,17 +373,17 @@ btnBuildNewSealedDeck=构建新的现开套牌 lblViewDeck=查看套牌 lblRandomDeck=随机套牌 lblRandomColors=随机颜色 -lblMustSelectGenerateNewDeck=You must select something before you can generate a new deck. -lblOK=OK -lblCannotEditDuplicateCustomDeck=cannot be edited directly. Would you like to duplicate %s for editing as a custom user deck? -lblDuplicateDeck=Duplicate Deck? -lblDuplicate=Duplicate -lblHowManyOpponents=How many opponents are you willing to face? -lblChooseAllowedDeckTypeOpponents=Choose allowed deck types for opponents -lblSelectOpponentDeck=Select Opponent's Deck -lblGenerateNewDeck=Generate New Deck -lblRandomTheme=Random Theme -lblTestDeck=Test Deck +lblMustSelectGenerateNewDeck=你必须选择一些内容，才能生成新的套牌。 +lblOK=确认 +lblCannotEditDuplicateCustomDeck=无法直接编辑。你想复制%s作为用户自定义套牌进行编辑吗？ +lblDuplicateDeck=复制套牌？ +lblDuplicate=复制 +lblHowManyOpponents=你想要面对几个对手？ +lblChooseAllowedDeckTypeOpponents=选择允许对手使用的套牌类型 +lblSelectOpponentDeck=为对手选择套牌 +lblGenerateNewDeck=生成新的套牌 +lblRandomTheme=随机主题 +lblTestDeck=测试套牌 #GameType.java lblSealed=现开 lblDraft=轮抓 @@ -985,61 +985,61 @@ lblLoadingFonts=加载字体中 lblLoadingCardTranslations=加载卡牌翻译中 lblFinishingStartup=完成启动 #LobbyScreen.java -lblMore=More... -lblLoadingNewGame=Loading new game... -lblSelectVariants=Select Variants -msgSelectAdeckBeforeReadying=Select a deck before readying! +lblMore=更多 +lblLoadingNewGame=载入新游戏中 +lblSelectVariants=选择变种 +msgSelectAdeckBeforeReadying=在准备之前选择一个套牌 #PlayerPanel -lblLoadingDeck=Loading Deck... -lblSchemeDeckRandomGenerated=Scheme Deck: Random Generated Deck -lblCommanderDeckRandomGenerated=Commander Deck: Random Generated Deck -lblOathbreakerDeckRandomGenerated=Oathbreaker Deck: Random Generated Deck -lblTinyLeadersDeckRandomGenerated=Tiny Leaders Deck: Random Generated Deck -lblBrawlDeckRandomGenerated=Brawl Deck: Random Generated Deck -lblPlanarDeckRandomGenerated=Planar Deck: Random Generated Deck -lblVanguardAvatarRandom=Vanguard Avatar: Random -lblNotReady=Not Ready -lblNormal=Normal -lblDevMode=Dev Mode -lblOathbreakerDeck=Oathbreaker Deck -lblTinyLeadersDeck=Tiny Leaders Deck -lblBrawlDeck=Brawl Deck -lblSelectDeckFor=Select Deck for %s -lblSelectCommanderDeckFor=Select Commander Deck for %s -lblSelectOathbreakerDeckFor=Select Oathbreaker Deck for %s -lblSelectTinyLeadersDeckFor=Select Tiny Leaders Deck for %s -lblSelectBrawlDeckFor=Select Brawl Deck for %s -lblSelectSchemeDeckFor=Select Scheme Deck for %s -lblSelectPlanarDeckFor=Select Planar Deck for %s -lblSelectVanguardFor=Select Vanguard for %s -lblMale=Male -lblFemale=Female -lblAny=Any -lblFantasy=Fantasy -lblGeneric=Generic +lblLoadingDeck=加载套牌中 +lblSchemeDeckRandomGenerated=阴谋套牌：随机生成的套牌 +lblCommanderDeckRandomGenerated=指挥官套牌：随机生成的套牌 +lblOathbreakerDeckRandomGenerated=破誓者套牌：随机生成的套牌 +lblTinyLeadersDeckRandomGenerated=小指挥官套牌：随机生成的套牌 +lblBrawlDeckRandomGenerated=争锋套牌：随机生成的套牌 +lblPlanarDeckRandomGenerated=时空竞逐套牌：随机生成的套牌 +lblVanguardAvatarRandom=先锋头像：随机 +lblNotReady=没有准备好 +lblNormal=正常 +lblDevMode=开发者模式 +lblOathbreakerDeck=破誓者套牌 +lblTinyLeadersDeck=小指挥官套牌：随机生成的套牌 +lblBrawlDeck=争锋套牌 +lblSelectDeckFor=选择套牌%s +lblSelectCommanderDeckFor=选择指挥官套牌%s +lblSelectOathbreakerDeckFor=选择破誓者套牌%s +lblSelectTinyLeadersDeckFor=选择小指挥官套牌%s +lblSelectBrawlDeckFor=选择争锋套牌%s +lblSelectSchemeDeckFor=选择阴谋套牌%s +lblSelectPlanarDeckFor=选择时空竞逐套牌%s +lblSelectVanguardFor=选择先锋套牌%s +lblMale=男 +lblFemale=女 +lblAny=任意 +lblFantasy=幻想 +lblGeneric=通用 #MatchController -lblChooseAbilityToPlay=Choose ability to play -lblSelected=Selected +lblChooseAbilityToPlay=选择使用的能力 +lblSelected=选择 #ItemManager -lblAdvancedSearch=Advanced Search -lblSort=Sort -lblResetFilters=Reset Filters +lblAdvancedSearch=高级搜索 +lblSort=排序 +lblResetFilters=重置筛选器 #AdvancedSearchFilter -lblEditExpression=Edit Expression -lblRemoveFilter=Remove Filter +lblEditExpression=编辑表达式 +lblRemoveFilter=移除筛选器 #CardZoom -lblSwipeUpTo=Swipe up to %s -lblSwipeDownDetailView=Swipe down to switch to detail view -lblSwipeDownPictureView=Swipe down to switch to picture view +lblSwipeUpTo=向上滑动%s +lblSwipeDownDetailView=向下滑动即可切换到详细信息视图 +lblSwipeDownPictureView=向下滑动即可切换到图片视图 #VGameMenu -lblNoPlayerPriorityNoDeckListViewed=No player has priority at the moment, so deck list can't be viewed. +lblNoPlayerPriorityNoDeckListViewed=现在玩家没有优先权，因此无法查看套牌列表。 #FilesPage -lblFiles=Files -lblStorageLocations=Storage Locations -lblCardPicsLocation=Card Pics Location -lblDecksLocation=Decks Location -lblDataLocation=Data Location (e.g. Settings and Quests) -lblImageCacheLocation=Image Cache Location -lblRestartForgeMoveFilesNewLocation=You'll need to restart Forge for this change to take effect. Be sure to move any necessary files to the new location before you do. -lblRestartRequired=Restart Required -lblSelect=Select %s \ No newline at end of file +lblFiles=文件 +lblStorageLocations=储存位置 +lblCardPicsLocation=牌张图片位置 +lblDecksLocation=套牌位置 +lblDataLocation=数据位置（例如 设置和探索模式） +lblImageCacheLocation=图片缓存位置 +lblRestartForgeMoveFilesNewLocation=您必须重启Forge才能使此更改生效。执行此操作之前，请确保将所有必要的文件移动到新的位置。 +lblRestartRequired=需要重启 +lblSelect=选择%s \ No newline at end of file