From 8f6d02a0b89d1081b54b5c6cfbc0d222be0fcf04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Krupi=C5=84ski?= <danielkrupinski@outlook.com>
Date: Tue, 24 Sep 2024 19:30:58 +0200
Subject: [PATCH] Optimize size of GameDependencies initialization code and
 const data

---
 Source/CS2/Classes/Entities/CBaseAnimGraph.h  |  1 -
 Source/CS2/Classes/Entities/C_CSPlayerPawn.h  |  2 -
 .../CS2/Classes/Entities/GrenadeProjectiles.h |  5 --
 Source/CS2/Classes/Entities/WeaponEntities.h  | 38 ---------
 Source/CS2/Constants/EntityTypeNames.h        | 56 +++++++++++++
 .../CS2/Constants/StylePropertySymbolNames.h  | 26 ++++++
 Source/CS2/Constants/StylePropertyTypeNames.h | 27 +++++++
 Source/CS2/Panorama/StyleProperties.h         | 44 -----------
 .../StylePropertiesSymbolsAndVMTs.h           | 41 +++-------
 Source/GameDependencies/EntitiesVMTs.h        | 79 +------------------
 Source/Osiris.vcxproj                         |  4 +
 Source/Osiris.vcxproj.filters                 | 12 +++
 Source/Utils/TypedStaticStringPool.h          | 47 +++++++++++
 13 files changed, 189 insertions(+), 193 deletions(-)
 create mode 100644 Source/CS2/Constants/EntityTypeNames.h
 create mode 100644 Source/CS2/Constants/StylePropertySymbolNames.h
 create mode 100644 Source/CS2/Constants/StylePropertyTypeNames.h
 create mode 100644 Source/Utils/TypedStaticStringPool.h

diff --git a/Source/CS2/Classes/Entities/CBaseAnimGraph.h b/Source/CS2/Classes/Entities/CBaseAnimGraph.h
index 467eafbc0b5..088582c7a04 100644
--- a/Source/CS2/Classes/Entities/CBaseAnimGraph.h
+++ b/Source/CS2/Classes/Entities/CBaseAnimGraph.h
@@ -7,7 +7,6 @@ namespace cs2
 {
 
 struct CBaseAnimGraph : C_BaseEntity {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVCBaseAnimGraph@@", "14CBaseAnimGraph")};
 };
 
 }
