release 1.1.0-beta11

.gitignore

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

_ark/char/anim_genres.dta

@@ -0,0 +1,34 @@
+(alternative rocker)
+(blues rocker)
+(classical dramatic)
+(classicrock rocker)
+(country rocker)
+(disco rocker)
+(emo dramatic)
+(fusion rocker)
+(glam dramatic)
+(hardrock rocker)
+(industrial rocker)
+(inspirational dramatic)
+(jazz dramatic)
+(jrock spazz)
+(latin spazz)
+(metal banger)
+(novelty spazz)
+(numetal banger)
+(poprock rocker)
+(prog rocker)
+(punk spazz)
+(rock rocker)
+(rockabilly rocker)
+(southernrock rocker)
+(grunge banger)
+(indierock rocker)
+(new_wave dramatic)
+(reggaeska rocker)
+(rbsoulfunk rocker)
+(hiphoprap rocker)
+(other rocker)
+(popdanceelectronic dramatic)
+(urban rocker)
+(world rocker)

_ark/config/midi_parsers.dta

@@ -7,13 +7,34 @@
          {> $mp.after_delta_sec $after}}}
    {func
       is_ugc_plus
-      {&&
-         {exists meta_performer}
-         {exists song_mgr}
-      } ; i feel like this is formatted wrong - TODO
-      {||
-         {== {{song_mgr get_meta_data {meta_performer song}} version} 30} ; dx - check if a song's version is equal to 30
-         #ifndef HX_WII {{song_mgr get_meta_data {meta_performer song}} is_ugc_plus} #endif ; vanilla check on ugc_plus source
+      {do
+         {set $is_ugc_plus FALSE}
+         {if
+            {&&
+               {exists meta_performer}
+               {exists song_mgr}
+            }
+            {if {== {{song_mgr get_meta_data {meta_performer song}} version} 30} ; dx - check if a song's version is equal to 30
+               {set $is_ugc_plus TRUE}
+            }
+            {if {file_exists {sprint "songs/" {meta_performer song} "/" {meta_performer song} ".mid"}}
+               {set $is_ugc_plus FALSE}
+            }
+            {if {file_exists {sprint "songs/updates/" {meta_performer song} "/" {meta_performer song} "_update.mid"}}
+               {set $is_ugc_plus FALSE}
+            }
+            {if {>= {{song_mgr get_meta_data {meta_performer song}} id} 5005600}
+               {if {<= {{song_mgr get_meta_data {meta_performer song}} id} 5012250}
+                  {set $is_ugc_plus TRUE}
+               }
+            }
+            #ifndef HX_WII
+            {if {{song_mgr get_meta_data {meta_performer song}} is_ugc_plus}  ; vanilla check on ugc_plus source
+               {set $is_ugc_plus TRUE}
+            }
+            #endif
+            ;{dx_passive_messenger_symbol {sprint $is_ugc_plus}}
+         }
       }
    }
    #include ../dx/countdown/dx_countdown_midi_parsers.dta
@@ -2121,10 +2142,15 @@
                      "Hey, no fake_songmgr or song_mgr for"
                      [song_name]}
                   30}})
