mirror of
https://github.com/doukutsu-rs/doukutsu-rs
synced 2024-09-29 21:49:33 +00:00
Initial P2 Quote NPC
This commit is contained in:
parent
4b0b667ed5
commit
06b4aeead9
|
@ -154,6 +154,10 @@ impl NPC {
|
||||||
self.action_num = 1;
|
self.action_num = 1;
|
||||||
self.anim_num = 0;
|
self.anim_num = 0;
|
||||||
|
|
||||||
|
if self.npc_type == 370 {
|
||||||
|
self.cond.set_alive(players[1].cond.alive());
|
||||||
|
}
|
||||||
|
|
||||||
if self.tsc_direction > 10 {
|
if self.tsc_direction > 10 {
|
||||||
let player = &players[state.textscript_vm.executor_player.index()];
|
let player = &players[state.textscript_vm.executor_player.index()];
|
||||||
self.x = player.x;
|
self.x = player.x;
|
||||||
|
|
|
@ -390,7 +390,7 @@ impl GameEntity<([&mut Player; 2], &NPCList, &mut Stage, &mut BulletManager, &mu
|
||||||
147 => self.tick_n147_critter_purple(state, players, npc_list),
|
147 => self.tick_n147_critter_purple(state, players, npc_list),
|
||||||
148 => self.tick_n148_critter_purple_projectile(state),
|
148 => self.tick_n148_critter_purple_projectile(state),
|
||||||
149 => self.tick_n149_horizontal_moving_block(state, players, npc_list),
|
149 => self.tick_n149_horizontal_moving_block(state, players, npc_list),
|
||||||
150 => self.tick_n150_quote(state, players, npc_list),
|
150 | 370 => self.tick_n150_quote(state, players, npc_list),
|
||||||
151 => self.tick_n151_blue_robot_standing(state),
|
151 => self.tick_n151_blue_robot_standing(state),
|
||||||
152 => self.tick_n152_shutter_stuck(),
|
152 => self.tick_n152_shutter_stuck(),
|
||||||
153 => self.tick_n153_gaudi(state, players),
|
153 => self.tick_n153_gaudi(state, players),
|
||||||
|
|
|
@ -1965,7 +1965,7 @@ impl Scene for GameScene {
|
||||||
self.falling_island.draw(state, ctx, &self.frame)?;
|
self.falling_island.draw(state, ctx, &self.frame)?;
|
||||||
self.text_boxes.draw(state, ctx, &self.frame)?;
|
self.text_boxes.draw(state, ctx, &self.frame)?;
|
||||||
|
|
||||||
if self.skip_counter > 0 {
|
if self.skip_counter > 1 {
|
||||||
let text = format!("Hold {:?} to skip the cutscene", state.settings.player1_key_map.inventory);
|
let text = format!("Hold {:?} to skip the cutscene", state.settings.player1_key_map.inventory);
|
||||||
let width = state.font.text_width(text.chars(), &state.constants);
|
let width = state.font.text_width(text.chars(), &state.constants);
|
||||||
let pos_x = state.canvas_size.0 - width - 20.0;
|
let pos_x = state.canvas_size.0 - width - 20.0;
|
||||||
|
|
Loading…
Reference in a new issue