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

Fix MYB bumping away from NPC when direction >4

This commit is contained in:
dawnDus 2022-11-12 17:11:03 -05:00
parent 2be1c422d6
commit 0330cf3b2b
No known key found for this signature in database
GPG Key ID: 972AABDE81848F21
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/scripting/tsc/text_script.rs
View File

@ -794,27 +794,27 @@ impl TextScriptVM {
game_scene.player1.vel_y = 0x200;
game_scene.player2.vel_y = 0x200;
}
Direction::FacingPlayer => {
for npc in game_scene.npc_list.iter_alive() {
if npc.event_num == new_direction as u16 {
if game_scene.player1.x >= npc.x {
game_scene.player1.direction = Left;
game_scene.player1.vel_x = 0x200;
} else {
game_scene.player1.direction = Right;
game_scene.player1.vel_x = -0x200;
}
if game_scene.player2.x >= npc.x {
game_scene.player2.direction = Left;
game_scene.player2.vel_x = 0x200;
} else {
game_scene.player2.direction = Right;
game_scene.player2.vel_x = -0x200;
}
break;
}
_ => (),
}
} else {
for npc in game_scene.npc_list.iter_alive() {
if npc.event_num == new_direction as u16 {
if game_scene.player1.x >= npc.x {
game_scene.player1.direction = Left;
game_scene.player1.vel_x = 0x200;
} else {
game_scene.player1.direction = Right;
game_scene.player1.vel_x = -0x200;
}
if game_scene.player2.x >= npc.x {
game_scene.player2.direction = Left;
game_scene.player2.vel_x = 0x200;
} else {
game_scene.player2.direction = Right;
game_scene.player2.vel_x = -0x200;
}
break;
}
}
}