+         {is_ugc_plus}
          {if
             {'||'
+               {&&
+                  {file_exists {sprint "songs/updates/" {meta_performer song} "/" {meta_performer song} "_update.mid"}}
+                  {== {{song_mgr get_meta_data {meta_performer song}} version} 30}
+               }
                {< $ver 30}
-               {is_ugc_plus}}
+               $is_ugc_plus}
             {new
                MidiParser
                world_crowd_parser
@@ -2172,10 +2198,11 @@
                (track_name VENUE)
                (enabled TRUE)
                (init
-                  {set
-                     [enabled]
-                     {!
-                        {is_ugc_plus}}})
+                  {is_ugc_plus}
+                  {if_else $is_ugc_plus
+                     {set [enabled] FALSE}
+                     {set [enabled] TRUE}
+                  })
                (allowed_notes
                   (96 97 98 99 100 101 102 103 104 105 106 107 108 109 110))
                (midi
@@ -2221,9 +2248,18 @@
                (compress TRUE)
                (enabled TRUE)
                (init
-                  {set
-                     [enabled]
-                     {is_ugc_plus}})
+                  {is_ugc_plus}
+                  {if_else $is_ugc_plus
+                     {set [enabled] TRUE}
+                     {set [enabled] FALSE}
+                  }
+                  {if
+                     {&&
+                        {file_exists {sprint "songs/updates/" {meta_performer song} "/" {meta_performer song} "_update.mid"}}
+                        {== {{song_mgr get_meta_data {meta_performer song}} version} 30}
+                     }
+                     {set [enabled] TRUE}
+                  })
                (post_procs
                   (bloom.pp bright.pp clean_trails.pp contrast_a.pp desat_blue.pp desat_posterize_trails.pp film_16mm.pp 'film_b+w.pp' film_blue_filter.pp film_contrast.pp film_contrast_blue.pp film_contrast_green.pp film_contrast_red.pp film_sepia_ink.pp film_silvertone.pp flicker_trails.pp horror_movie_special.pp photo_negative.pp photocopy.pp posterize.pp ProFilm_a.pp ProFilm_b.pp ProFilm_mirror_a.pp ProFilm_psychedelic_blue_red.pp shitty_tv.pp space_woosh.pp video.pp video_a.pp video_bw.pp video_security.pp video_trails.pp))
                (text
@@ -2258,10 +2294,18 @@
                (track_name VENUE)
                (enabled TRUE)
                (init
-                  {set
-                     [enabled]
-                     {!
-                        {is_ugc_plus}}}
+                  {is_ugc_plus}
+                  {if_else $is_ugc_plus
+                     {set [enabled] FALSE}
+                     {set [enabled] TRUE}
+                  }
+                  {if
+                     {&&
+                        {file_exists {sprint "songs/updates/" {meta_performer song} "/" {meta_performer song} "_update.mid"}}
+                        {== {{song_mgr get_meta_data {meta_performer song}} version} 30}
+                     }
+                     {set [enabled] FALSE}
+                  }
                   {set
                      [zero_length]
                      TRUE})
@@ -2290,9 +2334,18 @@
                (compress TRUE)
                (enabled TRUE)
                (init
-                  {set
-                     [enabled]
-                     {is_ugc_plus}})
+                  {is_ugc_plus}
+                  {if_else $is_ugc_plus
+                     {set [enabled] TRUE}
+                     {set [enabled] FALSE}
+                  }
+                  {if
+                     {&&
+                        {file_exists {sprint "songs/updates/" {meta_performer song} "/" {meta_performer song} "_update.mid"}}
+                        {== {{song_mgr get_meta_data {meta_performer song}} version} 30}
+                     }
+                     {set [enabled] TRUE}
+                  })
                (text
                   {if
                      {&&
@@ -2313,9 +2366,18 @@
                   {set
                      [zero_length]
                      TRUE}
-                  {set
-                     [enabled]
-                     {is_ugc_plus}})
+                  {is_ugc_plus}
+                  {if_else $is_ugc_plus
+                     {set [enabled] TRUE}
+                     {set [enabled] FALSE}
+                  }
+                  {if
+                     {&&
+                        {file_exists {sprint "songs/updates/" {meta_performer song} "/" {meta_performer song} "_update.mid"}}
+                        {== {{song_mgr get_meta_data {meta_performer song}} version} 30}
+                     }
+                     {set [enabled] TRUE}
+                  })
                (text
                   {if
                      {&&
@@ -2350,10 +2412,18 @@
                   {set
                      [legacy_presets]
                      FALSE}
-                  {set
-                     [enabled]
-                     {!
-                        {is_ugc_plus}}})
+                  {is_ugc_plus}
+                  {if_else $is_ugc_plus
+                     {set [enabled] FALSE}
+                     {set [enabled] TRUE}
+                  }
+                  {if
+                     {&&
+                        {file_exists {sprint "songs/updates/" {meta_performer song} "/" {meta_performer song} "_update.mid"}}
+                        {== {{song_mgr get_meta_data {meta_performer song}} version} 30}
+                     }
+                     {set [enabled] FALSE}
+                  })
                (term
                   {if
                      [legacy_presets]
@@ -2400,9 +2470,11 @@
                   {set
                      [start_offset]
                      0.25}
-                  {set
-                     [allow_keys]
-                     {is_ugc_plus}})
+                  {is_ugc_plus}
+                  {if_else $is_ugc_plus
+                     {set [allow_keys] TRUE}
+                     {set [allow_keys] FALSE}
+                  })
                (allowed_notes
                   (37 38 39 40 41))
                (get_instrument
@@ -2501,10 +2573,18 @@
                   {set
                      $mp.last_times
                      (0 0 0 0 0 0 0 0)}
-                  {set
-                     [enabled]
-                     {!
-                        {is_ugc_plus}}})
+                  {is_ugc_plus}
+                  {if_else $is_ugc_plus
+                     {set [enabled] FALSE}
+                     {set [enabled] TRUE}
+                  }
+                  {if
+                     {&&
+                        {file_exists {sprint "songs/updates/" {meta_performer song} "/" {meta_performer song} "_update.mid"}}
+                        {== {{song_mgr get_meta_data {meta_performer song}} version} 30}
+                     }
+                     {set [enabled] FALSE}
+                  })
                (term
                   {if
                      [enabled]
@@ -2574,9 +2654,18 @@
                (track_name VENUE)
                (enabled TRUE)
                (init
-                  {set
-                     [enabled]
-                     {is_ugc_plus}})
+                  {is_ugc_plus}
+                  {if_else $is_ugc_plus
+                     {set [enabled] TRUE}
+                     {set [enabled] FALSE}
+                  }
+                  {if
+                     {&&
+                        {file_exists {sprint "songs/updates/" {meta_performer song} "/" {meta_performer song} "_update.mid"}}
+                        {== {{song_mgr get_meta_data {meta_performer song}} version} 30}
+                     }
+                     {set [enabled] TRUE}
+                  })
                (term
                   {if
                      [enabled]

_ark/config/modifiers.dta

@@ -5,7 +5,7 @@
    (mod_drum_surface_navigation default_enabled save_value use_save_value) ;vanilla
    (mod_drum_fills save_value delayed_effect use_save_value) ;vanilla, dx diasbles by default
    (mod_static_fills) ; no drum fills allowed, auto activate drum player
-   (mod_doublespeed save_value use_save_value custom_location) ;vanilla - dx added use_save_value (and removes it lol)
+   (mod_doublespeed save_value use_save_value) ;vanilla - dx added use_save_value (and removes it lol)
    (mod_independent_track_speeds default_enabled save_value use_save_value) ; vanilla, dx enables by default
    (mod_synced_track_speeds) ; use the same track speed for all difficulties
    (enable_popup_help default_enabled save_value use_save_value) ; vanilla

_ark/dx/locale/dx_locale_updates.dta

@@ -35,7 +35,8 @@
 (cal_audio_desc_pad
    "This test determines the amount of Audio Latency in your system. Every time you hear a tick, press the A button.")
 #endif
-
+(dx_track_speed_locked "Track Speed menu cannot be entered online.")
+(dx_track_speed_desc "Breakneck Speed is equivalent to 150% Track Speed")
 ;server stuff
 ;ashcentral
 (ash_overshell_register_online "Play on AshCentral")
@@ -684,6 +685,7 @@
 (hint_career_desc
    "Welcome to the Rock Band 3 Deluxe Career!\n\nYour progress as a musician is measured by goals. As you get better at a particular instrument, you'll beat more goals for that instrument. Beating goals is a big deal; goals can give you more fans, more clothing, and even better transportation to travel around in!")
 (vocal_parts_0 "No Vocals")
+(by_recent "Source")
 (overshell_rb3esettings "Deluxe Settings")
 (trackspeed_msg "NOTE SPEED: %d%%")
 (speed_msg "SONG SPEED: %d%%")

_ark/dx/overshell/dx_overshell_macros.dta

@@ -241,8 +241,13 @@
       {overshell update_all}
    )
    (mod_doublespeed
-      {modifier_mgr toggle_modifier_enabled mod_doublespeed}
-      {overshell update_all}
+      {if_else {{$this get_session_mgr} is_online_enabled}
+         {dx_passive_messenger_symbol {sprint {localize dx_track_speed_locked}}}
+         {do
+            {set $dx_track_speed_from_modifiers TRUE}
+            {$this show_state dxState_TrackSpeeds}
+         }
+      }
    )
    (mod_fakejuke
       {do

_ark/dx/overshell/dx_speed_states.dta

@@ -180,6 +180,11 @@
       options_audio
    )
    (enter
+      {if {! {session is_in_game}}
+         {$this show_message}
+         {$this setup_message_text dx_track_speed_desc FALSE}
+         {set $dx_no_message_sound TRUE}
+      }
       {set $dx_list_item_selected FALSE}
       {set $dx_list_pos 0}
       {set $current_list options_audio.lst}
@@ -505,9 +510,16 @@
       }
    )
    (on_cancel
-      {if_else {$this in_game}
-         {$this show_state dxState_DeluxeSettings}
-         {$this show_state dxState_SetSpeeds}
+      DX_OS_CLOSE_MSG
+      {if_else $dx_track_speed_from_modifiers
+         {do
+            {$this show_modifiers}
+            {set $dx_track_speed_from_modifiers FALSE}
+         }
+         {if_else {$this in_game}
+            {$this show_state dxState_DeluxeSettings}
+            {$this show_state dxState_SetSpeeds}
+         }
       }
    )
 )