From 781ec5160f8c9affbb29ddb9290fd06fd56bb63f Mon Sep 17 00:00:00 2001 From: drojf <1249449+drojf@users.noreply.github.com> Date: Sun, 11 Feb 2024 19:07:50 +1100 Subject: [PATCH] Rename Rei 'files' folder to 'files-rei' instead of 'files-2019.4' --- .../948_MonoBehaviour msgothic_2 SDF.dat | Bin .../SGCaret000000_0_Sprite.dat | Bin .../SGCaret000000_1_Sprite.dat | Bin .../SGCaret000000_2_Sprite.dat | Bin .../SGCaret000100_0_Sprite.dat | Bin .../SGCaret000100_1_Sprite.dat | Bin .../SGCaret000100_2_Sprite.dat | Bin .../msgothic_2 SDF Atlas_Texture2D.dat | Bin src/main.rs | 7 ++++--- 9 files changed, 4 insertions(+), 3 deletions(-) rename assets/{files-2019.4 => files-rei}/948_MonoBehaviour msgothic_2 SDF.dat (100%) rename assets/{files-2019.4 => files-rei}/SGCaret000000_0_Sprite.dat (100%) rename assets/{files-2019.4 => files-rei}/SGCaret000000_1_Sprite.dat (100%) rename assets/{files-2019.4 => files-rei}/SGCaret000000_2_Sprite.dat (100%) rename assets/{files-2019.4 => files-rei}/SGCaret000100_0_Sprite.dat (100%) rename assets/{files-2019.4 => files-rei}/SGCaret000100_1_Sprite.dat (100%) rename assets/{files-2019.4 => files-rei}/SGCaret000100_2_Sprite.dat (100%) rename assets/{files-2019.4 => files-rei}/msgothic_2 SDF Atlas_Texture2D.dat (100%) diff --git a/assets/files-2019.4/948_MonoBehaviour msgothic_2 SDF.dat b/assets/files-rei/948_MonoBehaviour msgothic_2 SDF.dat similarity index 100% rename from assets/files-2019.4/948_MonoBehaviour msgothic_2 SDF.dat rename to assets/files-rei/948_MonoBehaviour msgothic_2 SDF.dat diff --git a/assets/files-2019.4/SGCaret000000_0_Sprite.dat b/assets/files-rei/SGCaret000000_0_Sprite.dat similarity index 100% rename from assets/files-2019.4/SGCaret000000_0_Sprite.dat rename to assets/files-rei/SGCaret000000_0_Sprite.dat diff --git a/assets/files-2019.4/SGCaret000000_1_Sprite.dat b/assets/files-rei/SGCaret000000_1_Sprite.dat similarity index 100% rename from assets/files-2019.4/SGCaret000000_1_Sprite.dat rename to assets/files-rei/SGCaret000000_1_Sprite.dat diff --git a/assets/files-2019.4/SGCaret000000_2_Sprite.dat b/assets/files-rei/SGCaret000000_2_Sprite.dat similarity index 100% rename from assets/files-2019.4/SGCaret000000_2_Sprite.dat rename to assets/files-rei/SGCaret000000_2_Sprite.dat diff --git a/assets/files-2019.4/SGCaret000100_0_Sprite.dat b/assets/files-rei/SGCaret000100_0_Sprite.dat similarity index 100% rename from assets/files-2019.4/SGCaret000100_0_Sprite.dat rename to assets/files-rei/SGCaret000100_0_Sprite.dat diff --git a/assets/files-2019.4/SGCaret000100_1_Sprite.dat b/assets/files-rei/SGCaret000100_1_Sprite.dat similarity index 100% rename from assets/files-2019.4/SGCaret000100_1_Sprite.dat rename to assets/files-rei/SGCaret000100_1_Sprite.dat diff --git a/assets/files-2019.4/SGCaret000100_2_Sprite.dat b/assets/files-rei/SGCaret000100_2_Sprite.dat similarity index 100% rename from assets/files-2019.4/SGCaret000100_2_Sprite.dat rename to assets/files-rei/SGCaret000100_2_Sprite.dat diff --git a/assets/files-2019.4/msgothic_2 SDF Atlas_Texture2D.dat b/assets/files-rei/msgothic_2 SDF Atlas_Texture2D.dat similarity index 100% rename from assets/files-2019.4/msgothic_2 SDF Atlas_Texture2D.dat rename to assets/files-rei/msgothic_2 SDF Atlas_Texture2D.dat diff --git a/src/main.rs b/src/main.rs index 449262d..6ae7906 100644 --- a/src/main.rs +++ b/src/main.rs @@ -129,14 +129,15 @@ fn main() -> ExitCode { 5..=6 => "assets/files-5.5", 7 => "assets/files-5.6", 8 => "assets/files-2017.2", - 9 => "assets/files-2019.4", - 10 => "assets/files-hou-plus", // Both rei and hou-plus are 2019.4, but the rei caret/font doesn't work on hou-plus + 9 => "assets/files-rei", + 10 => "assets/files-hou-plus", _ => panic!("Couldn't determine folder for text carets with arc {}", arc_number) }; copy_files(&caretdir, &directory_assets); println!(); - // 3. fonts + // 3. fonts - NOTE: Only applied for chapters 1-8. Fonts for Rei (Ch.9) and Hou Plus (Ch.10) will need to be generated manually + // and saved in the files-rei and files-hou-plus folders. if arc_number.clone() < 9 { let mut font_path = format!("assets/vanilla/{}/{}-{}-fonts/msgothic_0.dat", &chapter, &system, &unity); if ! Path::new(&font_path).exists() {