From 3c2d0919aa4df857ba3cb295440db48db0773ac3 Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 6 Apr 2023 11:36:24 -0400 Subject: [PATCH] changes from Wonderville --- namedropper/Assets/Resources/categories.yaml | 2 +- .../Assets/Resources/categories.yaml.bak | 1092 ++++++++++++++++- namedropper/Assets/Scripts/GameOverScreen.cs | 2 +- 3 files changed, 1093 insertions(+), 3 deletions(-) diff --git a/namedropper/Assets/Resources/categories.yaml b/namedropper/Assets/Resources/categories.yaml index 6f32f94..1fdbf2a 100644 --- a/namedropper/Assets/Resources/categories.yaml +++ b/namedropper/Assets/Resources/categories.yaml @@ -1067,7 +1067,7 @@ Topics: - Spike Spiegel - Jet Black - Faye Valentine - - Edward + - Edward Wong - Vicious - Julia - Gren diff --git a/namedropper/Assets/Resources/categories.yaml.bak b/namedropper/Assets/Resources/categories.yaml.bak index ea7a280..6f32f94 100644 --- a/namedropper/Assets/Resources/categories.yaml.bak +++ b/namedropper/Assets/Resources/categories.yaml.bak @@ -703,4 +703,1094 @@ Topics: - Brahmaputra - Helmand - Amu Darya - - Sir Darya \ No newline at end of file + - Sir Darya + - Category: North America + Elements: + - Missouri + - Mississippi + - Yukon + - Rio Grande + - Hudson + - Columbia + - MacKenzie + - Colorado + - Ohio + - Arkansas + - Snake + - Yellowstone + - Potomac + - Allegheny + - Category: Africa + Elements: + - Nile + - Congo + - Zambezi + - Orange + - Kasai + - Ubangi + - Limpopo + - Category: South America + Elements: + - Amazon + - Paraná + - Araguaia + - Tocantins + - São Francisco + - Rio de la Plata + - Orinoco + - Purús + - Paraguay + - Japurá + - Juruá + - Madeira + - Mamoré + - Category: Australia + Elements: + - Murray + - Murrumbidgee + - Darling + - Lachlan + - Warrego + - Cooper Creek + - Paroo + - Category: Europe + Elements: + - Volga + - Danube + - Thames + - Rhine + - Rhône + - Loire + - Severn + - Po + - Seine + - Vistula + - Tiber + - Ural + - Category: Antarctica + Elements: + - Onyx + - Adams Stream + - Aiken Creek + - Alph + - Lawson Creek + - Priscu Stream + - Rezovski Creek + - Surko Stream + - Jemmi Creek +- Topic: Athletes + Categories: + - Category: Cowboys + Elements: + - Emmitt Smith + - Troy Aikman + - Deion Sanders + - Dak Prescott + - Ezekial Elliott + - Michael Irvin + - Roger Staubach + - Tony Romo + - Category: Manchester United + Elements: + - Gary Neville + - Ryan Giggs + - Cristiano Ronaldo + - Paul Scholes + - Wayne Rooney + - Roy Keane + - Peter Schmeichel + - David Beckham + - Category: Yankees + Elements: + - Mickey Mantle + - Mariano Rivera + - Joe DiMaggio + - Reggie Jackson + - Lou Gehrig + - Derek Jeter + - Aaron Judge + - Joe Torre + - Category: Bulls + Elements: + - Michael Jordan + - Dennis Rodman + - Scottie Pippen + - Charles Oakley + - Steve Kerr + - Zach LaVine + - Toni Kukoc + - Jerry Sloan + - Category: Lakers + Elements: + - Kobe Bryant + - Shaq + - Kareem Abdul-Jabbar + - Elgin Baylor + - Magic Johnson + - Wilt Chamberlain + - Jerry West + - Derek Fisher + - Category: Raiders + Elements: + - Tim Brown + - John Madden + - Bo Jackson + - Howie Long + - Fred Biletnikoff + - Marcus Allen + - Charles Woodson + - Kenny Stabler + - Category: Celtics + Elements: + - Larry Bird + - Bob Cousy + - Paul Pierce + - Kevin McHale + - Robert Parish + - Kevin Garnett + - Ray Allen + - Bill Russell + - Category: Red Sox + Elements: + - David Ortiz + - Ted Williams + - Dustin Pedroia + - Tim Wakefield + - Carl Yastrzemski + - Pedro Martinez + - Manny Ramirez + - Cy Young + - Category: Boxing + Elements: + - Mike Tyson + - Muhammad Ali + - Evander Holyfield + - Manny Pacquiao + - Sugar Ray + - Floyd Mayweather + - Oscar De La Hoya + - George Foreman + - Category: Golf + Elements: + - Tiger Woods + - Jack Nicklaus + - Walter Hagen + - Phil Mickelson + - Ben Hogan + - Arnold Palmer + - Rory McIlroy + - Greg Norman + - Category: Professional Wrestling + Elements: + - Hulk Hogan + - Macho Man + - Shawn Michaels + - Ultimate Warrior + - John Cena + - The Undertaker + - The Rock + - Bret Hart +- Topic: 80s Pop Music + Categories: + - Category: Michael Jackson + Elements: + - "Thriller" + - "Billie Jean" + - "Beat It" + - "Bad" + - "The Way You Make Me Feel" + - "Man in the Mirror" + - "Human Nature" + - "Wanna Be Startin' Somethin'" + - "Smooth Criminal" + - "Black or White" + - Category: Prince + Elements: + - "When Doves Cry" + - "Purple Rain" + - "Kiss" + - "Let's Go Crazy" + - "1999" + - "Little Red Corvette" + - "Raspberry Beret" + - "I Would Die 4 U" + - "Sign o' the Times" + - "The Most Beautiful Girl in the World" + - Category: Madonna + Elements: + - "Like a Virgin" + - "Material Girl" + - "Papa Don't Preach" + - "Vogue" + - "Like a Prayer" + - "Holiday" + - "Crazy for You" + - "Borderline" + - "Lucky Star" + - "Into the Groove" + - Category: Whitney Houston + Elements: + - "I Wanna Dance With Somebody (Who Loves Me)" + - "Greatest Love of All" + - "How Will I Know" + - "Saving All My Love for You" + - "So Emotional" + - "One Moment in Time" + - "Where Do Broken Hearts Go" + - "Didn't We Almost Have It All" + - "All at Once" + - "I Have Nothing" + - Category: Cyndi Lauper + Elements: + - "Girls Just Want to Have Fun" + - "Time After Time" + - "True Colors" + - "She Bop" + - "All Through the Night" + - "The Goonies 'R' Good Enough" + - "Change of Heart" + - "I Drove All Night" + - "Money Changes Everything" + - "What's Going On" + - Category: George Michael + Elements: + - "Faith" + - "Careless Whisper" + - "Father Figure" + - "One More Try" + - "Freedom! '90" + - "I Want Your Sex" + - "Kissing a Fool" + - "Praying for Time" + - "Don't Let the Sun Go Down on Me" + - "Fastlove" + - Category: Duran Duran + Elements: + - "Hungry Like the Wolf" + - "Rio" + - "Girls on Film" + - "The Reflex" + - "A View to a Kill" + - "Save a Prayer" + - "Is There Something I Should Know?" + - "Union of the Snake" + - "Notorious" + - "Ordinary World" + - Category: U2 + Elements: + - "With or Without You" + - "I Still Haven't Found What I'm Looking For" + - "Where the Streets Have No Name" + - "Sunday Bloody Sunday" + - "Pride (In the Name of Love)" + - "New Year's Day" + - "One" + - "Desire" + - "Bullet the Blue Sky" + - "The Unforgettable Fire" +- Topic: Anime + Categories: + - Category: Naruto + Elements: + - Naruto Uzumaki + - Sasuke Uchiha + - Sakura Haruno + - Kakashi Hatake + - Itachi Uchiha + - Jiraiya + - Tsunade + - Gaara + - Shikamaru Nara + - Hinata Hyuga + - Category: Dragon Ball Z + Elements: + - Goku + - Vegeta + - Gohan + - Piccolo + - Krillin + - Future Trunks + - Android 18 + - Majin Buu + - Beerus + - Whis + - Category: Attack on Titan + Elements: + - Eren Yeager + - Mikasa Ackerman + - Armin Arlert + - Levi Ackerman + - Erwin Smith + - Reiner Braun + - Annie Leonhart + - Historia Reiss + - Zeke Yeager + - Jean Kirstein + - Category: "Fullmetal Alchemist: Brotherhood" + Elements: + - Edward Elric + - Alphonse Elric + - Roy Mustang + - Riza Hawkeye + - Scar + - Winry Rockbell + - Ling Yao + - Olivier Mira Armstrong + - Greed + - Father + - Category: Death Note + Elements: + - Light Yagami + - L Lawliet + - Misa Amane + - Near + - Mello + - Ryuk + - Soichiro Yagami + - Teru Mikami + - Matt + - Rem + - Category: One Piece + Elements: + - Monkey D. Luffy + - Roronoa Zoro + - Nami + - Usopp + - Sanji + - Tony Tony Chopper + - Nico Robin + - Franky + - Brook + - Jinbe + - Category: Cowboy Bebop + Elements: + - Spike Spiegel + - Jet Black + - Faye Valentine + - Edward + - Vicious + - Julia + - Gren + - Lin + - Annie + - Wen + - Category: My Hero Academia + Elements: + - Izuku Midoriya + - Katsuki Bakugo + - Shoto Todoroki + - All Might + - Ochaco Uraraka + - Tenya Iida + - Tsuyu Asui + - Momo Yaoyorozu + - Eijiro Kirishima + - Himiko Toga + - Category: Sword Art Online + Elements: + - Kirito + - Asuna Yuuki + - Sinon + - Leafa + - Eugeo + - Alice Zuberg + - Klein + - Agil + - Heathcliff + - Yuuki Konno + - Category: Bleach + Elements: + - Ichigo Kurosaki + - Rukia Kuchiki + - Toshiro Hitsugaya + - Renji Abarai + - Kenpachi Zar +- Topic: Cars + Categories: + - Category: Toyota + Elements: + - Corolla + - Camry + - RAV4 + - Highlander + - Tacoma + - Tundra + - Prius + - Sienna + - 4Runner + - Avalon + - Category: Honda + Elements: + - Civic + - Accord + - CR-V + - Pilot + - Odyssey + - Ridgeline + - Passport + - Insight + - HR-V + - Clarity + - Category: Ford + Elements: + - F-150 + - Mustang + - Explorer + - Escape + - Fusion + - Ranger + - Edge + - Expedition + - Taurus + - Flex + - Category: Chevrolet + Elements: + - Silverado + - Equinox + - Traverse + - Tahoe + - Suburban + - Colorado + - Camaro + - Malibu + - Impala + - Corvette + - Category: Nissan + Elements: + - Rogue + - Altima + - Sentra + - Maxima + - Pathfinder + - Murano + - Frontier + - Titan + - Armada + - Leaf + - Category: Jeep + Elements: + - Wrangler + - Cherokee + - Grand Cherokee + - Compass + - Renegade + - Gladiator + - Patriot + - Liberty + - Commander + - Wagoneer + - Category: RAM + Elements: + - 1500 + - 2500 + - 3500 + - ProMaster + - ProMaster City + - Dakota + - 5500 Chassis Cab + - 4500 Chassis Cab + - 3500 Chassis Cab + - 2500 Chassis Cab + - Category: GMC + Elements: + - Sierra + - Terrain + - Acadia + - Yukon + - Canyon + - Savana + - Envoy + - Jimmy + - Safari + - Sonoma + - Category: Subaru + Elements: + - Outback + - Forester + - Crosstrek + - Ascent + - Impreza + - Legacy + - WRX + - BRZ + - XV Crosstrek + - Baja + - Category: Hyundai + Elements: + - Sonata + - Elantra + - Santa Fe + - Tucson + - Kona + - Palisade + - Accent + - Veloster + - Ioniq + - Nexo +- Topic: Music Genres + Categories: + - Category: Rock + Elements: + - Freddie Mercury + - John Lennon + - Jimi Hendrix + - David Bowie + - Kurt Cobain + - Bruce Springsteen + - Mick Jagger + - Eric Clapton + - Robert Plant + - Jimmy Page + - Ozzy Osbourne + - Category: Pop + Elements: + - Michael Jackson + - Madonna + - Prince + - Whitney Houston + - Beyonce + - Elton John + - Mariah Carey + - Justin Timberlake + - Taylor Swift + - Lady Gaga + - Britney Spears + - Category: Jazz + Elements: + - Louis Armstrong + - Duke Ellington + - Ella Fitzgerald + - Miles Davis + - Charlie Parker + - Dizzy Gillespie + - Billie Holiday + - John Coltrane + - Thelonious Monk + - Dave Brubeck + - Chet Baker + - Category: Hip Hop + Elements: + - Tupac Shakur + - Notorious B.I.G. + - Jay-Z + - Nas + - Eminem + - Kanye West + - Dr. Dre + - Snoop Dogg + - Kendrick Lamar + - Lil Wayne + - Drake + - Category: Country + Elements: + - Johnny Cash + - Dolly Parton + - Hank Williams Sr. + - Willie Nelson + - Patsy Cline + - Garth Brooks + - Shania Twain + - Kenny Rogers + - George Strait + - Alan Jackson + - Tim McGraw + - Category: Electronic + Elements: + - Daft Punk + - The Chemical Brothers + - Aphex Twin + - Kraftwerk + - Brian Eno + - Fatboy Slim + - Moby + - The Prodigy + - Deadmau5 + - Calvin Harris + - Skrillex + - Category: R&B/Soul + Elements: + - Ray Charles + - Stevie Wonder + - Aretha Franklin + - Marvin Gaye + - Al Green + - James Brown + - Sam Cooke + - Otis Redding + - Smokey Robinson + - Diana Ross + - Luther Vandross + - Category: Metal + Elements: + - Black Sabbath + - Metallica + - Iron Maiden + - Judas Priest + - Slayer + - Megadeth + - Pantera + - AC/DC + - Guns N' Roses + - System of a Down + - Slipknot + - Category: Classical + Elements: + - Johann Sebastian Bach + - Ludwig van Beethoven + - Wolfgang Amadeus Mozart + - Franz Schubert + - Frederic Chopin + - Johannes Brahms + - Giuseppe Verdi + - Richard Wagner + - Gustav Mahler + - Claude Debussy + - Igor Stravinsky + - Category: Funk + Elements: + - James Brown + - George Clinton + - Sly Stone + - Bootsy Collins + - Earth, Wind & Fire + - Parliament-Funkadelic + - Kool & The Gang + - Tower of Power + - Average White Band + - The Meters + - Chic +- Topic: Movie Genres + Categories: + - Category: Action + Elements: + - The Dark Knight + - Terminator + - Die Hard + - Mad Max + - John Wick + - Lethal Weapon + - "Mission: Impossible" + - Predator + - Aliens + - Category: Adventure + Elements: + - Indiana Jones + - Jurassic Park + - The Fellowship of the Ring + - The Princess Bride + - Pirates of the Caribbean + - The Lion King + - Up + - Finding Nemo + - Avatar + - Jumanji + - Category: Comedy + Elements: + - Airplane! + - The Big Lebowski + - Bridesmaids + - The Hangover + - Monty Python and the Holy Grail + - Superbad + - The Grand Budapest Hotel + - Borat + - The Princess Diaries + - Zoolander + - Category: Drama + Elements: + - The Shawshank Redemption + - The Godfather + - The Godfather Part II + - Schindler's List + - Forrest Gump + - Goodfellas + - One Flew Over the Cuckoo's Nest + - Saving Private Ryan + - The Green Mile + - The Silence of the Lambs + - Category: Horror + Elements: + - The Shining + - The Exorcist + - Psycho + - Jaws + - Halloween + - The Texas Chain Saw Massacre + - The Thing + - Rosemary's Baby + - Night of the Living Dead + - Alien + - Category: Mystery + Elements: + - The Usual Suspects + - Chinatown + - The Maltese Falcon + - Vertigo + - L.A. Confidential + - The Silence of the Lambs + - Memento + - Zodiac + - Gone Girl + - Se7en + - Category: Romance + Elements: + - Casablanca + - Titanic + - The Notebook + - La La Land + - The Fault in Our Stars + - The Before Trilogy + - Eternal Sunshine of the Spotless Mind + - When Harry Met Sally... + - A Star is Born + - Before Sunrise + - Category: Science Fiction + Elements: + - Blade Runner + - The Matrix + - The Terminator + - Star Wars + - "2001: A Space Odyssey" + - Close Encounters of the Third Kind + - War of the Worlds + - The Day the Earth Stood Still + - Jurassic Park + - Interstellar + - Category: Thriller + Elements: + - The Silence of the Lambs + - Se7en + - Psycho + - The Departed + - Heat + - Basic Instinct + - Memento + - The Bourne Identity + - Black Swan + - The Girl with the Dragon Tattoo + - Category: Western + Elements: + - "The Good, the Bad and the Ugly" + - "Once Upon a Time in the West" + - "The Searchers" + - "High Noon" + - "Unforgiven" + - "Rio Bravo" + - "The Magnificent Seven" + - "Shane" + - "Butch Cassidy and the Sundance Kid" + - "True Grit" +- Topic: Alcohol + Categories: + - Category: Beer + Elements: + - "Budweiser" + - "Coors Light" + - "Miller Lite" + - "Corona Extra" + - "Heineken" + - "Guinness" + - "Stella Artois" + - "Samuel Adams" + - "Blue Moon" + - "Sierra Nevada" + - Category: Wine + Elements: + - "Chardonnay" + - "Cabernet Sauvignon" + - "Pinot Noir" + - "Merlot" + - "Sauvignon Blanc" + - "Zinfandel" + - "Syrah" + - "Malbec" + - "Riesling" + - "Champagne" + - Category: Whiskey + Elements: + - "Jack Daniel's" + - "Jameson" + - "Crown Royal" + - "Wild Turkey" + - "Maker's Mark" + - "Knob Creek" + - "Jim Beam" + - "Bulleit" + - "Woodford Reserve" + - "The Macallan" + - Category: Vodka + Elements: + - "Absolut" + - "Grey Goose" + - "Smirnoff" + - "Belvedere" + - "Ketel One" + - "Tito's" + - "Skyy" + - "Stolichnaya" + - "Svedka" + - "Ciroc" + - Category: Tequila + Elements: + - "Patrón" + - "Jose Cuervo" + - "Don Julio" + - "1800" + - "Sauza" + - "El Jimador" + - "Milagro" + - "Herradura" + - "Corralejo" + - "Cazadores" + - Category: Rum + Elements: + - "Bacardi" + - "Captain Morgan" + - "Malibu" + - "Myers's" + - "Mount Gay" + - "Appleton Estate" + - "Kraken" + - "Havana Club" + - "Zacapa" + - "Plantation" + - Category: Gin + Elements: + - "Tanqueray" + - "Hendrick's" + - "Bombay Sapphire" + - "Beefeater" + - "Gordon's" + - "Plymouth" + - "Monkey 47" + - "Aviation" + - "Death's Door" + - "Nolet's" + - Category: Other + Elements: + - "Jägermeister" + - "Baileys" + - "Grand Marnier" + - "Campari" + - "Chartreuse" + - "Kahlúa" + - "Amaretto" + - "Cointreau" + - "Frangelico" + - "Pernod" +- Topic: Classic Literature + Categories: + - Category: Jane Austen + Elements: + - "Pride and Prejudice" + - "Sense and Sensibility" + - "Emma" + - "Mansfield Park" + - "Northanger Abbey" + - "Persuasion" + - Category: Charles Dickens + Elements: + - "Oliver Twist" + - "Nicholas Nickleby" + - "David Copperfield" + - "Bleak House" + - "Hard Times" + - "Little Dorrit" + - "A Tale of Two Cities" + - "Great Expectations" + - "Our Mutual Friend" + - Category: William Faulkner + Elements: + - "The Sound and the Fury" + - "As I Lay Dying" + - "Light in August" + - "Absalom, Absalom!" + - "Go Down, Moses" + - "Intruder in the Dust" + - Category: Ernest Hemingway + Elements: + - "The Sun Also Rises" + - "A Farewell to Arms" + - "For Whom the Bell Tolls" + - "The Old Man and the Sea" + - "A Moveable Feast" + - Category: F. Scott Fitzgerald + Elements: + - "This Side of Paradise" + - "The Beautiful and Damned" + - "The Great Gatsby" + - "Tender Is the Night" + - "The Last Tycoon" + - Category: Edgar Allan Poe + Elements: + - "The Narrative of Arthur Gordon Pym of Nantucket" + - "The Masque of the Red Death" + - "The Cask of Amontillado" + - "The Pit and the Pendulum" + - "The Tell-Tale Heart" + - "The Murders in the Rue Morgue" + - "The Purloined Letter" + - "The Black Cat" + - "The Fall of the House of Usher" + - "The Raven" + - "Annabel Lee" + - Category: William Shakespeare + Elements: + - "Hamlet" + - "Romeo and Juliet" + - "Macbeth" + - "Othello" + - "King Lear" + - "Julius Caesar" + - "Anthony and Cleopatra" + - "The Tempest" + - "The Merchant of Venice" + - "Much Ado About Nothing" + - "Twelfth Night" + - "A Midsummer Night's Dream" + - "Richard III" + - "Henry V" + - "Henry IV, Part 1" + - "Henry IV, Part 2" + - "The Merry Wives of Windsor" + - "Taming of the Shrew" + - "The Comedy of Errors" + - "Measure for Measure" + - "All's Well That Ends Well" +- Topic: Game Genres + Categories: + - Category: Action + Elements: + - Grand Theft Auto + - Red Dead Redemption + - The Last of Us + - God of War + - Doom Eternal + - Death Stranding + - Resident Evil + - Category: Adventure + Elements: + - The Legend of Zelda + - Uncharted + - Horizon Zero Dawn + - Assassin's Creed + - Firewatch + - Life is Strange + - What Remains of Edith Finch + - Oxenfree + - Night in the Woods + - Category: RPG + Elements: + - The Elder Scrolls + - Fallout + - Mass Effect + - Disco Elysium + - Persona 5 + - Dark Souls + - The Witcher + - Dragon Age + - Final Fantasy + - Ultima + - Wizardry + - Category: Strategy + Elements: + - Civilization + - XCOM + - Starcraft + - Warcraft + - Total War + - Company of Heroes + - Crusader Kings + - Age of Empires + - Europa Universalis + - Homeworld + - Command & Conquer + - Killer Queen Black + - Category: Sports + Elements: + - FIFA + - NBA 2K + - Rocket League + - MLB The Show + - Tony Hawk's Pro Skater + - SSX + - Virtua Tennis + - Wii Sports + - Track & Field + - Category: Racing + Elements: + - Mario Kart + - F1 + - Assetto Corsa + - Dirt + - Burnout + - Forza Motorsport + - Project Cars + - Need for Speed + - Wipeout + - Gran Turismo + - Pole Position + - Category: Horror + Elements: + - Silent Hill + - "Amnesia: The Dark Descent" + - Dead Space + - Until Dawn + - Outlast + - "Alien: Isolation" + - Resident Evil + - Layers of Fear + - Soma + - Category: Fighting + Elements: + - Mortal Kombat + - Tekken + - Street Fighter + - Injustice + - Dragon Ball FighterZ + - Guilty Gear + - Soulcalibur + - Marvel vs. Capcom + - Super Smash Bros. + - Category: Puzzle + Elements: + - Portal + - Tetris + - Braid + - The Witness + - Monument Valley + - Limbo + - Baba Is You + - The Talos Principle + - Fez + - Category: Roguelike + Elements: + - Rogue + - Nethack + - Hades + - Dead Cells + - Spelunky + - Enter the Gungeon + - The Binding of Isaac + - Slay the Spire + - Crypt of the Necrodancer + - Darkest Dungeon + - FTL + - Risk of Rain 2 + - Category: Arcade + Elements: + - Pac-Man + - Donkey Kong + - Space Invaders + - Galaga + - Street Fighter II + - Mortal Kombat + - Defender + - Asteroids + - Ms. Pac-Man + - Centipede + - Joust + - Spy Hunter + - Killer Queen + - Black Emperor + - "ZOMBEEZ: a Killer Queen Remix" \ No newline at end of file diff --git a/namedropper/Assets/Scripts/GameOverScreen.cs b/namedropper/Assets/Scripts/GameOverScreen.cs index f8350ae..4a265b9 100644 --- a/namedropper/Assets/Scripts/GameOverScreen.cs +++ b/namedropper/Assets/Scripts/GameOverScreen.cs @@ -38,7 +38,7 @@ public class GameOverScreen : MonoBehaviour _gameOverMessage.text += "TIE!"; } - //_gameOverMessage.text += "\n\nPress 'R' to replay"; + _gameOverMessage.text += "\n\nPlay again?"; } Invoke("Restart", 10);