release 1.1.0-beta12

.github/workflows/build.yml

@@ -123,10 +123,8 @@ jobs:
           args: 7z a -t7z -mx=9 build.7z ./build/
       - name: Configure Tools
         run: |
-          curl -L https://dlhb.gamebrew.org/wiihomebrews/wiimmfiisopatcherwii.7z -o wiimmfi-patcher-latest.7z
-          7z x wiimmfi-patcher-latest.7z
-          7z x wiimmfi-patcher-v7.4.zip
-          mv wiimmfi-patcher-v7.4 rb3dx_wii_patcher
+          7z x dependencies/wii_patcher/wiimmfi-patcher-v7.5.zip
+          mv wiimmfi-patcher-v7.5 rb3dx_wii_patcher
           mkdir rb3dx_wii_patcher/wii_patch_files
           mkdir rb3dx_wii_patcher/wii_patch_files/gen
           cp out/wii/files/gen/main_wii.hdr rb3dx_wii_patcher/wii_patch_files/gen/main_wii.hdr

.gitignore

@@ -14,4 +14,5 @@ out
 
 #generated files by additional game scripts
 scripts/dx_config.ini
-demo
+demo
+scripts/dx_playdata.json

_ark/char/anim_genres.dta

@@ -1,27 +1,44 @@
 (alternative rocker)
+(bigband dramatic)
+(blackmetal banger)
 (blues rocker)
 (classical dramatic)
 (classicrock rocker)
 (country rocker)
+(deathmetal banger)
 (disco rocker)
+(dubstep dramatic)
 (emo dramatic)
+(experimental spazz)
 (fusion rocker)
 (glam dramatic)
+(hairmetal banger)
+(hardcorepunk spazz)
 (hardrock rocker)
 (industrial rocker)
 (inspirational dramatic)
 (jazz dramatic)
 (jrock spazz)
 (latin spazz)
 (metal banger)
+(metalcore banger)
 (novelty spazz)
 (numetal banger)
+(pop rocker)
+(poppunk spazz)
 (poprock rocker)
+(posthardcore spazz)
 (prog rocker)
+(psychobilly rocker)
 (punk spazz)
+(raprock rocker)
 (rock rocker)
 (rockabilly rocker)
+(skapunk rocker)
 (southernrock rocker)
+(speedmetal banger)
+(surfrock rocker)
+(trap rocker)
 (grunge banger)
 (indierock rocker)
 (new_wave dramatic)

_ark/config/macros.dta

@@ -451,6 +451,8 @@
 #define kNetUI_InDialog
 (23)
 #endif
+;#define kNetUI_PlayAShow
+;(24)
 #define kCareerState_Invalid
 (0)
 #define kCareerState_Group
@@ -789,6 +791,8 @@
 #define kState_ConfirmPlayaShowExit (69103)
 #define dxState_RebootThemeWarn (69104)
 #define kState_ReadyToPlayaShowWait (69105)
+#define dxState_CalibrationInGame (69106)
+#define dxState_CalibrationInGameSetting (69107)
 #define kOverrideFlow_None
 (0)
 #define kOverrideFlow_SongSettings

_ark/config/song_select.dta

@@ -80,7 +80,7 @@
       (music_library_visible TRUE)
       (desc setlist_rb1endless_desc)
       (date 2007 11 20)
