release 1.1.0-beta3

.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 target/
+platform/wii
 *.pyc
 *.tmp
 *.ninja
@@ -53,3 +54,5 @@ dependencies/discordrichpresence_xbox.py
 dependencies/config.ini
 dependencies/dx_play_a_show_config.ini
 dependencies/dx_songs.json
+_ark_wii/*
+wii.bat

_ark/(..)/(..)/system/run/band/band_objects.dta

@@ -4565,10 +4565,12 @@
       {set
          [scenetrigger]
          ''})
+   #ifndef HX_WII
    (cam_cat_priorities
       (CAM_CAT_PRIORITIES))
    (generic_cam_cats
       (GENERIC_CAM_CATS))
+   #endif
    (editor
       (debug_char_interests
          script

_ark/(..)/(..)/system/run/config/default.dta

@@ -389,12 +389,12 @@
    #endif
    (wait_for_splash FALSE) ; dx - removes splash screen wait time in conjunction with xex mod
    (default_allow_edit_text TRUE)
-   #ifndef _SHIP
+   ;#ifndef _SHIP
    (cheat_init
       #include ../ui/cheat.dta
       #include ../ui/panel_select.dta
       #include ../ui/locale.dta)
-   #endif
+   ;#endif
    (init))
 (locale)
 (net

_ark/config/accomplishments/acc_grp_band.dta

@@ -767,9 +767,17 @@
    (units_token unit_songs_plural)
    (units_token_singular unit_songs_singular)
    (dynamic_prereqs
+      #ifdef HX_WII
+      (num_songs 750)
+      #else
       (num_songs 1000)
+      #endif
       (precached_filter careerfilter_dlc))
+   #ifdef HX_WII
+   (num_songs 750)
+   #else
    (num_songs 1000)
+   #endif
    (conditions
       (stars 2))
    (part_difficulty_sym band)

_ark/config/band_keep.dta

@@ -1,4 +1,7 @@
 #include macros.dta
+;here is where most every dx script hooks being initialized.
+;others are usually linked to their corresponding vanilla dta.
+;ex. track hooks at the top of ui/track_panel.dta
 #include ../dx/macros/dx_macros.dta
 #include ../dx/read_write/dx_reader_macros.dta
 #include ../dx/read_write/dx_currentsong_funcs.dta
@@ -17,6 +20,10 @@
 (content_mgr
    (roots
       "."))
+#ifdef HX_WII
+(install_mgr
+   #include install_mgr.dta)
+#endif
 (song_mgr
    (alt_dirs
       #ifndef _SHIP
@@ -27,8 +34,12 @@
    (max_song_count 1000)
    #else
    (max_song_count
+      ;this lets the user configure the max song count on the fly in rpcs3 via a raw dta externally.
+      ;ensure the file exists
       {if_else {file_exists "GD:/dev_hdd0/game/BLUS30463/USRDIR/dx_high_memory.dta"}
+         ;if the file contains data
          {if_else {> {size {read_file "GD:/dev_hdd0/game/BLUS30463/USRDIR/dx_high_memory.dta"}} 1}
+            ;find the stored song count
             {elem {find {read_file "GD:/dev_hdd0/game/BLUS30463/USRDIR/dx_high_memory.dta"} dx_song_count} 1}
             8000 ; dx - vanilla is 3000
          }
@@ -68,6 +79,9 @@
    #include net.dta)
 (objects
    #include objects.dta)
+;dx locale edits are found in dx/locale folder
+;the dx locale #include is located at the bottom of /lang/locale_updates_keep.dta
+;this ensures each language gets dx locale additions
 (locale ../ui/locale/eng/locale_keep.dta ../ui/locale/eng/locale_updates_keep.dta)
 (venues VENUES)
 (subway_venues SUBWAY_VENUES)
@@ -116,6 +130,8 @@
          (bass generic_tier9)
          (vocals generic_tier9)
          (band generic_tier9))))
+;dx song updates abuse this file with many #includes and #merges
+;actual data is stored in dx/song_updates
 (missing_song_data
    #include ../songs/missing_song_data.dta)
 (demo

_ark/config/beatmatcher.dta

@@ -1,21 +1,55 @@
 (callbacks
    (sixteenth_note
+      {dx_show_user_overdrive}
+      {dx_calc_overdrive bass}
+      {dx_calc_overdrive real_guitar}
+      {dx_calc_overdrive real_bass}
+      {dx_calc_overdrive keys}
+      {dx_calc_overdrive real_keys}
+      {dx_calc_overdrive guitar}
+      {dx_calc_overdrive drum}
+      {dx_calc_overdrive real_drum}
+      #ifdef HX_WII
+      {unless
+         $stagekit
+         {handle
+            (game quarterbeat)}}
+      #else
       {if_else
          $stagekit
          {stagekit_left_right kStageSweepLeft_fast kStageSweepRight_fast}
          {handle
-            (game quarterbeat)}})
+            (game quarterbeat)}}
+      #endif)
    (eighth_note
+      #ifndef HX_WII
       {if
          $stagekit
-         {stagekit_left_right kStageSweepLeft_medium kStageSweepRight_medium}})
+         {stagekit_left_right kStageSweepLeft_medium kStageSweepRight_medium}}
+      #endif)
    (beat
+      #ifdef HX_WII
+      {unless
+         $stagekit
+         {handle
+            (game beat)}}
+      #else
       {if_else
          $stagekit
          {stagekit_left_right kStageSweepLeft_slow kStageSweepRight_slow}
          {handle
-            (game beat)}})
+            (game beat)}}
+      #endif)
    (downbeat
+      {dx_show_user_overdrive}
+      {dx_calc_overdrive bass}
+      {dx_calc_overdrive real_guitar}
+      {dx_calc_overdrive real_bass}
+      {dx_calc_overdrive keys}
+      {dx_calc_overdrive real_keys}
+      {dx_calc_overdrive guitar}
+      {dx_calc_overdrive drum}
+      {dx_calc_overdrive real_drum}
       {unless
          $stagekit
          {handle
@@ -120,7 +154,12 @@
    (remote_attenuation 1.5)
    (drum_velocity_to_db
       (0.0 -13.0 -7.0 -3.0 -2.0 -0.5 0.0))
+   #ifdef HX_WII
+   (drum_sample_attenuation -12.0)
+   #endif
+   #ifndef HX_WII
    (drum_sample_attenuation 3.0)
+   #endif
    (whammy_enabled $dx_whammy_fx)
    (auto_miss_sound_timeout_seconds 5.0)
    (auto_miss_sound_timeout_gems 5)

_ark/config/joypad.dta

@@ -31,6 +31,15 @@
    (analog joypad)
    (dualshock joypad)
    (stagekit_xbox joypad)
+   (wii_remote wii_remote)
+   (wii_classic wii_classic)
+   (gamecube gamecube)
+   (wii_guitar wii_guitar)
+   (wii_guitar_rb2 wii_guitar)
+   (wii_drums wii_drums)
+   (wii_drums_rb2 wii_drums)
+   (wii_roguitar wii_guitar)
+   (wii_rodrums wii_rodrums)
    (none joypad))
 (instrument_mapping
    (ro_guitar kControllerGuitar)
@@ -40,6 +49,9 @@
    (hx_guitar_ps3 kControllerGuitar)
    (ps3_rb2_guitar kControllerGuitar)
    (ro_guitar_ps3 kControllerGuitar)
+   (wii_guitar kControllerGuitar)
+   (wii_guitar_rb2 kControllerGuitar)
+   (wii_roguitar kControllerGuitar)
    (hx_midi_guitar_xbox kControllerRealGuitar)
    (hx_midi_keys_xbox kControllerKeys)
    (hx_midi_guitar_ps3 kControllerRealGuitar)
@@ -55,9 +67,15 @@
    (ro_drums_ps3_ghwt kControllerDrum)
    (konami_drums_ps3_rr kControllerDrum)
    (ps3_rb2_drums kControllerDrum)
+   (wii_drums kControllerDrum)
+   (wii_drums_rb2 kControllerDrum)
+   (wii_rodrums kControllerDrum)
    (hx_xbox kControllerVocals)
    (digital kControllerVocals)
    (analog kControllerVocals)
    (dualshock kControllerVocals)
    (stagekit_xbox kControllerVocals)
+   (wii_remote kControllerVocals)
+   (wii_classic kControllerVocals)
+   (gamecube kControllerVocals)
    (none kControllerNone))