Implement outline glow for ticking bomb

danielkrupinski · Sep 25, 2024 · 19ed3bf · 19ed3bf
1 parent 9598a6e
commit 19ed3bf
Show file tree

Hide file tree

Showing 18 changed files with 187 additions and 7 deletions.
diff --git a/Source/CS2/Classes/CPlantedC4.h b/Source/CS2/Classes/CPlantedC4.h
@@ -2,10 +2,12 @@
 
 #include <cstdint>
 
+#include "Entities/C_BaseEntity.h"
+
 namespace cs2
 {
 
-struct CPlantedC4 {
+struct CPlantedC4 : C_BaseEntity {
     using m_nBombSite = int;
     using m_bBombTicking = bool;
     using m_hBombDefuser = std::uint32_t;

diff --git a/Source/CS2/Constants/EntityTypeNames.h b/Source/CS2/Constants/EntityTypeNames.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <CS2/Classes/Entities/WeaponEntities.h>
+#include <CS2/Classes/CPlantedC4.h>
 #include <Platform/Macros/PlatformSpecific.h>
 #include <Utils/TypedStaticStringPool.h>
 
@@ -51,6 +52,7 @@ constexpr auto kEntityTypeNames = TypedStaticStringPool{}
     .add<C_SmokeGrenadeProjectile>(WIN64_LINUX(".?AVC_SmokeGrenadeProjectile@@", "24C_SmokeGrenadeProjectile"))
     .add<C_MolotovProjectile>(WIN64_LINUX(".?AVC_MolotovProjectile@@", "19C_MolotovProjectile"))
     .add<C_FlashbangProjectile>(WIN64_LINUX(".?AVC_FlashbangProjectile@@", "21C_FlashbangProjectile"))
-    .add<C_C4>(WIN64_LINUX(".?AVC_C4@@", "4C_C4"));
+    .add<C_C4>(WIN64_LINUX(".?AVC_C4@@", "4C_C4"))
+    .add<CPlantedC4>(WIN64_LINUX(".?AVC_PlantedC4@@", "11C_PlantedC4"));
 
 }
diff --git a/Source/Features/Hud/BombTimer/BombTimerContext.h b/Source/Features/Hud/BombTimer/BombTimerContext.h
@@ -24,7 +24,7 @@ struct BombTimerContext {
     [[nodiscard]] bool hasTickingC4() const noexcept
     {
         const auto plantedC4{_context.plantedC4()};
-        return plantedC4 && plantedC4->isTicking();
+        return plantedC4 && plantedC4->isTicking().valueOr(true) && plantedC4->getTimeToExplosion().greaterThan(0.0f).valueOr(false);
     }
 
     [[nodiscard]] auto tickingC4() const noexcept

diff --git a/Source/Features/Visuals/OutlineGlow/OutlineGlow.h b/Source/Features/Visuals/OutlineGlow/OutlineGlow.h
@@ -21,6 +21,8 @@ class OutlineGlow {
             context.applyGlowToPlayer(entity);
         else if (entityTypeInfo.typeIndex == utils::typeIndex<cs2::CBaseAnimGraph, KnownEntityTypes>())
             context.applyGlowToDefuseKit(entity);
+        else if (entityTypeInfo.is<cs2::CPlantedC4>())
+            context.applyGlowToPlantedBomb(entity);
         else if (entityTypeInfo.is<cs2::C_C4>())
             context.applyGlowToBomb(entity);
         else if (entityTypeInfo.isGrenadeProjectile())

diff --git a/Source/Features/Visuals/OutlineGlow/OutlineGlowContext.h b/Source/Features/Visuals/OutlineGlow/OutlineGlowContext.h
@@ -1,12 +1,14 @@
 #pragma once
 
 #include <GameClasses/PlayerPawn.h>
+#include <GameClasses/PlantedC4.h>
 #include <OutlineGlow/GlowSceneObjects.h>
 
 #include "DefuseKitOutlineGlow/DefuseKitOutlineGlow.h"
 #include "DroppedBombOutlineGlow/DroppedBombOutlineGlow.h"
 #include "GrenadeProjectileOutlineGlow/GrenadeProjectileOutlineGlow.h"
 #include "PlayerOutlineGlow/PlayerOutlineGlow.h"
+#include "TickingBombOutlineGlow/TickingBombOutlineGlow.h"
 #include "WeaponOutlineGlow/WeaponOutlineGlow.h"
 
 template <typename HookContext>
@@ -47,6 +49,11 @@ class OutlineGlowContext {
         hookContext.template make<DroppedBombOutlineGlow>().applyGlowToBomb(hookContext.template make<BaseEntity>(static_cast<cs2::C_C4*>(&entity)));
     }
 
+    void applyGlowToPlantedBomb(auto& entity) const noexcept
+    {
+        hookContext.template make<TickingBombOutlineGlow>().applyGlowToPlantedBomb(PlantedC4{PlantedC4Base{static_cast<cs2::CPlantedC4*>(&entity)}, hookContext});
+    }
+
     [[nodiscard]] auto& viewRenderHook() const noexcept
     {
         return hookContext.hooks().viewRenderHook;

diff --git a/Source/Features/Visuals/OutlineGlow/TickingBombOutlineGlow/TickingBombOutlineGlow.h b/Source/Features/Visuals/OutlineGlow/TickingBombOutlineGlow/TickingBombOutlineGlow.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <utility>
+
+#include "TickingBombOutlineGlowContext.h"
+#include "TickingBombOutlineGlowParams.h"
+
+template <typename Context>
+class TickingBombOutlineGlow {
+public:
+    template <typename... Args>
+    TickingBombOutlineGlow(Args&&... args) noexcept
+        : context{std::forward<Args>(args)...}
+    {
+    }
+
+    void applyGlowToPlantedBomb(auto&& plantedBomb) const noexcept
+    {
+        auto&& condition = context.condition();
+        if (!condition.shouldRun() || !condition.shouldGlowPlantedBomb(plantedBomb))
+            return;
+
+        using namespace ticking_bomb_outline_glow_params;
+        plantedBomb.baseEntity().applyGlowRecursively(kColor);
+    }
+
+private:
+    Context context;
+};
+
+template <typename HookContext>
+TickingBombOutlineGlow(HookContext&) -> TickingBombOutlineGlow<TickingBombOutlineGlowContext<HookContext>>;
diff --git a/Source/Features/Visuals/OutlineGlow/TickingBombOutlineGlow/TickingBombOutlineGlowCondition.h b/Source/Features/Visuals/OutlineGlow/TickingBombOutlineGlow/TickingBombOutlineGlowCondition.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include <utility>
+
+template <typename Context>
+class TickingBombOutlineGlowCondition {
+public:
+    template <typename... Args>
+    TickingBombOutlineGlowCondition(Args&&... args) noexcept
+        : context{std::forward<Args>(args)...}
+    {
+    }
+
+    [[nodiscard]] bool shouldRun() const noexcept
+    {
+        return context.state().enabled;
+    }
+
+    [[nodiscard]] bool shouldGlowPlantedBomb(auto&& plantedBomb) const noexcept
+    {
+        return plantedBomb.isTicking().valueOr(true);
+    }
+
+private:
+    Context context;
+};
diff --git a/Source/Features/Visuals/OutlineGlow/TickingBombOutlineGlow/TickingBombOutlineGlowContext.h b/Source/Features/Visuals/OutlineGlow/TickingBombOutlineGlow/TickingBombOutlineGlowContext.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "TickingBombOutlineGlowCondition.h"
+
+template <typename HookContext>
+class TickingBombOutlineGlowContext {
+public:
+    explicit TickingBombOutlineGlowContext(HookContext& hookContext) noexcept
+        : hookContext{hookContext}
+    {
+    }
+
+    [[nodiscard]] auto& state() const noexcept
+    {
+        return hookContext.featuresStates().visualFeaturesStates.tickingBombOutlineGlowState;
+    }
+
+    [[nodiscard]] decltype(auto) condition() const noexcept
+    {
+        return hookContext.template make<TickingBombOutlineGlowCondition<TickingBombOutlineGlowContext>>();
+    }
+
+private:
+    HookContext& hookContext;
+};
diff --git a/Source/Features/Visuals/OutlineGlow/TickingBombOutlineGlow/TickingBombOutlineGlowParams.h b/Source/Features/Visuals/OutlineGlow/TickingBombOutlineGlow/TickingBombOutlineGlowParams.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#include <CS2/Classes/Color.h>
+
+namespace ticking_bomb_outline_glow_params
+{
+    constexpr cs2::Color kColor{255, 128, 128, 102};
+}
diff --git a/Source/Features/Visuals/OutlineGlow/TickingBombOutlineGlow/TickingBombOutlineGlowState.h b/Source/Features/Visuals/OutlineGlow/TickingBombOutlineGlow/TickingBombOutlineGlowState.h
@@ -0,0 +1,5 @@
+#pragma once
+
+struct TickingBombOutlineGlowState {
+    bool enabled{true};
+};
diff --git a/Source/Features/Visuals/OutlineGlow/TickingBombOutlineGlow/TickingBombOutlineGlowToggle.h b/Source/Features/Visuals/OutlineGlow/TickingBombOutlineGlow/TickingBombOutlineGlowToggle.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <utility>
+
+#include <FeatureHelpers/FeatureToggle.h>
+#include "TickingBombOutlineGlowContext.h"
+
+template <typename Context>
+class TickingBombOutlineGlowToggle : public FeatureToggle<TickingBombOutlineGlowToggle<Context>> {
+public:
+    template <typename... Args>
+    TickingBombOutlineGlowToggle(Args&&... args) noexcept
+        : context{std::forward<Args>(args)...}
+    {
+    }
+
+    [[nodiscard]] auto& enabledVariable(typename TickingBombOutlineGlowToggle::ToggleMethod) const noexcept
+    {
+        return context.state().enabled;
+    }
+
+private:
+    Context context;
+};
+
+template <typename HookContext>
+TickingBombOutlineGlowToggle(HookContext&) -> TickingBombOutlineGlowToggle<TickingBombOutlineGlowContext<HookContext>>;
diff --git a/Source/Features/Visuals/VisualFeatures.h b/Source/Features/Visuals/VisualFeatures.h
@@ -6,6 +6,7 @@
 #include "OutlineGlow/DroppedBombOutlineGlow/DroppedBombOutlineGlowToggle.h"
 #include "OutlineGlow/GrenadeProjectileOutlineGlow/GrenadeProjectileOutlineGlowToggle.h"
 #include "OutlineGlow/PlayerOutlineGlow/PlayerOutlineGlowToggle.h"
+#include "OutlineGlow/TickingBombOutlineGlow/TickingBombOutlineGlowToggle.h"
 #include "OutlineGlow/WeaponOutlineGlow/WeaponOutlineGlowToggle.h"
 #include "OutlineGlow/OutlineGlowToggle.h"
 #include "VisualFeaturesStates.h"
@@ -106,6 +107,11 @@ struct VisualFeatures {
         return hookContext.template make<DroppedBombOutlineGlowToggle>();
     }
 
+    [[nodiscard]] decltype(auto) tickingBombOutlineGlowToggle() const noexcept
+    {
+        return hookContext.template make<TickingBombOutlineGlowToggle>();
+    }
+
     HookContext& hookContext;
     VisualFeaturesStates& states;
     ViewRenderHook& viewRenderHook;

diff --git a/Source/Features/Visuals/VisualFeaturesStates.h b/Source/Features/Visuals/VisualFeaturesStates.h
@@ -5,6 +5,7 @@
 #include "OutlineGlow/DroppedBombOutlineGlow/DroppedBombOutlineGlowState.h"
 #include "OutlineGlow/GrenadeProjectileOutlineGlow/GrenadeProjectileOutlineGlowState.h"
 #include "OutlineGlow/PlayerOutlineGlow/PlayerOutlineGlowState.h"
+#include "OutlineGlow/TickingBombOutlineGlow/TickingBombOutlineGlowState.h"
 #include "OutlineGlow/WeaponOutlineGlow/WeaponOutlineGlowState.h"
 #include "OutlineGlow/OutlineGlowState.h"
 
@@ -16,4 +17,5 @@ struct VisualFeaturesStates {
     DefuseKitOutlineGlowState defuseKitOutlineGlowState;
     GrenadeProjectileOutlineGlowState grenadeProjectileOutlineGlowState;
     DroppedBombOutlineGlowState droppedBombOutlineGlowState;
+    TickingBombOutlineGlowState tickingBombOutlineGlowState;
 };
diff --git a/Source/GameClasses/PlantedC4.h b/Source/GameClasses/PlantedC4.h
@@ -39,20 +39,25 @@ struct PlantedC4Base {
 
 template <typename Dependencies>
 struct PlantedC4 {
-    explicit PlantedC4(PlantedC4Base base, Dependencies dependencies) noexcept
+    explicit PlantedC4(PlantedC4Base base, Dependencies& dependencies) noexcept
         : base{base}
         , dependencies{dependencies}
     {
     }
 
+    [[nodiscard]] decltype(auto) baseEntity() const noexcept
+    {
+        return dependencies.template make<BaseEntity>(base.thisptr);
+    }
+
     [[nodiscard]] auto getTimeToExplosion() const noexcept
     {
         return base.blowTime().toOptional() - dependencies.globalVars().curtime();
     }
 
-    [[nodiscard]] bool isTicking() const noexcept
+    [[nodiscard]] auto isTicking() const noexcept
     {
-        return base.ticking().valueOr(true) && getTimeToExplosion().greaterThan(0.0f).valueOr(false);
+        return base.ticking().toOptional();
     }
 
     [[nodiscard]] bool isBeingDefused() const noexcept
@@ -82,5 +87,5 @@ struct PlantedC4 {
 
 private:
     PlantedC4Base base;
-    Dependencies dependencies;
+    Dependencies& dependencies;
 };
diff --git a/Source/Osiris.vcxproj b/Source/Osiris.vcxproj
@@ -195,6 +195,12 @@
     <ClInclude Include="Features\Visuals\OutlineGlow\PlayerOutlineGlow\PlayerOutlineGlowContext.h" />
     <ClInclude Include="Features\Visuals\OutlineGlow\PlayerOutlineGlow\PlayerOutlineGlowState.h" />
     <ClInclude Include="Features\Visuals\OutlineGlow\PlayerOutlineGlow\PlayerOutlineGlowToggle.h" />
+    <ClInclude Include="Features\Visuals\OutlineGlow\TickingBombOutlineGlow\TickingBombOutlineGlow.h" />
+    <ClInclude Include="Features\Visuals\OutlineGlow\TickingBombOutlineGlow\TickingBombOutlineGlowCondition.h" />
+    <ClInclude Include="Features\Visuals\OutlineGlow\TickingBombOutlineGlow\TickingBombOutlineGlowContext.h" />
+    <ClInclude Include="Features\Visuals\OutlineGlow\TickingBombOutlineGlow\TickingBombOutlineGlowParams.h" />
+    <ClInclude Include="Features\Visuals\OutlineGlow\TickingBombOutlineGlow\TickingBombOutlineGlowState.h" />
+    <ClInclude Include="Features\Visuals\OutlineGlow\TickingBombOutlineGlow\TickingBombOutlineGlowToggle.h" />
     <ClInclude Include="Features\Visuals\OutlineGlow\WeaponOutlineGlow\WeaponOutlineGlow.h" />
     <ClInclude Include="Features\Visuals\OutlineGlow\WeaponOutlineGlow\WeaponOutlineGlowCondition.h" />
     <ClInclude Include="Features\Visuals\OutlineGlow\WeaponOutlineGlow\WeaponOutlineGlowContext.h" />

diff --git a/Source/Osiris.vcxproj.filters b/Source/Osiris.vcxproj.filters
@@ -181,6 +181,9 @@
     <Filter Include="Features\Visuals\OutlineGlow\DroppedBombOutlineGlow">
       <UniqueIdentifier>{4cacd578-512d-4917-912c-c98f07a6d19b}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Features\Visuals\OutlineGlow\TickingBombOutlineGlow">
+      <UniqueIdentifier>{845ab4cc-9e82-4b6d-8e55-170788a073b5}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CS2\Classes\C_CSGameRules.h">
@@ -1565,6 +1568,24 @@
     <ClInclude Include="GameClasses\BaseWeapon.h">
       <Filter>GameClasses</Filter>
     </ClInclude>
+    <ClInclude Include="Features\Visuals\OutlineGlow\TickingBombOutlineGlow\TickingBombOutlineGlow.h">
+      <Filter>Features\Visuals\OutlineGlow\TickingBombOutlineGlow</Filter>
+    </ClInclude>
+    <ClInclude Include="Features\Visuals\OutlineGlow\TickingBombOutlineGlow\TickingBombOutlineGlowCondition.h">
+      <Filter>Features\Visuals\OutlineGlow\TickingBombOutlineGlow</Filter>
+    </ClInclude>
+    <ClInclude Include="Features\Visuals\OutlineGlow\TickingBombOutlineGlow\TickingBombOutlineGlowContext.h">
+      <Filter>Features\Visuals\OutlineGlow\TickingBombOutlineGlow</Filter>
+    </ClInclude>
+    <ClInclude Include="Features\Visuals\OutlineGlow\TickingBombOutlineGlow\TickingBombOutlineGlowParams.h">
+      <Filter>Features\Visuals\OutlineGlow\TickingBombOutlineGlow</Filter>
+    </ClInclude>
+    <ClInclude Include="Features\Visuals\OutlineGlow\TickingBombOutlineGlow\TickingBombOutlineGlowState.h">
+      <Filter>Features\Visuals\OutlineGlow\TickingBombOutlineGlow</Filter>
+    </ClInclude>
+    <ClInclude Include="Features\Visuals\OutlineGlow\TickingBombOutlineGlow\TickingBombOutlineGlowToggle.h">
+      <Filter>Features\Visuals\OutlineGlow\TickingBombOutlineGlow</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="UI\Panorama\CreateGUI.js">

diff --git a/Source/UI/Panorama/CreateGUI.js b/Source/UI/Panorama/CreateGUI.js
@@ -315,6 +315,8 @@ $.Osiris = (function () {
   var bombAndDefuseKitOutlineGlow = createSection(outlineGlowTab, 'Bomb & Defuse Kit');
   createYesNoDropDown(bombAndDefuseKitOutlineGlow, "Glow Dropped Bomb", 'visuals', 'dropped_bomb_outline_glow', 0);
   $.CreatePanel('Panel', bombAndDefuseKitOutlineGlow, '', { class: "horizontal-separator" });
+  createYesNoDropDown(bombAndDefuseKitOutlineGlow, "Glow Ticking Bomb", 'visuals', 'ticking_bomb_outline_glow', 0);
+  $.CreatePanel('Panel', bombAndDefuseKitOutlineGlow, '', { class: "horizontal-separator" });
   createYesNoDropDown(bombAndDefuseKitOutlineGlow, "Glow Defuse Kits on Ground Nearby", 'visuals', 'defuse_kit_outline_glow', 0);
 
   $.Osiris.navigateToSubTab('visuals', 'player_info');

diff --git a/Source/UI/Panorama/SetCommandHandler.h b/Source/UI/Panorama/SetCommandHandler.h
@@ -92,6 +92,8 @@ struct SetCommandHandler {
             handleTogglableFeature(features.visualFeatures().grenadeProjectileOutlineGlowToggle());
         } else if (feature == "dropped_bomb_outline_glow") {
             handleTogglableFeature(features.visualFeatures().droppedBombOutlineGlowToggle());
+        } else if (feature == "ticking_bomb_outline_glow") {
+            handleTogglableFeature(features.visualFeatures().tickingBombOutlineGlowToggle());
         }
     }