From 91c684151a740005e24c3c52ff188772489b5171 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 7 May 2024 14:16:25 +0800 Subject: [PATCH 1/2] Update bundled beatmaps --- .../Drawables/BundledBeatmapDownloader.cs | 504 +++++++++++------- 1 file changed, 312 insertions(+), 192 deletions(-) diff --git a/osu.Game/Beatmaps/Drawables/BundledBeatmapDownloader.cs b/osu.Game/Beatmaps/Drawables/BundledBeatmapDownloader.cs index 21ab1b78ea..3aa34a5580 100644 --- a/osu.Game/Beatmaps/Drawables/BundledBeatmapDownloader.cs +++ b/osu.Game/Beatmaps/Drawables/BundledBeatmapDownloader.cs @@ -6,6 +6,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Text.RegularExpressions; using osu.Framework.Allocation; @@ -21,6 +22,8 @@ using osu.Game.Utils; namespace osu.Game.Beatmaps.Drawables { + [SuppressMessage("ReSharper", "StringLiteralTypo")] + [SuppressMessage("ReSharper", "CommentTypo")] public partial class BundledBeatmapDownloader : CompositeDrawable { private readonly bool shouldPostNotifications; @@ -50,7 +53,7 @@ namespace osu.Game.Beatmaps.Drawables { queueDownloads(always_bundled_beatmaps); - queueDownloads(bundled_osu, 8); + queueDownloads(bundled_osu, 6); queueDownloads(bundled_taiko, 3); queueDownloads(bundled_catch, 3); queueDownloads(bundled_mania, 3); @@ -128,6 +131,26 @@ namespace osu.Game.Beatmaps.Drawables } } + /* + * criteria for bundled maps (managed by pishifat) + * + * auto: + * - licensed song + * - includes ENHI diffs + * - between 60s and 240s + * + * manual: + * - bg is explicitly permitted as okay to use. lots of artists say some variation of "it's ok for personal use/non-commercial use/with credit" + * (which is prob fine when maps are presented as user-generated content), but for a new osu! player, it's easy to assume bundled maps are + * commercial content like other rhythm games, so it's best to be cautious about using not-explicitly-permitted artwork. + * + * - no ai/thirst bgs + * - no controversial/explicit song content or titles + * - no repeating bundled songs (within each mode) + * - no songs that are relatively low production value + * - no songs with limited accessibility (annoying high pitch vocals, noise rock, etc) + */ + private const string tutorial_filename = "1011011 nekodex - new beginnings.osz"; /// @@ -135,215 +158,312 @@ namespace osu.Game.Beatmaps.Drawables /// private static readonly string[] always_bundled_beatmaps = { - // This thing is 40mb, I'm not sure we want it here... + // winner of https://osu.ppy.sh/home/news/2013-09-06-osu-monthly-beatmapping-contest-1 + @"123593 Rostik - Liquid (Paul Rosenthal Remix).osz", + // winner of https://osu.ppy.sh/home/news/2013-10-28-monthly-beatmapping-contest-2-submissions-open + @"140662 cYsmix feat. Emmy - Tear Rain.osz", + // winner of https://osu.ppy.sh/home/news/2013-12-15-monthly-beatmapping-contest-3-submissions-open + @"151878 Chasers - Lost.osz", + // winner of https://osu.ppy.sh/home/news/2014-02-14-monthly-beatmapping-contest-4-submissions-now + @"163112 Kuba Oms - My Love.osz", + // winner of https://osu.ppy.sh/home/news/2014-05-07-monthly-beatmapping-contest-5-submissions-now + @"190390 Rameses B - Flaklypa.osz", + // winner of https://osu.ppy.sh/home/news/2014-09-24-monthly-beatmapping-contest-7 + @"241526 Soleily - Renatus.osz", + // winner of https://osu.ppy.sh/home/news/2015-02-11-monthly-beatmapping-contest-8 + @"299224 raja - the light.osz", + // winner of https://osu.ppy.sh/home/news/2015-04-13-monthly-beatmapping-contest-9-taiko-only + @"319473 Furries in a Blender - Storm World.osz", + // winner of https://osu.ppy.sh/home/news/2015-06-15-monthly-beatmapping-contest-10-ctb-only + @"342751 Hylian Lemon - Foresight Is for Losers.osz", + // winner of https://osu.ppy.sh/home/news/2015-08-22-monthly-beatmapping-contest-11-mania-only + @"385056 Toni Leys - Dragon Valley (Toni Leys Remix feat. Esteban Bellucci).osz", + // winner of https://osu.ppy.sh/home/news/2016-03-04-beatmapping-contest-12-osu + @"456054 IAHN - Candy Luv (Short Ver.).osz", + // winner of https://osu.ppy.sh/home/news/2020-11-30-a-labour-of-love + // (this thing is 40mb, I'm not sure if we want it here...) @"1388906 Raphlesia & BilliumMoto - My Love.osz", - // Winner of Triangles mapping competition: https://osu.ppy.sh/home/news/2022-10-06-results-triangles + // winner of https://osu.ppy.sh/home/news/2022-05-31-triangles @"1841885 cYsmix - triangles.osz", + // winner of https://osu.ppy.sh/home/news/2023-02-01-twin-trials-contest-beatmapping-phase + @"1971987 James Landino - Aresene's Bazaar.osz", }; private static readonly string[] bundled_osu = { - "682286 Yuyoyuppe - Emerald Galaxy.osz", - "682287 baker - For a Dead Girl+.osz", - "682289 Hige Driver - I Wanna Feel Your Love (feat. shully).osz", - "682290 Hige Driver - Miracle Sugite Yabai (feat. shully).osz", - "682416 Hige Driver - Palette.osz", - "682595 baker - Kimi ga Kimi ga -vocanico remix-.osz", - "716211 yuki. - Spring Signal.osz", - "716213 dark cat - BUBBLE TEA (feat. juu & cinders).osz", - "716215 LukHash - CLONED.osz", - "716219 IAHN - Snowdrop.osz", - "716249 *namirin - Senaka Awase no Kuukyo (with Kakichoco).osz", - "716390 sakuraburst - SHA.osz", - "716441 Fractal Dreamers - Paradigm Shift.osz", - "729808 Thaehan - Leprechaun.osz", - "751771 Cranky - Hanaarashi.osz", - "751772 Cranky - Ran.osz", - "751773 Cranky - Feline, the White....osz", - "751774 Function Phantom - Variable.osz", - "751779 Rin - Daishibyo set 14 ~ Sado no Futatsuiwa.osz", - "751782 Fractal Dreamers - Fata Morgana.osz", - "751785 Cranky - Chandelier - King.osz", - "751846 Fractal Dreamers - Celestial Horizon.osz", - "751866 Rin - Moriya set 08 ReEdit ~ Youkai no Yama.osz", - "751894 Fractal Dreamers - Blue Haven.osz", - "751896 Cranky - Rave 2 Rave.osz", - "751932 Cranky - La fuite des jours.osz", - "751972 Cranky - CHASER.osz", - "779173 Thaehan - Superpower.osz", - "780932 VINXIS - A Centralized View.osz", - "785572 S3RL - I'll See You Again (feat. Chi Chi).osz", - "785650 yuki. feat. setsunan - Hello! World.osz", - "785677 Dictate - Militant.osz", - "785731 S3RL - Catchit (Radio Edit).osz", - "785774 LukHash - GLITCH.osz", - "786498 Trial & Error - Tokoyami no keiyaku KEGARETA-SHOUJO feat. GUMI.osz", - "789374 Pulse - LP.osz", - "789528 James Portland - Sky.osz", - "789529 Lexurus - Gravity.osz", - "789544 Andromedik - Invasion.osz", - "789905 Gourski x Himmes - Silence.osz", - "791667 cYsmix - Babaroque (Short Ver.).osz", - "791798 cYsmix - Behind the Walls.osz", - "791845 cYsmix - Little Knight.osz", - "792241 cYsmix - Eden.osz", - "792396 cYsmix - The Ballad of a Mindless Girl.osz", - "795432 Phonetic - Journey.osz", - "831322 DJ'TEKINA//SOMETHING - Hidamari no Uta.osz", - "847764 Cranky - Crocus.osz", - "847776 Culprate & Joe Ford - Gaucho.osz", - "847812 J. Pachelbel - Canon (Cranky Remix).osz", - "847900 Cranky - Time Alter.osz", - "847930 LukHash - 8BIT FAIRY TALE.osz", - "848003 Culprate - Aurora.osz", - "848068 nanobii - popsicle beach.osz", - "848090 Trial & Error - DAI*TAN SENSATION feat. Nanahira, Mii, Aitsuki Nakuru (Short Ver.).osz", - "848259 Culprate & Skorpion - Jester.osz", - "848976 Dictate - Treason.osz", - "851543 Culprate - Florn.osz", - "864748 Thaehan - Angry Birds Epic (Remix).osz", - "873667 OISHII - ONIGIRI FREEWAY.osz", - "876227 Culprate, Keota & Sophie Meiers - Mechanic Heartbeat.osz", - "880487 cYsmix - Peer Gynt.osz", - "883088 Wisp X - Somewhere I'd Rather Be.osz", - "891333 HyuN - White Aura.osz", - "891334 HyuN - Wild Card.osz", - "891337 HyuN feat. LyuU - Cross Over.osz", - "891338 HyuN & Ritoru - Apocalypse in Love.osz", - "891339 HyuN feat. Ato - Asu wa Ame ga Yamukara.osz", - "891345 HyuN - Infinity Heaven.osz", - "891348 HyuN - Guitian.osz", - "891356 HyuN - Legend of Genesis.osz", - "891366 HyuN - Illusion of Inflict.osz", - "891417 HyuN feat. Yu-A - My life is for you.osz", - "891441 HyuN - You'Re aRleAdY dEAd.osz", - "891632 HyuN feat. YURI - Disorder.osz", - "891712 HyuN - Tokyo's Starlight.osz", - "901091 *namirin - Ciel etoile.osz", - "916990 *namirin - Koishiteiku Planet.osz", - "929284 tieff - Sense of Nostalgia.osz", - "933940 Ben Briggs - Yes (Maybe).osz", - "934415 Ben Briggs - Fearless Living.osz", - "934627 Ben Briggs - New Game Plus.osz", - "934666 Ben Briggs - Wave Island.osz", - "936126 siromaru + cranky - conflict.osz", - "940377 onumi - ARROGANCE.osz", - "940597 tieff - Take Your Swimsuit.osz", - "941085 tieff - Our Story.osz", - "949297 tieff - Sunflower.osz", - "952380 Ben Briggs - Why Are We Yelling.osz", - "954272 *namirin - Kanzen Shouri*Esper Girl.osz", - "955866 KIRA & Heartbreaker - B.B.F (feat. Hatsune Miku & Kagamine Rin).osz", - "961320 Kuba Oms - All In All.osz", - "964553 The Flashbulb - You Take the World's Weight Away.osz", - "965651 Fractal Dreamers - Ad Astra.osz", - "966225 The Flashbulb - Passage D.osz", - "966324 DJ'TEKINA//SOMETHING - Hidamari no Uta.osz", - "972810 James Landino & Kabuki - Birdsong.osz", - "972932 James Landino - Hide And Seek.osz", - "977276 The Flashbulb - Mellann.osz", - "981616 *namirin - Mizutamari Tobikoete (with Nanahira).osz", - "985788 Loki - Wizard's Tower.osz", - "996628 OISHII - ONIGIRI FREEWAY.osz", - "996898 HyuN - White Aura.osz", - "1003554 yuki. - Nadeshiko Sensation.osz", - "1014936 Thaehan - Bwa !.osz", - "1019827 UNDEAD CORPORATION - Sad Dream.osz", - "1020213 Creo - Idolize.osz", - "1021450 Thaehan - Chiptune & Baroque.osz", + @"682286 Yuyoyuppe - Emerald Galaxy.osz", + @"682287 baker - For a Dead Girl+.osz", + @"682595 baker - Kimi ga Kimi ga -vocanico remix-.osz", + @"1048705 Thaehan - Never Give Up.osz", + @"1050185 Carpool Tunnel - Hooked Again.osz", + @"1052846 Carpool Tunnel - Impressions.osz", + @"1062477 Ricky Montgomery - Line Without a Hook.osz", + @"1081119 Celldweller - Pulsar.osz", + @"1086289 Frums - 24eeev0-$.osz", + @"1133317 PUP - Free At Last.osz", + @"1171188 PUP - Full Blown Meltdown.osz", + @"1177043 PUP - My Life Is Over And I Couldn't Be Happier.osz", + @"1250387 Circle of Dust - Humanarchy (Cut Ver.).osz", + @"1255411 Wisp X - Somewhere I'd Rather Be.osz", + @"1320298 nekodex - Little Drummer Girl.osz", + @"1323877 Masahiro ""Godspeed"" Aoki - Blaze.osz", + @"1342280 Minagu feat. Aitsuki Nakuru - Theater Endroll.osz", + @"1356447 SECONDWALL - Boku wa Boku de shika Nakute.osz", + @"1368054 SECONDWALL - Shooting Star.osz", + @"1398580 La priere - Senjou no Utahime.osz", + @"1403962 m108 - Sunflower.osz", + @"1405913 fiend - FEVER DREAM (feat. yzzyx).osz", + @"1409184 Omoi - Hey William (New Translation).osz", + @"1413418 URBANGARDE - KAMING OUT (Cut Ver.).osz", + @"1417793 P4koo (NONE) - Sogaikan Utopia.osz", + @"1428384 DUAL ALTER WORLD - Veracila.osz", + @"1442963 PUP - DVP.osz", + @"1460370 Sound Souler - Empty Stars.osz", + @"1485184 Koven - Love Wins Again.osz", + @"1496811 T & Sugah - Wicked Days (Cut Ver.).osz", + @"1501511 Masahiro ""Godspeed"" Aoki - Frostbite (Cut Ver.).osz", + @"1511518 T & Sugah X Zazu - Lost On My Own (Cut Ver.).osz", + @"1516617 wotoha - Digital Life Hacker.osz", + @"1524273 Michael Cera Palin - Admiral.osz", + @"1564234 P4koo - Fly High (feat. rerone).osz", + @"1572918 Lexurus - Take Me Away (Cut Ver.).osz", + @"1577313 Kurubukko - The 84th Flight.osz", + @"1587839 Amidst - Droplet.osz", + @"1595193 BlackY - Sakura Ranman Cleopatra.osz", + @"1667560 xi - FREEDOM DiVE.osz", + @"1668789 City Girl - L2M (feat. Kelsey Kuan).osz", + @"1672934 xi - Parousia.osz", + @"1673457 Boom Kitty - Any Other Way (feat. Ivy Marie).osz", + @"1685122 xi - Time files.osz", + @"1689372 NIWASHI - Y.osz", + @"1729551 JOYLESS - Dream.osz", + @"1742868 Ritorikal - Synergy.osz", + @"1757511 KINEMA106 - KARASU.osz", + @"1778169 Ricky Montgomery - Cabo.osz", + @"1848184 FRASER EDWARDS - Ruination.osz", + @"1862574 Pegboard Nerds - Try This (Cut Ver.).osz", + @"1873680 happy30 - You spin my world.osz", + @"1890055 A.SAKA - Mutsuki Akari no Yuki.osz", + @"1911933 Marmalade butcher - Waltz for Chroma (feat. Natsushiro Takaaki).osz", + @"1940007 Mili - Ga1ahad and Scientific Witchery.osz", + @"1948970 Shadren - You're Here Forever.osz", + @"1967856 Annabel - alpine blue.osz", + @"1969316 Silentroom - NULCTRL.osz", + @"1978614 Krimek - Idyllic World.osz", + @"1991315 Feint - Tower Of Heaven (You Are Slaves) (Cut Ver.).osz", + @"1997470 tephe - Genjitsu Escape.osz", + @"1999116 soowamisu - .vaporcore.osz", + @"2010589 Junk - Yellow Smile (bms edit).osz", + @"2022054 Yokomin - STINGER.osz", + @"2025686 Aice room - For U.osz", + @"2035357 C-Show feat. Ishizawa Yukari - Border Line.osz", + @"2039403 SECONDWALL - Freedom.osz", + @"2046487 Rameses B - Against the Grain (feat. Veela).osz", + @"2052201 ColBreakz & Vizzen - Remember.osz", + @"2055535 Sephid - Thunderstrike 1988.osz", + @"2057584 SAMString - Ataraxia.osz", + @"2067270 Blue Stahli - The Fall.osz", + @"2075039 garlagan - Skyless.osz", + @"2079089 Hamu feat. yuiko - Innocent Letter.osz", + @"2082895 FATE GEAR - Heart's Grave.osz", + @"2085974 HoneyComeBear - Twilight.osz", + @"2094934 F.O.O.L & Laura Brehm - Waking Up.osz", + @"2097481 Mameyudoufu - Wave feat. Aitsuki Nakuru.osz", + @"2106075 MYUKKE. - The 89's Momentum.osz", + @"2117392 t+pazolite & Komiya Mao - Elustametat.osz", + @"2123533 LeaF - Calamity Fortune.osz", + @"2143876 Alkome - Your Voice.osz", + @"2145826 Sephid - Cross-D Skyline.osz", + @"2153172 Emiru no Aishita Tsukiyo ni Dai San Gensou Kyoku wo - Eternal Bliss.osz", }; private static readonly string[] bundled_taiko = { - "707824 Fractal Dreamers - Fortuna Redux.osz", - "789553 Cranky - Ran.osz", - "827822 Function Phantom - Neuronecia.osz", - "847323 Nakanojojo - Bittersweet (feat. Kuishinboakachan a.k.a Kiato).osz", - "847433 Trial & Error - Tokoyami no keiyaku KEGARETA-SHOUJO feat. GUMI.osz", - "847576 dark cat - hot chocolate.osz", - "847957 Wisp X - Final Moments.osz", - "876282 VINXIS - Greetings.osz", - "876648 Thaehan - Angry Birds Epic (Remix).osz", - "877069 IAHN - Transform (Original Mix).osz", - "877496 Thaehan - Leprechaun.osz", - "877935 Thaehan - Overpowered.osz", - "878344 yuki. - Be Your Light.osz", - "918446 VINXIS - Facade.osz", - "918903 LukHash - Ghosts.osz", - "919251 *namirin - Hitokoto no Kyori.osz", - "919704 S3RL - I Will Pick You Up (feat. Tamika).osz", - "921535 SOOOO - Raven Haven.osz", - "927206 *namirin - Kanzen Shouri*Esper Girl.osz", - "927544 Camellia feat. Nanahira - Kansoku Eisei.osz", - "930806 Nakanojojo - Pararara (feat. Amekoya).osz", - "931741 Camellia - Quaoar.osz", - "935699 Rin - Mythic set ~ Heart-Stirring Urban Legends.osz", - "935732 Thaehan - Yuujou.osz", - "941145 Function Phantom - Euclid.osz", - "942334 Dictate - Cauldron.osz", - "946540 nanobii - astral blast.osz", - "948844 Rin - Kishinjou set 01 ~ Mist Lake.osz", - "949122 Wisp X - Petal.osz", - "951618 Rin - Kishinjou set 02 ~ Mermaid from the Uncharted Land.osz", - "957412 Rin - Lunatic set 16 ~ The Space Shrine Maiden Returns Home.osz", - "961335 Thaehan - Insert Coin.osz", - "965178 The Flashbulb - DIDJ PVC.osz", - "966087 The Flashbulb - Creep.osz", - "966277 The Flashbulb - Amen Iraq.osz", - "966407 LukHash - ROOM 12.osz", - "966451 The Flashbulb - Six Acid Strings.osz", - "972301 BilliumMoto - four veiled stars.osz", - "973173 nanobii - popsicle beach.osz", - "973954 BilliumMoto - Rocky Buinne (Short Ver.).osz", - "975435 BilliumMoto - life flashes before weeb eyes.osz", - "978759 L. V. Beethoven - Moonlight Sonata (Cranky Remix).osz", - "982559 BilliumMoto - HDHR.osz", - "984361 The Flashbulb - Ninedump.osz", - "1023681 Inferi - The Ruin of Mankind.osz", - "1034358 ALEPH - The Evil Spirit.osz", - "1037567 ALEPH - Scintillations.osz", + "1048153 Chroma - [@__@].osz", + "1229307 Venetian Snares - Shaky Sometimes.osz", + "1236083 meganeko - Sirius A (osu! edit).osz", + "1248594 Noisia - Anomaly.osz", + "1272851 siqlo - One Way Street.osz", + "1290736 Kola Kid - good old times.osz", + "1318825 SECONDWALL - Light.osz", + "1320872 MYUKKE. - The 89's Momentum.osz", + "1337389 cute girls doing cute things - Main Heroine.osz", + "1397782 Reku Mochizuki - Yorixiro.osz", + "1407228 II-L - VANGUARD-1.osz", + "1422686 II-L - VANGUARD-2.osz", + "1429217 Street - Phi.osz", + "1442235 2ToneDisco x Cosmicosmo - Shoelaces (feat. Puniden).osz", + "1447478 Cres. - End Time.osz", + "1449942 m108 - Crescent Sakura.osz", + "1463778 MuryokuP - A tree without a branch.osz", + "1465152 fiend - Fever Dream (feat. yzzyx).osz", + "1472397 MYUKKE. - Boudica.osz", + "1488148 Aoi vs. siqlo - Hacktivism.osz", + "1522733 wotoha - Digital Life Hacker.osz", + "1540010 Marmalade butcher - Floccinaucinihilipilification.osz", + "1584690 MYUKKE. - AKKERA-COUNTRY-BOY.osz", + "1608857 BLOOD STAIN CHILD - S.O.P.H.I.A.osz", + "1609365 Reku Mochizuki - Faith of Eastward.osz", + "1622545 METAROOM - I - DINKI THE STARGUIDE.osz", + "1629336 METAROOM - PINK ORIGINS.osz", + "1644680 Neko Hacker - Pictures feat. 4s4ki.osz", + "1650835 RiraN - Ready For The Madness.osz", + "1661508 PTB10 - Starfall.osz", + "1671987 xi - World Fragments II.osz", + "1703065 tokiwa - wasurena feat. Sennzai.osz", + "1703527 tokiwa feat. Nakamura Sanso - Kotodama Refrain.osz", + "1704340 A-One feat. Shihori - Magic Girl !!.osz", + "1712783 xi - Parousia.osz", + "1718774 Harumaki Gohan - Suisei ni Nareta nara.osz", + "1719687 EmoCosine - Love Kills U.osz", + "1733940 WHITEFISTS feat. Sennzai - Paralyzed Ash.osz", + "1734692 EmoCosine - Cutter.osz", + "1739529 luvlxckdown - tbh i dont like being social.osz", + "1756970 Kurubukko vs. yukitani - Minamichita EVOLVED.osz", + "1762209 Marmalade butcher - Immortality Math Club.osz", + "1765720 ZxNX - FORTALiCE.osz", + "1786165 NILFRUITS - Arandano.osz", + "1787258 SAMString - Night Fighter.osz", + "1791462 ZxNX - Schadenfreude.osz", + "1793821 Kobaryo - The Lightning Sword.osz", + "1796440 kuru x miraie - re:start.osz", + "1799285 Origami Angel - 666 Flags.osz", + "1812415 nanobii - Rainbow Road.osz", + "1814682 NIWASHI - Y.osz", + "1818361 meganeko - Feral (osu! edit).osz", + "1818924 fiend - Disconnect.osz", + "1838730 Pegboard Nerds - Disconnected.osz", + "1854710 Blaster & Extra Terra - Spacecraft (Cut Ver.).osz", + "1859322 Hino Isuka - Delightness Brightness.osz", + "1884102 Maduk - Go (feat. Lachi) (Cut Ver.).osz", + "1884578 Neko Hacker - People People feat. Nanahira.osz", + "1897902 uma vs. Morimori Atsushi - Re: End of a Dream.osz", + "1905582 KINEMA106 - Fly Away (Cut Ver.).osz", + "1934686 ARForest - Rainbow Magic!!.osz", + "1963076 METAROOM - S.N.U.F.F.Y.osz", + "1968973 Stars Hollow - Out the Sunroof..osz", + "1971951 James Landino - Shiba Paradise.osz", + "1972518 Toromaru - Sleight of Hand.osz", + "1982302 KINEMA106 - INVITE.osz", + "1983475 KNOWER - The Government Knows.osz", + "2010165 Junk - Yellow Smile (bms edit).osz", + "2022737 Andora - Euphoria (feat. WaMi).osz", + "2025023 tephe - Genjitsu Escape.osz", + "2052754 P4koo - 8th:Planet ~Re:search~.osz", + "2054122 Raimukun - Myths Orbis.osz", + "2121470 Raimukun - Nyarlathotep's Dreamland.osz", + "2122284 Agressor Bunx - Tornado (Cut Ver.).osz", + "2125034 Agressor Bunx - Acid Mirage (Cut Ver.).osz", + "2136263 Se-U-Ra - Cris Fortress.osz", }; private static readonly string[] bundled_catch = { - "554256 Helblinde - When Time Sleeps.osz", - "693123 yuki. - Nadeshiko Sensation.osz", - "767009 OISHII - PIZZA PLAZA.osz", - "767346 Thaehan - Bwa !.osz", - "815162 VINXIS - Greetings.osz", - "840964 cYsmix - Breeze.osz", - "932657 Wisp X - Eventide.osz", - "933700 onumi - CONFUSION PART ONE.osz", - "933984 onumi - PERSONALITY.osz", - "934785 onumi - FAKE.osz", - "936545 onumi - REGRET PART ONE.osz", - "943803 Fractal Dreamers - Everything for a Dream.osz", - "943876 S3RL - I Will Pick You Up (feat. Tamika).osz", - "946773 Trial & Error - DREAMING COLOR (Short Ver.).osz", - "955808 Trial & Error - Tokoyami no keiyaku KEGARETA-SHOUJO feat. GUMI (Short Ver.).osz", - "957808 Fractal Dreamers - Module_410.osz", - "957842 antiPLUR - One Life Left to Live.osz", - "965730 The Flashbulb - Lawn Wake IV (Black).osz", - "966240 Creo - Challenger.osz", - "968232 Rin - Lunatic set 15 ~ The Moon as Seen from the Shrine.osz", - "972302 VINXIS - A Centralized View.osz", - "972887 HyuN - Illusion of Inflict.osz", - "1008600 LukHash - WHEN AN ANGEL DIES.osz", - "1032103 LukHash - H8 U.osz", + @"693123 yuki. - Nadeshiko Sensation.osz", + @"833719 FOLiACETATE - Heterochromia Iridis.osz", + @"981762 siromaru + cranky - conflict.osz", + @"1008600 LukHash - WHEN AN ANGEL DIES.osz", + @"1071294 dark cat - pursuit of happiness.osz", + @"1102115 meganeko - Nova.osz", + @"1115500 Chopin - Etude Op. 25, No. 12 (meganeko Remix).osz", + @"1128274 LeaF - Wizdomiot.osz", + @"1141049 HyuN feat. JeeE - Fallen Angel.osz", + @"1148215 Zekk - Fluctuation.osz", + @"1151833 ginkiha - nightfall.osz", + @"1158124 PUP - Dark Days.osz", + @"1184890 IAHN - Transform (Original Mix).osz", + @"1195922 Disasterpeace - Home.osz", + @"1197461 MIMI - Nanimo nai Youna.osz", + @"1197924 Camellia feat. Nanahira - Looking For A New Adventure.osz", + @"1203594 ginkiha - Anemoi.osz", + @"1211572 MIMI - Lapis Lazuli.osz", + @"1231601 Lime - Harmony.osz", + @"1240162 P4koo - 8th:Planet ~Re:search~.osz", + @"1246000 Zekk - Calling.osz", + @"1249928 Thaehan - Yuujou.osz", + @"1258751 Umeboshi Chazuke - ICHIBANBOSHI*ROCKET.osz", + @"1264818 Umeboshi Chazuke - Panic! Pop'n! Picnic! (2019 REMASTER).osz", + @"1280183 IAHN - Mad Halloween.osz", + @"1303201 Umeboshi Chazuke - Run*2 Run To You!!.osz", + @"1328918 Kobaryo - Theme for Psychopath Justice.osz", + @"1338215 Lime - Renai Syndrome.osz", + @"1338796 uma vs. Morimori Atsushi - Re:End of a Dream.osz", + @"1340492 MYUKKE. - The 89's Momentum.osz", + @"1393933 Mastermind (xi+nora2r) - Dreadnought.osz", + @"1400205 m108 - XIII Charlotte.osz", + @"1471328 Lime - Chronomia.osz", + @"1503591 Origami Angel - The Title Track.osz", + @"1524173 litmus* as Ester - Krave.osz", + @"1541235 Getty vs. DJ DiA - Grayed Out -Antifront-.osz", + @"1554250 Shawn Wasabi - Otter Pop (feat. Hollis).osz", + @"1583461 Sound Souler - Absent Color.osz", + @"1638487 tokiwa - wasurena feat. Sennzai.osz", + @"1698949 ZxNX - Schadenfreude.osz", + @"1704324 xi - Time files.osz", + @"1756405 Fractal Dreamers - Kingdom of Silence.osz", + @"1769575 cYsmix - Peer Gynt.osz", + @"1770054 Ardolf - Split.osz", + @"1772648 in love with a ghost - interdimensional portal leading to a cute place feat. snail's house.osz", + @"1776379 in love with a ghost - i thought we were lovers w/ basil.osz", + @"1779476 URBANGARDE - KIMI WA OKUMAGASO.osz", + @"1789435 xi - Parousia.osz", + @"1794190 Se-U-Ra - The Endless for Traveler.osz", + @"1799889 Waterflame - Ricochet Love.osz", + @"1816401 Gram vs. Yooh - Apocalypse.osz", + @"1826327 -45 - Total Eclipse of The Sun.osz", + @"1830796 xi - Halcyon.osz", + @"1924231 Mili - Nine Point Eight.osz", + @"1952903 Cres. - End Time.osz", + @"1970946 Good Kid - Slingshot.osz", + @"1982063 linear ring - enchanted love.osz", + @"2000438 Toromaru - Erinyes.osz", + @"2124277 II-L - VANGUARD-3.osz", + @"2147529 Nashimoto Ui - AaAaAaAAaAaAAa (Cut Ver.).osz", }; private static readonly string[] bundled_mania = { - "943516 antiPLUR - Clockwork Spooks.osz", - "946394 VINXIS - Three Times The Original Charm.osz", - "966408 antiPLUR - One Life Left to Live.osz", - "971561 antiPLUR - Runengon.osz", - "983864 James Landino - Shiba Island.osz", - "989512 BilliumMoto - 1xMISS.osz", - "994104 James Landino - Reaction feat. Slyleaf.osz", - "1003217 nekodex - circles!.osz", - "1009907 James Landino & Kabuki - Birdsong.osz", - "1015169 Thaehan - Insert Coin.osz", + @"1008419 BilliumMoto - Four Veiled Stars.osz", + @"1025170 Frums - We Want To Run.osz", + @"1092856 F-777 - Viking Arena.osz", + @"1139247 O2i3 - Heart Function.osz", + @"1154007 LeaF - ATHAZA.osz", + @"1170054 Zekk - Fallen.osz", + @"1212132 Street - Koiyamai (TV Size).osz", + @"1226466 Se-U-Ra - Elif to Shiro Kura no Yoru -Called-.osz", + @"1247210 Frums - Credits.osz", + @"1254196 ARForest - Regret.osz", + @"1258829 Umeboshi Chazuke - Cineraria.osz", + @"1300398 ARForest - The Last Page.osz", + @"1305627 Frums - Star of the COME ON!!.osz", + @"1348806 Se-U-Ra - LOA2.osz", + @"1375449 yuki. - Nadeshiko Sensation.osz", + @"1448292 Cres. - End Time.osz", + @"1479741 Reku Mochizuki - FORViDDEN ENERZY -Fataldoze-.osz", + @"1494747 Fractal Dreamers - Whispers from a Distant Star.osz", + @"1505336 litmus* - Rush-More.osz", + @"1508963 ARForest - Rainbow Magic!!.osz", + @"1727126 Chroma - Strange Inventor.osz", + @"1737101 ZxNX - FORTALiCE.osz", + @"1740952 Sobrem x Silentroom - Random.osz", + @"1756251 Plum - Mad Piano Party.osz", + @"1909163 Frums - theyaremanycolors.osz", + @"1916285 siromaru + cranky - conflict.osz", + @"1948972 Ardolf - Split.osz", + @"1957138 GLORYHAMMER - Rise Of The Chaos Wizards.osz", + @"1972411 James Landino - Shiba Paradise.osz", + @"1978179 Andora - Flicker (feat. RANASOL).osz", + @"1987180 cygnus - The Evolution of War.osz", + @"1994458 tephe - Genjitsu Escape.osz", + @"1999339 Aice room - Nyan Nyan Dive (EmoCosine Remix).osz", + @"2015361 HoneyComeBear - Rainy Girl.osz", + @"2028108 HyuN - Infinity Heaven.osz", + @"2055329 miraie & blackwinterwells - facade.osz", + @"2069877 Sephid - Thunderstrike 1988.osz", + @"2119716 Aethoro - Snowy.osz", + @"2120379 Synthion - VIVIDVELOCITY.osz", + @"2124805 Frums (unknown ""lambda"") - 19ZZ.osz", + @"2127811 Wiklund - Joy of Living (Cut Ver.).osz", }; } } From 1d6915478f485998a47e6926bd3927dd533d1309 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 7 May 2024 14:26:49 +0800 Subject: [PATCH 2/2] Add message letting users know that beatmaps are donwloading in the background --- .../FirstRunSetupBeatmapScreenStrings.cs | 5 +++++ .../Overlays/FirstRunSetup/ScreenBeatmaps.cs | 16 ++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/osu.Game/Localisation/FirstRunSetupBeatmapScreenStrings.cs b/osu.Game/Localisation/FirstRunSetupBeatmapScreenStrings.cs index a77ee066e4..50a417312d 100644 --- a/osu.Game/Localisation/FirstRunSetupBeatmapScreenStrings.cs +++ b/osu.Game/Localisation/FirstRunSetupBeatmapScreenStrings.cs @@ -39,6 +39,11 @@ namespace osu.Game.Localisation /// public static LocalisableString BundledButton => new TranslatableString(getKey(@"bundled_button"), @"Get recommended beatmaps"); + /// + /// "Beatmaps will be downloaded in the background. You can continue with setup while this happens!" + /// + public static LocalisableString DownloadingInBackground => new TranslatableString(getKey(@"downloading_in_background"), @"Beatmaps will be downloaded in the background. You can continue with setup while this happens!"); + /// /// "You can also obtain more beatmaps from the main menu "browse" button at any time." /// diff --git a/osu.Game/Overlays/FirstRunSetup/ScreenBeatmaps.cs b/osu.Game/Overlays/FirstRunSetup/ScreenBeatmaps.cs index 385695f669..da60951ab6 100644 --- a/osu.Game/Overlays/FirstRunSetup/ScreenBeatmaps.cs +++ b/osu.Game/Overlays/FirstRunSetup/ScreenBeatmaps.cs @@ -15,6 +15,7 @@ using osu.Game.Graphics.Containers; using osu.Game.Localisation; using osu.Game.Online; using osuTK; +using osuTK.Graphics; using Realms; namespace osu.Game.Overlays.FirstRunSetup @@ -25,6 +26,8 @@ namespace osu.Game.Overlays.FirstRunSetup private ProgressRoundedButton downloadBundledButton = null!; private ProgressRoundedButton downloadTutorialButton = null!; + private OsuTextFlowContainer downloadInBackgroundText = null!; + private OsuTextFlowContainer currentlyLoadedBeatmaps = null!; private BundledBeatmapDownloader? tutorialDownloader; @@ -100,6 +103,15 @@ namespace osu.Game.Overlays.FirstRunSetup Text = FirstRunSetupBeatmapScreenStrings.BundledButton, Action = downloadBundled }, + downloadInBackgroundText = new OsuTextFlowContainer(cp => cp.Font = OsuFont.Default.With(size: CONTENT_FONT_SIZE)) + { + Colour = OverlayColourProvider.Light2, + Alpha = 0, + TextAnchor = Anchor.TopCentre, + Text = FirstRunSetupBeatmapScreenStrings.DownloadingInBackground, + RelativeSizeAxes = Axes.X, + AutoSizeAxes = Axes.Y + }, new OsuTextFlowContainer(cp => cp.Font = OsuFont.Default.With(size: CONTENT_FONT_SIZE)) { Colour = OverlayColourProvider.Content1, @@ -169,6 +181,10 @@ namespace osu.Game.Overlays.FirstRunSetup if (bundledDownloader != null) return; + downloadInBackgroundText + .FlashColour(Color4.White, 500) + .FadeIn(200); + bundledDownloader = new BundledBeatmapDownloader(false); AddInternal(bundledDownloader);