diff --git a/_ark/dx/track/dx_track_macros.dta b/_ark/dx/track/dx_track_macros.dta index 20c42125..92b94b47 100644 --- a/_ark/dx/track/dx_track_macros.dta +++ b/_ark/dx/track/dx_track_macros.dta @@ -16,6 +16,7 @@ {if {== $odbar "rb2"} {set $odbar "none"} {set $odbarcustomtexture FALSE}} {if {== $rails "rb2"} {set $rails "none"} {set $railscustomtexture FALSE}} {if {== $flames "rb2"} {set $flames "none"} {set $flamescustomtexture FALSE}} + {if {== $crowdmetertex "rb2"} {set $crowdmetertex "none"} {set $crowdmetercustomtexture FALSE}} {if {== $scoretex "rb2"} {set $scoretex "none"} {set $scorecustomtexture FALSE}} {if {== $solobox "rb2"} {set $solobox "none"} {set $soloboxcustomtexture FALSE}} {if {== $stars "rb2"} {set $stars "none"} {set $starscustomtexture FALSE}} @@ -41,6 +42,7 @@ {if {== $odbar "rb2dx"} {set $odbar "none"} {set $odbarcustomtexture FALSE}} {if {== $rails "rb2"} {set $rails "none"} {set $railscustomtexture FALSE}} {if {== $flames "rb2dx"} {set $flames "none"} {set $flamescustomtexture FALSE}} + {if {== $crowdmetertex "rb2"} {set $crowdmetertex "none"} {set $crowdmetercustomtexture FALSE}} {if {== $scoretex "rb4"} {set $scoretex "none"} {set $scorecustomtexture FALSE}} {if {== $solobox "rb2"} {set $solobox "none"} {set $soloboxcustomtexture FALSE}} {if {== $stars "rb4"} {set $stars "none"} {set $starscustomtexture FALSE}} @@ -312,6 +314,11 @@ {{$this find freestyle_nowbar_FX.tex} set_bitmap {sprint "track/voxod/vox_now_bar_effect_" $voxod ".png"}} } + {if $crowdmetercustomtexture + {{$this find meter_star.tex} set_bitmap {sprint "track/crowd_meter/meter_star_" $crowdmetertex ".png"}} + {{$this find new_tube.tex} set_bitmap {sprint "track/crowd_meter/new_tube_" $crowdmetertex ".png"}} + } + {if $scorecustomtexture {{$this find indv_player_meter_circle.tex} set_bitmap {sprint "track/score/indv_player_meter_circle_" $scoretex ".png"}} {{$this find indv_player_meter_glass.tex} set_bitmap {sprint "track/score/indv_player_meter_glass_" $scoretex ".png"}} diff --git a/_ark/dx/ui/dx_init.dta b/_ark/dx/ui/dx_init.dta index eb2862c7..46bdf09f 100644 --- a/_ark/dx/ui/dx_init.dta +++ b/_ark/dx/ui/dx_init.dta @@ -77,6 +77,9 @@ ;flames texture {set $flames "rb2dx"} +;crowd meter texture +{set $crowdmetertex "rb2"} + ;score texture {set $scoretex "rb4"} diff --git a/_ark/dx/ui/dx_overshell_macros.dta b/_ark/dx/ui/dx_overshell_macros.dta index 96b88ccb..dadffdd9 100644 --- a/_ark/dx/ui/dx_overshell_macros.dta +++ b/_ark/dx/ui/dx_overshell_macros.dta @@ -16,6 +16,8 @@ {set $voxnotes rb2} {set $voxodcustomtexture TRUE} {set $voxod rb2} + {set $crowdmetercustomtexture TRUE} + {set $crowdmetertex rb2} {set $scorecustomtexture TRUE} {set $scoretex rb2} {set $soloboxcustomtexture TRUE} @@ -72,6 +74,8 @@ {set $voxnotes rb2dx} {set $voxodcustomtexture TRUE} {set $voxod rb2} + {set $crowdmetercustomtexture TRUE} + {set $crowdmetertex rb2} {set $scorecustomtexture TRUE} {set $scoretex rb4} {set $soloboxcustomtexture TRUE} @@ -128,6 +132,8 @@ {set $voxnotes rb2} {set $voxodcustomtexture TRUE} {set $voxod rb1} + {set $crowdmetercustomtexture TRUE} + {set $crowdmetertex rb1} {set $scorecustomtexture TRUE} {set $scoretex rb1} {set $soloboxcustomtexture TRUE} diff --git a/_ark/track/crowd_meter/crowd_meter.dta b/_ark/track/crowd_meter/crowd_meter.dta new file mode 100644 index 00000000..0d815d14 --- /dev/null +++ b/_ark/track/crowd_meter/crowd_meter.dta @@ -0,0 +1,3 @@ +"rb1" +"rb2" +"rb2_unused" \ No newline at end of file diff --git a/_ark/track/crowd_meter/gen/meter_star_rb1.png_ps2 b/_ark/track/crowd_meter/gen/meter_star_rb1.png_ps2 new file mode 100644 index 00000000..23c86658 Binary files /dev/null and b/_ark/track/crowd_meter/gen/meter_star_rb1.png_ps2 differ diff --git a/_ark/track/crowd_meter/gen/meter_star_rb1.png_ps3 b/_ark/track/crowd_meter/gen/meter_star_rb1.png_ps3 new file mode 100644 index 00000000..ca1455b0 Binary files /dev/null and b/_ark/track/crowd_meter/gen/meter_star_rb1.png_ps3 differ diff --git a/_ark/track/crowd_meter/gen/meter_star_rb1.png_xbox b/_ark/track/crowd_meter/gen/meter_star_rb1.png_xbox new file mode 100644 index 00000000..27ef541b Binary files /dev/null and b/_ark/track/crowd_meter/gen/meter_star_rb1.png_xbox differ diff --git a/_ark/track/crowd_meter/gen/meter_star_rb2.png_ps2 b/_ark/track/crowd_meter/gen/meter_star_rb2.png_ps2 new file mode 100644 index 00000000..de31b697 Binary files /dev/null and b/_ark/track/crowd_meter/gen/meter_star_rb2.png_ps2 differ diff --git a/_ark/track/crowd_meter/gen/meter_star_rb2.png_ps3 b/_ark/track/crowd_meter/gen/meter_star_rb2.png_ps3 new file mode 100644 index 00000000..6a630bad Binary files /dev/null and b/_ark/track/crowd_meter/gen/meter_star_rb2.png_ps3 differ diff --git a/_ark/track/crowd_meter/gen/meter_star_rb2.png_xbox b/_ark/track/crowd_meter/gen/meter_star_rb2.png_xbox new file mode 100644 index 00000000..2c1c955b Binary files /dev/null and b/_ark/track/crowd_meter/gen/meter_star_rb2.png_xbox differ diff --git a/_ark/track/crowd_meter/gen/meter_star_rb2_unused.png_ps2 b/_ark/track/crowd_meter/gen/meter_star_rb2_unused.png_ps2 new file mode 100644 index 00000000..de31b697 Binary files /dev/null and b/_ark/track/crowd_meter/gen/meter_star_rb2_unused.png_ps2 differ diff --git a/_ark/track/crowd_meter/gen/meter_star_rb2_unused.png_ps3 b/_ark/track/crowd_meter/gen/meter_star_rb2_unused.png_ps3 new file mode 100644 index 00000000..6a630bad Binary files /dev/null and b/_ark/track/crowd_meter/gen/meter_star_rb2_unused.png_ps3 differ diff --git a/_ark/track/crowd_meter/gen/meter_star_rb2_unused.png_xbox b/_ark/track/crowd_meter/gen/meter_star_rb2_unused.png_xbox new file mode 100644 index 00000000..2c1c955b Binary files /dev/null and b/_ark/track/crowd_meter/gen/meter_star_rb2_unused.png_xbox differ diff --git a/_ark/track/crowd_meter/gen/new_tube_rb1.png_ps2 b/_ark/track/crowd_meter/gen/new_tube_rb1.png_ps2 new file mode 100644 index 00000000..0077a6c1 Binary files /dev/null and b/_ark/track/crowd_meter/gen/new_tube_rb1.png_ps2 differ diff --git a/_ark/track/crowd_meter/gen/new_tube_rb1.png_ps3 b/_ark/track/crowd_meter/gen/new_tube_rb1.png_ps3 new file mode 100644 index 00000000..ce969d9d Binary files /dev/null and b/_ark/track/crowd_meter/gen/new_tube_rb1.png_ps3 differ diff --git a/_ark/track/crowd_meter/gen/new_tube_rb1.png_xbox b/_ark/track/crowd_meter/gen/new_tube_rb1.png_xbox new file mode 100644 index 00000000..59b4be51 Binary files /dev/null and b/_ark/track/crowd_meter/gen/new_tube_rb1.png_xbox differ diff --git a/_ark/track/crowd_meter/gen/new_tube_rb2.png_ps2 b/_ark/track/crowd_meter/gen/new_tube_rb2.png_ps2 new file mode 100644 index 00000000..440cdf08 Binary files /dev/null and b/_ark/track/crowd_meter/gen/new_tube_rb2.png_ps2 differ diff --git a/_ark/track/crowd_meter/gen/new_tube_rb2.png_ps3 b/_ark/track/crowd_meter/gen/new_tube_rb2.png_ps3 new file mode 100644 index 00000000..6cfb33a1 Binary files /dev/null and b/_ark/track/crowd_meter/gen/new_tube_rb2.png_ps3 differ diff --git a/_ark/track/crowd_meter/gen/new_tube_rb2.png_xbox b/_ark/track/crowd_meter/gen/new_tube_rb2.png_xbox new file mode 100644 index 00000000..915aeeba Binary files /dev/null and b/_ark/track/crowd_meter/gen/new_tube_rb2.png_xbox differ diff --git a/_ark/track/crowd_meter/gen/new_tube_rb2_unused.png_ps2 b/_ark/track/crowd_meter/gen/new_tube_rb2_unused.png_ps2 new file mode 100644 index 00000000..29f58fdd Binary files /dev/null and b/_ark/track/crowd_meter/gen/new_tube_rb2_unused.png_ps2 differ diff --git a/_ark/track/crowd_meter/gen/new_tube_rb2_unused.png_ps3 b/_ark/track/crowd_meter/gen/new_tube_rb2_unused.png_ps3 new file mode 100644 index 00000000..28e5d668 Binary files /dev/null and b/_ark/track/crowd_meter/gen/new_tube_rb2_unused.png_ps3 differ diff --git a/_ark/track/crowd_meter/gen/new_tube_rb2_unused.png_xbox b/_ark/track/crowd_meter/gen/new_tube_rb2_unused.png_xbox new file mode 100644 index 00000000..12aa250a Binary files /dev/null and b/_ark/track/crowd_meter/gen/new_tube_rb2_unused.png_xbox differ diff --git a/_ark/ui/eng/locale_updates.dta b/_ark/ui/eng/locale_updates.dta index 8426fb04..38bd2e02 100644 --- a/_ark/ui/eng/locale_updates.dta +++ b/_ark/ui/eng/locale_updates.dta @@ -1102,6 +1102,7 @@ (os_hwbhvr "Highway Behavior") (os_strkbhvr "Streak Behavior") (os_warnbhvr "Low Health Behavior") +(os_crowd_meter "Crowd Meter") (os_font "Font") (os_score "Score") (os_solobox "Solo Box") @@ -1164,6 +1165,7 @@ ;texture names (rb1 "Rock Band 1") (rb2 "Rock Band 2") +(rb2_unused "RB2 Unused") (rb3 "Rock Band 3") (rb3_alt "RB3 Alt") (rb4 "Rock Band 4") diff --git a/_ark/ui/overshell_textures.dta b/_ark/ui/overshell_textures.dta index c1943b8d..53cb9989 100644 --- a/_ark/ui/overshell_textures.dta +++ b/_ark/ui/overshell_textures.dta @@ -8,7 +8,7 @@ #endif (focus sel_section.lst) (enter - {sel_section.lst set_data (#ifndef HX_EE os_hw #endif os_strk os_spotlight os_gems os_smashers os_flames os_sus #ifndef HX_EE os_lanes os_font #endif os_score os_solobox os_stars os_bre os_rails os_odbar os_multi_ring os_voxtrk)} + {sel_section.lst set_data (#ifndef HX_EE os_hw #endif os_strk os_spotlight os_gems os_smashers os_flames os_sus #ifndef HX_EE os_lanes os_font #endif os_score os_solobox os_stars os_crowd_meter os_bre os_rails os_odbar os_multi_ring os_voxtrk)} {title.lbl set_localized {localize os_tex1}} {full_selection.mesh set_showing FALSE}) (exit) @@ -29,6 +29,10 @@ {set $dx_tracked_texture_loader smashers} {os_change_screen overshell_texload} ) + (os_crowd_meter + {set $dx_tracked_texture_loader crowd_meter} + {os_change_screen overshell_texload} + ) (os_font {set $dx_tracked_texture_loader font} {os_change_screen overshell_texload} @@ -256,6 +260,11 @@ {title.lbl set_localized {localize os_smashers}} {anchor_corner02.tex set_bitmap {sprint "track_new/smashers/black_smasher_yellow_" $smasher ".png"}} ) + (crowd_meter + {sel_section.lst set_data (#include ../track/crowd_meter/crowd_meter.dta)} + {title.lbl set_localized {localize os_crowd_meter}} + {anchor_corner02.tex set_bitmap {sprint "track/crowd_meter/new_tube_" $crowdmetertex ".png"}} + ) (font {sel_section.lst set_data (#include ../track/font/font.dta)} {title.lbl set_localized {localize os_font}} @@ -396,6 +405,8 @@ } #ifndef HX_EE {sit_gargoyle.mat set color {pack_color 1 1 1}} + {sit_gargoyle.mat set prelit TRUE} + {sit_gargoyle.mat set intensify FALSE} {sit_gargoyle.mat set diffuse_tex anchor_corner02.tex} {sit_gargoyle.mat set specular_map anchor_corner02.tex} {sit_gargoyle02.mesh set_local_pos_index 2 -140} @@ -411,6 +422,10 @@ {set $smashercustomtexture TRUE} {set $smasher {$component selected_sym}} ) + (crowd_meter + {set $crowdmetercustomtexture TRUE} + {set $crowdmetertex {$component selected_sym}} + ) (font {set $fontcustomtexture TRUE} {set $font {$component selected_sym}} @@ -551,6 +566,9 @@ (smashers {anchor_corner02.tex set_bitmap {sprint "track_new/smashers/black_smasher_yellow_" {$component selected_sym} ".png"}} ) + (crowd_meter + {anchor_corner02.tex set_bitmap {sprint "track/crowd_meter/new_tube_" {$component selected_sym} ".png"}} + ) (font {anchor_corner02.tex set_bitmap {sprint "track/font/" {$component selected_sym} ".png"}} ) diff --git a/custom_textures/crowd_meter/meter_star_rb1.png b/custom_textures/crowd_meter/meter_star_rb1.png new file mode 100644 index 00000000..8d94065a Binary files /dev/null and b/custom_textures/crowd_meter/meter_star_rb1.png differ diff --git a/custom_textures/crowd_meter/meter_star_rb2.png b/custom_textures/crowd_meter/meter_star_rb2.png new file mode 100644 index 00000000..48644b71 Binary files /dev/null and b/custom_textures/crowd_meter/meter_star_rb2.png differ diff --git a/custom_textures/crowd_meter/meter_star_rb2_unused.png b/custom_textures/crowd_meter/meter_star_rb2_unused.png new file mode 100644 index 00000000..0c04a2d9 Binary files /dev/null and b/custom_textures/crowd_meter/meter_star_rb2_unused.png differ diff --git a/custom_textures/crowd_meter/new_tube_rb1.png b/custom_textures/crowd_meter/new_tube_rb1.png new file mode 100644 index 00000000..2121063f Binary files /dev/null and b/custom_textures/crowd_meter/new_tube_rb1.png differ diff --git a/custom_textures/crowd_meter/new_tube_rb2.png b/custom_textures/crowd_meter/new_tube_rb2.png new file mode 100644 index 00000000..60e3f428 Binary files /dev/null and b/custom_textures/crowd_meter/new_tube_rb2.png differ diff --git a/custom_textures/crowd_meter/new_tube_rb2_unused.png b/custom_textures/crowd_meter/new_tube_rb2_unused.png new file mode 100644 index 00000000..ae5d1823 Binary files /dev/null and b/custom_textures/crowd_meter/new_tube_rb2_unused.png differ diff --git a/windows_bats/process_textures_crowd_meter.bat b/windows_bats/process_textures_crowd_meter.bat new file mode 100644 index 00000000..8a6f7d9f --- /dev/null +++ b/windows_bats/process_textures_crowd_meter.bat @@ -0,0 +1,25 @@ +del /f "%~dp0..\_ark\track\crowd_meter\crowd_meter.dta" +mkdir "%~dp0..\_tmp" +cd "%~dp0..\custom_textures\crowd_meter" +forfiles /s /m *.* /C "cmd /e:on /v:on /c set \"Phile=@file\" & if @ISDIR==FALSE ren @file !Phile: =_!" +forfiles /s /m *.* /C "cmd /e:on /v:on /c set \"Phile=@file\" & if @ISDIR==FALSE ren @file !Phile:-=_!" +for /f "Tokens=*" %%f in ('dir /l/b/a-d/s') do (move /y "%%f" "%%f") +for %%i in (*.bmp) do @echo "%%~ni">> crowd_meter.dta +for %%i in (*.png) do @echo "%%~ni">> crowd_meter.dta +for %%i in (*.jpg) do @echo "%%~ni">> crowd_meter.dta +move "%~dp0..\custom_textures\crowd_meter\crowd_meter.dta" "%~dp0..\_ark\track\crowd_meter\crowd_meter.dta" +"%~dp0..\dependencies/sed.exe" -i -e "s/meter_star_//g" "%~dp0..\_ark\track\crowd_meter\crowd_meter.dta" +"%~dp0..\dependencies/sed.exe" -i -e "s/new_tube_//g" "%~dp0..\_ark\track\crowd_meter\crowd_meter.dta" +FOR /F "tokens=*" %%G IN ('dir /b *.jpg') DO "%~dp0..\dependencies/magick/magick.exe" convert "%~dp0..\custom_textures\crowd_meter/%%G" "%~dp0..\custom_textures\crowd_meter\%%~nG.png" +FOR /F "tokens=*" %%G IN ('dir /b *.bmp') DO "%~dp0..\dependencies/magick/magick.exe" convert "%~dp0..\custom_textures\crowd_meter/%%G" "%~dp0..\custom_textures\crowd_meter\%%~nG.png" +FOR /F "tokens=*" %%G IN ('dir /b *.png') DO "%~dp0..\dependencies/windows/superfreq.exe" png2tex "%~dp0..\custom_textures\crowd_meter/%%G" "%~dp0..\_ark\track\crowd_meter\gen\%%~nG.png_xbox" --platform x360 --miloVersion 25 +del sed* /a /s +cd "%~dp0..\_ark/track/crowd_meter/gen" +FOR /F "tokens=*" %%G IN ('dir /b *.png_xbox') DO python "%~dp0..\dependencies/swap_rb_art_bytes.py" "%~dp0..\_ark/track/crowd_meter/gen/%%G" "%~dp0..\_ark/track/crowd_meter/gen/%%~nG.png_ps3" +cd "%~dp0..\custom_textures\crowd_meter" +FOR /F "tokens=*" %%G IN ('dir /b *.png') DO "%~dp0..\dependencies/windows/superfreq.exe" png2tex "%~dp0..\custom_textures\crowd_meter/%%G" "%~dp0..\_tmp\%%~nG.bmp_ps2" +cd "%~dp0..\_tmp" +FOR /F "tokens=*" %%G IN ('dir /b *.bmp_ps2') DO "%~dp0..\dependencies/windows/superfreq.exe" tex2png "%~dp0..\_tmp/%%G" "%~dp0..\_tmp\%%~nG.png" +FOR /F "tokens=*" %%G IN ('dir /b *.png') DO "%~dp0..\dependencies/windows/superfreq.exe" png2tex "%~dp0..\_tmp/%%G" "%~dp0..\_ark\track\crowd_meter\gen\%%~nG.png_ps2" +cd "%~dp0..\" +rmdir "%~dp0..\_tmp" /s /q \ No newline at end of file