phantop/doukutsu-rs
1
0
Fork 0
mirror of https://github.com/doukutsu-rs/doukutsu-rs synced 2024-11-16 10:52:44 +00:00
Code Issues Releases Wiki Activity

fix nikumaru z index and behavior on <TRA

Browse source
This commit is contained in:
Alula 2022-01-09 13:11:25 +01:00
parent 124b2e2c82
commit 7d92b55b58
No known key found for this signature in database
GPG key ID: 3E00485503A1D8BA
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/components/nikumaru.rs
View file

@ -7,6 +7,7 @@ use crate::framework::error::GameResult;
use crate::player::Player;
use crate::shared_game_state::{SharedGameState, TimingMode};
#[derive(Clone, Copy)]
pub struct NikumaruCounter {
pub tick: usize,
pub shown: bool,

3
src/scene/game_scene.rs
View file

@ -1710,7 +1710,6 @@ impl Scene for GameScene {
match state.textscript_vm.mode {
ScriptMode::Map if state.control_flags.control_enabled() => {
self.nikumaru.draw(state, ctx, &self.frame)?;
self.hud_player1.draw(state, ctx, &self.frame)?;
self.hud_player2.draw(state, ctx, &self.frame)?;
self.boss_life_bar.draw(state, ctx, &self.frame)?;
@ -1774,6 +1773,8 @@ impl Scene for GameScene {
}
self.fade.draw(state, ctx, &self.frame)?;
self.nikumaru.draw(state, ctx, &self.frame)?;
if state.textscript_vm.mode == ScriptMode::Map && self.map_name_counter > 0 {
let map_name = if self.stage.data.name == "u" {
state.constants.title.intro_text.chars()

1
src/scripting/tsc/text_script.rs
View file

@ -1063,6 +1063,7 @@ impl TextScriptVM {
new_scene.player1.cond.set_interacted(false);
new_scene.player2.cond.set_interacted(false);
new_scene.frame.wait = game_scene.frame.wait;
new_scene.nikumaru = game_scene.nikumaru;
let skip = state.textscript_vm.flags.cutscene_skip();
state.control_flags.set_tick_world(true);