diff --git a/Source/CS2/Classes/Entities/C_CSPlayerPawn.h b/Source/CS2/Classes/Entities/C_CSPlayerPawn.h
index ba718f8a055..79754dd6178 100644
--- a/Source/CS2/Classes/Entities/C_CSPlayerPawn.h
+++ b/Source/CS2/Classes/Entities/C_CSPlayerPawn.h
@@ -12,8 +12,6 @@ struct CCSPlayer_HostageServices;
 struct CCSPlayer_WeaponServices;
 
 struct C_CSPlayerPawn : C_BaseEntity {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_CSPlayerPawn@@", "14C_CSPlayerPawn")};
-
     using m_bGunGameImmunity = bool;
     using m_pWeaponServices = CCSPlayer_WeaponServices*;
     using m_hController = CEntityHandle;
diff --git a/Source/CS2/Classes/Entities/GrenadeProjectiles.h b/Source/CS2/Classes/Entities/GrenadeProjectiles.h
index e282537a517..69c998a5094 100644
--- a/Source/CS2/Classes/Entities/GrenadeProjectiles.h
+++ b/Source/CS2/Classes/Entities/GrenadeProjectiles.h
@@ -7,21 +7,16 @@ namespace cs2
 {
 
 struct C_HEGrenadeProjectile : C_BaseCSGrenadeProjectile {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_HEGrenadeProjectile@@", "21C_HEGrenadeProjectile")};
 };
 
 struct C_SmokeGrenadeProjectile : C_BaseCSGrenadeProjectile {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_SmokeGrenadeProjectile@@", "24C_SmokeGrenadeProjectile")};
-
     using m_bDidSmokeEffect = bool;
 };
 
 struct C_MolotovProjectile : C_BaseCSGrenadeProjectile {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_MolotovProjectile@@", "19C_MolotovProjectile")};
 };
 
 struct C_FlashbangProjectile : C_BaseCSGrenadeProjectile {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_FlashbangProjectile@@", "21C_FlashbangProjectile")};
 };
 
 }
diff --git a/Source/CS2/Classes/Entities/WeaponEntities.h b/Source/CS2/Classes/Entities/WeaponEntities.h
index dd0732924df..b7caa6a0f57 100644
--- a/Source/CS2/Classes/Entities/WeaponEntities.h
+++ b/Source/CS2/Classes/Entities/WeaponEntities.h
@@ -7,155 +7,117 @@ namespace cs2
 {
 
 struct C_WeaponGlock : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_WeaponGlock@@", "13C_WeaponGlock")};
 };
 
 struct C_WeaponHKP2000 : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_WeaponHKP2000@@", "15C_WeaponHKP2000")};
 };
 
 struct C_WeaponElite : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_WeaponElite@@", "13C_WeaponElite")};
 };
 
 struct C_WeaponP250 : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_WeaponP250@@", "12C_WeaponP250")};
 };
 
 struct C_WeaponTec9 : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_WeaponTec9@@", "12C_WeaponTec9")};
 };
 
 struct C_WeaponFiveSeven : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_WeaponFiveSeven@@", "17C_WeaponFiveSeven")};
 };
 
 struct C_DEagle : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_DEagle@@", "8C_DEagle")};
 };
 
 struct C_WeaponMAC10 : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_WeaponMAC10@@", "13C_WeaponMAC10")};
 };
 
 struct C_WeaponMP7 : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_WeaponMP7@@", "11C_WeaponMP7")};
 };
 
 struct C_WeaponMP9 : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_WeaponMP9@@", "11C_WeaponMP9")};
 };
 
 struct C_WeaponUMP45 : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_WeaponUMP45@@", "13C_WeaponUMP45")};
 };
 
 struct C_WeaponP90 : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_WeaponP90@@", "11C_WeaponP90")};
 };
 
 struct C_WeaponBizon : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_WeaponBizon@@", "13C_WeaponBizon")};
 };
 
 struct C_WeaponMag7 : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_WeaponMag7@@", "12C_WeaponMag7")};
 };
 
 struct C_WeaponSawedoff : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_WeaponSawedoff@@", "16C_WeaponSawedoff")};
 };
 
 struct C_WeaponXM1014 : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_WeaponXM1014@@", "14C_WeaponXM1014")};
 };
 
 struct C_WeaponNOVA : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_WeaponNOVA@@", "12C_WeaponNOVA")};
 };
 
 struct C_WeaponM249 : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_WeaponM249@@", "12C_WeaponM249")};
 };
 
 struct C_WeaponNegev : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_WeaponNegev@@", "13C_WeaponNegev")};
 };
 
 struct C_WeaponGalilAR : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_WeaponGalilAR@@", "15C_WeaponGalilAR")};
 };
 
 struct C_WeaponFamas : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_WeaponFamas@@", "13C_WeaponFamas")};
 };
 
 struct C_AK47 : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_AK47@@", "6C_AK47")};
 };
 
 struct C_WeaponM4A1 : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_WeaponM4A1@@", "12C_WeaponM4A1")};
 };
 
 struct C_WeaponSG556 : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_WeaponSG556@@", "13C_WeaponSG556")};
 };
 
 struct C_WeaponAug : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_WeaponAug@@", "11C_WeaponAug")};
 };
 
 struct C_WeaponSSG08 : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_WeaponSSG08@@", "13C_WeaponSSG08")};
 };
 
 struct C_WeaponAWP : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_WeaponAWP@@", "11C_WeaponAWP")};
 };
 
 struct C_WeaponG3SG1 : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_WeaponG3SG1@@", "13C_WeaponG3SG1")};
 };
 
 struct C_WeaponSCAR20 : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_WeaponSCAR20@@", "14C_WeaponSCAR20")};
 };
 
 struct C_WeaponTaser : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_WeaponTaser@@", "13C_WeaponTaser")};
 };
 
 struct C_Knife : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_Knife@@", "7C_Knife")};
 };
 
 struct C_Flashbang : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_Flashbang@@", "11C_Flashbang")};
 };
 
 struct C_HEGrenade : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_HEGrenade@@", "11C_HEGrenade")};
 };
 
 struct C_SmokeGrenade : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_SmokeGrenade@@", "14C_SmokeGrenade")};
 };
 
 struct C_MolotovGrenade : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_MolotovGrenade@@", "16C_MolotovGrenade")};
 };
 
 struct C_IncendiaryGrenade : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_IncendiaryGrenade@@", "19C_IncendiaryGrenade")};
 };
 
 struct C_DecoyGrenade : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_DecoyGrenade@@", "14C_DecoyGrenade")};
 };
 
 struct C_C4 : C_CSWeaponBase {
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVC_C4@@", "4C_C4")};
 };
 
 }
