phantop/doukutsu-rs
1
0
Fork 0
mirror of https://github.com/doukutsu-rs/doukutsu-rs synced 2025-07-12 07:46:48 +00:00
Code Issues Releases Wiki Activity

armsitem.tsc loading

Browse source
This commit is contained in:
Alula 2020-09-10 12:25:40 +02:00
parent bed2641f10
commit b72d0451a6
No known key found for this signature in database
GPG key ID: 3E00485503A1D8BA
4 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
src/weapon.rs → src/inventory.rs
View file

0
src/npc/egg_corridor.rs Normal file
View file

6
src/scene/loading_scene.rs
View file

@ -27,8 +27,10 @@ impl Scene for LoadingScene {
state.stages = stages; state.stages = stages;
let npc_table = NPCTable::load_from(filesystem::open(ctx, [&state.base_path, "/npc.tbl"].join(""))?)?; let npc_table = NPCTable::load_from(filesystem::open(ctx, [&state.base_path, "/npc.tbl"].join(""))?)?;
state.npc_table = npc_table; state.npc_table = npc_table;
let script = TextScript::load_from(filesystem::open(ctx, [&state.base_path, "/Head.tsc"].join(""))?)?; let head_script = TextScript::load_from(filesystem::open(ctx, [&state.base_path, "/Head.tsc"].join(""))?)?;
state.textscript_vm.set_global_script(script); let arms_item_script = TextScript::load_from(filesystem::open(ctx, [&state.base_path, "/ArmsItem.tsc"].join(""))?)?;
state.textscript_vm.set_global_script(head_script);
state.textscript_vm.append_global_script(arms_item_script);
let mut next_scene = GameScene::new(state, ctx, 13)?; let mut next_scene = GameScene::new(state, ctx, 13)?;
next_scene.player.x = 10 * 16 * 0x200; next_scene.player.x = 10 * 16 * 0x200;

16
src/text_script.rs
View file

@ -347,6 +347,22 @@ impl TextScriptVM {
if !self.suspend { self.reset(); } if !self.suspend { self.reset(); }
} }
pub fn append_global_script(&mut self, script: TextScript) {
for (key, val) in script.event_map {
self.scripts.global_script.event_map.insert(key, val);
}
if !self.suspend { self.reset(); }
}
pub fn append_scene_script(&mut self, script: TextScript) {
for (key, val) in script.event_map {
self.scripts.scene_script.event_map.insert(key, val);
}
if !self.suspend { self.reset(); }
}
pub fn reset(&mut self) { pub fn reset(&mut self) {
self.state = TextScriptExecutionState::Ended; self.state = TextScriptExecutionState::Ended;
self.clear_text_box(); self.clear_text_box();