From bb07919505764aa6b1c1eda06391825c9dbe3d9c Mon Sep 17 00:00:00 2001
From: dawnDus <96957561+dawndus@users.noreply.github.com>
Date: Sun, 23 Jan 2022 10:09:04 -0500
Subject: [PATCH] fixed core ball direciton and shock state

---
 src/npc/boss/core.rs    | 12 ++++++++++--
 src/scene/game_scene.rs |  3 ---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/npc/boss/core.rs b/src/npc/boss/core.rs
index 4a2ca3e..5b63c63 100644
--- a/src/npc/boss/core.rs
+++ b/src/npc/boss/core.rs
@@ -276,7 +276,8 @@ impl BossNPC {
                     self.parts[0].action_counter = 0;
                     self.parts[11].npc_flags.set_shootable(true);
 
-                    // todo <SSS1000 equivalent!!!!
+                    state.sound_manager.loop_sfx_freq(40, 1000.0 / 2205.0);
+                    state.sound_manager.loop_sfx_freq(41, 1100.0 / 2205.0);
                     state.quake_counter = 100;
                     state.npc_super_pos.1 = 1;
                 }
@@ -312,7 +313,10 @@ impl BossNPC {
                 if [300, 350, 400].contains(&self.parts[0].action_counter) {
                     state.sound_manager.play_sfx(101);
                     let mut npc = NPC::create(218, &state.npc_table);
-                    let angle = 0.0f64;
+                    let angle = f64::atan2(
+                        (self.parts[0].y - players[idx].y) as f64,
+                        (self.parts[0].x - players[idx].x) as f64,
+                    );
                     npc.cond.set_alive(true);
                     npc.x = self.parts[0].x - 0x5000;
                     npc.y = self.parts[0].y;
@@ -344,6 +348,10 @@ impl BossNPC {
 
                     state.quake_counter = 20;
 
+                    state.sound_manager.stop_sfx(40);
+                    state.sound_manager.stop_sfx(41);
+                    state.sound_manager.stop_sfx(58);
+
                     let mut npc = NPC::create(4, &state.npc_table);
                     npc.cond.set_alive(true);
                     for _ in 0..32 {
diff --git a/src/scene/game_scene.rs b/src/scene/game_scene.rs
index 1da2c38..8ef7716 100644
--- a/src/scene/game_scene.rs
+++ b/src/scene/game_scene.rs
@@ -1200,9 +1200,6 @@ impl GameScene {
                         }
 
                         npc.shock = 8;
-
-                        npc = unsafe { self.boss.parts.get_unchecked_mut(0) };
-                        npc.shock = 8;
                     }
 
                     bullet.life = bullet.life.saturating_sub(1);