Continue TyHealth.cpp

1superchip · 1superchip · commit 48a8b5673e7b · 2025-09-03T16:08:31.000-05:00
Work on Ty.cpp and TyHealth.cpp
diff --git a/include/ty/StructList.h b/include/ty/StructList.h
@@ -2,6 +2,7 @@
 #define STRUCTLIST_H
 
 #include "types.h"
+#include "common/Heap.h"
 
 /// @brief A fixed-capacity, reverse-fill list structure
 /// @tparam T Type of elements stored in the list
diff --git a/include/ty/Ty.h b/include/ty/Ty.h
@@ -45,10 +45,7 @@ struct HeadTurningInfo {
 
 enum KnockBackType {
     KB_TYPE_0 = 0,
-};
-
-enum TyHeads {
-
+    KB_TYPE_2 = 2,
 };
 
 // Ty movement state: Air, Water, Land, UnderWater
@@ -463,6 +460,11 @@ struct DustTrail {
     char padding[0x18];
 };
 
+enum TyHeads {
+    TY_HEAD_0 = 0,
+    TY_HEAD_1 = 1
+};
+
 struct Ty : Hero {
 
     int unk320;
@@ -794,6 +796,8 @@ struct Ty : Hero {
     void AddShadowLight(Vector*, float);
     void SetAbsolutePosition(Vector*, int, float, bool);
     void SetBounceOffFromPos(Vector*, float, bool);
+
+    void SetKnockBackFromPos(Vector*, float, KnockBackType);
     void SetKnockBackFromDir(Vector*, float, KnockBackType);
 
     bool TryChangeState(bool, HeroActorState);
@@ -834,6 +838,8 @@ struct Ty : Hero {
     void LandMediumDeinit(void);
     //
 
+    void ResetDrownTimer(void);
+
     // Rang Management
     void InitRangChange(void);
     void DeinitRangChange(void);
@@ -849,6 +855,8 @@ struct Ty : Hero {
     bool IsAbleToGlide(void);
     //
 
+    void EnableHead(TyHeads);
+
     void SetFakeFloor(void);
 };
 
diff --git a/include/ty/TyHealth.h b/include/ty/TyHealth.h
@@ -1,23 +1,47 @@
 #ifndef TYHEALTH_H
 #define TYHEALTH_H
 
+#include "ty/StructList.h"
+#include "common/Blitter.h"
+#include "common/Material.h"
 #include "common/Vector.h"
 
 enum TyHealthType {
     HEALTH_TYPE_0 = 0,
     HEALTH_TYPE_1 = 1,
+    HEALTH_TYPE_2 = 2,
 };
 
 enum HurtType {
-    HURT_TYPE_5 = 5
+    HURT_TYPE_0 = 0,
+    HURT_TYPE_1 = 1,
+    HURT_TYPE_2 = 2,
+    HURT_TYPE_3 = 3,
+    HURT_TYPE_4 = 4,
+    HURT_TYPE_5 = 5,
+    HURT_TYPE_6 = 6
 };
 
 struct HealthInfo {
-    char padding[0x24];
+    int unk0;
+    int unk4;
+    int unk8;
+    int unkC;
+    int unk10;
+    int unk14;
+    int unk18;
+    char* unk1C;
+    Material* unk20;
 };
 
 struct TyHealth {
-    char padding[0x24];
+    TyHealthType mType;
+    int unk4;
+    StructList<Blitter_Image> bubbleList;
+    Material* pMaterial;
+    int unk18;
+    char unk1C;
+    float unk20;
 
     void Init(TyHealthType);
     void Deinit(void);
@@ -29,7 +53,11 @@ struct TyHealth {
     void DrawHudElement(Vector);
     void DoLoseFX(void);
 
-    static HealthInfo heathInfo[3];
+    float GetHealthFieldUnk4(void) {
+        return heathInfo[mType].unk4;
+    }
+
+    static HealthInfo heathInfo[];
 };
 
 #endif // TYHEALTH_H
diff --git a/include/ty/soundbank.h b/include/ty/soundbank.h
@@ -163,6 +163,8 @@ enum SoundID {
     SFX_TyLand = 0x4,
     SFX_TyLongfallLand = 0x5,
 
+    SFX_Ty_0x9 = 0x9,
+
     SFX_TyBiteRelease = 0x13,
 
     SFX_TyRangStdThrow      = 0x14,
diff --git a/src/ty/source/Ty.cpp b/src/ty/source/Ty.cpp
@@ -287,7 +287,7 @@ void Ty::Draw(void) {
     mFsm.Draw(this);
 }
 
-void Ty::StartDeath(HurtType, bool) {
+void Ty::StartDeath(HurtType hurtType, bool r5) {
     gb.unk7AC = true;
     particleManager->StopExclamation(true);
 
@@ -300,8 +300,61 @@ void Ty::StartDeath(HurtType, bool) {
     }
 }
 
-void Ty::Hurt(HurtType, DDADamageCause, bool, Vector*, float) {
+void VibrateJoystick(float, float, float, char, float);
 
+void Ty::Hurt(HurtType hurtType, DDADamageCause damageCause, bool, Vector* pVec, float f1) {
+    static int flinch = 0;
+    
+    if (gb.disableTriggers || gb.infinitePie) {
+        return;
+    }
+
+    if (invicibilityFrames > 0 || mFsm.GetStateEx() == TY_AS_28 || mFsm.GetStateEx() == TY_AS_29) {
+        return;
+    }
+
+    EnableHead(TY_HEAD_0);
+
+    if (hurtType == HURT_TYPE_1 || hurtType == HURT_TYPE_5) {
+        VibrateJoystick(0.5f, 1.0f, (f1 / 45.0f) + 0.2f, 0, 4.0f);
+    }
+
+    dda.StoreDamageInfo(damageCause);
+
+    if (ty.mMediumMachine.GetUnk0() == TY_MEDIUM_3 && mFsm.GetStateEx() != TY_AS_25) {
+        for (int i = 0; i < 31; i++) {
+
+        }
+
+        SoundBank_Play(0x9, NULL, ID_NONE);
+    }
+
+    if (tyHealth.Hurt(hurtType)) {
+        switch (hurtType) {
+            case HURT_TYPE_0:
+            case HURT_TYPE_3:
+            case HURT_TYPE_6:
+                flinch = (flinch + 1) % 3;
+                if (unk4EC.Condition()) {
+                    unk4EC.SetAnim(NULL);
+                }
+                break;
+            case HURT_TYPE_2:
+                SetKnockBackFromPos(&pos, f1, KB_TYPE_2);
+                break;
+            case HURT_TYPE_1:
+            case HURT_TYPE_4:
+                SetKnockBackFromPos(pVec, f1, KB_TYPE_0);
+                break;
+            case HURT_TYPE_5:
+                SetKnockBackFromDir(pVec, f1, KB_TYPE_0);
+                break;
+        }
+
+        invicibilityFrames = 240; // 240 frames
+    } else {
+        StartDeath(hurtType, false);
+    }
 }
 
 // void Ty::SetToIdle(bool, TyMedium) {
@@ -328,9 +381,13 @@ void AutoTargetStruct::Reset(void) {
 
 }
 
+void Ty::ResetDrownTimer(void) {
+    unk828 = gb.logicGameCount + (int)((gDisplay.fps * 180.0f) / tyHealth.GetHealthFieldUnk4());
+}
+
 void Ty::WaterMediumInit(void) {
     BoomerangManagerAnims swimAnims = {
-        true,
+        false,
         unk6C8,
         {unk6C8, unk6DC},
         {unk6D4, unk6E8}
@@ -351,6 +408,8 @@ void Ty::WaterMediumDeinit(void) {
     
 }
 
+void Hud_ShowHealthMeter(bool);
+
 void Ty::UnderWaterMediumInit(void) {
     BoomerangManagerAnims underWaterAnims = {
         true,
@@ -363,13 +422,22 @@ void Ty::UnderWaterMediumInit(void) {
 
     tyHealth.SetType(HEALTH_TYPE_1);
 
+    SoundBank_PlayExclusiveAmbientSound(false);
+
+    Hud_ShowHealthMeter(true);
+
+    ResetDrownTimer();
+
     if (pBunyip) {
         pBunyip->SetState(BUNYIP_DISAPPEAR);
     }
 }
 
 void Ty::UnderWaterMediumUpdate(void) {
-    
+    if (gb.logicGameCount >= unk828) {
+        ty.Hurt(HURT_TYPE_6, DDA_DAMAGE_3, false, NULL, 15.0f);
+        ResetDrownTimer();
+    }
 }
 
 void Ty::UnderWaterMediumDeinit(void) {
diff --git a/src/ty/source/TyHealth.cpp b/src/ty/source/TyHealth.cpp
@@ -0,0 +1,117 @@
+#include "ty/TyHealth.h"
+#include "ty/soundbank.h"
+
+#include "ty/Ty.h"
+
+void Hud_ShowLives(void);
+
+void VibrateJoystick(float, float, float, char, float);
+
+extern "C" int Sound_IsVoicePlaying(int);
+
+HealthInfo TyHealth::heathInfo[] = {
+    {2, 4, 1, 4, 0x10F, -1, -1, "paw_health"},
+    {2, 8, 1, 8, 0x21, 0x22, 0x23, "paw_air"},
+    {2, 4, 1, 8, -1, -1, -1, "paw_health"}
+};
+
+void TyHealth::Init(TyHealthType type) {
+    pMaterial = Material::Create("fx_002a");
+
+    bubbleList.Init(20);
+
+    SetType(type);
+
+    unk4 = 0;
+
+    for (int i = 0; i < ARRAY_SIZE(heathInfo); i++) {
+        heathInfo[i].unk20 = Material::Create(heathInfo[i].unk1C);
+    }
+
+    unk18 = -1;
+    unk1C = 0;
+    unk20 = 1.0f;
+}
+
+void TyHealth::Deinit(void) {
+    bubbleList.Deinit();
+
+    pMaterial->Destroy();
+
+    for (int i = 0; i < ARRAY_SIZE(heathInfo); i++) {
+        heathInfo[i].unk20->Destroy();
+    }
+}
+
+bool TyHealth::Hurt(HurtType type) {
+    unk4 = 15;
+
+    if (ty.mFsm.GetState() == TY_AS_28 || ty.mFsm.GetState() == TY_AS_29) {
+        SoundBank_Stop(&unk18);
+    }
+
+    if (type != HURT_TYPE_6 && mType == HEALTH_TYPE_1) {
+        heathInfo[mType].unkC = Max<int>(heathInfo[mType].unkC - 2, 0);
+    } else {
+        heathInfo[mType].unkC = Max<int>(heathInfo[mType].unkC - 1, 0);
+    }
+
+    DoLoseFX();
+
+    Hud_ShowLives();
+
+    VibrateJoystick(0.0f, 0.6f, 0.27f, 0, 4.0f);
+
+    return heathInfo[mType].unkC > 0;
+}
+
+void TyHealth::Gain(int r4) {
+    if (unk18 > -1 && Sound_IsVoicePlaying(unk18)) {
+        SoundBank_Stop(&unk18);
+    }
+
+    unk4 = 0;
+
+    heathInfo[mType].unkC = Min<int>(heathInfo[mType].unkC + r4, heathInfo[mType].unk4 * heathInfo[mType].unk8);
+
+    Hud_ShowLives();
+}
+
+void TyHealth::SetType(TyHealthType type) {
+    mType = type;
+    unk4 = 0;
+
+    if (ty.mFsm.GetState() == TY_AS_28 || ty.mFsm.GetState() == TY_AS_29) {
+        heathInfo[mType].unkC = 0;
+    } else {
+        heathInfo[mType].unkC = heathInfo[mType].unk8 * heathInfo[mType].unk4;
+    }
+
+    Hud_ShowLives();
+}
+
+void TyHealth::SetNumSymbols(int r4) {
+    for (int i = 0; i < ARRAY_SIZE(heathInfo); i++) {
+        heathInfo[i].unk8 = r4;
+    }
+
+    SetType(mType);
+}
+
+void TyHealth::DrawLooseFX(Vector vec) {
+
+}
+
+void TyHealth::DrawHudElement(Vector vec) {
+
+}
+
+void TyHealth::DoLoseFX(void) {
+    if (heathInfo[mType].unk18 >= 0 && heathInfo[mType].unkC == 1) {
+        if (unk18 == -1) {
+            unk18 = SoundBank_Play(heathInfo[mType].unk18, NULL, 0);
+        }
+    } else if (heathInfo[mType].unk14 >= 0 && heathInfo[mType].unkC > 0) {
+        SoundBank_Play(heathInfo[mType].unk14, NULL, 0);
+    }
+}
