From 6099699319eddb1514acb7934a4f8fa8cf4065f5 Mon Sep 17 00:00:00 2001 From: Tellow Krinkle Date: Wed, 29 May 2019 01:19:59 -0500 Subject: [PATCH] Fix caret sprite info breaking everything --- .../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 .../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 assets/files-5.5/SGCaret000000_0_Sprite.dat | Bin 0 -> 224 bytes assets/files-5.5/SGCaret000000_1_Sprite.dat | Bin 0 -> 224 bytes assets/files-5.5/SGCaret000000_2_Sprite.dat | Bin 0 -> 224 bytes assets/files-5.5/SGCaret000100_0_Sprite.dat | Bin 0 -> 224 bytes assets/files-5.5/SGCaret000100_1_Sprite.dat | Bin 0 -> 224 bytes assets/files-5.5/SGCaret000100_2_Sprite.dat | Bin 0 -> 224 bytes src/main.rs | 8 +++++++- 19 files changed, 7 insertions(+), 1 deletion(-) rename assets/{files-legacy => files-5.2}/SGCaret000000_0_Sprite.dat (100%) rename assets/{files-legacy => files-5.2}/SGCaret000000_1_Sprite.dat (100%) rename assets/{files-legacy => files-5.2}/SGCaret000000_2_Sprite.dat (100%) rename assets/{files-legacy => files-5.2}/SGCaret000100_0_Sprite.dat (100%) rename assets/{files-legacy => files-5.2}/SGCaret000100_1_Sprite.dat (100%) rename assets/{files-legacy => files-5.2}/SGCaret000100_2_Sprite.dat (100%) rename assets/{files => files-5.3}/SGCaret000000_0_Sprite.dat (100%) rename assets/{files => files-5.3}/SGCaret000000_1_Sprite.dat (100%) rename assets/{files => files-5.3}/SGCaret000000_2_Sprite.dat (100%) rename assets/{files => files-5.3}/SGCaret000100_0_Sprite.dat (100%) rename assets/{files => files-5.3}/SGCaret000100_1_Sprite.dat (100%) rename assets/{files => files-5.3}/SGCaret000100_2_Sprite.dat (100%) create mode 100644 assets/files-5.5/SGCaret000000_0_Sprite.dat create mode 100644 assets/files-5.5/SGCaret000000_1_Sprite.dat create mode 100644 assets/files-5.5/SGCaret000000_2_Sprite.dat create mode 100644 assets/files-5.5/SGCaret000100_0_Sprite.dat create mode 100644 assets/files-5.5/SGCaret000100_1_Sprite.dat create mode 100644 assets/files-5.5/SGCaret000100_2_Sprite.dat diff --git a/assets/files-legacy/SGCaret000000_0_Sprite.dat b/assets/files-5.2/SGCaret000000_0_Sprite.dat similarity index 100% rename from assets/files-legacy/SGCaret000000_0_Sprite.dat rename to assets/files-5.2/SGCaret000000_0_Sprite.dat diff --git a/assets/files-legacy/SGCaret000000_1_Sprite.dat b/assets/files-5.2/SGCaret000000_1_Sprite.dat similarity index 100% rename from assets/files-legacy/SGCaret000000_1_Sprite.dat rename to assets/files-5.2/SGCaret000000_1_Sprite.dat diff --git a/assets/files-legacy/SGCaret000000_2_Sprite.dat b/assets/files-5.2/SGCaret000000_2_Sprite.dat similarity index 100% rename from assets/files-legacy/SGCaret000000_2_Sprite.dat rename to assets/files-5.2/SGCaret000000_2_Sprite.dat diff --git a/assets/files-legacy/SGCaret000100_0_Sprite.dat b/assets/files-5.2/SGCaret000100_0_Sprite.dat similarity index 100% rename from assets/files-legacy/SGCaret000100_0_Sprite.dat rename to assets/files-5.2/SGCaret000100_0_Sprite.dat diff --git a/assets/files-legacy/SGCaret000100_1_Sprite.dat b/assets/files-5.2/SGCaret000100_1_Sprite.dat similarity index 100% rename from assets/files-legacy/SGCaret000100_1_Sprite.dat rename to assets/files-5.2/SGCaret000100_1_Sprite.dat diff --git a/assets/files-legacy/SGCaret000100_2_Sprite.dat b/assets/files-5.2/SGCaret000100_2_Sprite.dat similarity index 100% rename from assets/files-legacy/SGCaret000100_2_Sprite.dat rename to assets/files-5.2/SGCaret000100_2_Sprite.dat diff --git a/assets/files/SGCaret000000_0_Sprite.dat b/assets/files-5.3/SGCaret000000_0_Sprite.dat similarity index 100% rename from assets/files/SGCaret000000_0_Sprite.dat rename to assets/files-5.3/SGCaret000000_0_Sprite.dat diff --git a/assets/files/SGCaret000000_1_Sprite.dat b/assets/files-5.3/SGCaret000000_1_Sprite.dat similarity index 100% rename from assets/files/SGCaret000000_1_Sprite.dat rename to assets/files-5.3/SGCaret000000_1_Sprite.dat diff --git a/assets/files/SGCaret000000_2_Sprite.dat b/assets/files-5.3/SGCaret000000_2_Sprite.dat similarity index 100% rename from assets/files/SGCaret000000_2_Sprite.dat rename to assets/files-5.3/SGCaret000000_2_Sprite.dat diff --git a/assets/files/SGCaret000100_0_Sprite.dat b/assets/files-5.3/SGCaret000100_0_Sprite.dat similarity index 100% rename from assets/files/SGCaret000100_0_Sprite.dat rename to assets/files-5.3/SGCaret000100_0_Sprite.dat diff --git a/assets/files/SGCaret000100_1_Sprite.dat b/assets/files-5.3/SGCaret000100_1_Sprite.dat similarity index 100% rename from assets/files/SGCaret000100_1_Sprite.dat rename to assets/files-5.3/SGCaret000100_1_Sprite.dat diff --git a/assets/files/SGCaret000100_2_Sprite.dat b/assets/files-5.3/SGCaret000100_2_Sprite.dat similarity index 100% rename from assets/files/SGCaret000100_2_Sprite.dat rename to assets/files-5.3/SGCaret000100_2_Sprite.dat diff --git a/assets/files-5.5/SGCaret000000_0_Sprite.dat b/assets/files-5.5/SGCaret000000_0_Sprite.dat new file mode 100644 index 0000000000000000000000000000000000000000..da3ba4ab472a063c49af2799e131f3fb6ebffaa6 GIT binary patch literal 224 zcmd;QU|pFfM^&Sq^My(2s?n73=Kd^z!^e2H~|2@ CMHb!w literal 0 HcmV?d00001 diff --git a/assets/files-5.5/SGCaret000000_2_Sprite.dat b/assets/files-5.5/SGCaret000000_2_Sprite.dat new file mode 100644 index 0000000000000000000000000000000000000000..c40f9aff5238892b325c640a47f282ff8cb46f8a GIT binary patch literal 224 zcmd;QU|QgENo-f&)$v4B=st4fa4WFlI!Oltp60m@Ht1!$F|g zju0^r4QGSIffxk9;$Su#n9s<-1cZzX%pf@&?rPZ2z|gSY0j$0ONEHCpfoKOO07cCf AK>z>% literal 0 HcmV?d00001 diff --git a/assets/files-5.5/SGCaret000100_0_Sprite.dat b/assets/files-5.5/SGCaret000100_0_Sprite.dat new file mode 100644 index 0000000000000000000000000000000000000000..37dc4387d3e4e64b57ac64f077d027e7cd9bf601 GIT binary patch literal 224 zcmd;QU| z1A~JjL<~g3*&uNs1_7`*n9T;}Gcqs%AtM7bkOy-Mh=#F2iW>HVumgz6&;X F69B~<7U}>1 literal 0 HcmV?d00001 diff --git a/assets/files-5.5/SGCaret000100_2_Sprite.dat b/assets/files-5.5/SGCaret000100_2_Sprite.dat new file mode 100644 index 0000000000000000000000000000000000000000..ed2e24fe02371123a4e9088e7d2015e925370081 GIT binary patch literal 224 zcmd;QU|4ra4~`HT!qK*-3z43fj)u7>>#3=R7o!0H=-Q~^*Oh<0!S E08FD6O#lD@ literal 0 HcmV?d00001 diff --git a/src/main.rs b/src/main.rs index 421d381..fcc0ed6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -83,7 +83,13 @@ fn main() { copy_images(version_specific_path.as_ref(), &directory_assets); } fs::rename("output/assets/configbg_Texture2D.png", "output/assets/47configbg_Texture2D.png").expect("Unable to rename"); - copy_files(if arc_number <= &2 { "assets/files-legacy" } else { "assets/files" }, &directory_assets); + let caretdir = match arc_number { + 1..=2 => "assets/files-5.2", + 3..=4 => "assets/files-5.3", + 5..=6 => "assets/files-5.5", + _ => panic!("Couldn't folder for text carets with arc {}", arc_number) + }; + copy_files(&caretdir, &directory_assets); println!(); // 3. fonts