From d427651de3273ac23591091882b738320010608d Mon Sep 17 00:00:00 2001
From: jake <jakevvolkenburg@gmail.com>
Date: Wed, 30 Jun 2021 19:15:27 -0700
Subject: [PATCH] moved down facing this from MYB to MYD, whoops. Also
 implemented <MYB for facing npc

---
 src/text_script.rs | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/text_script.rs b/src/text_script.rs
index c80d724..eb8f19e 100644
--- a/src/text_script.rs
+++ b/src/text_script.rs
@@ -30,6 +30,7 @@ use crate::scene::title_scene::TitleScene;
 use crate::shared_game_state::SharedGameState;
 use crate::str;
 use crate::weapon::WeaponType;
+use crate::common::Direction::{Left, Right};
 
 /// Engine's text script VM operation codes.
 #[derive(EnumString, Debug, FromPrimitive, PartialEq)]
@@ -879,8 +880,9 @@ impl TextScriptVM {
                             game_scene.player1.direction = direction;
                             game_scene.player2.direction = direction;
                         }
-                        game_scene.player1.cond.set_interacted(false);
-                        game_scene.player2.cond.set_interacted(false);
+                        game_scene.player1.cond.set_interacted(new_direction == 3);
+                        game_scene.player2.cond.set_interacted(new_direction == 3);
+
 
                         game_scene.player1.vel_x = 0;
                         game_scene.player2.vel_x = 0;
@@ -914,11 +916,28 @@ impl TextScriptVM {
                                 Direction::Bottom => {
                                     game_scene.player1.vel_y = 0x200;
                                     game_scene.player2.vel_y = 0x200;
-                                    game_scene.player1.cond.set_interacted(true);
-                                    game_scene.player2.cond.set_interacted(true);
                                 }
                                 Direction::FacingPlayer => {
-                                    // todo npc direction dependent bump
+                                    for npc in game_scene.npc_list.iter_alive() {
+                                        if npc.event_num == event_num {
+                                            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;
+                                        }
+                                    }
                                 }
                             }
                         }