feat: pay and clear crime fines on death

tiltedphoques · May 24, 2022 · e6f47dd · e6f47dd
1 parent a02b88f
commit e6f47dd
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 5 deletions.
diff --git a/Code/client/Games/Skyrim/Actor.h b/Code/client/Games/Skyrim/Actor.h
@@ -62,7 +62,7 @@ struct Actor : TESObjectREFR
     virtual void sub_B8();
     virtual void sub_B9();
     virtual void sub_BA();
-    virtual void sub_BB();
+    virtual void PayFine(TESFaction* apFaction, bool aGoToJail, bool aRemoveStolenItems);
     virtual void sub_BC();
     virtual void sub_BD();
     virtual void sub_BE();

diff --git a/Code/client/Games/Skyrim/PlayerCharacter.cpp b/Code/client/Games/Skyrim/PlayerCharacter.cpp
@@ -58,7 +58,7 @@ void PlayerCharacter::AddSkillExperience(int32_t aSkill, float aExperience) noex
     spdlog::debug("Added {} experience to skill {}", deltaExperience, aSkill);
 }
 
-void PlayerCharacter::RespawnPlayer() noexcept
+NiPoint3 PlayerCharacter::RespawnPlayer() noexcept
 {
     // Make bleedout state recoverable
     SetNoBleedoutRecovery(false);
@@ -91,6 +91,26 @@ void PlayerCharacter::RespawnPlayer() noexcept
 
     // Make bleedout state unrecoverable again for when the player goes down the next time
     SetNoBleedoutRecovery(true);
+
+    return pos;
+}
+
+void PlayerCharacter::PayCrimeGoldToAllFactions() noexcept
+{
+    // Yes, yes, this isn't great, but there's no "pay fines everywhere" function
+    TiltedPhoques::Vector<uint32_t> crimeFactionIds{ 0x28170, 0x267E3, 0x29DB0, 0x2816D, 0x2816e, 0x2816C, 0x2816B, 0x267EA, 0x2816F, 0x4018279 };
+
+    for (uint32_t crimeFactionId : crimeFactionIds)
+    {
+        TESFaction* pCrimeFaction = Cast<TESFaction>(TESForm::GetById(crimeFactionId));
+        if (!pCrimeFaction)
+        {
+            spdlog::error("This isn't a crime faction! {:X}", crimeFactionId);
+            continue;
+        }
+
+        PayFine(pCrimeFaction, false, false);
+    }
 }
 
 char TP_MAKE_THISCALL(HookPickUpObject, PlayerCharacter, TESObjectREFR* apObject, int32_t aCount, bool aUnk1, bool aUnk2)

diff --git a/Code/client/Games/Skyrim/PlayerCharacter.h b/Code/client/Games/Skyrim/PlayerCharacter.h
@@ -153,7 +153,9 @@ struct PlayerCharacter : Actor
         return (*pSkills)->skills[aSkill].xp;
     }
 
-    void RespawnPlayer() noexcept;
+    NiPoint3 RespawnPlayer() noexcept;
+
+    void PayCrimeGoldToAllFactions() noexcept;
 
     struct Objective
     {

diff --git a/Code/client/Services/Generic/PlayerService.cpp b/Code/client/Services/Generic/PlayerService.cpp
@@ -37,6 +37,7 @@ PlayerService::PlayerService(World& aWorld, entt::dispatcher& aDispatcher, Trans
 
 bool knockdownStart = false;
 double knockdownTimer = 0.0;
+NiPoint3 newPosition{};
 
 bool godmodeStart = false;
 double godmodeTimer = 0.0;
@@ -151,13 +152,15 @@ void PlayerService::RunRespawnUpdates(const double acDeltaTime) noexcept
         // just by setting its health back to max. Therefore, put it to 0.
         if (pPlayer->GetActorValue(ActorValueInfo::kHealth) > 0.f)
             pPlayer->ForceActorValue(ActorValueOwner::ForceMode::DAMAGE, ActorValueInfo::kHealth, 0);
+
+        pPlayer->PayCrimeGoldToAllFactions();
     }
 
     m_respawnTimer -= acDeltaTime;
 
     if (m_respawnTimer <= 0.0)
     {
-        pPlayer->RespawnPlayer();
+        newPosition = pPlayer->RespawnPlayer();
 
         knockdownTimer = 1.0;
         knockdownStart = true;
@@ -176,7 +179,7 @@ void PlayerService::RunPostDeathUpdates(const double acDeltaTime) noexcept
     if (knockdownStart)
     {
         knockdownTimer -= acDeltaTime;
-        if (knockdownTimer <= 0.0)
+        if (PlayerCharacter::Get()->position == newPosition)
         {
             PlayerCharacter::SetGodMode(true);
             godmodeStart = true;