-      (songs sayitaintso inbloom ithinkimparanoid missqueen hereitgoesagain 29fingers creep waveofmutilation maps seven gimmeshelter sabotage blitzkriegbop celebrityskin whenyouwereyoung timewehad imsosick blackholesun blooddoll wanteddeadoralive daylatedollarshort nightmare orangecrush mainoffender thehandthatfeeds epic suffragettecity ballroomblitz deadonarrival trainkeptarollin areyougonnabemygirl pleasure brainpower cantletgo gowiththeflow danicalifornia igetby outside electricversion vasoline timmy detroitrockcity cherubrock nexttoyou tomsawyer greengrass highwaystar wontgetfooled))
+      (songs 29fingers sayitaintso inbloom ithinkimparanoid timewehad missqueen hereitgoesagain creep blooddoll waveofmutilation shouldistay maps gimmeshelter brainpower sabotage blitzkriegbop celebrityskin imsosick whenyouwereyoung blackholesun wanteddeadoralive learntofly seven orangecrush mainoffender thehandthatfeeds daylatedollarshort epic suffragettecity ballroomblitz deadonarrival pleasure trainkeptarollin areyougonnabemygirl paranoid timmy welcomehome gowiththeflow danicalifornia nightmare dontfearthereaper reptilia electricversion vasoline detroitrockcity cantletgo nexttoyou cherubrock tomsawyer entersandman greengrass outside highwaystar foreplaylongtime flirtinwithdisaster igetby runtothehills wontgetfooled))
    (setlist_lrbendless
       (music_library_visible TRUE)
       (desc setlist_rb2endless_desc)
@@ -90,14 +90,14 @@
       (music_library_visible TRUE)
       (desc setlist_rb2endless_desc)
       (date 2008 9 14)
-      (songs iwaswrong sowhatchawant epro hungrylikethewolf pretendweredead rebelgirl nineintheafternoon drainyou pda coolforcats hellothere today thatswhatyouget spiritinthesky wegotthebeat newkidinschool feelthepain pumpitup onestepcloser welcometothe whitewedding psychokiller lump conventionallover deluxe shootingstar #ifndef HX_WII giveitaway2 #endif themiddle livinonaprayer onewayoranother ajaggedgorgeouswinter goyourownway kidsinamerica girlsnotgrey lazyeye comeoutandplay mountainsong wheredyougo alexchilton rocknme roundandround yououghtaknow alabamagetaway supremegirl pinballwizard ourtruth uncontrollableurge badreputation nightlies teenageriot shacklersrevenge letthereberock thetrees aqualung downwiththesickness everlong giveitall robtheprezodent #ifndef HX_WII spoonman2 #endif aceofspades almosteasy ramblinman getclean peacesells colonyofbirchmen soulsofblack bodhisattva shouldertotheplow battery panicattack))
+      (songs eyeofthetiger myownworstenemy iwaswrong sowhatchawant epro hungrylikethewolf pretendweredead rebelgirl nineintheafternoon floaton drainyou pda maninthebox coolforcats hellothere today thatswhatyouget spiritinthesky wegotthebeat newkidinschool feelthepain pumpitup onestepcloser welcometothe whitewedding psychokiller lump conventionallover deluxe shootingstar giveitaway themiddle americanwoman livinonaprayer onewayoranother ajaggedgorgeouswinter goyourownway kidsinamerica girlsnotgrey lazyeye comeoutandplay mountainsong wheredyougo alexchilton rocknme tangledupinblue alive roundandround yououghtaknow alabamagetaway testify supremegirl pinballwizard ourtruth uncontrollableurge badreputation nightlies anywayyouwantit teenageriot shacklersrevenge letthereberock thetrees aqualung downwiththesickness chopsuey everlong masterexploder giveitall carryonwaywardson robtheprezodent spoonman aceofspades almosteasy ramblinman getclean peacesells colonyofbirchmen soulsofblack bodhisattva shouldertotheplow battery visions panicattack painkiller))
    (dx_setlist_infinite
       (music_library_visible TRUE)
       (desc dx_setlist_infinite_desc)
       (date 2024 3 25)
       (songs 
-         sayitaintso inbloom ithinkimparanoid missqueen hereitgoesagain 29fingers creep waveofmutilation maps seven gimmeshelter sabotage blitzkriegbop celebrityskin whenyouwereyoung timewehad imsosick blackholesun blooddoll wanteddeadoralive daylatedollarshort nightmare orangecrush mainoffender thehandthatfeeds epic suffragettecity ballroomblitz deadonarrival trainkeptarollin areyougonnabemygirl pleasure brainpower cantletgo gowiththeflow danicalifornia igetby outside electricversion vasoline timmy detroitrockcity cherubrock nexttoyou tomsawyer greengrass highwaystar wontgetfooled
-         iwaswrong sowhatchawant epro hungrylikethewolf pretendweredead rebelgirl nineintheafternoon drainyou pda coolforcats hellothere today thatswhatyouget spiritinthesky wegotthebeat newkidinschool feelthepain pumpitup onestepcloser welcometothe whitewedding psychokiller lump conventionallover deluxe shootingstar #ifndef HX_WII giveitaway2 #endif themiddle livinonaprayer onewayoranother ajaggedgorgeouswinter goyourownway kidsinamerica girlsnotgrey lazyeye comeoutandplay mountainsong wheredyougo alexchilton rocknme roundandround yououghtaknow alabamagetaway supremegirl pinballwizard ourtruth uncontrollableurge badreputation nightlies teenageriot shacklersrevenge letthereberock thetrees aqualung downwiththesickness everlong giveitall robtheprezodent #ifndef HX_WII spoonman2 #endif aceofspades almosteasy ramblinman getclean peacesells colonyofbirchmen soulsofblack bodhisattva shouldertotheplow battery panicattack
+         29fingers sayitaintso inbloom ithinkimparanoid timewehad missqueen hereitgoesagain creep blooddoll waveofmutilation shouldistay maps gimmeshelter brainpower sabotage blitzkriegbop celebrityskin imsosick whenyouwereyoung blackholesun wanteddeadoralive learntofly seven orangecrush mainoffender thehandthatfeeds daylatedollarshort epic suffragettecity ballroomblitz deadonarrival pleasure trainkeptarollin areyougonnabemygirl paranoid timmy welcomehome gowiththeflow danicalifornia nightmare dontfearthereaper reptilia electricversion vasoline detroitrockcity cantletgo nexttoyou cherubrock tomsawyer entersandman greengrass outside highwaystar foreplaylongtime flirtinwithdisaster igetby runtothehills wontgetfooled
+         eyeofthetiger myownworstenemy iwaswrong sowhatchawant epro hungrylikethewolf pretendweredead rebelgirl nineintheafternoon floaton drainyou pda maninthebox coolforcats hellothere today thatswhatyouget spiritinthesky wegotthebeat newkidinschool feelthepain pumpitup onestepcloser welcometothe whitewedding psychokiller lump conventionallover deluxe shootingstar giveitaway themiddle americanwoman livinonaprayer onewayoranother ajaggedgorgeouswinter goyourownway kidsinamerica girlsnotgrey lazyeye comeoutandplay mountainsong wheredyougo alexchilton rocknme tangledupinblue alive roundandround yououghtaknow alabamagetaway testify supremegirl pinballwizard ourtruth uncontrollableurge badreputation nightlies anywayyouwantit teenageriot shacklersrevenge letthereberock thetrees aqualung downwiththesickness chopsuey everlong masterexploder giveitall carryonwaywardson robtheprezodent spoonman aceofspades almosteasy ramblinman getclean peacesells colonyofbirchmen soulsofblack bodhisattva shouldertotheplow battery visions panicattack painkiller
          20thcenturyboy iloverocknroll lowrider rehab kinggeorge walkinonthesun saturdaynightsalright breakonthrough walkoflife thehardestbutton ineedtoknow dontburyme antibodies flylikeaneagle heartofglass stopmeifyouthink vivalaresistance oyemiamor thisbastardslife inthemeantime imagine icanseeformiles thecon ohmygod livinginamerica dontstandsoclosetome iwannabesedated centerfold rocklobster getfree sisterchristian deadendfriends onearmedscissors meenamora werewolvesoflondon coldasice caughtinamosh 25or6to4 heymanniceshot thekillingmoon portionsforfoxes spaceoddity humanoid nooneknows justlikeheaven thebeautifulpeople hereigoagain beencaughtstealing rainbowinthedark needyoutonight ifeelgoodalt somethingbigger falsealarm thepoweroflove everybodywantstorule beforeiforget getupstandup outerspacemuffs lastdance goodvibrationslive miserybusiness2 smokeonthewater inabigcountry jerrywasaracecar foolin chinagrove duhast crosstowntraffic plush llama roundabout yoshimibattles radarlove beastandtheharlot combatbaby lasso whipit killingloneliness midlifecrisis crazytrain thelook bohemianrhapsody freebird
       ))
    (setlist_guitarbossmedium

_ark/config/synth.dta

@@ -25,15 +25,15 @@
       ({do {dx_store_meta_info "epic" "Epic" "Faith No More" "get it all"} rb1_shellmusic_multi_epic} 0.0)
       ({do {dx_store_meta_info "gowiththeflow" "Go with the Flow" "Queens of the Stone Age" "throw yourself away"} rb1_shellmusic_multi_gowiththeflow} 0.0)
       ({do {dx_store_meta_info "imsosick" "I'm So Sick" "Flyleaf" "go see the nurse"} rb1_shellmusic_multi_imsosick} 0.0)
-      ({do {dx_store_meta_info "missqueen" "Mississippi Queen" "Mountain" "know what I mean"} rb1_shellmusic_multi_missqueen} 0.0)
+      ({do {dx_store_meta_info "missqueen" "Mississippi Queen (Cover)" "Mountain" "know what I mean"} rb1_shellmusic_multi_missqueen} 0.0)
       ({do {dx_store_meta_info "nightmare" "Nightmare" "Crooked X" "none"} rb1_shellmusic_multi_nightmare} 0.0)
       ({do {dx_store_meta_info "pleasure" "Pleasure (Pleasure)" "Bang Camaro" "Pleasure (Pleasure)"} rb1_shellmusic_multi_pleasure} 0.0)
       ({do {dx_store_meta_info "seven" "Seven" "Tijuana Sweetheart" "none"} rb1_shellmusic_multi_seven} 0.0)
       ({do {dx_store_meta_info "suffragettecity" "Suffragette City" "David Bowie" "wham bam, thank you ma’am"} rb1_shellmusic_multi_suffragettecity} 0.0)
       ({do {dx_store_meta_info "thehandthatfeeds" "The Hand That Feeds" "Nine Inch Nails" "bite the hand"} rb1_shellmusic_multi_thehandthatfeeds} 0.0)
       ; Rock Band 2
       ({do {dx_store_meta_info "aceofspades" "Ace of Spades" "Motörhead" "win some, lose some"} rb2_shellmusic_multi_aceofspades} 0.0)
-      ({do {dx_store_meta_info "badreputation" "Bad Reputation" "Joan Jett & The Blackhearts" "not give a damn"} rb2_shellmusic_multi_badreputation} 0.0)
+      ({do {dx_store_meta_info "badreputation" "Bad Reputation" "Joan Jett" "not give a damn"} rb2_shellmusic_multi_badreputation} 0.0)
       ({do {dx_store_meta_info "drainyou" "Drain You" "Nirvana" "be lucky to have met you"} rb2_shellmusic_multi_drainyou} 0.0)
       ({do {dx_store_meta_info "everlong" "Everlong" "Foo Fighters" "breathe out"} rb2_shellmusic_multi_everlong} 0.0)
       ({do {dx_store_meta_info "getclean" "Get Clean" "Anarchy Club" "scrub with soap"} rb2_shellmusic_multi_getclean} 0.0)
@@ -66,30 +66,30 @@
       ; Rock Band 4
       ({do {dx_store_meta_info "dreamgenie" "Dream Genie" "Lightning Bolt" "suffer"} rb4_shellmusic_multi_dreamgenie} 0.0)
       ({do {dx_store_meta_info "lightupthenight" "Light Up the Night" "The Protomen" "none"} rb4_shellmusic_multi_lightupthenight} 0.0)
-      ({do {dx_store_meta_info "o335947165_rudeboys_dutchr" "RudeBoys" "Dutch ReBelle" "disrespect"} rb4_shellmusic_multi_rudeboys} 0.0)
+      ({do {dx_store_meta_info "rudeboys" "RudeBoys" "Dutch ReBelle" "disrespect"} rb4_shellmusic_multi_rudeboys} 0.0)
       ({do {dx_store_meta_info "vbomb" "V-Bomb" "Dark Wheels" "none"} rb4_shellmusic_multi_vbomb} 0.0)
       ; Deluxe mods
-      ({do {dx_store_meta_info "PsychobillyFreakoutRHH_rb" "Psychobilly Freakout" "Reverend Horton Heat" "none"} gh2dx_shellmusic_multi_psychobilly} 0.0) ; https://rhythmverse.co/songfile/2fe493405a61498285749b5e751bb107
       ({do {dx_store_meta_info "beencaughtstealing" "Been Caught Stealing" "Jane's Addiction" "steal"} rb3dx_shellmusic_multi_beencaughtstealing} 0.0)
       ({do {dx_store_meta_info "o705576952_bigenergy_latto" "Big Energy" "Latto" "none"} rb3dx_shellmusic_multi_bigenergy} 0.0)
       ({do {dx_store_meta_info "combatbaby" "Combat Baby" "Metric" "come back"} rb3dx_shellmusic_multi_combatbaby} 0.0)
       ({do {dx_store_meta_info "deadendfriends" "Dead End Friends" "Them Crooked Vultures" "none"} rb3dx_shellmusic_multi_deadendfriends} 0.0)
       ({do {dx_store_meta_info "downwiththesickness" "Down with the Sickness" "Disturbed" "OH, AH, AH, AH, AH"} rb3dx_shellmusic_multi_downwiththesickness} 0.0)
       ({do {dx_store_meta_info "getfree" "Get Free" "The Vines" "ride into the sun"} rb3dx_shellmusic_multi_getfree} 0.0)
       ({do {dx_store_meta_info "getready2rokk" "Get Ready 2 Rokk" "Freezepop" "put on your make-up"} rb3dx_shellmusic_multi_getready2rokk} 0.0)
-      ({do {dx_store_meta_info "igetby" "I Get By" "Honest Bob and The Factory-to-Dealer Incentives" "wait on another bright idea"} rb3dx_shellmusic_multi_igetby} 0.0)
+      ({do {dx_store_meta_info "igetby" "I Get By" "Honest Bob and the Factory-to-Dealer Incentives" "wait on another bright idea"} rb3dx_shellmusic_multi_igetby} 0.0)
       ({do {dx_store_meta_info "inthemeantime" "In the Meantime" "Spacehog" "love the all of you"} rb3dx_shellmusic_multi_inthemeantime} 0.0)
+      ({do {dx_store_meta_info "thekillingmoon" "The Killing Moon" "Echo & the Bunnymen" "show your commitment to sparkle motion"} rb3dx_shellmusic_multi_thekillingmoon} 0.0)
       ({do {dx_store_meta_info "marchofthepigs" "March of the Pigs" "Nine Inch Nails" "let the pigs win"} rb3dx_shellmusic_multi_marchofthepigs} 0.0)
       ({do {dx_store_meta_info "miserybusiness2" "Misery Business" "Paramore" "feel so good"} rb3dx_shellmusic_multi_miserybusiness2} 0.0)
       ({do {dx_store_meta_info "moveslikejagger" "Moves Like Jagger (ft. Christina Aguilera)" "Maroon 5" "move like Jagger"} rb3dx_shellmusic_multi_moveslikejagger} 0.0)
       ({do {dx_store_meta_info "nevergonnagiveyouup" "Never Gonna Give You Up" "Rick Astley" "get rick rolled"} rb3dx_shellmusic_multi_nevergonnagiveyouup} 0.0)
       ({do {dx_store_meta_info "panicattack" "Panic Attack" "Dream Theater" "to feel like you're in danger"} rb3dx_shellmusic_multi_panicattack} 0.0)
       ({do {dx_store_meta_info "parrtyintheusa" "Party in the USA" "Miley Cyrus" "hop on a plane"} rb3dx_shellmusic_multi_parrtyintheusa} 0.0)
       ({do {dx_store_meta_info "perfectdrug" "The Perfect Drug" "Nine Inch Nails" "none"} rb3dx_shellmusic_multi_perfectdrug} 0.0)
-      ({do {dx_store_meta_info "thekillingmoon" "The Killing Moon" "Echo & the Bunnymen" "show your commitment to sparkle motion"} rb3dx_shellmusic_multi_thekillingmoon} 0.0)
+      ({do {dx_store_meta_info "IWANNATAKEYOUFORARIDE_rb3" "Player Select (I Wanna Take You for a Ride)" "Tetsuya Shibata & Mitsuhiko Takano" "insert coin"} sekrit} 0.0) ; https://rhythmverse.co/songfile/e1caa4dff20a47b8b0fbd559c1785afa
+      ({do {dx_store_meta_info "PsychobillyFreakoutRHH_rb" "Psychobilly Freakout" "Reverend Horton Heat" "none"} gh2dx_shellmusic_multi_psychobilly} 0.0) ; https://rhythmverse.co/songfile/2fe493405a61498285749b5e751bb107
       ({do {dx_store_meta_info "thisbastardslife" "This Bastard's Life" "Swingin' Utters" "beat the banker's deal"} rb3dx_shellmusic_multi_thisbastardslife} 0.0)
       ({do {dx_store_meta_info "tragickingdom" "Tragic Kingdom" "No Doubt" "remain seated"} rb3dx_shellmusic_multi_tragickingdom} 0.0)
-      ({do {dx_store_meta_info "IWANNATAKEYOUFORARIDE_rb3" "Player Select (I Wanna Take You for a Ride)" "Tetsuya Shibata & Mitsuhiko Takano" "insert coin"} sekrit} 0.0) ; https://rhythmverse.co/songfile/e1caa4dff20a47b8b0fbd559c1785afa
    )
    (scenes
       #include metamusic_scenes.dta)

_ark/dx/game/dx_game_handles.dta

@@ -19,7 +19,7 @@
                   {dx_log_writer default {sprint "Game has been entered. Game enter count: " $dx_game_enter_count " - Gamemode: " $dx_gamemode " - Local: " {session_mgr is_local}}}
                   {dx_log_writer default {sprint "Current User Info - Song Speed: " $speedmod " - Trackspeed: " $trackspeed " - Venue FPS: " $emulatefps " - Venue: " $dx_venue " - Venue Forced: " $force}}
                   {dx_log_writer default {sprint "Current User Textures - Emissive: " $dx_overdrive_guitar " - Highway: " $dx_highway_guitar " - Spotlight: " $dx_streak_guitar  " - Keyboard: " $dx_keyboard " - Smasher: " $dx_smasher " - Gem: " $dx_gem " - Sustain: " $dx_sustain " - Crowd Meter Tex: " $dx_crowd_meter}}
-                  {dx_log_writer default {sprint "Current User Textures cont. - OD Bar: " $dx_overdrive_bar  " - Multiplier Ring: " $dx_multiplier_ring " - Track Rails: " $dx_rails " - Score Tex: " $dx_score " - Flames: " $dx_flames " - Vox Arrow: " $dx_vocal_arrow " - Vox Highway: " $dx_vocal_highway " - DX Multi Angle: " $dx_multiangle}}
+                  {dx_log_writer default {sprint "Current User Textures cont. - OD Bar: " $dx_overdrive_bar  " - Multiplier Ring: " $dx_multiplier_ring " - Track Rails: " $dx_rails " - Score Tex: " $dx_score " - Flares: " $dx_flares " - Particles: " $dx_particles " - Vox Arrow: " $dx_vocal_arrow " - Vox Highway: " $dx_vocal_highway " - DX Multi Angle: " $dx_multiangle}}
                   {game set_kick_autoplay {modifier_mgr is_modifier_active mod_auto_kick}} ; dx - auto kick
                   {gamemode set allow_drum_fills {! {modifier_mgr is_modifier_active mod_static_fills}}} ; dx - static fills
                   {set $dx_apply_postproc TRUE} ; needed to avoid microstutter in-game
@@ -82,7 +82,14 @@
          {{{coop_track_panel find tracker_broadcast_display} find band_message.lbl} set_showing TRUE}
          {{coop_track_panel find tracker_broadcast_display} set_challenge_type kTrackerChallengeType_Overdrive}
          {{coop_track_panel find tracker_broadcast_display} set_display_type kBroadcastTrackerDisplay_BandMessage}
-         {{coop_track_panel find tracker_broadcast_display} show_brief_band_message {symbol {sprintf "You Rock!"}}}
+         {if_else $dx_event_mode
+            {switch $dx_event_type
+               (party {{coop_track_panel find tracker_broadcast_display} show_brief_band_message {symbol {sprint {localize dx_you_rock_msg}}}})
+               (club {{coop_track_panel find tracker_broadcast_display} show_brief_band_message {symbol {sprint {localize dx_you_rock_club_msg} $dx_event_name "!"}}})
+               (convention {{coop_track_panel find tracker_broadcast_display} show_brief_band_message {symbol {sprint {localize dx_you_rock_convention_msg} $dx_event_name "!"}}})
+            }
+            {{coop_track_panel find tracker_broadcast_display} show_brief_band_message {symbol {sprint {localize dx_you_rock_msg}}}}
+         }
       }
       ;{dx_log_writer info {sprint "func: dx_on_game_won"}}
       ;{dx_log_writer info