Merge branch 'develop' into pr/458

CaptnCH · Nov 3, 2023 · d7e9701 · d7e9701
2 parents cd7feb7 + 0d6ccd9
commit d7e9701
Show file tree

Hide file tree

Showing 14 changed files with 801 additions and 41 deletions.
diff --git a/_ark/config/modifiers.dta b/_ark/config/modifiers.dta
@@ -14,6 +14,7 @@
    (mod_miss_sounds default_enabled save_value delayed_effect) ; vanilla
    (mod_awesome save_value use_save_value) ;vanilla
    ;visual
+   (mod_remote_texture_sync default_enabled delayed_effect) ; syncs custom track themes between online players
    (mod_mhx_color_shuffle #ifdef RB3E custom_location #endif) ; random gem coloring
    ; we should prefer rb3e's version of this modifier if it is present.
    ; we also need to use a different name so we don't conflict with rb3e

diff --git a/_ark/dx/funcs/dx_game_reset_funcs.dta b/_ark/dx/funcs/dx_game_reset_funcs.dta
@@ -104,7 +104,7 @@
             {if {== $dx_vocal_highway "rock band 3"} {set $dx_vocal_highway none}}
             {if {== $dx_vocal_notes "rock band 3"} {set $dx_vocal_notes none}}
             {if {== $dx_vocal_overdrive "rock band 3"} {set $dx_vocal_overdrive none}}
-            {if {== $dx_keyboard classic} {set $dx_keyboard none}}
+            {if {== $dx_keyboard "rock band 3"} {set $dx_keyboard none}}
             {if {== $dx_highway_guitar _2_rb3_guitar} {set $dx_highway_guitar none}}
             {if {== $dx_highway_bass _rb3_bass} {set $dx_highway_bass none}}
             {if {== $dx_highway_drum _rb3_drum} {set $dx_highway_drum none}}

diff --git a/_ark/dx/locale/dx_locale_updates.dta b/_ark/dx/locale/dx_locale_updates.dta
@@ -537,6 +537,8 @@
 (mod_animatedgems "Animated Gems")
 (mod_dx_left_right_jump "Dpad Songlist Shortcuts")
 (mod_dx_left_right_jump_desc "Allows Left and Right on the dpad to jump up and down to the next section respectively")
+(mod_remote_texture_sync "Sync Online Textures")
+(mod_remote_texture_sync_desc "Show off each player's unique Highway/Streak/Overdrive in online sessions")
 (os_gems "Gems")
 (os_sustains "Sustains")
 (os_setguitarcol "Guitar Colors")

diff --git a/_ark/dx/locale/dx_version.dta b/_ark/dx/locale/dx_version.dta
@@ -1,4 +1,4 @@
-(message_motd "Rock Band 3 Deluxe v1.0b (devbuild) Loaded! Thanks for playing!")
-(message_motd_signin "Rock Band 3 Deluxe v1.0b (devbuild) Loaded! Thanks for playing!")
-(message_motd_noconnection "Rock Band 3 Deluxe v1.0b (devbuild) Loaded! Thanks for playing!")
-(rb3e_mod_string "RB3DX v1.0b (devbuild)")
+(message_motd "Rock Band 3 Deluxe v1.0.1 (devbuild) Loaded! Thanks for playing!")
+(message_motd_signin "Rock Band 3 Deluxe v1.0.1 (devbuild) Loaded! Thanks for playing!")
+(message_motd_noconnection "Rock Band 3 Deluxe v1.0.1 (devbuild) Loaded! Thanks for playing!")
+(rb3e_mod_string "RB3DX v1.0.1 (devbuild)")
diff --git a/_ark/dx/macros/dx_reader_macros.dta b/_ark/dx/macros/dx_reader_macros.dta
@@ -613,21 +613,33 @@
       {set $dx_highway_guitar
          {elem {find $entry highway_guitar} 1}
       }
+      {set $dx_local_highway_guitar
+         {elem {find $entry highway_guitar} 1}
+      }
    }
    {if {== {elem $entry 0} {basename highway_bass}}
       {set $dx_highway_bass
          {elem {find $entry highway_bass} 1}
       }
+      {set $dx_local_highway_bass
+         {elem {find $entry highway_bass} 1}
+      }
    }
    {if {== {elem $entry 0} {basename highway_drums}}
       {set $dx_highway_drum
          {elem {find $entry highway_drums} 1}
       }
+      {set $dx_local_highway_drum
+         {elem {find $entry highway_drums} 1}
+      }
    }
    {if {== {elem $entry 0} {basename highway_keys}}
       {set $dx_highway_keys
          {elem {find $entry highway_keys} 1}
       }
+      {set $dx_local_highway_keys
+         {elem {find $entry highway_keys} 1}
+      }
    }
    {if {== {elem $entry 0} {basename highway_guitar_shading}}
       {set $dx_highway_guitar_shading
@@ -653,51 +665,81 @@
       {set $dx_streak_guitar
          {elem {find $entry streak_guitar} 1}
       }
+      {set $dx_local_streak_guitar
+         {elem {find $entry streak_guitar} 1}
+      }
    }
    {if {== {elem $entry 0} {basename streak_bass}}
       {set $dx_streak_bass
          {elem {find $entry streak_bass} 1}
       }
+      {set $dx_local_streak_bass
+         {elem {find $entry streak_bass} 1}
+      }
    }
    {if {== {elem $entry 0} {basename streak_drums}}
       {set $dx_streak_drum
          {elem {find $entry streak_drums} 1}
       }
+      {set $dx_local_streak_drum
+         {elem {find $entry streak_drums} 1}
+      }
    }
    {if {== {elem $entry 0} {basename streak_keys}}
       {set $dx_streak_keys
          {elem {find $entry streak_keys} 1}
       }
+      {set $dx_local_streak_keys
+         {elem {find $entry streak_keys} 1}
+      }
    }
    {if {== {elem $entry 0} {basename streak_prokeys}}
       {set $dx_streak_prokeys
          {elem {find $entry streak_prokeys} 1}
       }
+      {set $dx_local_streak_prokeys
+         {elem {find $entry streak_prokeys} 1}
+      }
    }
    {if {== {elem $entry 0} {basename overdrive_guitar}}
       {set $dx_overdrive_guitar
          {elem {find $entry overdrive_guitar} 1}
       }
+      {set $dx_local_overdrive_guitar
+         {elem {find $entry overdrive_guitar} 1}
+      }
    }
    {if {== {elem $entry 0} {basename overdrive_bass}}
       {set $dx_overdrive_bass
          {elem {find $entry overdrive_bass} 1}
       }
+      {set $dx_local_overdrive_bass
+         {elem {find $entry overdrive_bass} 1}
+      }
    }
    {if {== {elem $entry 0} {basename overdrive_drums}}
       {set $dx_overdrive_drum
          {elem {find $entry overdrive_drums} 1}
       }
+      {set $dx_local_overdrive_drum
+         {elem {find $entry overdrive_drums} 1}
+      }
    }
    {if {== {elem $entry 0} {basename overdrive_keys}}
       {set $dx_overdrive_keys
          {elem {find $entry overdrive_keys} 1}
       }
+      {set $dx_local_overdrive_keys
+         {elem {find $entry overdrive_keys} 1}
+      }
    }
    {if {== {elem $entry 0} {basename overdrive_prokeys}}
       {set $dx_overdrive_prokeys
          {elem {find $entry overdrive_prokeys} 1}
       }
+      {set $dx_local_overdrive_prokeys
+         {elem {find $entry overdrive_prokeys} 1}
+      }
    }
    {if {== {elem $entry 0} {basename overdrive_guitar_shading}}
       {set $dx_overdrive_guitar_shading
@@ -814,26 +856,41 @@
       {set $dx_keyboard
          {elem {find $entry keyboard} 1}
       }
+      {set $dx_local_keyboard
+         {elem {find $entry keyboard} 1}
+      }
    }
    {if {== {elem $entry 0} {basename vocal_highway}}
       {set $dx_vocal_highway
          {elem {find $entry vocal_highway} 1}
       }
+      {set $dx_local_vocal_highway
+         {elem {find $entry vocal_highway} 1}
+      }
    }
    {if {== {elem $entry 0} {basename vocal_arrows}}
       {set $dx_vocal_arrow
          {elem {find $entry vocal_arrows} 1}
       }
+      {set $dx_local_vocal_arrow
+         {elem {find $entry vocal_arrows} 1}
+      }
    }
    {if {== {elem $entry 0} {basename vocal_notes}}
       {set $dx_vocal_notes
          {elem {find $entry vocal_notes} 1}
       }
+      {set $dx_local_vocal_notes
+         {elem {find $entry vocal_notes} 1}
+      }
    }
    {if {== {elem $entry 0} {basename vocal_overdrive}}
       {set $dx_vocal_overdrive
          {elem {find $entry vocal_overdrive} 1}
       }
+      {set $dx_local_vocal_overdrive
+         {elem {find $entry vocal_overdrive} 1}
+      }
    }
 )
 #define LOADING_VALUES_OPTIONS
@@ -902,6 +959,7 @@
    {dx_modifier_reader mod_rb4lanes}
    {dx_modifier_reader mod_synced_track_speeds}
    {dx_modifier_reader mod_nopause}
+   {dx_modifier_reader mod_remote_texture_sync}
    {unless {modifier_mgr is_modifier_active mod_doublespeed}
       {dx_modifier_reader mod_doublespeed}
    }

diff --git a/_ark/dx/macros/dx_writer_macros.dta b/_ark/dx/macros/dx_writer_macros.dta
@@ -192,6 +192,10 @@
       {dx_setting_saver dx_modifiers mod_miss_sounds FALSE}
       {dx_setting_saver dx_modifiers mod_miss_sounds TRUE}
    }