diff --git a/Source/CS2/Constants/EntityTypeNames.h b/Source/CS2/Constants/EntityTypeNames.h
new file mode 100644
index 00000000000..43dc7074c13
--- /dev/null
+++ b/Source/CS2/Constants/EntityTypeNames.h
@@ -0,0 +1,56 @@
+#pragma once
+
+#include <CS2/Classes/Entities/WeaponEntities.h>
+#include <Platform/Macros/PlatformSpecific.h>
+#include <Utils/TypedStaticStringPool.h>
+
+namespace cs2
+{
+
+constexpr auto kEntityTypeNames = TypedStaticStringPool{}
+    .add<C_CSPlayerPawn>(WIN64_LINUX(".?AVC_CSPlayerPawn@@", "14C_CSPlayerPawn"))
+    .add<C_WeaponGlock>(WIN64_LINUX(".?AVC_WeaponGlock@@", "13C_WeaponGlock"))
+    .add<C_WeaponHKP2000>(WIN64_LINUX(".?AVC_WeaponHKP2000@@", "15C_WeaponHKP2000"))
+    .add<C_WeaponElite>(WIN64_LINUX(".?AVC_WeaponElite@@", "13C_WeaponElite"))
+    .add<C_WeaponP250>(WIN64_LINUX(".?AVC_WeaponP250@@", "12C_WeaponP250"))
+    .add<C_WeaponTec9>(WIN64_LINUX(".?AVC_WeaponTec9@@", "12C_WeaponTec9"))
+    .add<C_WeaponFiveSeven>(WIN64_LINUX(".?AVC_WeaponFiveSeven@@", "17C_WeaponFiveSeven"))
+    .add<C_DEagle>(WIN64_LINUX(".?AVC_DEagle@@", "8C_DEagle"))
+    .add<C_WeaponMAC10>(WIN64_LINUX(".?AVC_WeaponMAC10@@", "13C_WeaponMAC10"))
+    .add<C_WeaponMP7>(WIN64_LINUX(".?AVC_WeaponMP7@@", "11C_WeaponMP7"))
+    .add<C_WeaponMP9>(WIN64_LINUX(".?AVC_WeaponMP9@@", "11C_WeaponMP9"))
+    .add<C_WeaponBizon>(WIN64_LINUX(".?AVC_WeaponBizon@@", "13C_WeaponBizon"))
+    .add<C_WeaponP90>(WIN64_LINUX(".?AVC_WeaponP90@@", "11C_WeaponP90"))
+    .add<C_WeaponUMP45>(WIN64_LINUX(".?AVC_WeaponUMP45@@", "13C_WeaponUMP45"))
+    .add<C_WeaponMag7>(WIN64_LINUX(".?AVC_WeaponMag7@@", "12C_WeaponMag7"))
+    .add<C_WeaponSawedoff>(WIN64_LINUX(".?AVC_WeaponSawedoff@@", "16C_WeaponSawedoff"))
+    .add<C_WeaponXM1014>(WIN64_LINUX(".?AVC_WeaponXM1014@@", "14C_WeaponXM1014"))
+    .add<C_WeaponNOVA>(WIN64_LINUX(".?AVC_WeaponNOVA@@", "12C_WeaponNOVA"))
+    .add<C_WeaponM249>(WIN64_LINUX(".?AVC_WeaponM249@@", "12C_WeaponM249"))
+    .add<C_WeaponNegev>(WIN64_LINUX(".?AVC_WeaponNegev@@", "13C_WeaponNegev"))
+    .add<C_WeaponGalilAR>(WIN64_LINUX(".?AVC_WeaponGalilAR@@", "15C_WeaponGalilAR"))
+    .add<C_WeaponFamas>(WIN64_LINUX(".?AVC_WeaponFamas@@", "13C_WeaponFamas"))
+    .add<C_AK47>(WIN64_LINUX(".?AVC_AK47@@", "6C_AK47"))
+    .add<C_WeaponM4A1>(WIN64_LINUX(".?AVC_WeaponM4A1@@", "12C_WeaponM4A1"))
+    .add<C_WeaponSG556>(WIN64_LINUX(".?AVC_WeaponSG556@@", "13C_WeaponSG556"))
+    .add<C_WeaponAug>(WIN64_LINUX(".?AVC_WeaponAug@@", "11C_WeaponAug"))
+    .add<C_WeaponSSG08>(WIN64_LINUX(".?AVC_WeaponSSG08@@", "13C_WeaponSSG08"))
+    .add<C_WeaponAWP>(WIN64_LINUX(".?AVC_WeaponAWP@@", "11C_WeaponAWP"))
+    .add<C_WeaponG3SG1>(WIN64_LINUX(".?AVC_WeaponG3SG1@@", "13C_WeaponG3SG1"))
+    .add<C_WeaponSCAR20>(WIN64_LINUX(".?AVC_WeaponSCAR20@@", "14C_WeaponSCAR20"))
+    .add<C_WeaponTaser>(WIN64_LINUX(".?AVC_WeaponTaser@@", "13C_WeaponTaser"))
+    .add<C_Knife>(WIN64_LINUX(".?AVC_Knife@@", "7C_Knife"))
+    .add<C_Flashbang>(WIN64_LINUX(".?AVC_Flashbang@@", "11C_Flashbang"))
+    .add<C_HEGrenade>(WIN64_LINUX(".?AVC_HEGrenade@@", "11C_HEGrenade"))
+    .add<C_SmokeGrenade>(WIN64_LINUX(".?AVC_SmokeGrenade@@", "14C_SmokeGrenade"))
+    .add<C_MolotovGrenade>(WIN64_LINUX(".?AVC_MolotovGrenade@@", "16C_MolotovGrenade"))
+    .add<C_IncendiaryGrenade>(WIN64_LINUX(".?AVC_IncendiaryGrenade@@", "19C_IncendiaryGrenade"))
+    .add<C_DecoyGrenade>(WIN64_LINUX(".?AVC_DecoyGrenade@@", "14C_DecoyGrenade"))
+    .add<CBaseAnimGraph>(WIN64_LINUX(".?AVCBaseAnimGraph@@", "14CBaseAnimGraph"))
+    .add<C_HEGrenadeProjectile>(WIN64_LINUX(".?AVC_HEGrenadeProjectile@@", "21C_HEGrenadeProjectile"))
+    .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"));
+
+}
diff --git a/Source/CS2/Constants/StylePropertySymbolNames.h b/Source/CS2/Constants/StylePropertySymbolNames.h
new file mode 100644
index 00000000000..c60ceb3a023
--- /dev/null
+++ b/Source/CS2/Constants/StylePropertySymbolNames.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include <CS2/Panorama/StyleProperties.h>
+#include <Utils/TypedStaticStringPool.h>
+
+namespace cs2
+{
+    
+constexpr auto kStylePropertySymbolNames = TypedStaticStringPool{}
+    .add<CStylePropertyWidth>("width")
+    .add<CStylePropertyOpacity>("opacity")
+    .add<CStylePropertyZIndex>("z-index")
+    .add<CStylePropertyHeight>("height")
+    .add<CStylePropertyImageShadow>("img-shadow")
+    .add<CStylePropertyPosition>("position")
+    .add<CStylePropertyTransformOrigin>("transform-origin")
+    .add<CStylePropertyAlign>("align")
+    .add<CStylePropertyWashColor>("wash-color")
+    .add<CStylePropertyFlowChildren>("flow-children")
+    .add<CStylePropertyFont>("font")
+    .add<CStylePropertyTextShadow>("text-shadow")
+    .add<CStylePropertyMargin>("margin")
+    .add<CStylePropertyMixBlendMode>("-s2-mix-blend-mode")
+    .add<CStylePropertyTextAlign>("text-align");
+
+}
diff --git a/Source/CS2/Constants/StylePropertyTypeNames.h b/Source/CS2/Constants/StylePropertyTypeNames.h
new file mode 100644
index 00000000000..c9eabf5526c
--- /dev/null
+++ b/Source/CS2/Constants/StylePropertyTypeNames.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <CS2/Panorama/StyleProperties.h>
+#include <Platform/Macros/PlatformSpecific.h>
+#include <Utils/TypedStaticStringPool.h>
+
+namespace cs2
+{
+
+constexpr auto kStylePropertyTypeNames = TypedStaticStringPool{}
+    .add<CStylePropertyWidth>(WIN64_LINUX(".?AVCStylePropertyWidth@panorama@@", "N8panorama19CStylePropertyWidthE"))
+    .add<CStylePropertyOpacity>(WIN64_LINUX(".?AVCStylePropertyOpacity@panorama@@", "N8panorama21CStylePropertyOpacityE"))
+    .add<CStylePropertyZIndex>(WIN64_LINUX(".?AVCStylePropertyZIndex@panorama@@", "N8panorama20CStylePropertyZIndexE"))
+    .add<CStylePropertyHeight>(WIN64_LINUX(".?AVCStylePropertyHeight@panorama@@", "N8panorama20CStylePropertyHeightE"))
+    .add<CStylePropertyImageShadow>(WIN64_LINUX(".?AVCStylePropertyImageShadow@panorama@@", "N8panorama25CStylePropertyImageShadowE"))
+    .add<CStylePropertyPosition>(WIN64_LINUX(".?AVCStylePropertyPosition@panorama@@", "N8panorama22CStylePropertyPositionE"))
+    .add<CStylePropertyTransformOrigin>(WIN64_LINUX(".?AVCStylePropertyTransformOrigin@panorama@@", "N8panorama29CStylePropertyTransformOriginE"))
+    .add<CStylePropertyAlign>(WIN64_LINUX(".?AVCStylePropertyAlign@panorama@@", "N8panorama19CStylePropertyAlignE"))
+    .add<CStylePropertyWashColor>(WIN64_LINUX(".?AVCStylePropertyWashColor@panorama@@", "N8panorama23CStylePropertyWashColorE"))
+    .add<CStylePropertyFlowChildren>(WIN64_LINUX(".?AVCStylePropertyFlowChildren@panorama@@", "N8panorama26CStylePropertyFlowChildrenE"))
+    .add<CStylePropertyFont>(WIN64_LINUX(".?AVCStylePropertyFont@panorama@@", "N8panorama18CStylePropertyFontE"))
+    .add<CStylePropertyTextShadow>(WIN64_LINUX(".?AVCStylePropertyTextShadow@panorama@@", "N8panorama24CStylePropertyTextShadowE"))
+    .add<CStylePropertyMargin>(WIN64_LINUX(".?AVCStylePropertyMargin@panorama@@", "N8panorama20CStylePropertyMarginE"))
+    .add<CStylePropertyMixBlendMode>(WIN64_LINUX(".?AVCStylePropertyMixBlendMode@panorama@@", "N8panorama26CStylePropertyMixBlendModeE"))
+    .add<CStylePropertyTextAlign>(WIN64_LINUX(".?AVCStylePropertyTextAlign@panorama@@", "N8panorama23CStylePropertyTextAlignE"));
+
+}
diff --git a/Source/CS2/Panorama/StyleProperties.h b/Source/CS2/Panorama/StyleProperties.h
index 02f122a7409..7b3125d0591 100644
--- a/Source/CS2/Panorama/StyleProperties.h
+++ b/Source/CS2/Panorama/StyleProperties.h
@@ -15,37 +15,22 @@ struct LINUX_ONLY([[gnu::packed]]) CStyleProperty {
 };
 
 struct CStylePropertyWidth : CStyleProperty {
-    static constexpr auto kName{"width"};
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVCStylePropertyWidth@panorama@@", "N8panorama19CStylePropertyWidthE")};
-
     CUILength m_Length;
 };
 
 struct CStylePropertyOpacity : CStyleProperty {
-    static constexpr auto kName{"opacity"};
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVCStylePropertyOpacity@panorama@@", "N8panorama21CStylePropertyOpacityE")};
-
     float opacity;
 };
 
 struct CStylePropertyZIndex : CStyleProperty {
-    static constexpr auto kName{"z-index"};
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVCStylePropertyZIndex@panorama@@", "N8panorama20CStylePropertyZIndexE")};
-
     float zindex;
 };
 
 struct CStylePropertyHeight : CStyleProperty {
-    static constexpr auto kName{"height"};
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVCStylePropertyHeight@panorama@@", "N8panorama20CStylePropertyHeightE")};
-
     CUILength m_Height;
 };
 
 struct CStylePropertyImageShadow : CStyleProperty {
-    static constexpr auto kName{"img-shadow"};
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVCStylePropertyImageShadow@panorama@@", "N8panorama25CStylePropertyImageShadowE")};
-
     bool fullySet;
     CUILength horizontalOffset;
     CUILength verticalOffset;
@@ -55,50 +40,32 @@ struct CStylePropertyImageShadow : CStyleProperty {
 };
 
 struct CStylePropertyPosition : CStyleProperty {
-    static constexpr auto kName{"position"};
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVCStylePropertyPosition@panorama@@", "N8panorama22CStylePropertyPositionE")};
-
     CUILength x;
     CUILength y;
     CUILength z;
 };
 
 struct CStylePropertyTransformOrigin : CStyleProperty {
-    static constexpr auto kName{"transform-origin"};
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVCStylePropertyTransformOrigin@panorama@@", "N8panorama29CStylePropertyTransformOriginE")};
-
     CUILength x;
     CUILength y;
     bool m_bParentRelative;
 };
 
 struct CStylePropertyAlign : CStyleProperty {
-    static constexpr auto kName{"align"};
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVCStylePropertyAlign@panorama@@", "N8panorama19CStylePropertyAlignE")};
-
     EHorizontalAlignment m_eHorizontalAlignment;
     EVerticalAlignment m_eVerticalAlignment;
 };
 
 struct CStylePropertyWashColor : CStyleProperty {
-    static constexpr auto kName{"wash-color"};
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVCStylePropertyWashColor@panorama@@", "N8panorama23CStylePropertyWashColorE")};
-
     Color color;
     bool fullySet;
 };
 
 struct CStylePropertyFlowChildren : CStyleProperty {
-    static constexpr auto kName{"flow-children"};
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVCStylePropertyFlowChildren@panorama@@", "N8panorama26CStylePropertyFlowChildrenE")};
-
     EFlowDirection m_eFlowDirection;
 };
 
 struct CStylePropertyFont : CStyleProperty {
-    static constexpr auto kName{"font"};
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVCStylePropertyFont@panorama@@", "N8panorama18CStylePropertyFontE")};
-
     CUtlString m_strFontFamily;
     float m_flFontSize;
     EFontStyle m_eFontStyle;
@@ -107,9 +74,6 @@ struct CStylePropertyFont : CStyleProperty {
 };
 
 struct CStylePropertyTextShadow : CStyleProperty {
-    static constexpr auto kName{"text-shadow"};
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVCStylePropertyTextShadow@panorama@@", "N8panorama24CStylePropertyTextShadowE")};
-
     bool fullySet;
     CUILength horizontalOffset;
     CUILength verticalOffset;
@@ -119,17 +83,11 @@ struct CStylePropertyTextShadow : CStyleProperty {
 };
 
 struct CStylePropertyMixBlendMode : CStyleProperty {
-    static constexpr auto kName{"-s2-mix-blend-mode"};
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVCStylePropertyMixBlendMode@panorama@@", "N8panorama26CStylePropertyMixBlendModeE")};
-
     EMixBlendMode m_eMixBlendMode;
     bool m_bSet;
 };
 
 struct CStylePropertyTextAlign : CStyleProperty {
-    static constexpr auto kName{"text-align"};
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVCStylePropertyTextAlign@panorama@@", "N8panorama23CStylePropertyTextAlignE")};
-
     ETextAlign m_eAlign;
 };
 
@@ -141,8 +99,6 @@ struct CStylePropertyDimensionsBase : CStyleProperty {
 };
 
 struct CStylePropertyMargin : CStylePropertyDimensionsBase {
-    static constexpr auto kName{"margin"};
-    static constexpr auto kMangledTypeName{WIN64_LINUX(".?AVCStylePropertyMargin@panorama@@", "N8panorama20CStylePropertyMarginE")};
 };
 
 };
diff --git a/Source/FeatureHelpers/StylePropertiesSymbolsAndVMTs.h b/Source/FeatureHelpers/StylePropertiesSymbolsAndVMTs.h
index 150e815130e..c05dd3d28cc 100644
--- a/Source/FeatureHelpers/StylePropertiesSymbolsAndVMTs.h
+++ b/Source/FeatureHelpers/StylePropertiesSymbolsAndVMTs.h
@@ -2,53 +2,38 @@
 
 #include <array>
 
+#include <CS2/Constants/StylePropertySymbolNames.h>
+#include <CS2/Constants/StylePropertyTypeNames.h>
 #include <CS2/Panorama/StyleProperties.h>
 #include <Platform/VmtFinder.h>
 #include <Utils/TypeIndex.h>
 
 #include "StylePropertySymbolMap.h"
 
-template <typename... StyleProperties>
-struct StylePropertiesSymbolsAndVMTsBase {
-    StylePropertiesSymbolsAndVMTsBase() = default;
+struct StylePropertiesSymbolsAndVMTs {
+    StylePropertiesSymbolsAndVMTs() = default;
 
-    StylePropertiesSymbolsAndVMTsBase(StylePropertySymbolMap symbolMap, const VmtFinder& panoramaVmtFinder) noexcept
-        : symbols{symbolMap.findSymbol(StyleProperties::kName)...}
-        , vmts{panoramaVmtFinder.findVmt(StyleProperties::kMangledTypeName)...}
+    StylePropertiesSymbolsAndVMTs(StylePropertySymbolMap symbolMap, const VmtFinder& panoramaVmtFinder) noexcept
     {
+        cs2::kStylePropertySymbolNames.forEach([i = 0u, &symbolMap, this](const auto typeName) mutable { symbols[i++] = symbolMap.findSymbol(typeName); });
+        cs2::kStylePropertyTypeNames.forEach([i = 0u, &panoramaVmtFinder, this](const auto typeName) mutable { vmts[i++] = panoramaVmtFinder.findVmt(typeName); });
     }
 
     template <typename StyleProperty>
     [[nodiscard]] cs2::CStyleSymbol getSymbol() const noexcept
     {
-        return symbols[utils::typeIndex<StyleProperty, std::tuple<StyleProperties...>>()];
+        return symbols[utils::typeIndex<StyleProperty, StyleProperties>()];
     }
 
     template <typename StyleProperty>
     [[nodiscard]] const void* getVmt() const noexcept
     {
-        return vmts[utils::typeIndex<StyleProperty, std::tuple<StyleProperties...>>()];
+        return vmts[utils::typeIndex<StyleProperty, StyleProperties>()];
     }
 
 private:
-    std::array<cs2::CStyleSymbol, sizeof...(StyleProperties)> symbols;
-    std::array<const void*, sizeof...(StyleProperties)> vmts;
-};
+    using StyleProperties = decltype(cs2::kStylePropertySymbolNames)::TypeList;
 
-using StylePropertiesSymbolsAndVMTs =
-    StylePropertiesSymbolsAndVMTsBase<
-        cs2::CStylePropertyWidth,
-        cs2::CStylePropertyOpacity,
-        cs2::CStylePropertyZIndex,
-        cs2::CStylePropertyHeight,
-        cs2::CStylePropertyImageShadow,
-        cs2::CStylePropertyPosition,
-        cs2::CStylePropertyTransformOrigin,
-        cs2::CStylePropertyAlign,
-        cs2::CStylePropertyWashColor,
-        cs2::CStylePropertyFlowChildren,
-        cs2::CStylePropertyFont,
-        cs2::CStylePropertyTextShadow,
-        cs2::CStylePropertyMargin,
-        cs2::CStylePropertyMixBlendMode,
-        cs2::CStylePropertyTextAlign>;
+    std::array<cs2::CStyleSymbol, std::tuple_size_v<StyleProperties>> symbols;
+    std::array<const void*, std::tuple_size_v<StyleProperties>> vmts;
+};
diff --git a/Source/GameDependencies/EntitiesVMTs.h b/Source/GameDependencies/EntitiesVMTs.h
index 46049dd4689..f2f6c95b51f 100644
--- a/Source/GameDependencies/EntitiesVMTs.h
+++ b/Source/GameDependencies/EntitiesVMTs.h
@@ -9,90 +9,19 @@
 #include <CS2/Classes/Entities/CCSPlayerController.h>
 #include <CS2/Classes/Entities/GrenadeProjectiles.h>
 #include <CS2/Classes/Entities/WeaponEntities.h>
+#include <CS2/Constants/EntityTypeNames.h>
 #include <Platform/VmtFinder.h>
 #include <Utils/TypeIndex.h>
 
-using KnownEntityTypes = std::tuple<
-    cs2::C_CSPlayerPawn,
-    cs2::C_WeaponGlock,
-    cs2::C_WeaponHKP2000,
-    cs2::C_WeaponElite,
-    cs2::C_WeaponP250,
-    cs2::C_WeaponTec9,
-    cs2::C_WeaponFiveSeven,
-    cs2::C_DEagle,
-
-    cs2::C_WeaponMAC10,
-    cs2::C_WeaponMP7,
-    cs2::C_WeaponMP9,
-    cs2::C_WeaponBizon,
-    cs2::C_WeaponP90,
-    cs2::C_WeaponUMP45,
-
-    cs2::C_WeaponMag7,
-    cs2::C_WeaponSawedoff,
-    cs2::C_WeaponXM1014,
-    cs2::C_WeaponNOVA,
-    cs2::C_WeaponM249,
-    cs2::C_WeaponNegev,
-
-    cs2::C_WeaponGalilAR,
-    cs2::C_WeaponFamas,
-    cs2::C_AK47,
-    cs2::C_WeaponM4A1,
-    cs2::C_WeaponSG556,
-    cs2::C_WeaponAug,
-    cs2::C_WeaponSSG08,
-    cs2::C_WeaponAWP,
-    cs2::C_WeaponG3SG1,
-    cs2::C_WeaponSCAR20,
-
-    cs2::C_WeaponTaser,
-    cs2::C_Knife,
-
-    cs2::C_Flashbang,
-    cs2::C_HEGrenade,
-    cs2::C_SmokeGrenade,
-    cs2::C_MolotovGrenade,
-    cs2::C_IncendiaryGrenade,
-    cs2::C_DecoyGrenade,
-
-    cs2::CBaseAnimGraph,
-
-    cs2::C_HEGrenadeProjectile,
-    cs2::C_SmokeGrenadeProjectile,
-    cs2::C_MolotovProjectile,
-    cs2::C_FlashbangProjectile,
-
-    cs2::C_C4
->;
+using KnownEntityTypes = decltype(cs2::kEntityTypeNames)::TypeList;
 
 struct EntitiesVMTs {
     EntitiesVMTs() = default;
 
     explicit EntitiesVMTs(const VmtFinder& clientVmtFinder) noexcept
     {
-        initVmts(clientVmtFinder, std::type_identity<KnownEntityTypes>{});
+        cs2::kEntityTypeNames.forEach([i = 0u, &clientVmtFinder, this] (const auto typeName) mutable { vmts[i] = clientVmtFinder.findVmt(typeName); ++i; });
     }
 
-    std::array<const void*, std::tuple_size_v<KnownEntityTypes>> vmts{};
-
-private:
-    template <typename... EntityTypes>
-    void initVmts(const VmtFinder& clientVmtFinder, std::type_identity<std::tuple<EntityTypes...>>) noexcept
-    {
-        (initVmt<EntityTypes>(clientVmtFinder), ...);
-    }
-
-    template <typename EntityType>
-    void initVmt(const VmtFinder& clientVmtFinder) noexcept
-    {
-        vmts[utils::typeIndex<EntityType, KnownEntityTypes>()] = clientVmtFinder.findVmt(EntityType::kMangledTypeName);
-    }
-
-    template <typename EntityType>
-    [[nodiscard]] const void* getVmt() const noexcept
-    {
-        return vmts[utils::typeIndex<EntityType, KnownEntityTypes>()];
-    }
+    std::array<const void*, std::tuple_size_v<KnownEntityTypes>> vmts;
 };
diff --git a/Source/Osiris.vcxproj b/Source/Osiris.vcxproj
index f76c23f5416..aac919d90c5 100644
--- a/Source/Osiris.vcxproj
+++ b/Source/Osiris.vcxproj
@@ -62,10 +62,13 @@
     <ClInclude Include="CS2\Constants\ColorConstants.h" />
     <ClInclude Include="CS2\Constants\DllNames.h" />
     <ClInclude Include="CS2\Constants\EntityHandle.h" />
+    <ClInclude Include="CS2\Constants\EntityTypeNames.h" />
     <ClInclude Include="CS2\Constants\IconURLs.h" />
     <ClInclude Include="CS2\Constants\LifeStateConstants.h" />
     <ClInclude Include="CS2\Constants\PanelIDs.h" />
     <ClInclude Include="CS2\Constants\SoundNames.h" />
+    <ClInclude Include="CS2\Constants\StylePropertySymbolNames.h" />
+    <ClInclude Include="CS2\Constants\StylePropertyTypeNames.h" />
     <ClInclude Include="CS2\Constants\TeamNumberConstants.h" />
     <ClInclude Include="CS2\Panorama\CImagePanel.h" />
     <ClInclude Include="CS2\Panorama\CLabel.h" />
@@ -461,6 +464,7 @@
     <ClInclude Include="Utils\StringBuilder.h" />
     <ClInclude Include="Utils\StringParser.h" />
     <ClInclude Include="Utils\TypeBitFlags.h" />
+    <ClInclude Include="Utils\TypedStaticStringPool.h" />
     <ClInclude Include="Utils\TypeIndex.h" />
     <ClInclude Include="Verification\Verifier.h" />
     <ClInclude Include="Verification\VerifyMacros.h" />
diff --git a/Source/Osiris.vcxproj.filters b/Source/Osiris.vcxproj.filters
index 02076add1d5..a340690f4a4 100644
--- a/Source/Osiris.vcxproj.filters
+++ b/Source/Osiris.vcxproj.filters
@@ -1550,6 +1550,18 @@
     <ClInclude Include="Features\Visuals\OutlineGlow\DroppedBombOutlineGlow\DroppedBombOutlineGlowToggle.h">
       <Filter>Features\Visuals\OutlineGlow\DroppedBombOutlineGlow</Filter>
     </ClInclude>
+    <ClInclude Include="Utils\TypedStaticStringPool.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="CS2\Constants\EntityTypeNames.h">
+      <Filter>CS2\Constants</Filter>
+    </ClInclude>
+    <ClInclude Include="CS2\Constants\StylePropertySymbolNames.h">
+      <Filter>CS2\Constants</Filter>
+    </ClInclude>
+    <ClInclude Include="CS2\Constants\StylePropertyTypeNames.h">
+      <Filter>CS2\Constants</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="UI\Panorama\CreateGUI.js">
diff --git a/Source/Utils/TypedStaticStringPool.h b/Source/Utils/TypedStaticStringPool.h
new file mode 100644
index 00000000000..8c74d5c1ac9
--- /dev/null
+++ b/Source/Utils/TypedStaticStringPool.h
@@ -0,0 +1,47 @@
+#pragma once
+
+#include <algorithm>
+#include <array>
+#include <cstddef>
+#include <cstdint>
+#include <tuple>
+
+template <std::size_t BufferSize = 0, std::size_t NumberOfStrings = 0, typename... Types>
+class TypedStaticStringPool {
+public:
+    using TypeList = std::tuple<Types...>;
+
+    template <typename T, std::uint8_t N>
+    [[nodiscard]] consteval auto add(const char(&str)[N]) const noexcept
+    {
+        if (str[N - 1] != '\0')
+            error("string must be null-terminated");
+
+        TypedStaticStringPool<BufferSize + N, NumberOfStrings + 1, Types..., T> newPool;
+        std::ranges::copy(buffer, newPool.buffer.begin());
+        std::ranges::copy(str, newPool.buffer.begin() + buffer.size());
+        std::ranges::copy(stringLengths, newPool.stringLengths.begin());
+        newPool.stringLengths.back() = N;
+        return newPool;
+    }
+
+    template <typename F>
+    void forEach(F f) const noexcept
+    {
+        std::size_t index = 0;
+        for (const auto stringLength : stringLengths) {
+            const auto str = buffer.data() + index;
+            f(str);
+            index += stringLength;
+        }
+    }
+
+private:
+    static void error(const char*);
+
+    template <std::size_t, std::size_t, typename...>
+    friend class TypedStaticStringPool;
+
+    std::array<char, BufferSize> buffer{};
+    std::array<std::uint8_t, NumberOfStrings> stringLengths{};
+};