diff --git a/_ark/dx/config/dx_macros.dta b/_ark/dx/config/dx_macros.dta index 145a6c8e..af43bc0d 100644 --- a/_ark/dx/config/dx_macros.dta +++ b/_ark/dx/config/dx_macros.dta @@ -98,6 +98,8 @@ {if {== $smasher rb2} {set $smasher "none"}} + {if {== $lanestex rb2} {set $lanestex "none"}} + {if {== $streak rb2} {set $streak "none"}} {if {== $spotlightgtr rb2_guitar} {set $spotlightgtr "none"}} @@ -242,6 +244,16 @@ {{$this find spark.tex} set_bitmap {sprint "track_new/flames/sparks_" $flames ".png"}} {{$this find sparks.tex} set_bitmap {sprint "track_new/flames/sparks_" $flames ".png"}} } + + #ifndef HX_EE + {if $lanescustomtexture + {{$this find gem_mash_green_emmisive.tex} set_bitmap {sprint "track/lanes/gem_mash_green_" $lanestex ".png"}} + {{$this find gem_mash_red_emmisive.tex} set_bitmap {sprint "track/lanes/gem_mash_red_" $lanestex ".png"}} + {{$this find gem_mash_yellow_emmisive.tex} set_bitmap {sprint "track/lanes/gem_mash_yellow_" $lanestex ".png"}} + {{$this find gem_mash_blue_emmisive.tex} set_bitmap {sprint "track/lanes/gem_mash_blue_" $lanestex ".png"}} + {{$this find gem_mash_orange_emmisive.tex} set_bitmap {sprint "track/lanes/gem_mash_orange_" $lanestex ".png"}} + } + #endif {if $voxarrowcustomtexture {{$this find pitch_arrow_split.tex} set_bitmap {sprint "track/voxarrow/pitch_arrow_split_" $voxarrow ".png"}} @@ -372,6 +384,7 @@ {set $brecustomtexture FALSE} {set $gemcustomtexture FALSE} {set $smashercustomtexture FALSE} +{set $lanescustomtexture FALSE} {set $voxarrowcustomtexture FALSE} {set $voxnotescustomtexture FALSE} {set $voxodcustomtexture FALSE} @@ -396,6 +409,8 @@ {unless {== $smasher none} {set $smashercustomtexture TRUE}} +{unless {== $lanestex none} set $lanescustomtexture TRUE} + {unless {== $highway _1_none} {set $highwaycustomtexture TRUE}} {unless {== $streak none} {set $streakcustomtexture TRUE}} diff --git a/_ark/dx/ui/dx_init.dta b/_ark/dx/ui/dx_init.dta index f5a1c338..909660ec 100644 --- a/_ark/dx/ui/dx_init.dta +++ b/_ark/dx/ui/dx_init.dta @@ -23,6 +23,9 @@ ;strikeline texture {set $smasher "rb2dx"} +;lanes texture +{set $lanestex "rb2"} + ;no gem dividers {set $nogemdividers FALSE} diff --git a/_ark/track/lanes/gen/gem_mash_blue_rb2.png_ps3 b/_ark/track/lanes/gen/gem_mash_blue_rb2.png_ps3 new file mode 100644 index 00000000..6fb3ed15 Binary files /dev/null and b/_ark/track/lanes/gen/gem_mash_blue_rb2.png_ps3 differ diff --git a/_ark/track/lanes/gen/gem_mash_blue_rb2.png_xbox b/_ark/track/lanes/gen/gem_mash_blue_rb2.png_xbox new file mode 100644 index 00000000..d94c7071 Binary files /dev/null and b/_ark/track/lanes/gen/gem_mash_blue_rb2.png_xbox differ diff --git a/_ark/track/lanes/gen/gem_mash_blue_rb4.png_ps3 b/_ark/track/lanes/gen/gem_mash_blue_rb4.png_ps3 new file mode 100644 index 00000000..6901e464 Binary files /dev/null and b/_ark/track/lanes/gen/gem_mash_blue_rb4.png_ps3 differ diff --git a/_ark/track/lanes/gen/gem_mash_blue_rb4.png_xbox b/_ark/track/lanes/gen/gem_mash_blue_rb4.png_xbox new file mode 100644 index 00000000..94d10619 Binary files /dev/null and b/_ark/track/lanes/gen/gem_mash_blue_rb4.png_xbox differ diff --git a/_ark/track/lanes/gen/gem_mash_green_rb2.png_ps3 b/_ark/track/lanes/gen/gem_mash_green_rb2.png_ps3 new file mode 100644 index 00000000..df54278c Binary files /dev/null and b/_ark/track/lanes/gen/gem_mash_green_rb2.png_ps3 differ diff --git a/_ark/track/lanes/gen/gem_mash_green_rb2.png_xbox b/_ark/track/lanes/gen/gem_mash_green_rb2.png_xbox new file mode 100644 index 00000000..20a45e85 Binary files /dev/null and b/_ark/track/lanes/gen/gem_mash_green_rb2.png_xbox differ diff --git a/_ark/track/lanes/gen/gem_mash_green_rb4.png_ps3 b/_ark/track/lanes/gen/gem_mash_green_rb4.png_ps3 new file mode 100644 index 00000000..927a3743 Binary files /dev/null and b/_ark/track/lanes/gen/gem_mash_green_rb4.png_ps3 differ diff --git a/_ark/track/lanes/gen/gem_mash_green_rb4.png_xbox b/_ark/track/lanes/gen/gem_mash_green_rb4.png_xbox new file mode 100644 index 00000000..cf1f8ae8 Binary files /dev/null and b/_ark/track/lanes/gen/gem_mash_green_rb4.png_xbox differ diff --git a/_ark/track/lanes/gen/gem_mash_orange_rb2.png_ps3 b/_ark/track/lanes/gen/gem_mash_orange_rb2.png_ps3 new file mode 100644 index 00000000..5b9a9e41 Binary files /dev/null and b/_ark/track/lanes/gen/gem_mash_orange_rb2.png_ps3 differ diff --git a/_ark/track/lanes/gen/gem_mash_orange_rb2.png_xbox b/_ark/track/lanes/gen/gem_mash_orange_rb2.png_xbox new file mode 100644 index 00000000..3a18cdc5 Binary files /dev/null and b/_ark/track/lanes/gen/gem_mash_orange_rb2.png_xbox differ diff --git a/_ark/track/lanes/gen/gem_mash_orange_rb4.png_ps3 b/_ark/track/lanes/gen/gem_mash_orange_rb4.png_ps3 new file mode 100644 index 00000000..f1807d23 Binary files /dev/null and b/_ark/track/lanes/gen/gem_mash_orange_rb4.png_ps3 differ diff --git a/_ark/track/lanes/gen/gem_mash_orange_rb4.png_xbox b/_ark/track/lanes/gen/gem_mash_orange_rb4.png_xbox new file mode 100644 index 00000000..06bc0977 Binary files /dev/null and b/_ark/track/lanes/gen/gem_mash_orange_rb4.png_xbox differ diff --git a/_ark/track/lanes/gen/gem_mash_red_rb2.png_ps3 b/_ark/track/lanes/gen/gem_mash_red_rb2.png_ps3 new file mode 100644 index 00000000..12acf005 Binary files /dev/null and b/_ark/track/lanes/gen/gem_mash_red_rb2.png_ps3 differ diff --git a/_ark/track/lanes/gen/gem_mash_red_rb2.png_xbox b/_ark/track/lanes/gen/gem_mash_red_rb2.png_xbox new file mode 100644 index 00000000..a7bf7dcc Binary files /dev/null and b/_ark/track/lanes/gen/gem_mash_red_rb2.png_xbox differ diff --git a/_ark/track/lanes/gen/gem_mash_red_rb4.png_ps3 b/_ark/track/lanes/gen/gem_mash_red_rb4.png_ps3 new file mode 100644 index 00000000..8507c5be Binary files /dev/null and b/_ark/track/lanes/gen/gem_mash_red_rb4.png_ps3 differ diff --git a/_ark/track/lanes/gen/gem_mash_red_rb4.png_xbox b/_ark/track/lanes/gen/gem_mash_red_rb4.png_xbox new file mode 100644 index 00000000..6b533739 Binary files /dev/null and b/_ark/track/lanes/gen/gem_mash_red_rb4.png_xbox differ diff --git a/_ark/track/lanes/gen/gem_mash_yellow_rb2.png_ps3 b/_ark/track/lanes/gen/gem_mash_yellow_rb2.png_ps3 new file mode 100644 index 00000000..39367711 Binary files /dev/null and b/_ark/track/lanes/gen/gem_mash_yellow_rb2.png_ps3 differ diff --git a/_ark/track/lanes/gen/gem_mash_yellow_rb2.png_xbox b/_ark/track/lanes/gen/gem_mash_yellow_rb2.png_xbox new file mode 100644 index 00000000..fd6abee7 Binary files /dev/null and b/_ark/track/lanes/gen/gem_mash_yellow_rb2.png_xbox differ diff --git a/_ark/track/lanes/gen/gem_mash_yellow_rb4.png_ps3 b/_ark/track/lanes/gen/gem_mash_yellow_rb4.png_ps3 new file mode 100644 index 00000000..2a641d22 Binary files /dev/null and b/_ark/track/lanes/gen/gem_mash_yellow_rb4.png_ps3 differ diff --git a/_ark/track/lanes/gen/gem_mash_yellow_rb4.png_xbox b/_ark/track/lanes/gen/gem_mash_yellow_rb4.png_xbox new file mode 100644 index 00000000..3d26d9cf Binary files /dev/null and b/_ark/track/lanes/gen/gem_mash_yellow_rb4.png_xbox differ diff --git a/_ark/track/lanes/lanes.dta b/_ark/track/lanes/lanes.dta new file mode 100644 index 00000000..0a5050bb --- /dev/null +++ b/_ark/track/lanes/lanes.dta @@ -0,0 +1,10 @@ +"rb2" +"rb4" +"rb2" +"rb4" +"rb2" +"rb4" +"rb2" +"rb4" +"rb2" +"rb4" diff --git a/_ark/ui/eng/locale_updates.dta b/_ark/ui/eng/locale_updates.dta index 1f21eee5..e7873a70 100644 --- a/_ark/ui/eng/locale_updates.dta +++ b/_ark/ui/eng/locale_updates.dta @@ -1049,6 +1049,7 @@ (os_tex "[CUSTOMIZE]") (os_tex1 "Customize Track Theme") (os_sus "Sustains") +(os_lanes "lanes") (os_hw_behavior "Highway Behavior") (os_strk_behavior "Streak Behavior") (os_warn_behavior "Low Health Behavior") diff --git a/_ark/ui/overshell.dta b/_ark/ui/overshell.dta index a371cea1..56267720 100644 --- a/_ark/ui/overshell.dta +++ b/_ark/ui/overshell.dta @@ -749,7 +749,7 @@ #endif (focus sel_section.lst) (enter - {sel_section.lst set_data (#ifndef HX_EE os_hw #endif os_strk os_spotlight os_hw_behavior os_gems os_smashers os_flames os_sus os_score 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_hw_behavior os_gems os_smashers os_flames os_sus #ifndef HX_EE os_lanes #endif os_score 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) @@ -761,6 +761,10 @@ (os_sus {ui push_screen overshell_sustains_screen} ) + (os_lanes + {set $dx_tracked_texture_loader lanes} + {ui push_screen overshell_texload_screen} + ) (os_gems {set $dx_tracked_texture_loader gems} {ui push_screen overshell_texload_screen} @@ -1212,6 +1216,11 @@ {title.lbl set_localized {localize os_score}} {anchor_corner02.tex set_bitmap {sprint "track/score/indv_player_meter_" $scoretex ".png"}} ) + (lanes + {sel_section.lst set_data (#include ../track/lanes/lanes.dta)} + {title.lbl set_localized {localize os_lanes}} + {anchor_corner02.tex set_bitmap {sprint "track/lanes/gem_mash_green_" $lanestex ".png"}} + ) (bre {sel_section.lst set_data (#include ../track_new/bre/bre.dta)} {title.lbl set_localized {localize os_bre}} @@ -1310,6 +1319,10 @@ {set $scorecustomtexture TRUE} {set $scoretex {$component selected_sym}} ) + (lanes + {set $lanescustomtexture TRUE} + {set $lanestex {$component selected_sym}} + ) (bre {set $brecustomtexture TRUE} {set $bretex {$component selected_sym}} @@ -1398,6 +1411,9 @@ (score {anchor_corner02.tex set_bitmap {sprint "track/score/indv_player_meter_" {$component selected_sym} ".png"}} ) + (lanes + {anchor_corner02.tex set_bitmap {sprint "track/lanes/gem_mash_green_" {$component selected_sym} ".png"}} + ) (bre {anchor_corner02.tex set_bitmap {sprint "track_new/bre/bre_shield_" {$component selected_sym} ".png"}} ) diff --git a/windows_bats/process_textures_lanes.bat b/windows_bats/process_textures_lanes.bat new file mode 100644 index 00000000..6ae05588 --- /dev/null +++ b/windows_bats/process_textures_lanes.bat @@ -0,0 +1,20 @@ +del /f "%~dp0..\_ark\track\lanes\lanes.dta" +cd "%~dp0..\custom_textures\lanes" +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">> lanes.dta +for %%i in (*.png) do @echo "%%~ni">> lanes.dta +for %%i in (*.jpg) do @echo "%%~ni">> lanes.dta +move "%~dp0..\custom_textures\lanes\lanes.dta" "%~dp0..\_ark\track\lanes\lanes.dta" +"%~dp0..\dependencies/sed.exe" -i -e "s/gem_mash_green_//g" "%~dp0..\_ark\track\lanes\lanes.dta" +"%~dp0..\dependencies/sed.exe" -i -e "s/gem_mash_red_//g" "%~dp0..\_ark\track\lanes\lanes.dta" +"%~dp0..\dependencies/sed.exe" -i -e "s/gem_mash_yellow_//g" "%~dp0..\_ark\track\lanes\lanes.dta" +"%~dp0..\dependencies/sed.exe" -i -e "s/gem_mash_blue_//g" "%~dp0..\_ark\track\lanes\lanes.dta" +"%~dp0..\dependencies/sed.exe" -i -e "s/gem_mash_orange_//g" "%~dp0..\_ark\track\lanes\lanes.dta" +FOR /F "tokens=*" %%G IN ('dir /b *.jpg') DO "%~dp0..\dependencies/magick/magick.exe" convert "%~dp0..\custom_textures\lanes/%%G" "%~dp0..\custom_textures\lanes\%%~nG.png" +FOR /F "tokens=*" %%G IN ('dir /b *.bmp') DO "%~dp0..\dependencies/magick/magick.exe" convert "%~dp0..\custom_textures\lanes/%%G" "%~dp0..\custom_textures\lanes\%%~nG.png" +FOR /F "tokens=*" %%G IN ('dir /b *.png') DO "%~dp0..\dependencies/windows/superfreq.exe" png2tex "%~dp0..\custom_textures\lanes/%%G" "%~dp0..\_ark\track\lanes\gen\%%~nG.png_xbox" --platform x360 --miloVersion 25 +del sed* /a /s +cd "%~dp0..\_ark/track/lanes/gen" +FOR /F "tokens=*" %%G IN ('dir /b *.png_xbox') DO python "%~dp0..\dependencies/swap_rb_art_bytes.py" "%~dp0..\_ark/track/lanes/gen/%%G" "%~dp0..\_ark/track/lanes/gen/%%~nG.png_ps3" \ No newline at end of file