From b94b20bf76830136899ec284f8862cc8a3214a79 Mon Sep 17 00:00:00 2001
From: dawnDus <96957561+dawndus@users.noreply.github.com>
Date: Tue, 19 Apr 2022 19:39:36 -0400
Subject: [PATCH] Fixed Curly/Toroko+/Undead Core bugs

---
 src/npc/boss/undead_core.rs | 2 +-
 src/shared_game_state.rs    | 1 +
 src/weapon/bullet.rs        | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/npc/boss/undead_core.rs b/src/npc/boss/undead_core.rs
index 78d04f8..422ef88 100644
--- a/src/npc/boss/undead_core.rs
+++ b/src/npc/boss/undead_core.rs
@@ -562,7 +562,7 @@ impl BossNPC {
                     self.parts[5].anim_num = 0;
                 }
 
-                if self.parts[0].life + 150 < self.parts[0].action_counter
+                if self.parts[0].life + 150 < self.parts[19].action_counter
                     || self.parts[0].action_counter > 400
                     || self.parts[0].life < 200
                 {
diff --git a/src/shared_game_state.rs b/src/shared_game_state.rs
index c5b932a..8479592 100644
--- a/src/shared_game_state.rs
+++ b/src/shared_game_state.rs
@@ -404,6 +404,7 @@ impl SharedGameState {
     }
 
     pub fn process_debug_keys(&mut self, key_code: ScanCode) {
+        #[cfg(not(debug_assertions))]
         if !self.settings.debug_mode {
             return;
         }
diff --git a/src/weapon/bullet.rs b/src/weapon/bullet.rs
index 72ae6b8..dbe9e37 100644
--- a/src/weapon/bullet.rs
+++ b/src/weapon/bullet.rs
@@ -84,7 +84,7 @@ impl BulletManager {
     }
 
     pub fn count_bullets_type_idx_all(&self, type_idx: u16) -> usize {
-        self.bullets.iter().filter(|b| (b.btype.saturating_sub(2) / 3) == type_idx).count()
+        self.bullets.iter().filter(|b| (b.btype.saturating_add(2) / 3) == type_idx).count()
     }
 
     pub fn count_bullets_multi(&self, btypes: &[u16], player_id: TargetPlayer) -> usize {