+   {if_else {modifier_mgr is_modifier_active mod_remote_texture_sync}
+      {dx_setting_saver dx_modifiers mod_remote_texture_sync FALSE}
+      {dx_setting_saver dx_modifiers mod_remote_texture_sync TRUE}
+   }
    {dx_setting_saver dx_modifiers mod_practiceoverdrive {modifier_mgr is_modifier_active mod_practiceoverdrive}}
    {dx_setting_saver dx_modifiers mod_nolanes {modifier_mgr is_modifier_active mod_nolanes}}
    {dx_setting_saver dx_modifiers mod_rb4lanes {modifier_mgr is_modifier_active mod_rb4lanes}}

diff --git a/_ark/dx/overshell/dx_states.dta b/_ark/dx/overshell/dx_states.dta
@@ -40,6 +40,10 @@
       }
       {overshell_view_chooser}
    )
+   (enter
+      ;reapplies the user's own theme when entering dx settings to prevent remote textures from overriding their own theme
+      {dx_resync_local_textures all}
+   )
    (SCROLL_MSG
       DX_MENU_SCROLL_DESC ;updates description with currently selected modifier
    )

diff --git a/_ark/dx/overshell/dx_texture_states.dta b/_ark/dx/overshell/dx_texture_states.dta
@@ -372,23 +372,28 @@
          (keyboard_lanes
             {set $dx_keyboard_needs_reset TRUE}
             {set $dx_refresh_beatmatch TRUE}
-            {set $dx_keyboard {$component selected_sym}})
+            {set $dx_keyboard {$component selected_sym}}
+            {set $dx_local_keyboard {$component selected_sym}})
          (vocal_highway_bg
             {set $dx_vocal_highway_needs_reset TRUE}
             {set $dx_refresh_beatmatch TRUE}
-            {set $dx_vocal_highway {$component selected_sym}})
+            {set $dx_vocal_highway {$component selected_sym}}
+            {set $dx_local_vocal_highway {$component selected_sym}})
          (vocal_arrow
             {set $dx_vocal_arrow_needs_reset TRUE}
             {set $dx_refresh_beatmatch TRUE}
-            {set $dx_vocal_arrow {$component selected_sym}})
+            {set $dx_vocal_arrow {$component selected_sym}}
+            {set $dx_local_vocal_arrow {$component selected_sym}})
          (vocal_note_tube
             {set $dx_vocal_notes_needs_reset TRUE}
             {set $dx_refresh_beatmatch TRUE}
-            {set $dx_vocal_notes {$component selected_sym}})
+            {set $dx_vocal_notes {$component selected_sym}}
+            {set $dx_local_vocal_notes {$component selected_sym}})
          (vocal_overdrive_now_bar
             {set $dx_vocal_overdrive_needs_reset TRUE}
             {set $dx_refresh_beatmatch TRUE}
-            {set $dx_vocal_overdrive {$component selected_sym}})
+            {set $dx_vocal_overdrive {$component selected_sym}}
+            {set $dx_local_vocal_overdrive {$component selected_sym}})
       }
       {if_else
          {||
@@ -446,60 +451,60 @@
          (all_instruments
             {switch $dx_tracked_texture_loader
                 (overdrive
-                    {set $dx_overdrive_guitar_needs_reset TRUE} {set $dx_overdrive_guitar $dx_tracked_emissive}
-                    {set $dx_overdrive_bass_needs_reset TRUE} {set $dx_overdrive_bass $dx_tracked_emissive}
-                    {set $dx_overdrive_drum_needs_reset TRUE} {set $dx_overdrive_drum $dx_tracked_emissive}
-                    {set $dx_overdrive_keys_needs_reset TRUE} {set $dx_overdrive_keys $dx_tracked_emissive}
-                    {set $dx_overdrive_prokeys_needs_reset TRUE} {set $dx_overdrive_prokeys $dx_tracked_emissive}
+                    {set $dx_overdrive_guitar_needs_reset TRUE} {set $dx_overdrive_guitar $dx_tracked_emissive} {set $dx_local_overdrive_guitar $dx_tracked_emissive}
+                    {set $dx_overdrive_bass_needs_reset TRUE} {set $dx_overdrive_bass $dx_tracked_emissive} {set $dx_local_overdrive_bass $dx_tracked_emissive}
+                    {set $dx_overdrive_drum_needs_reset TRUE} {set $dx_overdrive_drum $dx_tracked_emissive} {set $dx_local_overdrive_drum $dx_tracked_emissive}
+                    {set $dx_overdrive_keys_needs_reset TRUE} {set $dx_overdrive_keys $dx_tracked_emissive} {set $dx_local_overdrive_keys $dx_tracked_emissive}
+                    {set $dx_overdrive_prokeys_needs_reset TRUE} {set $dx_overdrive_prokeys $dx_tracked_emissive} {set $dx_local_overdrive_prokeys $dx_tracked_emissive}
                 )
                 (highways
-                    {set $dx_highway_guitar_needs_reset TRUE} {set $dx_highway_guitar $dx_tracked_highway}
-                    {set $dx_highway_bass_needs_reset TRUE} {set $dx_highway_bass $dx_tracked_highway}
-                    {set $dx_highway_drum_needs_reset TRUE} {set $dx_highway_drum $dx_tracked_highway}
-                    {set $dx_highway_keys_needs_reset TRUE} {set $dx_highway_keys $dx_tracked_highway}
+                    {set $dx_highway_guitar_needs_reset TRUE} {set $dx_highway_guitar $dx_tracked_highway} {set $dx_local_highway_guitar $dx_tracked_highway}
+                    {set $dx_highway_bass_needs_reset TRUE} {set $dx_highway_bass $dx_tracked_highway} {set $dx_local_highway_bass $dx_tracked_highway}
+                    {set $dx_highway_drum_needs_reset TRUE} {set $dx_highway_drum $dx_tracked_highway} {set $dx_local_highway_drum $dx_tracked_highway}
+                    {set $dx_highway_keys_needs_reset TRUE} {set $dx_highway_keys $dx_tracked_highway} {set $dx_local_highway_keys $dx_tracked_highway}
                 )
                 (streaks
-                    {set $dx_streak_guitar_needs_reset TRUE} {set $dx_streak_guitar $dx_tracked_spotlight}
-                    {set $dx_streak_bass_needs_reset TRUE} {set $dx_streak_bass $dx_tracked_spotlight}
-                    {set $dx_streak_drum_needs_reset TRUE} {set $dx_streak_drum $dx_tracked_spotlight}
-                    {set $dx_streak_prokeys_needs_reset TRUE} {set $dx_streak_prokeys $dx_tracked_spotlight}
-                    {set $dx_streak_keys_needs_reset TRUE} {set $dx_streak_keys $dx_tracked_spotlight}
+                    {set $dx_streak_guitar_needs_reset TRUE} {set $dx_streak_guitar $dx_tracked_spotlight} {set $dx_local_streak_guitar $dx_tracked_spotlight}
+                    {set $dx_streak_bass_needs_reset TRUE} {set $dx_streak_bass $dx_tracked_spotlight} {set $dx_local_streak_bass $dx_tracked_spotlight}
+                    {set $dx_streak_drum_needs_reset TRUE} {set $dx_streak_drum $dx_tracked_spotlight} {set $dx_local_streak_drum $dx_tracked_spotlight}
+                    {set $dx_streak_prokeys_needs_reset TRUE} {set $dx_streak_prokeys $dx_tracked_spotlight} {set $dx_local_streak_prokeys $dx_tracked_spotlight}
+                    {set $dx_streak_keys_needs_reset TRUE} {set $dx_streak_keys $dx_tracked_spotlight} {set $dx_local_streak_keys $dx_tracked_spotlight}
                 )
             }
          )
          (guitar
             {switch $dx_tracked_texture_loader
-                (overdrive {set $dx_overdrive_guitar_needs_reset TRUE} {set $dx_overdrive_guitar $dx_tracked_emissive})
-                (highways {set $dx_highway_guitar_needs_reset TRUE} {set $dx_highway_guitar $dx_tracked_highway})
-                (streaks {set $dx_streak_guitar_needs_reset TRUE} {set $dx_streak_guitar $dx_tracked_spotlight})
+                (overdrive {set $dx_overdrive_guitar_needs_reset TRUE} {set $dx_overdrive_guitar $dx_tracked_emissive} {set $dx_local_overdrive_guitar $dx_tracked_emissive})
+                (highways {set $dx_highway_guitar_needs_reset TRUE} {set $dx_highway_guitar $dx_tracked_highway} {set $dx_local_highway_guitar $dx_tracked_highway})
+                (streaks {set $dx_streak_guitar_needs_reset TRUE} {set $dx_streak_guitar $dx_tracked_spotlight} {set $dx_local_streak_guitar $dx_tracked_spotlight})
             }
          )
          (bass
             {switch $dx_tracked_texture_loader
-                (overdrive {set $dx_overdrive_bass_needs_reset TRUE} {set $dx_overdrive_bass $dx_tracked_emissive})
-                (highways {set $dx_highway_bass_needs_reset TRUE} {set $dx_highway_bass $dx_tracked_highway})
-                (streaks {set $dx_streak_bass_needs_reset TRUE} {set $dx_streak_bass $dx_tracked_spotlight})
+                (overdrive {set $dx_overdrive_bass_needs_reset TRUE} {set $dx_overdrive_bass $dx_tracked_emissive} {set $dx_local_overdrive_bass $dx_tracked_emissive})
+                (highways {set $dx_highway_bass_needs_reset TRUE} {set $dx_highway_bass $dx_tracked_highway} {set $dx_local_highway_bass $dx_tracked_highway})
+                (streaks {set $dx_streak_bass_needs_reset TRUE} {set $dx_streak_bass $dx_tracked_spotlight} {set $dx_local_streak_bass $dx_tracked_spotlight})
             }
          )
          (drums
             {switch $dx_tracked_texture_loader
-                (overdrive {set $dx_overdrive_drum_needs_reset TRUE} {set $dx_overdrive_drum $dx_tracked_emissive})
-                (highways {set $dx_highway_drum_needs_reset TRUE} {set $dx_highway_drum $dx_tracked_highway})
-                (streaks {set $dx_streak_drum_needs_reset TRUE} {set $dx_streak_drum $dx_tracked_spotlight})
+                (overdrive {set $dx_overdrive_drum_needs_reset TRUE} {set $dx_overdrive_drum $dx_tracked_emissive} {set $dx_local_overdrive_drum $dx_tracked_emissive})
+                (highways {set $dx_highway_drum_needs_reset TRUE} {set $dx_highway_drum $dx_tracked_highway} {set $dx_local_highway_drum $dx_tracked_highway})
+                (streaks {set $dx_streak_drum_needs_reset TRUE} {set $dx_streak_drum $dx_tracked_spotlight} {set $dx_local_streak_drum $dx_tracked_spotlight})
             }
          )
          (keys
             {switch $dx_tracked_texture_loader
-                (overdrive {set $dx_overdrive_keys_needs_reset TRUE} {set $dx_overdrive_keys $dx_tracked_emissive})
-                (highways {set $dx_highway_keys_needs_reset TRUE} {set $dx_highway_keys $dx_tracked_highway})
-                (streaks {set $dx_streak_keys_needs_reset TRUE} {set $dx_streak_keys $dx_tracked_spotlight})
+                (overdrive {set $dx_overdrive_keys_needs_reset TRUE} {set $dx_overdrive_keys $dx_tracked_emissive} {set $dx_local_overdrive_keys $dx_tracked_emissive})
+                (highways {set $dx_highway_keys_needs_reset TRUE} {set $dx_highway_keys $dx_tracked_highway} {set $dx_local_highway_keys $dx_tracked_highway})
+                (streaks {set $dx_streak_keys_needs_reset TRUE} {set $dx_streak_keys $dx_tracked_spotlight} {set $dx_local_streak_keys $dx_tracked_spotlight})
             }
          )
          (pro_keys
             {switch $dx_tracked_texture_loader
-                (overdrive {set $dx_overdrive_prokeys_needs_reset TRUE} {set $dx_overdrive_prokeys $dx_tracked_emissive})
-                (highways {set $dx_highway_prokeys_needs_reset TRUE} {set $dx_highway_prokeys $dx_tracked_highway})
-                (streaks {set $dx_streak_prokeys_needs_reset TRUE} {set $dx_streak_prokeys $dx_tracked_spotlight})
+                (overdrive {set $dx_overdrive_prokeys_needs_reset TRUE} {set $dx_overdrive_prokeys $dx_tracked_emissive} {set $dx_local_overdrive_prokeys $dx_tracked_emissive})
+                (highways {set $dx_highway_prokeys_needs_reset TRUE} {set $dx_highway_prokeys $dx_tracked_highway} {set $dx_local_highway_prokeys $dx_tracked_highway})
+                (streaks {set $dx_streak_prokeys_needs_reset TRUE} {set $dx_streak_prokeys $dx_tracked_spotlight} {set $dx_local_streak_prokeys $dx_tracked_spotlight})
             }
          )
       }