zNPCBPatrick::Damage 50%

bfbbdecomp · Jul 19, 2024 · 6591bea · 6591bea
1 parent cd3da06
commit 6591bea
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/src/SB/Game/zNPCTypeBossPatrick.cpp b/src/SB/Game/zNPCTypeBossPatrick.cpp
@@ -249,7 +249,7 @@ void zNPCBPatrick::Damage(en_NPC_DAMAGE_TYPE dmg_type, xBase* who, const xVec3*
         return;
     }
 
-    if (!(this->bossFlags & 4) && this->badHitTimer < f832)
+    if (!(this->bossFlags & 4))
     {
         if (vec_hit)
         {
@@ -271,34 +271,34 @@ void zNPCBPatrick::Damage(en_NPC_DAMAGE_TYPE dmg_type, xBase* who, const xVec3*
             this->badHitTimer = f1054;
         }
     }
-    else
+    else if (this->badHitTimer < f832)
     {
-        if ((this->nfFlags & 4) == 0)
+        if (this->nfFlags & 4)
         {
-            if (this->round == 2)
+            U32 uVar1 = xrand();
+
+            if (((uVar1 & 0x80) == 0) || (this->round == 2))
             {
-                // not right, but it's some newsfish vtable call
-                this->newsfish->AnimStart(0, 1);
+                this->newsfish->AnimStart(2, 1);
             }
             else
             {
-                this->newsfish->AnimStart(1, 1);
+                this->newsfish->AnimStart(3, 1);
             }
-
-            this->nfFlags |= 4;
         }
         else
         {
-            U32 uVar1 = xrand();
-
-            if (((uVar1 & 0x80) == 0) || (this->round == 2))
+            if (this->round == 2)
             {
-                this->newsfish->AnimStart(2, 1);
+                // not right, but it's some newsfish vtable call
+                this->newsfish->AnimStart(0, 1);
             }
             else
             {
-                this->newsfish->AnimStart(3, 1);
+                this->newsfish->AnimStart(1, 1);
             }
+
+            this->nfFlags |= 4;
         }
         this->badHitTimer = f1054;
     }