phantop
/
doukutsu-rs
mirror of https://github.com/doukutsu-rs/doukutsu-rs
1
0
Fork 0
Code Issues Releases Wiki Activity

feat: support custom encoding for stage table

This commit is contained in:
poly000 2024-03-24 04:26:01 +08:00
parent bb10cdb4ee
commit 612f347019
No known key found for this signature in database
4 changed files with 54 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/engine_constants/mod.rs
View File

@ -345,6 +345,7 @@ pub struct EngineConstants {
pub missile_flags: Vec<u16>,
pub locales: Vec<Locale>,
pub gamepad: GamepadConsts,
pub stage_encoding: Option<TextScriptEncoding>,
}
impl Clone for EngineConstants {
@ -380,6 +381,7 @@ impl Clone for EngineConstants {
missile_flags: self.missile_flags.clone(),
locales: self.locales.clone(),
gamepad: self.gamepad.clone(),
stage_encoding: self.stage_encoding,
}
}
}
@ -1705,6 +1707,7 @@ impl EngineConstants {
(Axis::TriggerRight, GamepadConsts::rects(Rect::new(32, 80, 64, 96))),
]),
},
stage_encoding: None,
}
}

10
src/game/shared_game_state.rs
View File

@ -430,6 +430,9 @@ impl SharedGameState {
constants.textscript.encoding = TextScriptEncoding::UTF8
}
}
if let Some(state_encoding) = locale.stage_encoding.as_ref() {
constants.stage_encoding = Some(state_encoding.as_str().into());
}
let font = BMFont::load(&constants.base_paths, &locale.font.path, ctx, locale.font.scale).or_else(|e| {
log::warn!("Failed to load font, using built-in: {}", e);
@ -535,7 +538,12 @@ impl SharedGameState {
self.constants.load_csplus_tables(ctx)?;
self.constants.load_animated_faces(ctx)?;
self.constants.load_texture_size_hints(ctx)?;
let stages = StageData::load_stage_table(ctx, &self.constants.base_paths, self.constants.is_switch)?;
let stages = StageData::load_stage_table(
ctx,
&self.constants.base_paths,
self.constants.is_switch,
self.constants.stage_encoding,
)?;
self.stages = stages;
let npc_tbl = filesystem::open_find(ctx, &self.constants.base_paths, "npc.tbl")?;

59
src/game/stage.rs
View File

@ -14,6 +14,8 @@ use crate::framework::filesystem;
use crate::game::map::{Map, NPCData};
use crate::game::scripting::tsc::text_script::TextScript;
use super::scripting::tsc::text_script::TextScriptEncoding;
#[derive(Debug, PartialEq, Eq, Hash)]
pub struct NpcType {
name: String,
@ -260,11 +262,20 @@ fn zero_index(s: &[u8]) -> usize {
s.iter().position(|&c| c == b'\0').unwrap_or(s.len())
}
fn from_encoding(s: &[u8], encoding: Option<TextScriptEncoding>) -> String {
let encoding: Option<&encoding_rs::Encoding> = encoding.map(TextScriptEncoding::into);
if let Some(encoding) = encoding {
encoding.decode_without_bom_handling(s).0.into_owned()
} else {
from_shift_jis(s)
}
}
fn from_shift_jis(s: &[u8]) -> String {
encoding_rs::SHIFT_JIS.decode_without_bom_handling(s).0.into_owned()
}
fn from_csplus_stagetbl(s: &[u8], is_switch: bool) -> String {
fn from_csplus_stagetbl(s: &[u8], is_switch: bool, encoding: Option<TextScriptEncoding>) -> String {
if is_switch {
from_utf8(s).unwrap_or("").trim_matches('\0').to_string()
} else {
@ -273,7 +284,12 @@ fn from_csplus_stagetbl(s: &[u8], is_switch: bool) -> String {
}
impl StageData {
pub fn load_stage_table(ctx: &mut Context, roots: &Vec<String>, is_switch: bool) -> GameResult<Vec<Self>> {
pub fn load_stage_table(
ctx: &mut Context,
roots: &Vec<String>,
is_switch: bool,
encoding: Option<TextScriptEncoding>,
) -> GameResult<Vec<Self>> {
let stage_tbl_path = "/stage.tbl";
let stage_sect_path = "/stage.sect";
let mrmap_bin_path = "/mrmap.bin";
@ -314,13 +330,14 @@ impl StageData {
f.read_exact(&mut name_jap_buf)?;
f.read_exact(&mut name_buf)?;
let tileset = from_csplus_stagetbl(&ts_buf[0..zero_index(&ts_buf)], is_switch);
let map = from_csplus_stagetbl(&map_buf[0..zero_index(&map_buf)], is_switch);
let background = from_csplus_stagetbl(&back_buf[0..zero_index(&back_buf)], is_switch);
let npc1 = from_csplus_stagetbl(&npc1_buf[0..zero_index(&npc1_buf)], is_switch);
let npc2 = from_csplus_stagetbl(&npc2_buf[0..zero_index(&npc2_buf)], is_switch);
let name = from_csplus_stagetbl(&name_buf[0..zero_index(&name_buf)], is_switch);
let name_jp = from_csplus_stagetbl(&name_jap_buf[0..zero_index(&name_jap_buf)], is_switch);
let tileset = from_csplus_stagetbl(&ts_buf[0..zero_index(&ts_buf)], is_switch, encoding);
let map = from_csplus_stagetbl(&map_buf[0..zero_index(&map_buf)], is_switch, encoding);
let background = from_csplus_stagetbl(&back_buf[0..zero_index(&back_buf)], is_switch, encoding);
let npc1 = from_csplus_stagetbl(&npc1_buf[0..zero_index(&npc1_buf)], is_switch, encoding);
let npc2 = from_csplus_stagetbl(&npc2_buf[0..zero_index(&npc2_buf)], is_switch, encoding);
let name = from_csplus_stagetbl(&name_buf[0..zero_index(&name_buf)], is_switch, encoding);
let name_jp =
from_csplus_stagetbl(&name_jap_buf[0..zero_index(&name_jap_buf)], is_switch, encoding);
let stage = StageData {
name: name.clone(),
@ -380,12 +397,12 @@ impl StageData {
let _ = f.read(&mut lol)?;
}
let tileset = from_shift_jis(&ts_buf[0..zero_index(&ts_buf)]);
let map = from_shift_jis(&map_buf[0..zero_index(&map_buf)]);
let background = from_shift_jis(&back_buf[0..zero_index(&back_buf)]);
let npc1 = from_shift_jis(&npc1_buf[0..zero_index(&npc1_buf)]);
let npc2 = from_shift_jis(&npc2_buf[0..zero_index(&npc2_buf)]);
let name = from_shift_jis(&name_buf[0..zero_index(&name_buf)]);
let tileset = from_encoding(&ts_buf[0..zero_index(&ts_buf)], encoding);
let map = from_encoding(&map_buf[0..zero_index(&map_buf)], encoding);
let background = from_encoding(&back_buf[0..zero_index(&back_buf)], encoding);
let npc1 = from_encoding(&npc1_buf[0..zero_index(&npc1_buf)], encoding);
let npc2 = from_encoding(&npc2_buf[0..zero_index(&npc2_buf)], encoding);
let name = from_encoding(&name_buf[0..zero_index(&name_buf)], encoding);
let stage = StageData {
name: name.clone(),
@ -439,12 +456,12 @@ impl StageData {
let boss_no = f.read_u8()?;
f.read_exact(&mut name_buf)?;
let tileset = from_shift_jis(&ts_buf[0..zero_index(&ts_buf)]);
let map = from_shift_jis(&map_buf[0..zero_index(&map_buf)]);
let background = from_shift_jis(&back_buf[0..zero_index(&back_buf)]);
let npc1 = from_shift_jis(&npc1_buf[0..zero_index(&npc1_buf)]);
let npc2 = from_shift_jis(&npc2_buf[0..zero_index(&npc2_buf)]);
let name = from_shift_jis(&name_buf[0..zero_index(&name_buf)]);
let tileset = from_encoding(&ts_buf[0..zero_index(&ts_buf)], encoding);
let map = from_encoding(&map_buf[0..zero_index(&map_buf)], encoding);
let background = from_encoding(&back_buf[0..zero_index(&back_buf)], encoding);
let npc1 = from_encoding(&npc1_buf[0..zero_index(&npc1_buf)],encoding);
let npc2 = from_encoding(&npc2_buf[0..zero_index(&npc2_buf)],encoding);
let name = from_encoding(&name_buf[0..zero_index(&name_buf)],encoding);
let stage = StageData {
name: name.clone(),

5
src/i18n.rs
View File

@ -11,6 +11,7 @@ pub struct Locale {
pub name: String,
pub font: FontData,
pub encoding: Option<String>,
pub stage_encoding: Option<String>,
strings: HashMap<String, String>,
}
@ -25,6 +26,7 @@ impl Default for Locale {
space_offset: 0.0
},
encoding: None,
stage_encoding: None,
strings: HashMap::new(),
}
}
@ -44,8 +46,9 @@ impl Locale {
let font = FontData::new(font_name, font_scale, 0.0);
let encoding = strings.get("encoding").cloned();
let stage_encoding = strings.get("stage_encoding").cloned();
Locale { code: code.to_string(), name, font, encoding, strings }
Locale { code: code.to_string(), name, font, encoding, strings, stage_encoding }
}
fn flatten(json: &serde_json::Value) -> HashMap<String, String> {