Skip to content

Commit

Permalink
Merge pull request #65 from C0Assassin/main
Browse files Browse the repository at this point in the history
Fix broke trivia token/Add Festival trivia/Add 50s decade
  • Loading branch information
LlysiX authored Nov 3, 2024
2 parents f3fa9f0 + d7f758e commit f7eeda4
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 2 deletions.
1 change: 1 addition & 0 deletions _ark/config/songs_verify.dta
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
(generic_tier6)
(generic_tier8)
(generic_tier9)
(the50s)
(the60s)
(the70s)
(the80s)
Expand Down
26 changes: 24 additions & 2 deletions _ark/dx/config/dx_tips.dta
Original file line number Diff line number Diff line change
Expand Up @@ -946,7 +946,7 @@
;;iwannarock
(loading_trivia1096
TRIVIA_WEIGHT
(song iris))
(song iwannarock))
;;juice
(loading_trivia1097
TRIVIA_WEIGHT
Expand Down Expand Up @@ -1483,4 +1483,26 @@
(artist "Queens of the Stone Age"))
(loading_trivia1358
TRIVIA_WEIGHT
(artist "Queens of the Stone Age"))
(artist "Queens of the Stone Age"))
;;FES
(loading_trivia1359
TRIVIA_WEIGHT
(song sweetchildomine))
(loading_trivia1360
TRIVIA_WEIGHT
(song welcometothejungle))
(loading_trivia1361
TRIVIA_WEIGHT
(song barbiegirl))
(loading_trivia1362
TRIVIA_WEIGHT
(song gangnamstyle))
(loading_trivia1363
TRIVIA_WEIGHT
(song toxic))
(loading_trivia1364
TRIVIA_WEIGHT
(song whatislove))
(loading_trivia1365
TRIVIA_WEIGHT
(song sandstorm))
10 changes: 10 additions & 0 deletions _ark/ui/eng/locale_updates.dta
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
(the50s "'50s Hits")
(localhpack "LocalH's Pack")
(bleepbloops "Bleep Bloops")
(solomedley "Solo Medleys")
Expand Down Expand Up @@ -2272,6 +2273,15 @@
(loading_trivia1356 "In 2001, former Queens of the Stone Age member Nick Oliveri was arrested in Rio for performing onstage wearing only his bass.")
(loading_trivia1357 "Queens of the Stone Age were originally called \qGamma Ray\q but another band had already claimed the name.")
(loading_trivia1358 "Queens of the Stone Age reportedly opted not to be called \qKings of the Stone Age\q because they thought it would sound overly masculine.")

;;FES
(loading_trivia1359 "Slash would play the opening lick to warm up before practice. It was meant to be nothing more than just to get his fingers moving. Axl absolutely loved it however, and before long they had a new song come together based on the one simple riff.")
(loading_trivia1360 "A cover of this song was originally going to be in the setlist of Rock Band 1. A demo video of the song being played still exists.")
(loading_trivia1361 "In 1997, Mattel filed a lawsuit against the band, claiming they infringed on the Barbie trademark and portrayed Barbie as a sexual object, referring to her as a \qBlonde Bimbo\q.")
(loading_trivia1362 "The lyrics are all in Korean except for the line, \qHey... Sexy Lady.\q")
(loading_trivia1363 "\qToxic\q was the most-searched song on Google in 2004, with Spears being the most-searched artist that year.")
(loading_trivia1364 "This song became popular after being featured in a recurring Saturday Night Live sketch that showcased three guys going clubbing, where the men bobbed their heads in sync.")
(loading_trivia1365 "This was one of the first songs to gain popularity via the internet. It was initially promoted by posting a 60-second clip of the track online, followed by airplay in discos and clubs, before finally being released to an eager audience.")
(os_blnk
" ")
#include ../../dx/locale/dx_locale_updates.dta
Expand Down

0 comments on commit f7eeda4

Please sign in to comment.