diff --git a/generator/schema_generator/sdk.json b/generator/schema_generator/sdk.json index 5bacb6301..ca1b69def 100644 --- a/generator/schema_generator/sdk.json +++ b/generator/schema_generator/sdk.json @@ -7561,7 +7561,7 @@ "name": "CNmAdditiveBlendTask", "name_hash": 464382483, "project": "animlib", - "size": 216 + "size": 224 }, { "alignment": 8, @@ -10532,7 +10532,7 @@ "name": "CNmModelSpaceBlendTask", "name_hash": 2929360260, "project": "animlib", - "size": 216 + "size": 224 }, { "alignment": 8, @@ -12027,7 +12027,7 @@ "name": "CNmCachedPoseWriteTask", "name_hash": 3081357062, "project": "animlib", - "size": 88 + "size": 96 }, { "alignment": 255, @@ -14486,7 +14486,7 @@ "name": "CNmAimCSTask", "name_hash": 3259071915, "project": "server", - "size": 304 + "size": 240 }, { "alignment": 8, @@ -16592,7 +16592,7 @@ "name": "m_nEffectorBoneIdx", "name_hash": 6730447204332483518, "networked": false, - "offset": 80, + "offset": 88, "size": 4, "type": "int32" }, @@ -16602,7 +16602,7 @@ "name": "m_nEffectorTargetBoneIdx", "name_hash": 6730447202459181273, "networked": false, - "offset": 84, + "offset": 92, "size": 4, "type": "int32" }, @@ -17576,7 +17576,7 @@ "name": "CNmFollowBoneTask", "name_hash": 3848924445, "project": "animlib", - "size": 112 + "size": 120 }, { "alignment": 8, @@ -21429,13 +21429,23 @@ "size": 2, "type": "int16" }, + { + "alignment": 2, + "kind": "ref", + "name": "m_nWeaponCategoryNodeIdx", + "name_hash": 16270683852598515940, + "networked": false, + "offset": 28, + "size": 2, + "type": "int16" + }, { "alignment": 2, "kind": "ref", "name": "m_nEnabledNodeIdx", "name_hash": 16270683856373151209, "networked": false, - "offset": 28, + "offset": 30, "size": 2, "type": "int16" }, @@ -21450,7 +21460,7 @@ "type": "float32" } ], - "fields_count": 4, + "fields_count": 5, "has_chainer": false, "is_struct": false, "name": "CNmAimCSNode::CDefinition", @@ -24794,7 +24804,7 @@ "name_hash": 9980084397714929188, "networked": false, "offset": 304, - "size": 32, + "size": 40, "type": "CTakeDamageResult" }, { @@ -24803,7 +24813,7 @@ "name": "hTarget", "name_hash": 9980084400054047546, "networked": false, - "offset": 336, + "offset": 344, "size": 4, "template": [ "CBaseEntity" @@ -24818,7 +24828,7 @@ "name": "SummaryTakeDamageInfo_t", "name_hash": 2323669474, "project": "server", - "size": 344 + "size": 352 }, { "alignment": 4, @@ -28186,7 +28196,7 @@ "name": "CNmOverlayBlendTask", "name_hash": 2093687489, "project": "animlib", - "size": 216 + "size": 224 }, { "alignment": 8, @@ -30230,15 +30240,26 @@ ], "templated": "CUtlVector< CPlayerSlot >", "type": "CUtlVector" + }, + { + "alignment": 4, + "kind": "atomic", + "name": "m_slotPlayerExcludedDueToPrediction", + "name_hash": 12862091886393996956, + "networked": false, + "offset": 48, + "size": 4, + "templated": "CPlayerSlot", + "type": "CPlayerSlot" } ], - "fields_count": 2, + "fields_count": 3, "has_chainer": false, "is_struct": true, "name": "CCopyRecipientFilter", "name_hash": 2994689132, "project": "server", - "size": 48 + "size": 56 }, { "alignment": 8, @@ -34018,7 +34039,7 @@ "name_hash": 13719914161994080503, "networked": false, "offset": 104, - "size": 48, + "size": 56, "type": "CCopyRecipientFilter" }, { @@ -34027,7 +34048,7 @@ "name": "m_flCloseCaptionDuration", "name_hash": 13719914162987421821, "networked": false, - "offset": 152, + "offset": 160, "size": 4, "type": "float32" }, @@ -34037,7 +34058,7 @@ "name": "m_bUpdatedSoundOrigin", "name_hash": 13719914163978838769, "networked": false, - "offset": 156, + "offset": 164, "size": 1, "type": "bool" }, @@ -34047,7 +34068,7 @@ "name": "m_iszClassName", "name_hash": 13719914162987672340, "networked": false, - "offset": 160, + "offset": 168, "size": 8, "templated": "CUtlSymbolLarge", "type": "CUtlSymbolLarge" @@ -34059,7 +34080,7 @@ "name": "CSoundPatch", "name_hash": 3194416445, "project": "server", - "size": 168 + "size": 176 }, { "alignment": 8, @@ -47992,7 +48013,7 @@ "name": "CNmSampleTask", "name_hash": 3886769856, "project": "animlib", - "size": 96 + "size": 104 }, { "alignment": 255, @@ -49519,75 +49540,6 @@ "project": "particleslib", "size": 80 }, - { - "alignment": 255, - "base_classes": [ - "CBaseAnimGraphAnimGraphController" - ], - "base_classes_count": 1, - "fields": [ - { - "alignment": 8, - "kind": "atomic", - "name": "m_paramActivity", - "name_hash": 12866280003586565167, - "networked": false, - "offset": 616, - "size": 40, - "template": [ - "char" - ], - "templated": "CAnimGraphParamRef< char* >", - "type": "CAnimGraphParamRef" - }, - { - "alignment": 8, - "kind": "atomic", - "name": "m_paramEndActivityImmediately", - "name_hash": 12866280001806042744, - "networked": false, - "offset": 656, - "size": 32, - "template": [ - "bool" - ], - "templated": "CAnimGraphParamRef< bool >", - "type": "CAnimGraphParamRef" - }, - { - "alignment": 8, - "kind": "atomic", - "name": "m_sActivityFinished", - "name_hash": 12866280001118990553, - "networked": false, - "offset": 688, - "size": 24, - "templated": "CAnimGraphTagRef", - "type": "CAnimGraphTagRef" - }, - { - "alignment": 8, - "kind": "atomic", - "name": "m_paramTurnAngle", - "name_hash": 12866280002691007116, - "networked": false, - "offset": 712, - "size": 32, - "template": [ - "float32" - ], - "templated": "CAnimGraphParamRef< float32 >", - "type": "CAnimGraphParamRef" - } - ], - "fields_count": 4, - "has_chainer": false, - "is_struct": false, - "name": "CChicken_GraphController", - "name_hash": 2995664254, - "project": "server", - "size": 744 - }, { "alignment": 8, "fields": [ @@ -53474,7 +53426,7 @@ "name": "m_nChainEndBoneIdx", "name_hash": 4621256080747648952, "networked": false, - "offset": 80, + "offset": 88, "size": 4, "type": "int32" }, @@ -53484,7 +53436,7 @@ "name": "m_nNumBonesInChain", "name_hash": 4621256080844057406, "networked": false, - "offset": 84, + "offset": 92, "size": 4, "type": "int32" }, @@ -53494,7 +53446,7 @@ "name": "m_chainForwardDir", "name_hash": 4621256080002200922, "networked": false, - "offset": 88, + "offset": 96, "size": 12, "templated": "Vector", "type": "Vector" @@ -53505,7 +53457,7 @@ "name": "m_flBlendWeight", "name_hash": 4621256081297291726, "networked": false, - "offset": 100, + "offset": 108, "size": 4, "type": "float32" }, @@ -53515,7 +53467,7 @@ "name": "m_flHorizontalAngleLimitDegrees", "name_hash": 4621256077659508510, "networked": false, - "offset": 104, + "offset": 112, "size": 4, "type": "float32" }, @@ -53525,7 +53477,7 @@ "name": "m_flVerticalAngleLimitDegrees", "name_hash": 4621256080714973776, "networked": false, - "offset": 108, + "offset": 116, "size": 4, "type": "float32" }, @@ -53535,7 +53487,7 @@ "name": "m_lookatTarget", "name_hash": 4621256080618018006, "networked": false, - "offset": 112, + "offset": 120, "size": 12, "templated": "Vector", "type": "Vector" @@ -53546,7 +53498,7 @@ "name": "m_bIsTargetInWorldSpace", "name_hash": 4621256079040766149, "networked": false, - "offset": 124, + "offset": 132, "size": 1, "type": "bool" }, @@ -53556,7 +53508,7 @@ "name": "m_bIsRunningFromDeserializedData", "name_hash": 4621256078641926429, "networked": false, - "offset": 125, + "offset": 133, "size": 1, "type": "bool" }, @@ -53566,7 +53518,7 @@ "name": "m_flHorizontalAngleDegrees", "name_hash": 4621256078074807935, "networked": false, - "offset": 128, + "offset": 136, "size": 4, "type": "float32" }, @@ -53576,7 +53528,7 @@ "name": "m_flVerticalAngleDegrees", "name_hash": 4621256081498993157, "networked": false, - "offset": 132, + "offset": 140, "size": 4, "type": "float32" } @@ -53587,7 +53539,7 @@ "name": "CNmChainLookatTask", "name_hash": 1075970027, "project": "animlib", - "size": 136 + "size": 144 }, { "alignment": 8, @@ -55310,13 +55262,23 @@ "size": 4, "type": "int32" }, + { + "alignment": 4, + "kind": "ref", + "name": "m_nHealthBefore", + "name_hash": 15323311149770248668, + "networked": false, + "offset": 12, + "size": 4, + "type": "int32" + }, { "alignment": 4, "kind": "ref", "name": "m_nDamageDealt", "name_hash": 15323311148405813562, "networked": false, - "offset": 12, + "offset": 16, "size": 4, "type": "int32" }, @@ -55326,7 +55288,7 @@ "name": "m_flPreModifiedDamage", "name_hash": 15323311146682891862, "networked": false, - "offset": 16, + "offset": 20, "size": 4, "type": "float32" }, @@ -55336,7 +55298,7 @@ "name": "m_nTotalledHealthLost", "name_hash": 15323311149985425778, "networked": false, - "offset": 20, + "offset": 24, "size": 4, "type": "int32" }, @@ -55346,7 +55308,7 @@ "name": "m_nTotalledDamageDealt", "name_hash": 15323311145925468459, "networked": false, - "offset": 24, + "offset": 28, "size": 4, "type": "int32" }, @@ -55356,18 +55318,18 @@ "name": "m_bWasDamageSuppressed", "name_hash": 15323311146429776569, "networked": false, - "offset": 28, + "offset": 32, "size": 1, "type": "bool" } ], - "fields_count": 7, + "fields_count": 8, "has_chainer": false, "is_struct": true, "name": "CTakeDamageResult", "name_hash": 3567736397, "project": "server", - "size": 32 + "size": 40 }, { "alignment": 8, @@ -66024,7 +65986,7 @@ "name": "CNmReferencePoseTask", "name_hash": 2542910052, "project": "animlib", - "size": 80 + "size": 88 }, { "alignment": 8, @@ -69990,7 +69952,7 @@ "name": "CNmBlendTaskBase", "name_hash": 1083481978, "project": "animlib", - "size": 216 + "size": 224 }, { "alignment": 4, @@ -72670,7 +72632,7 @@ "name": "CNmZeroPoseTask", "name_hash": 1442873929, "project": "animlib", - "size": 80 + "size": 88 }, { "alignment": 8, @@ -85991,7 +85953,7 @@ "name": "CNmCachedPoseReadTask", "name_hash": 240255089, "project": "animlib", - "size": 88 + "size": 96 }, { "alignment": 8, @@ -86898,7 +86860,7 @@ "name": "CNmPoseTask", "name_hash": 3844309959, "project": "animlib", - "size": 80 + "size": 88 }, { "alignment": 4, @@ -87006,7 +86968,7 @@ "name": "CNmBlendTask", "name_hash": 612300983, "project": "animlib", - "size": 216 + "size": 224 }, { "alignment": 255, @@ -90517,7 +90479,7 @@ "name": "CNmSnapWeaponTask", "name_hash": 1603844202, "project": "server", - "size": 88 + "size": 96 }, { "alignment": 8, @@ -94252,7 +94214,7 @@ "name": "CNmScaleTask", "name_hash": 2185078706, "project": "animlib", - "size": 168 + "size": 176 }, { "alignment": 8, @@ -102543,7 +102505,7 @@ ], "base_classes_count": 1, "fields_count": 0, - "has_chainer": false, + "has_chainer": true, "is_struct": false, "name": "CCSGameModeRules_Noop", "name_hash": 441839825, @@ -104925,13 +104887,23 @@ "size": 1, "type": "bool" }, + { + "alignment": 4, + "kind": "ref", + "name": "m_iFreezeTime", + "name_hash": 7103812020580241710, + "networked": true, + "offset": 236, + "size": 4, + "type": "int32" + }, { "alignment": 4, "kind": "ref", "name": "m_iRoundTime", "name_hash": 7103812022535082325, "networked": true, - "offset": 236, + "offset": 240, "size": 4, "type": "int32" }, @@ -104941,7 +104913,7 @@ "name": "m_fMatchStartTime", "name_hash": 7103812020892077211, "networked": true, - "offset": 240, + "offset": 244, "size": 4, "type": "float32" }, @@ -104951,7 +104923,7 @@ "name": "m_fRoundStartTime", "name_hash": 7103812023206735420, "networked": true, - "offset": 244, + "offset": 248, "size": 4, "type": "GameTime_t" }, @@ -104961,7 +104933,7 @@ "name": "m_flRestartRoundTime", "name_hash": 7103812024119668855, "networked": true, - "offset": 248, + "offset": 252, "size": 4, "type": "GameTime_t" }, @@ -104971,7 +104943,7 @@ "name": "m_bGameRestart", "name_hash": 7103812020797690958, "networked": true, - "offset": 252, + "offset": 256, "size": 1, "type": "bool" }, @@ -104981,7 +104953,7 @@ "name": "m_flGameStartTime", "name_hash": 7103812020027278446, "networked": true, - "offset": 256, + "offset": 260, "size": 4, "type": "float32" }, @@ -104991,7 +104963,7 @@ "name": "m_timeUntilNextPhaseStarts", "name_hash": 7103812022999179485, "networked": true, - "offset": 260, + "offset": 264, "size": 4, "type": "float32" }, @@ -105001,7 +104973,7 @@ "name": "m_gamePhase", "name_hash": 7103812023414566626, "networked": true, - "offset": 264, + "offset": 268, "size": 4, "type": "int32" }, @@ -105011,7 +104983,7 @@ "name": "m_totalRoundsPlayed", "name_hash": 7103812021394809091, "networked": true, - "offset": 268, + "offset": 272, "size": 4, "type": "int32" }, @@ -105021,7 +104993,7 @@ "name": "m_nRoundsPlayedThisPhase", "name_hash": 7103812022974622026, "networked": true, - "offset": 272, + "offset": 276, "size": 4, "type": "int32" }, @@ -105031,7 +105003,7 @@ "name": "m_nOvertimePlaying", "name_hash": 7103812020630092868, "networked": true, - "offset": 276, + "offset": 280, "size": 4, "type": "int32" }, @@ -105041,7 +105013,7 @@ "name": "m_iHostagesRemaining", "name_hash": 7103812020996227566, "networked": true, - "offset": 280, + "offset": 284, "size": 4, "type": "int32" }, @@ -105051,7 +105023,7 @@ "name": "m_bAnyHostageReached", "name_hash": 7103812020668749916, "networked": true, - "offset": 284, + "offset": 288, "size": 1, "type": "bool" }, @@ -105061,7 +105033,7 @@ "name": "m_bMapHasBombTarget", "name_hash": 7103812021238476802, "networked": true, - "offset": 285, + "offset": 289, "size": 1, "type": "bool" }, @@ -105071,7 +105043,7 @@ "name": "m_bMapHasRescueZone", "name_hash": 7103812022385755924, "networked": true, - "offset": 286, + "offset": 290, "size": 1, "type": "bool" }, @@ -105081,7 +105053,7 @@ "name": "m_bMapHasBuyZone", "name_hash": 7103812021256834055, "networked": true, - "offset": 287, + "offset": 291, "size": 1, "type": "bool" }, @@ -105091,7 +105063,7 @@ "name": "m_bIsQueuedMatchmaking", "name_hash": 7103812022412946544, "networked": true, - "offset": 288, + "offset": 292, "size": 1, "type": "bool" }, @@ -105101,7 +105073,7 @@ "name": "m_nQueuedMatchmakingMode", "name_hash": 7103812023039085815, "networked": true, - "offset": 292, + "offset": 296, "size": 4, "type": "int32" }, @@ -105111,7 +105083,7 @@ "name": "m_bIsValveDS", "name_hash": 7103812022920017460, "networked": true, - "offset": 296, + "offset": 300, "size": 1, "type": "bool" }, @@ -105121,7 +105093,7 @@ "name": "m_bLogoMap", "name_hash": 7103812023032272260, "networked": true, - "offset": 297, + "offset": 301, "size": 1, "type": "bool" }, @@ -105131,7 +105103,7 @@ "name": "m_bPlayAllStepSoundsOnServer", "name_hash": 7103812020660194662, "networked": true, - "offset": 298, + "offset": 302, "size": 1, "type": "bool" }, @@ -105141,7 +105113,7 @@ "name": "m_iSpectatorSlotCount", "name_hash": 7103812023883301196, "networked": true, - "offset": 300, + "offset": 304, "size": 4, "type": "int32" }, @@ -105151,7 +105123,7 @@ "name": "m_MatchDevice", "name_hash": 7103812022739290056, "networked": true, - "offset": 304, + "offset": 308, "size": 4, "type": "int32" }, @@ -105161,7 +105133,7 @@ "name": "m_bHasMatchStarted", "name_hash": 7103812020858696217, "networked": true, - "offset": 308, + "offset": 312, "size": 1, "type": "bool" }, @@ -105171,7 +105143,7 @@ "name": "m_nNextMapInMapgroup", "name_hash": 7103812023273733968, "networked": true, - "offset": 312, + "offset": 316, "size": 4, "type": "int32" }, @@ -105184,7 +105156,7 @@ "name": "m_szTournamentEventName", "name_hash": 7103812023485266114, "networked": true, - "offset": 316, + "offset": 320, "size": 512, "type": "char" }, @@ -105197,7 +105169,7 @@ "name": "m_szTournamentEventStage", "name_hash": 7103812022117592945, "networked": true, - "offset": 828, + "offset": 832, "size": 512, "type": "char" }, @@ -105210,7 +105182,7 @@ "name": "m_szMatchStatTxt", "name_hash": 7103812023540459793, "networked": true, - "offset": 1340, + "offset": 1344, "size": 512, "type": "char" }, @@ -105223,7 +105195,7 @@ "name": "m_szTournamentPredictionsTxt", "name_hash": 7103812022788465337, "networked": true, - "offset": 1852, + "offset": 1856, "size": 512, "type": "char" }, @@ -105233,7 +105205,7 @@ "name": "m_nTournamentPredictionsPct", "name_hash": 7103812022330145687, "networked": true, - "offset": 2364, + "offset": 2368, "size": 4, "type": "int32" }, @@ -105243,7 +105215,7 @@ "name": "m_flCMMItemDropRevealStartTime", "name_hash": 7103812022468994238, "networked": true, - "offset": 2368, + "offset": 2372, "size": 4, "type": "GameTime_t" }, @@ -105253,7 +105225,7 @@ "name": "m_flCMMItemDropRevealEndTime", "name_hash": 7103812023666983003, "networked": true, - "offset": 2372, + "offset": 2376, "size": 4, "type": "GameTime_t" }, @@ -105263,7 +105235,7 @@ "name": "m_bIsDroppingItems", "name_hash": 7103812022695590152, "networked": true, - "offset": 2376, + "offset": 2380, "size": 1, "type": "bool" }, @@ -105273,7 +105245,7 @@ "name": "m_bIsQuestEligible", "name_hash": 7103812022114223032, "networked": true, - "offset": 2377, + "offset": 2381, "size": 1, "type": "bool" }, @@ -105283,7 +105255,7 @@ "name": "m_bIsHltvActive", "name_hash": 7103812022081293733, "networked": true, - "offset": 2378, + "offset": 2382, "size": 1, "type": "bool" }, @@ -105296,7 +105268,7 @@ "name": "m_arrProhibitedItemIndices", "name_hash": 7103812023165177894, "networked": true, - "offset": 2380, + "offset": 2384, "size": 200, "type": "uint16" }, @@ -105309,7 +105281,7 @@ "name": "m_arrTournamentActiveCasterAccounts", "name_hash": 7103812020570952449, "networked": true, - "offset": 2580, + "offset": 2584, "size": 16, "type": "uint32" }, @@ -105319,7 +105291,7 @@ "name": "m_numBestOfMaps", "name_hash": 7103812022121329367, "networked": true, - "offset": 2596, + "offset": 2600, "size": 4, "type": "int32" }, @@ -105329,7 +105301,7 @@ "name": "m_nHalloweenMaskListSeed", "name_hash": 7103812023933460961, "networked": true, - "offset": 2600, + "offset": 2604, "size": 4, "type": "int32" }, @@ -105339,7 +105311,7 @@ "name": "m_bBombDropped", "name_hash": 7103812023545279129, "networked": true, - "offset": 2604, + "offset": 2608, "size": 1, "type": "bool" }, @@ -105349,7 +105321,7 @@ "name": "m_bBombPlanted", "name_hash": 7103812020952151391, "networked": true, - "offset": 2605, + "offset": 2609, "size": 1, "type": "bool" }, @@ -105359,7 +105331,7 @@ "name": "m_iRoundWinStatus", "name_hash": 7103812020899806212, "networked": true, - "offset": 2608, + "offset": 2612, "size": 4, "type": "int32" }, @@ -105369,7 +105341,7 @@ "name": "m_eRoundWinReason", "name_hash": 7103812022220680146, "networked": true, - "offset": 2612, + "offset": 2616, "size": 4, "type": "int32" }, @@ -105379,7 +105351,7 @@ "name": "m_bTCantBuy", "name_hash": 7103812023804847343, "networked": true, - "offset": 2616, + "offset": 2620, "size": 1, "type": "bool" }, @@ -105389,7 +105361,7 @@ "name": "m_bCTCantBuy", "name_hash": 7103812021457061012, "networked": true, - "offset": 2617, + "offset": 2621, "size": 1, "type": "bool" }, @@ -105402,7 +105374,7 @@ "name": "m_iMatchStats_RoundResults", "name_hash": 7103812020683038863, "networked": true, - "offset": 2620, + "offset": 2624, "size": 120, "type": "int32" }, @@ -105415,7 +105387,7 @@ "name": "m_iMatchStats_PlayersAlive_CT", "name_hash": 7103812020117868444, "networked": true, - "offset": 2740, + "offset": 2744, "size": 120, "type": "int32" }, @@ -105428,7 +105400,7 @@ "name": "m_iMatchStats_PlayersAlive_T", "name_hash": 7103812023652091733, "networked": true, - "offset": 2860, + "offset": 2864, "size": 120, "type": "int32" }, @@ -105441,7 +105413,7 @@ "name": "m_TeamRespawnWaveTimes", "name_hash": 7103812022652514481, "networked": true, - "offset": 2980, + "offset": 2984, "size": 128, "type": "float32" }, @@ -105454,7 +105426,7 @@ "name": "m_flNextRespawnWave", "name_hash": 7103812024014976559, "networked": true, - "offset": 3108, + "offset": 3112, "size": 128, "type": "GameTime_t" }, @@ -105464,7 +105436,7 @@ "name": "m_vMinimapMins", "name_hash": 7103812022255299749, "networked": true, - "offset": 3236, + "offset": 3240, "size": 12, "templated": "Vector", "type": "Vector" @@ -105475,7 +105447,7 @@ "name": "m_vMinimapMaxs", "name_hash": 7103812024017644639, "networked": true, - "offset": 3248, + "offset": 3252, "size": 12, "templated": "Vector", "type": "Vector" @@ -105489,7 +105461,7 @@ "name": "m_MinimapVerticalSectionHeights", "name_hash": 7103812020879602415, "networked": true, - "offset": 3260, + "offset": 3264, "size": 32, "type": "float32" }, @@ -105639,23 +105611,13 @@ "size": 1, "type": "bool" }, - { - "alignment": 4, - "kind": "ref", - "name": "m_iFreezeTime", - "name_hash": 7103812020580241710, - "networked": false, - "offset": 3452, - "size": 4, - "type": "int32" - }, { "alignment": 4, "kind": "ref", "name": "m_iNumTerrorist", "name_hash": 7103812023796829082, "networked": false, - "offset": 3456, + "offset": 3452, "size": 4, "type": "int32" }, @@ -105665,7 +105627,7 @@ "name": "m_iNumCT", "name_hash": 7103812022468918515, "networked": false, - "offset": 3460, + "offset": 3456, "size": 4, "type": "int32" }, @@ -105675,7 +105637,7 @@ "name": "m_iNumSpawnableTerrorist", "name_hash": 7103812023900977547, "networked": false, - "offset": 3464, + "offset": 3460, "size": 4, "type": "int32" }, @@ -105685,7 +105647,7 @@ "name": "m_iNumSpawnableCT", "name_hash": 7103812022637310840, "networked": false, - "offset": 3468, + "offset": 3464, "size": 4, "type": "int32" }, @@ -106516,7 +106478,7 @@ "name_hash": 7103812023626835338, "networked": true, "offset": 4400, - "size": 400, + "size": 496, "type": "CRetakeGameRules" }, { @@ -106528,7 +106490,7 @@ "name": "m_arrTeamUniqueKillWeaponsMatch", "name_hash": 7103812023892790136, "networked": false, - "offset": 4800, + "offset": 4896, "size": 96, "type": "CUtlVector< int32 >" }, @@ -106541,7 +106503,7 @@ "name": "m_bTeamLastKillUsedUniqueWeaponMatch", "name_hash": 7103812023111414251, "networked": false, - "offset": 4896, + "offset": 4992, "size": 4, "type": "bool" }, @@ -106551,7 +106513,7 @@ "name": "m_nMatchEndCount", "name_hash": 7103812024186998062, "networked": true, - "offset": 4936, + "offset": 5032, "size": 1, "type": "uint8" }, @@ -106561,7 +106523,7 @@ "name": "m_nTTeamIntroVariant", "name_hash": 7103812020620998681, "networked": true, - "offset": 4940, + "offset": 5036, "size": 4, "type": "int32" }, @@ -106571,7 +106533,7 @@ "name": "m_nCTTeamIntroVariant", "name_hash": 7103812022712206012, "networked": true, - "offset": 4944, + "offset": 5040, "size": 4, "type": "int32" }, @@ -106581,7 +106543,7 @@ "name": "m_bTeamIntroPeriod", "name_hash": 7103812021304222071, "networked": true, - "offset": 4948, + "offset": 5044, "size": 1, "type": "bool" }, @@ -106591,7 +106553,7 @@ "name": "m_fTeamIntroPeriodEnd", "name_hash": 7103812023868698232, "networked": false, - "offset": 4952, + "offset": 5048, "size": 4, "type": "GameTime_t" }, @@ -106601,7 +106563,7 @@ "name": "m_bPlayedTeamIntroVO", "name_hash": 7103812020493832428, "networked": false, - "offset": 4956, + "offset": 5052, "size": 1, "type": "bool" }, @@ -106611,7 +106573,7 @@ "name": "m_iRoundEndWinnerTeam", "name_hash": 7103812021397163275, "networked": true, - "offset": 4960, + "offset": 5056, "size": 4, "type": "int32" }, @@ -106621,7 +106583,7 @@ "name": "m_eRoundEndReason", "name_hash": 7103812020069673745, "networked": true, - "offset": 4964, + "offset": 5060, "size": 4, "type": "int32" }, @@ -106631,7 +106593,7 @@ "name": "m_bRoundEndShowTimerDefend", "name_hash": 7103812022441296602, "networked": true, - "offset": 4968, + "offset": 5064, "size": 1, "type": "bool" }, @@ -106641,7 +106603,7 @@ "name": "m_iRoundEndTimerTime", "name_hash": 7103812023923701199, "networked": true, - "offset": 4972, + "offset": 5068, "size": 4, "type": "int32" }, @@ -106651,7 +106613,7 @@ "name": "m_sRoundEndFunFactToken", "name_hash": 7103812020960905631, "networked": true, - "offset": 4976, + "offset": 5072, "size": 8, "templated": "CUtlString", "type": "CUtlString" @@ -106662,7 +106624,7 @@ "name": "m_iRoundEndFunFactPlayerSlot", "name_hash": 7103812024141962361, "networked": true, - "offset": 4984, + "offset": 5080, "size": 4, "templated": "CPlayerSlot", "type": "CPlayerSlot" @@ -106673,7 +106635,7 @@ "name": "m_iRoundEndFunFactData1", "name_hash": 7103812022081754563, "networked": true, - "offset": 4988, + "offset": 5084, "size": 4, "type": "int32" }, @@ -106683,7 +106645,7 @@ "name": "m_iRoundEndFunFactData2", "name_hash": 7103812022098532182, "networked": true, - "offset": 4992, + "offset": 5088, "size": 4, "type": "int32" }, @@ -106693,7 +106655,7 @@ "name": "m_iRoundEndFunFactData3", "name_hash": 7103812022115309801, "networked": true, - "offset": 4996, + "offset": 5092, "size": 4, "type": "int32" }, @@ -106703,7 +106665,7 @@ "name": "m_sRoundEndMessage", "name_hash": 7103812023408166158, "networked": true, - "offset": 5000, + "offset": 5096, "size": 8, "templated": "CUtlString", "type": "CUtlString" @@ -106714,7 +106676,7 @@ "name": "m_iRoundEndPlayerCount", "name_hash": 7103812023308477739, "networked": true, - "offset": 5008, + "offset": 5104, "size": 4, "type": "int32" }, @@ -106724,7 +106686,7 @@ "name": "m_bRoundEndNoMusic", "name_hash": 7103812023828143066, "networked": true, - "offset": 5012, + "offset": 5108, "size": 1, "type": "bool" }, @@ -106734,7 +106696,7 @@ "name": "m_iRoundEndLegacy", "name_hash": 7103812022321749018, "networked": true, - "offset": 5016, + "offset": 5112, "size": 4, "type": "int32" }, @@ -106744,7 +106706,7 @@ "name": "m_nRoundEndCount", "name_hash": 7103812020209516627, "networked": true, - "offset": 5020, + "offset": 5116, "size": 1, "type": "uint8" }, @@ -106754,7 +106716,7 @@ "name": "m_iRoundStartRoundNumber", "name_hash": 7103812024042521361, "networked": true, - "offset": 5024, + "offset": 5120, "size": 4, "type": "int32" }, @@ -106764,7 +106726,7 @@ "name": "m_nRoundStartCount", "name_hash": 7103812022899877764, "networked": true, - "offset": 5028, + "offset": 5124, "size": 1, "type": "uint8" }, @@ -106774,7 +106736,7 @@ "name": "m_flLastPerfSampleTime", "name_hash": 7103812020124985259, "networked": false, - "offset": 21424, + "offset": 21520, "size": 8, "type": "float64" } @@ -106785,7 +106747,7 @@ "name": "CCSGameRules", "name_hash": 1653985125, "project": "server", - "size": 70608 + "size": 70704 }, { "alignment": 8, @@ -106972,13 +106934,23 @@ "size": 4, "type": "PropDoorRotatingOpenDirection_e" }, + { + "alignment": 4, + "kind": "ref", + "name": "m_eDefaultCheckDirection", + "name_hash": 2926977001658115944, + "networked": false, + "offset": 4108, + "size": 4, + "type": "doorCheck_e" + }, { "alignment": 4, "kind": "ref", "name": "m_flAjarAngle", "name_hash": 2926977004001912338, "networked": false, - "offset": 4108, + "offset": 4112, "size": 4, "type": "float32" }, @@ -106988,7 +106960,7 @@ "name": "m_angRotationAjarDeprecated", "name_hash": 2926977002350438248, "networked": false, - "offset": 4112, + "offset": 4116, "size": 12, "templated": "QAngle", "type": "QAngle" @@ -106999,7 +106971,7 @@ "name": "m_angRotationClosed", "name_hash": 2926977001269261037, "networked": false, - "offset": 4124, + "offset": 4128, "size": 12, "templated": "QAngle", "type": "QAngle" @@ -107010,7 +106982,7 @@ "name": "m_angRotationOpenForward", "name_hash": 2926977002965965374, "networked": false, - "offset": 4136, + "offset": 4140, "size": 12, "templated": "QAngle", "type": "QAngle" @@ -107021,7 +106993,7 @@ "name": "m_angRotationOpenBack", "name_hash": 2926977001261181310, "networked": false, - "offset": 4148, + "offset": 4152, "size": 12, "templated": "QAngle", "type": "QAngle" @@ -107032,7 +107004,7 @@ "name": "m_angGoal", "name_hash": 2926977001856872508, "networked": false, - "offset": 4160, + "offset": 4164, "size": 12, "templated": "QAngle", "type": "QAngle" @@ -107043,7 +107015,7 @@ "name": "m_vecForwardBoundsMin", "name_hash": 2926977002876781373, "networked": false, - "offset": 4172, + "offset": 4176, "size": 12, "templated": "Vector", "type": "Vector" @@ -107054,7 +107026,7 @@ "name": "m_vecForwardBoundsMax", "name_hash": 2926977003043174467, "networked": false, - "offset": 4184, + "offset": 4188, "size": 12, "templated": "Vector", "type": "Vector" @@ -107065,7 +107037,7 @@ "name": "m_vecBackBoundsMin", "name_hash": 2926977002432968869, "networked": false, - "offset": 4196, + "offset": 4200, "size": 12, "templated": "Vector", "type": "Vector" @@ -107076,7 +107048,7 @@ "name": "m_vecBackBoundsMax", "name_hash": 2926977002602024987, "networked": false, - "offset": 4208, + "offset": 4212, "size": 12, "templated": "Vector", "type": "Vector" @@ -107087,7 +107059,7 @@ "name": "m_bAjarDoorShouldntAlwaysOpen", "name_hash": 2926977002891581409, "networked": false, - "offset": 4220, + "offset": 4224, "size": 1, "type": "bool" }, @@ -107097,7 +107069,7 @@ "name": "m_hEntityBlocker", "name_hash": 2926977003025896346, "networked": false, - "offset": 4224, + "offset": 4228, "size": 4, "template": [ "CEntityBlocker" @@ -107106,7 +107078,7 @@ "type": "CHandle" } ], - "fields_count": 17, + "fields_count": 18, "has_chainer": false, "is_struct": false, "name": "CPropDoorRotating", @@ -107145,7 +107117,7 @@ ], "base_classes_count": 1, "fields_count": 0, - "has_chainer": false, + "has_chainer": true, "is_struct": false, "name": "CPlayer_UseServices", "name_hash": 263484267, @@ -109341,7 +109313,7 @@ } ], "fields_count": 5, - "has_chainer": false, + "has_chainer": true, "is_struct": false, "name": "CCSPlayer_RadioServices", "name_hash": 2390719285, @@ -110253,7 +110225,7 @@ } ], "fields_count": 1, - "has_chainer": false, + "has_chainer": true, "is_struct": false, "name": "CSingleplayRules", "name_hash": 1664943899, @@ -114189,7 +114161,7 @@ } ], "fields_count": 1, - "has_chainer": false, + "has_chainer": true, "is_struct": false, "name": "CBodyComponentPoint", "name_hash": 35277841, @@ -114259,7 +114231,7 @@ } ], "fields_count": 5, - "has_chainer": false, + "has_chainer": true, "is_struct": false, "name": "CCSPlayerController_ActionTrackingServices", "name_hash": 2531222465, @@ -114363,7 +114335,7 @@ } ], "fields_count": 3, - "has_chainer": false, + "has_chainer": true, "is_struct": false, "name": "CCSGameModeRules_Deathmatch", "name_hash": 2008812866, @@ -114377,7 +114349,7 @@ ], "base_classes_count": 1, "fields_count": 0, - "has_chainer": false, + "has_chainer": true, "is_struct": false, "name": "CPlayer_AutoaimServices", "name_hash": 4251166008, @@ -116353,6 +116325,20 @@ "project": "server", "size": 3336 }, + { + "alignment": 16, + "base_classes": [ + "CDynamicProp" + ], + "base_classes_count": 1, + "fields_count": 0, + "has_chainer": false, + "is_struct": false, + "name": "CFuncRetakeBarrier", + "name_hash": 580289293, + "project": "server", + "size": 3440 + }, { "alignment": 8, "base_classes": [ @@ -116753,7 +116739,7 @@ } ], "fields_count": 12, - "has_chainer": false, + "has_chainer": true, "is_struct": false, "name": "CPlayer_CameraServices", "name_hash": 217122663, @@ -118290,7 +118276,7 @@ } ], "fields_count": 4, - "has_chainer": false, + "has_chainer": true, "is_struct": false, "name": "CCSPlayer_ActionTrackingServices", "name_hash": 3364880797, @@ -121660,7 +121646,7 @@ ], "base_classes_count": 1, "fields_count": 0, - "has_chainer": false, + "has_chainer": true, "is_struct": false, "name": "CPlayer_FlashlightServices", "name_hash": 887362702, @@ -123311,7 +123297,7 @@ } ], "fields_count": 2, - "has_chainer": false, + "has_chainer": true, "is_struct": false, "name": "CCSPlayer_HostageServices", "name_hash": 390238735, @@ -124463,7 +124449,7 @@ } ], "fields_count": 1, - "has_chainer": false, + "has_chainer": true, "is_struct": false, "name": "CCSPlayer_BuyServices", "name_hash": 4039295266, @@ -125222,7 +125208,7 @@ "name": "m_nMatchSeed", "name_hash": 3783372546479490123, "networked": true, - "offset": 248, + "offset": 312, "size": 4, "type": "int32" }, @@ -125232,7 +125218,7 @@ "name": "m_bBlockersPresent", "name_hash": 3783372548900597549, "networked": true, - "offset": 252, + "offset": 316, "size": 1, "type": "bool" }, @@ -125242,7 +125228,7 @@ "name": "m_bRoundInProgress", "name_hash": 3783372548635951643, "networked": true, - "offset": 253, + "offset": 317, "size": 1, "type": "bool" }, @@ -125252,7 +125238,7 @@ "name": "m_iFirstSecondHalfRound", "name_hash": 3783372549504213145, "networked": true, - "offset": 256, + "offset": 320, "size": 4, "type": "int32" }, @@ -125262,18 +125248,32 @@ "name": "m_iBombSite", "name_hash": 3783372549600612047, "networked": true, - "offset": 260, + "offset": 324, "size": 4, "type": "int32" + }, + { + "alignment": 4, + "kind": "atomic", + "name": "m_hBombPlanter", + "name_hash": 3783372546147288739, + "networked": true, + "offset": 328, + "size": 4, + "template": [ + "CCSPlayerPawn" + ], + "templated": "CHandle< CCSPlayerPawn >", + "type": "CHandle" } ], - "fields_count": 5, + "fields_count": 6, "has_chainer": false, "is_struct": true, "name": "CRetakeGameRules", "name_hash": 880885065, "project": "server", - "size": 400 + "size": 496 }, { "alignment": 8, @@ -130053,7 +130053,7 @@ } ], "fields_count": 5, - "has_chainer": false, + "has_chainer": true, "is_struct": false, "name": "CPlayer_WeaponServices", "name_hash": 1665999488, @@ -131264,7 +131264,7 @@ ], "base_classes_count": 1, "fields_count": 0, - "has_chainer": false, + "has_chainer": true, "is_struct": false, "name": "CPlayer_ItemServices", "name_hash": 443784863, @@ -133222,15 +133222,25 @@ "size": 12, "templated": "Vector", "type": "Vector" + }, + { + "alignment": 1, + "kind": "ref", + "name": "m_bJumpApexPending", + "name_hash": 15135923263330754384, + "networked": true, + "offset": 3592, + "size": 1, + "type": "bool" } ], - "fields_count": 41, + "fields_count": 42, "has_chainer": false, "is_struct": false, "name": "CCSPlayer_MovementServices", "name_hash": 3524106755, "project": "server", - "size": 1512 + "size": 3600 }, { "alignment": 16, @@ -136420,7 +136430,7 @@ } ], "fields_count": 15, - "has_chainer": false, + "has_chainer": true, "is_struct": false, "name": "CPlayer_MovementServices", "name_hash": 3585995401, @@ -138263,7 +138273,7 @@ ], "base_classes_count": 1, "fields_count": 0, - "has_chainer": false, + "has_chainer": true, "is_struct": false, "name": "CCSPlayer_DamageReactServices", "name_hash": 2779250858, @@ -139813,7 +139823,7 @@ } ], "fields_count": 10, - "has_chainer": false, + "has_chainer": true, "is_struct": false, "name": "CCSPlayerController_InventoryServices", "name_hash": 3251636098, @@ -141819,7 +141829,7 @@ } ], "fields_count": 1, - "has_chainer": false, + "has_chainer": true, "is_struct": false, "name": "CCSGameModeRules_ArmsRace", "name_hash": 3758080763, @@ -142179,7 +142189,7 @@ ], "base_classes_count": 1, "fields_count": 0, - "has_chainer": false, + "has_chainer": true, "is_struct": false, "name": "CMultiplayRules", "name_hash": 1730262772, @@ -146466,7 +146476,7 @@ } ], "fields_count": 1, - "has_chainer": false, + "has_chainer": true, "is_struct": false, "name": "CBodyComponentSkeletonInstance", "name_hash": 1166132313, @@ -148432,23 +148442,13 @@ "size": 4, "type": "int32" }, - { - "alignment": 4, - "kind": "ref", - "name": "m_LastHealth", - "name_hash": 14366846385504372155, - "networked": false, - "offset": 6896, - "size": 4, - "type": "int32" - }, { "alignment": 8, "kind": "ptr", "name": "m_pBot", "name_hash": 14366846384977146036, "networked": false, - "offset": 6904, + "offset": 6896, "size": 8, "type": "CCSBot" }, @@ -148458,7 +148458,7 @@ "name": "m_bBotAllowActive", "name_hash": 14366846386320422861, "networked": false, - "offset": 6912, + "offset": 6904, "size": 1, "type": "bool" }, @@ -148468,7 +148468,7 @@ "name": "m_thirdPersonHeading", "name_hash": 14366846388049257127, "networked": true, - "offset": 6916, + "offset": 6908, "size": 12, "templated": "QAngle", "type": "QAngle" @@ -148479,7 +148479,7 @@ "name": "m_flSlopeDropOffset", "name_hash": 14366846388823448560, "networked": true, - "offset": 6928, + "offset": 6920, "size": 4, "type": "float32" }, @@ -148489,7 +148489,7 @@ "name": "m_flSlopeDropHeight", "name_hash": 14366846388203787020, "networked": true, - "offset": 6932, + "offset": 6924, "size": 4, "type": "float32" }, @@ -148499,7 +148499,7 @@ "name": "m_vHeadConstraintOffset", "name_hash": 14366846387505455431, "networked": true, - "offset": 6936, + "offset": 6928, "size": 12, "templated": "Vector", "type": "Vector" @@ -148510,7 +148510,7 @@ "name": "m_nLastPickupPriority", "name_hash": 14366846387231516137, "networked": false, - "offset": 6948, + "offset": 6940, "size": 4, "type": "int32" }, @@ -148520,7 +148520,7 @@ "name": "m_flLastPickupPriorityTime", "name_hash": 14366846388637334518, "networked": false, - "offset": 6952, + "offset": 6944, "size": 4, "type": "float32" }, @@ -148530,7 +148530,7 @@ "name": "m_ArmorValue", "name_hash": 14366846386890544429, "networked": true, - "offset": 6956, + "offset": 6948, "size": 4, "type": "int32" }, @@ -148540,7 +148540,7 @@ "name": "m_unCurrentEquipmentValue", "name_hash": 14366846388563103786, "networked": true, - "offset": 6960, + "offset": 6952, "size": 2, "type": "uint16" }, @@ -148550,7 +148550,7 @@ "name": "m_unRoundStartEquipmentValue", "name_hash": 14366846385822248747, "networked": true, - "offset": 6962, + "offset": 6954, "size": 2, "type": "uint16" }, @@ -148560,7 +148560,7 @@ "name": "m_unFreezetimeEndEquipmentValue", "name_hash": 14366846386816403364, "networked": true, - "offset": 6964, + "offset": 6956, "size": 2, "type": "uint16" }, @@ -148570,7 +148570,7 @@ "name": "m_iLastWeaponFireUsercmd", "name_hash": 14366846387754931501, "networked": false, - "offset": 6968, + "offset": 6960, "size": 4, "type": "int32" }, @@ -148580,7 +148580,7 @@ "name": "m_bIsSpawning", "name_hash": 14366846386845441504, "networked": false, - "offset": 6972, + "offset": 6964, "size": 1, "type": "bool" }, @@ -148590,7 +148590,7 @@ "name": "m_iDeathFlags", "name_hash": 14366846386134068801, "networked": false, - "offset": 6984, + "offset": 6976, "size": 4, "type": "int32" }, @@ -148600,7 +148600,7 @@ "name": "m_bHasDeathInfo", "name_hash": 14366846386499059507, "networked": false, - "offset": 6988, + "offset": 6980, "size": 1, "type": "bool" }, @@ -148610,7 +148610,7 @@ "name": "m_flDeathInfoTime", "name_hash": 14366846386623511894, "networked": false, - "offset": 6992, + "offset": 6984, "size": 4, "type": "float32" }, @@ -148620,7 +148620,7 @@ "name": "m_vecDeathInfoOrigin", "name_hash": 14366846384684222887, "networked": false, - "offset": 6996, + "offset": 6988, "size": 12, "templated": "Vector", "type": "Vector" @@ -148634,7 +148634,7 @@ "name": "m_vecPlayerPatchEconIndices", "name_hash": 14366846388558645180, "networked": true, - "offset": 7008, + "offset": 7000, "size": 20, "type": "uint32" }, @@ -148644,7 +148644,7 @@ "name": "m_GunGameImmunityColor", "name_hash": 14366846386140468384, "networked": true, - "offset": 7028, + "offset": 7020, "size": 4, "templated": "Color", "type": "Color" @@ -148655,7 +148655,7 @@ "name": "m_grenadeParameterStashTime", "name_hash": 14366846386844098528, "networked": false, - "offset": 7032, + "offset": 7024, "size": 4, "type": "GameTime_t" }, @@ -148665,7 +148665,7 @@ "name": "m_bGrenadeParametersStashed", "name_hash": 14366846384819735583, "networked": false, - "offset": 7036, + "offset": 7028, "size": 1, "type": "bool" }, @@ -148675,7 +148675,7 @@ "name": "m_angStashedShootAngles", "name_hash": 14366846387765461432, "networked": false, - "offset": 7040, + "offset": 7032, "size": 12, "templated": "QAngle", "type": "QAngle" @@ -148686,7 +148686,7 @@ "name": "m_vecStashedGrenadeThrowPosition", "name_hash": 14366846388011524698, "networked": false, - "offset": 7052, + "offset": 7044, "size": 12, "templated": "Vector", "type": "Vector" @@ -148697,7 +148697,7 @@ "name": "m_vecStashedVelocity", "name_hash": 14366846386056032932, "networked": false, - "offset": 7064, + "offset": 7056, "size": 12, "templated": "Vector", "type": "Vector" @@ -148711,7 +148711,7 @@ "name": "m_angShootAngleHistory", "name_hash": 14366846388513263567, "networked": false, - "offset": 7076, + "offset": 7068, "size": 24, "type": "QAngle" }, @@ -148724,7 +148724,7 @@ "name": "m_vecThrowPositionHistory", "name_hash": 14366846385488167804, "networked": false, - "offset": 7100, + "offset": 7092, "size": 24, "type": "Vector" }, @@ -148737,7 +148737,7 @@ "name": "m_vecVelocityHistory", "name_hash": 14366846385203960242, "networked": false, - "offset": 7124, + "offset": 7116, "size": 24, "type": "Vector" }, @@ -148747,7 +148747,7 @@ "name": "m_PredictedDamageTags", "name_hash": 14366846385340242243, "networked": true, - "offset": 7152, + "offset": 7144, "size": 104, "template": [ "PredictedDamageTag_t" @@ -148761,7 +148761,7 @@ "name": "m_nHighestAppliedDamageTagTick", "name_hash": 14366846384974533658, "networked": false, - "offset": 7256, + "offset": 7248, "size": 4, "type": "int32" }, @@ -148771,7 +148771,7 @@ "name": "m_bCommittingSuicideOnTeamChange", "name_hash": 14366846385481734876, "networked": false, - "offset": 7260, + "offset": 7252, "size": 1, "type": "bool" }, @@ -148781,7 +148781,7 @@ "name": "m_wasNotKilledNaturally", "name_hash": 14366846385990253284, "networked": false, - "offset": 7261, + "offset": 7253, "size": 1, "type": "bool" }, @@ -148791,7 +148791,7 @@ "name": "m_fImmuneToGunGameDamageTime", "name_hash": 14366846386786663627, "networked": true, - "offset": 7264, + "offset": 7256, "size": 4, "type": "GameTime_t" }, @@ -148801,7 +148801,7 @@ "name": "m_bGunGameImmunity", "name_hash": 14366846387207079949, "networked": true, - "offset": 7268, + "offset": 7260, "size": 1, "type": "bool" }, @@ -148811,7 +148811,7 @@ "name": "m_fMolotovDamageTime", "name_hash": 14366846388125154849, "networked": true, - "offset": 7272, + "offset": 7264, "size": 4, "type": "float32" }, @@ -148821,19 +148821,19 @@ "name": "m_angEyeAngles", "name_hash": 14366846385912177324, "networked": true, - "offset": 7276, + "offset": 7268, "size": 12, "templated": "QAngle", "type": "QAngle" } ], - "fields_count": 122, + "fields_count": 121, "has_chainer": false, "is_struct": false, "name": "CCSPlayerPawn", "name_hash": 3345042091, "project": "server", - "size": 7296 + "size": 7280 }, { "alignment": 8, @@ -149598,7 +149598,7 @@ } ], "fields_count": 6, - "has_chainer": false, + "has_chainer": true, "is_struct": false, "name": "CCSPlayerController_InGameMoneyServices", "name_hash": 1820838909, @@ -150229,7 +150229,7 @@ } ], "fields_count": 1, - "has_chainer": false, + "has_chainer": true, "is_struct": false, "name": "CCSPlayer_BulletServices", "name_hash": 967895454, @@ -151215,7 +151215,7 @@ } ], "fields_count": 4, - "has_chainer": false, + "has_chainer": true, "is_struct": false, "name": "CPlayer_ObserverServices", "name_hash": 370225498, @@ -156201,7 +156201,7 @@ } ], "fields_count": 2, - "has_chainer": false, + "has_chainer": true, "is_struct": false, "name": "CCSPlayerController_DamageServices", "name_hash": 3277087563, @@ -157395,14 +157395,14 @@ "offset": 84, "size": 4, "template": [ - "CBaseEntity" + "CPlayerPing" ], - "templated": "CHandle< CBaseEntity >", + "templated": "CHandle< CPlayerPing >", "type": "CHandle" } ], "fields_count": 2, - "has_chainer": false, + "has_chainer": true, "is_struct": false, "name": "CCSPlayer_PingServices", "name_hash": 3347937738, @@ -158832,7 +158832,7 @@ ], "base_classes_count": 1, "fields_count": 0, - "has_chainer": false, + "has_chainer": true, "is_struct": false, "name": "CPlayer_WaterServices", "name_hash": 2958700407, diff --git a/managed/src/SwiftlyS2.Core/Modules/EntitySystem/EntitySystem.cs b/managed/src/SwiftlyS2.Core/Modules/EntitySystem/EntitySystem.cs index 44b446d98..029e230d3 100644 --- a/managed/src/SwiftlyS2.Core/Modules/EntitySystem/EntitySystem.cs +++ b/managed/src/SwiftlyS2.Core/Modules/EntitySystem/EntitySystem.cs @@ -423,6 +423,7 @@ public void UnhookEntityOutput(Guid guid) { typeof(CFuncTimescale), "func_timescale" }, { typeof(CFuncTankTrain), "func_tanktrain" }, { typeof(CFuncShatterglass), "func_shatterglass" }, + { typeof(CFuncRetakeBarrier), "func_retakebarrier" }, { typeof(CFuncRotator), "func_rotator" }, { typeof(CFuncRotating), "func_rotating" }, { typeof(CFuncPropRespawnZone), "func_proprrespawnzone" }, diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Classes/CCSGameRulesImpl.cs b/managed/src/SwiftlyS2.Generated/Schemas/Classes/CCSGameRulesImpl.cs index 51c04582c..3980fdf1e 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Classes/CCSGameRulesImpl.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Classes/CCSGameRulesImpl.cs @@ -51,6 +51,9 @@ public ref bool TechnicalTimeOut { public ref bool MatchWaitingForResume { get => ref _Handle.AsRef(Schema.GetOffset(0x6295CF6597B2188B)); } + public ref int FreezeTime { + get => ref _Handle.AsRef(Schema.GetOffset(0x6295CF6525D5D12E)); + } public ref int RoundTime { get => ref _Handle.AsRef(Schema.GetOffset(0x6295CF659A5A5155)); } @@ -268,9 +271,6 @@ public ref bool EndMatchOnRoundReset { public ref bool EndMatchOnThink { get => ref _Handle.AsRef(Schema.GetOffset(0x6295CF650888575A)); } - public ref int FreezeTime { - get => ref _Handle.AsRef(Schema.GetOffset(0x6295CF6525D5D12E)); - } public ref int NumTerrorist { get => ref _Handle.AsRef(Schema.GetOffset(0x6295CF65E58F0B9A)); } @@ -650,6 +650,9 @@ public void TechnicalTimeOutUpdated() { public void MatchWaitingForResumeUpdated() { Schema.Update(_Handle, 0x6295CF6597B2188B); } + public void FreezeTimeUpdated() { + Schema.Update(_Handle, 0x6295CF6525D5D12E); + } public void RoundTimeUpdated() { Schema.Update(_Handle, 0x6295CF659A5A5155); } diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Classes/CCSPlayerPawnImpl.cs b/managed/src/SwiftlyS2.Generated/Schemas/Classes/CCSPlayerPawnImpl.cs index 9726ea1a1..280b22555 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Classes/CCSPlayerPawnImpl.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Classes/CCSPlayerPawnImpl.cs @@ -300,9 +300,6 @@ public ref bool KilledByHeadshot { public ref int LastHitBox { get => ref _Handle.AsRef(Schema.GetOffset(0xC7614AAB9B4C64DB)); } - public ref int LastHealth { - get => ref _Handle.AsRef(Schema.GetOffset(0xC7614AAB3697C5BB)); - } public CCSBot? Bot { get { var ptr = _Handle.Read(Schema.GetOffset(0xC7614AAB172AF0B4)); diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Classes/CCSPlayer_MovementServicesImpl.cs b/managed/src/SwiftlyS2.Generated/Schemas/Classes/CCSPlayer_MovementServicesImpl.cs index 683079279..12eedb773 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Classes/CCSPlayer_MovementServicesImpl.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Classes/CCSPlayer_MovementServicesImpl.cs @@ -138,6 +138,9 @@ public ref bool WasSurfing { public ref Vector InputRotated { get => ref _Handle.AsRef(Schema.GetOffset(0xD20D9A03853EE154)); } + public ref bool JumpApexPending { + get => ref _Handle.AsRef(Schema.GetOffset(0xD20D9A03B2669F50)); + } public void LadderNormalUpdated() { Schema.Update(_Handle, 0xD20D9A0308F3CAF6); @@ -196,4 +199,7 @@ public void StaminaUpdated() { public void WasSurfingUpdated() { Schema.Update(_Handle, 0xD20D9A03C30201EE); } + public void JumpApexPendingUpdated() { + Schema.Update(_Handle, 0xD20D9A03B2669F50); + } } \ No newline at end of file diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Classes/CCSPlayer_PingServicesImpl.cs b/managed/src/SwiftlyS2.Generated/Schemas/Classes/CCSPlayer_PingServicesImpl.cs index deeaf2f52..6ce34e888 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Classes/CCSPlayer_PingServicesImpl.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Classes/CCSPlayer_PingServicesImpl.cs @@ -18,8 +18,8 @@ public CCSPlayer_PingServicesImpl(nint handle) : base(handle) { public SchemaUntypedField PlayerPingTokens { get => new SchemaUntypedField(_Handle + Schema.GetOffset(0xC78D79CA55696280)); } - public ref CHandle PlayerPing { - get => ref _Handle.AsRef>(Schema.GetOffset(0xC78D79CA464EEA6E)); + public ref CHandle PlayerPing { + get => ref _Handle.AsRef>(Schema.GetOffset(0xC78D79CA464EEA6E)); } public void PlayerPingUpdated() { diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Classes/CCopyRecipientFilterImpl.cs b/managed/src/SwiftlyS2.Generated/Schemas/Classes/CCopyRecipientFilterImpl.cs index 9bd7e1340..711dc4383 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Classes/CCopyRecipientFilterImpl.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Classes/CCopyRecipientFilterImpl.cs @@ -21,6 +21,9 @@ public ref int Flags { public ref CUtlVector Recipients { get => ref _Handle.AsRef>(Schema.GetOffset(0xB27F546CDF6522D1)); } + public ref uint SlotPlayerExcludedDueToPrediction { + get => ref _Handle.AsRef(Schema.GetOffset(0xB27F546CA4F2B69C)); + } } \ No newline at end of file diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Classes/CFuncRetakeBarrierImpl.cs b/managed/src/SwiftlyS2.Generated/Schemas/Classes/CFuncRetakeBarrierImpl.cs new file mode 100644 index 000000000..2566e693b --- /dev/null +++ b/managed/src/SwiftlyS2.Generated/Schemas/Classes/CFuncRetakeBarrierImpl.cs @@ -0,0 +1,21 @@ +// +#pragma warning disable CS0108 +#nullable enable + +using SwiftlyS2.Core.Schemas; +using SwiftlyS2.Shared.Schemas; +using SwiftlyS2.Shared.SchemaDefinitions; +using SwiftlyS2.Shared.Natives; +using SwiftlyS2.Core.Extensions; + +namespace SwiftlyS2.Core.SchemaDefinitions; + +internal partial class CFuncRetakeBarrierImpl : CDynamicPropImpl, CFuncRetakeBarrier { + + public CFuncRetakeBarrierImpl(nint handle) : base(handle) { + } + + + + +} \ No newline at end of file diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Classes/CNmAimCSNode__CDefinitionImpl.cs b/managed/src/SwiftlyS2.Generated/Schemas/Classes/CNmAimCSNode__CDefinitionImpl.cs index 095474880..ce3cab7c6 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Classes/CNmAimCSNode__CDefinitionImpl.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Classes/CNmAimCSNode__CDefinitionImpl.cs @@ -21,6 +21,9 @@ public ref short VerticalAngleNodeIdx { public ref short HorizontalAngleNodeIdx { get => ref _Handle.AsRef(Schema.GetOffset(0xE1CD14C28E2FD3DB)); } + public ref short WeaponCategoryNodeIdx { + get => ref _Handle.AsRef(Schema.GetOffset(0xE1CD14C216D198E4)); + } public ref short EnabledNodeIdx { get => ref _Handle.AsRef(Schema.GetOffset(0xE1CD14C2F7CDF5E9)); } diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Classes/CPropDoorRotatingImpl.cs b/managed/src/SwiftlyS2.Generated/Schemas/Classes/CPropDoorRotatingImpl.cs index 4efd0c4aa..a06d2bbde 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Classes/CPropDoorRotatingImpl.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Classes/CPropDoorRotatingImpl.cs @@ -30,6 +30,9 @@ public ref PropDoorRotatingOpenDirection_e OpenDirection { public ref PropDoorRotatingOpenDirection_e CurrentOpenDirection { get => ref _Handle.AsRef(Schema.GetOffset(0x289EB6132BAD86EE)); } + public ref doorCheck_e DefaultCheckDirection { + get => ref _Handle.AsRef(Schema.GetOffset(0x289EB6134191E768)); + } public ref float AjarAngle { get => ref _Handle.AsRef(Schema.GetOffset(0x289EB613CD456612)); } diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Classes/CRetakeGameRulesImpl.cs b/managed/src/SwiftlyS2.Generated/Schemas/Classes/CRetakeGameRulesImpl.cs index 19ed44850..b7b2d0e34 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Classes/CRetakeGameRulesImpl.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Classes/CRetakeGameRulesImpl.cs @@ -30,6 +30,9 @@ public ref int FirstSecondHalfRound { public ref int BombSite { get => ref _Handle.AsRef(Schema.GetOffset(0x34813D49E7E88ECF)); } + public ref CHandle BombPlanter { + get => ref _Handle.AsRef>(Schema.GetOffset(0x34813D491A1306A3)); + } public void MatchSeedUpdated() { Schema.Update(_Handle, 0x34813D492DE0044B); @@ -46,4 +49,7 @@ public void FirstSecondHalfRoundUpdated() { public void BombSiteUpdated() { Schema.Update(_Handle, 0x34813D49E7E88ECF); } + public void BombPlanterUpdated() { + Schema.Update(_Handle, 0x34813D491A1306A3); + } } \ No newline at end of file diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CCSGameRules.cs b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CCSGameRules.cs index 6667f1231..6c3cdce7d 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CCSGameRules.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CCSGameRules.cs @@ -11,7 +11,7 @@ namespace SwiftlyS2.Shared.SchemaDefinitions; public partial interface CCSGameRules : CTeamplayRules, ISchemaClass { static CCSGameRules ISchemaClass.From(nint handle) => new CCSGameRulesImpl(handle); - static int ISchemaClass.Size => 70608; + static int ISchemaClass.Size => 70704; public ref bool FreezePeriod { get; } @@ -38,6 +38,8 @@ public partial interface CCSGameRules : CTeamplayRules, ISchemaClass { static CCSPlayerPawn ISchemaClass.From(nint handle) => new CCSPlayerPawnImpl(handle); - static int ISchemaClass.Size => 7296; + static int ISchemaClass.Size => 7280; public CCSPlayer_BulletServices? BulletServices { get; } @@ -184,8 +184,6 @@ public partial interface CCSPlayerPawn : CCSPlayerPawnBase, ISchemaClass { static CCSPlayer_MovementServices ISchemaClass.From(nint handle) => new CCSPlayer_MovementServicesImpl(handle); - static int ISchemaClass.Size => 1512; + static int ISchemaClass.Size => 3600; public ref Vector LadderNormal { get; } @@ -95,6 +95,8 @@ public partial interface CCSPlayer_MovementServices : CPlayer_MovementServices_H public ref bool WasSurfing { get; } public ref Vector InputRotated { get; } + + public ref bool JumpApexPending { get; } public void LadderNormalUpdated(); public void LadderSurfacePropIndexUpdated(); @@ -115,4 +117,5 @@ public partial interface CCSPlayer_MovementServices : CPlayer_MovementServices_H public void OffsetTickStashedSpeedUpdated(); public void StaminaUpdated(); public void WasSurfingUpdated(); + public void JumpApexPendingUpdated(); } \ No newline at end of file diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CCSPlayer_PingServices.cs b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CCSPlayer_PingServices.cs index 87a804455..8e1b79bd9 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CCSPlayer_PingServices.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CCSPlayer_PingServices.cs @@ -17,7 +17,7 @@ public partial interface CCSPlayer_PingServices : CPlayerPawnComponent, ISchemaC // GameTime_t public SchemaUntypedField PlayerPingTokens { get; } - public ref CHandle PlayerPing { get; } + public ref CHandle PlayerPing { get; } public void PlayerPingUpdated(); } \ No newline at end of file diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CCopyRecipientFilter.cs b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CCopyRecipientFilter.cs index 611a19d16..33b88b56e 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CCopyRecipientFilter.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CCopyRecipientFilter.cs @@ -11,12 +11,14 @@ namespace SwiftlyS2.Shared.SchemaDefinitions; public partial interface CCopyRecipientFilter : ISchemaClass { static CCopyRecipientFilter ISchemaClass.From(nint handle) => new CCopyRecipientFilterImpl(handle); - static int ISchemaClass.Size => 48; + static int ISchemaClass.Size => 56; public ref int Flags { get; } public ref CUtlVector Recipients { get; } + + public ref uint SlotPlayerExcludedDueToPrediction { get; } } \ No newline at end of file diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CFuncRetakeBarrier.cs b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CFuncRetakeBarrier.cs new file mode 100644 index 000000000..fab60f513 --- /dev/null +++ b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CFuncRetakeBarrier.cs @@ -0,0 +1,19 @@ +// +#pragma warning disable CS0108 +#nullable enable + +using SwiftlyS2.Shared.Schemas; +using SwiftlyS2.Shared.Natives; +using SwiftlyS2.Core.SchemaDefinitions; + +namespace SwiftlyS2.Shared.SchemaDefinitions; + +public partial interface CFuncRetakeBarrier : CDynamicProp, ISchemaClass { + + static CFuncRetakeBarrier ISchemaClass.From(nint handle) => new CFuncRetakeBarrierImpl(handle); + static int ISchemaClass.Size => 3440; + + + + +} \ No newline at end of file diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmAdditiveBlendTask.cs b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmAdditiveBlendTask.cs index 0a77b2d66..0d7773805 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmAdditiveBlendTask.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmAdditiveBlendTask.cs @@ -11,7 +11,7 @@ namespace SwiftlyS2.Shared.SchemaDefinitions; public partial interface CNmAdditiveBlendTask : CNmBlendTaskBase, ISchemaClass { static CNmAdditiveBlendTask ISchemaClass.From(nint handle) => new CNmAdditiveBlendTaskImpl(handle); - static int ISchemaClass.Size => 216; + static int ISchemaClass.Size => 224; diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmAimCSNode__CDefinition.cs b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmAimCSNode__CDefinition.cs index 40b8b72bc..310e100aa 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmAimCSNode__CDefinition.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmAimCSNode__CDefinition.cs @@ -18,6 +18,8 @@ public partial interface CNmAimCSNode__CDefinition : CNmPassthroughNode__CDefini public ref short HorizontalAngleNodeIdx { get; } + public ref short WeaponCategoryNodeIdx { get; } + public ref short EnabledNodeIdx { get; } public ref float BlendTimeSeconds { get; } diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmAimCSTask.cs b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmAimCSTask.cs index 0cb0c2d31..b5a5b233a 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmAimCSTask.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmAimCSTask.cs @@ -11,7 +11,7 @@ namespace SwiftlyS2.Shared.SchemaDefinitions; public partial interface CNmAimCSTask : CNmPoseTask, ISchemaClass { static CNmAimCSTask ISchemaClass.From(nint handle) => new CNmAimCSTaskImpl(handle); - static int ISchemaClass.Size => 304; + static int ISchemaClass.Size => 240; diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmBlendTask.cs b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmBlendTask.cs index 93c280610..a7f028286 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmBlendTask.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmBlendTask.cs @@ -11,7 +11,7 @@ namespace SwiftlyS2.Shared.SchemaDefinitions; public partial interface CNmBlendTask : CNmBlendTaskBase, ISchemaClass { static CNmBlendTask ISchemaClass.From(nint handle) => new CNmBlendTaskImpl(handle); - static int ISchemaClass.Size => 216; + static int ISchemaClass.Size => 224; diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmBlendTaskBase.cs b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmBlendTaskBase.cs index 3f4dd9484..a73e9a7d0 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmBlendTaskBase.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmBlendTaskBase.cs @@ -11,7 +11,7 @@ namespace SwiftlyS2.Shared.SchemaDefinitions; public partial interface CNmBlendTaskBase : CNmPoseTask, ISchemaClass { static CNmBlendTaskBase ISchemaClass.From(nint handle) => new CNmBlendTaskBaseImpl(handle); - static int ISchemaClass.Size => 216; + static int ISchemaClass.Size => 224; diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmCachedPoseReadTask.cs b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmCachedPoseReadTask.cs index 0f22c1978..323e41104 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmCachedPoseReadTask.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmCachedPoseReadTask.cs @@ -11,7 +11,7 @@ namespace SwiftlyS2.Shared.SchemaDefinitions; public partial interface CNmCachedPoseReadTask : CNmPoseTask, ISchemaClass { static CNmCachedPoseReadTask ISchemaClass.From(nint handle) => new CNmCachedPoseReadTaskImpl(handle); - static int ISchemaClass.Size => 88; + static int ISchemaClass.Size => 96; diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmCachedPoseWriteTask.cs b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmCachedPoseWriteTask.cs index b5f541159..8437e5702 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmCachedPoseWriteTask.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmCachedPoseWriteTask.cs @@ -11,7 +11,7 @@ namespace SwiftlyS2.Shared.SchemaDefinitions; public partial interface CNmCachedPoseWriteTask : CNmPoseTask, ISchemaClass { static CNmCachedPoseWriteTask ISchemaClass.From(nint handle) => new CNmCachedPoseWriteTaskImpl(handle); - static int ISchemaClass.Size => 88; + static int ISchemaClass.Size => 96; diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmChainLookatTask.cs b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmChainLookatTask.cs index cc9887e02..7c0855635 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmChainLookatTask.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmChainLookatTask.cs @@ -11,7 +11,7 @@ namespace SwiftlyS2.Shared.SchemaDefinitions; public partial interface CNmChainLookatTask : CNmPoseTask, ISchemaClass { static CNmChainLookatTask ISchemaClass.From(nint handle) => new CNmChainLookatTaskImpl(handle); - static int ISchemaClass.Size => 136; + static int ISchemaClass.Size => 144; public ref int ChainEndBoneIdx { get; } diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmFollowBoneTask.cs b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmFollowBoneTask.cs index dc9d9b0f6..401e2d96b 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmFollowBoneTask.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmFollowBoneTask.cs @@ -11,7 +11,7 @@ namespace SwiftlyS2.Shared.SchemaDefinitions; public partial interface CNmFollowBoneTask : CNmPoseTask, ISchemaClass { static CNmFollowBoneTask ISchemaClass.From(nint handle) => new CNmFollowBoneTaskImpl(handle); - static int ISchemaClass.Size => 112; + static int ISchemaClass.Size => 120; diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmModelSpaceBlendTask.cs b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmModelSpaceBlendTask.cs index e21d9e51b..4033475cf 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmModelSpaceBlendTask.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmModelSpaceBlendTask.cs @@ -11,7 +11,7 @@ namespace SwiftlyS2.Shared.SchemaDefinitions; public partial interface CNmModelSpaceBlendTask : CNmBlendTaskBase, ISchemaClass { static CNmModelSpaceBlendTask ISchemaClass.From(nint handle) => new CNmModelSpaceBlendTaskImpl(handle); - static int ISchemaClass.Size => 216; + static int ISchemaClass.Size => 224; diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmOverlayBlendTask.cs b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmOverlayBlendTask.cs index 464a39b97..4249d6f1c 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmOverlayBlendTask.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmOverlayBlendTask.cs @@ -11,7 +11,7 @@ namespace SwiftlyS2.Shared.SchemaDefinitions; public partial interface CNmOverlayBlendTask : CNmBlendTaskBase, ISchemaClass { static CNmOverlayBlendTask ISchemaClass.From(nint handle) => new CNmOverlayBlendTaskImpl(handle); - static int ISchemaClass.Size => 216; + static int ISchemaClass.Size => 224; diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmPoseTask.cs b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmPoseTask.cs index 83755c387..18951fc40 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmPoseTask.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmPoseTask.cs @@ -11,7 +11,7 @@ namespace SwiftlyS2.Shared.SchemaDefinitions; public partial interface CNmPoseTask : ISchemaClass { static CNmPoseTask ISchemaClass.From(nint handle) => new CNmPoseTaskImpl(handle); - static int ISchemaClass.Size => 80; + static int ISchemaClass.Size => 88; diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmReferencePoseTask.cs b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmReferencePoseTask.cs index 3d2b84585..081884084 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmReferencePoseTask.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmReferencePoseTask.cs @@ -11,7 +11,7 @@ namespace SwiftlyS2.Shared.SchemaDefinitions; public partial interface CNmReferencePoseTask : CNmPoseTask, ISchemaClass { static CNmReferencePoseTask ISchemaClass.From(nint handle) => new CNmReferencePoseTaskImpl(handle); - static int ISchemaClass.Size => 80; + static int ISchemaClass.Size => 88; diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmSampleTask.cs b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmSampleTask.cs index ea0b53ca3..d9492841f 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmSampleTask.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmSampleTask.cs @@ -11,7 +11,7 @@ namespace SwiftlyS2.Shared.SchemaDefinitions; public partial interface CNmSampleTask : CNmPoseTask, ISchemaClass { static CNmSampleTask ISchemaClass.From(nint handle) => new CNmSampleTaskImpl(handle); - static int ISchemaClass.Size => 96; + static int ISchemaClass.Size => 104; diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmScaleTask.cs b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmScaleTask.cs index 359045071..9f7d42a34 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmScaleTask.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmScaleTask.cs @@ -11,7 +11,7 @@ namespace SwiftlyS2.Shared.SchemaDefinitions; public partial interface CNmScaleTask : CNmPoseTask, ISchemaClass { static CNmScaleTask ISchemaClass.From(nint handle) => new CNmScaleTaskImpl(handle); - static int ISchemaClass.Size => 168; + static int ISchemaClass.Size => 176; diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmSnapWeaponTask.cs b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmSnapWeaponTask.cs index 40bf75e4a..beeca2e10 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmSnapWeaponTask.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmSnapWeaponTask.cs @@ -11,7 +11,7 @@ namespace SwiftlyS2.Shared.SchemaDefinitions; public partial interface CNmSnapWeaponTask : CNmPoseTask, ISchemaClass { static CNmSnapWeaponTask ISchemaClass.From(nint handle) => new CNmSnapWeaponTaskImpl(handle); - static int ISchemaClass.Size => 88; + static int ISchemaClass.Size => 96; diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmZeroPoseTask.cs b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmZeroPoseTask.cs index 4e522280e..3ecf8e50e 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmZeroPoseTask.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CNmZeroPoseTask.cs @@ -11,7 +11,7 @@ namespace SwiftlyS2.Shared.SchemaDefinitions; public partial interface CNmZeroPoseTask : CNmPoseTask, ISchemaClass { static CNmZeroPoseTask ISchemaClass.From(nint handle) => new CNmZeroPoseTaskImpl(handle); - static int ISchemaClass.Size => 80; + static int ISchemaClass.Size => 88; diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CPropDoorRotating.cs b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CPropDoorRotating.cs index 5b9c28b74..bd69dbb00 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CPropDoorRotating.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CPropDoorRotating.cs @@ -24,6 +24,8 @@ public partial interface CPropDoorRotating : CBasePropDoor, ISchemaClass { static CRetakeGameRules ISchemaClass.From(nint handle) => new CRetakeGameRulesImpl(handle); - static int ISchemaClass.Size => 400; + static int ISchemaClass.Size => 496; public ref int MatchSeed { get; } @@ -23,10 +23,13 @@ public partial interface CRetakeGameRules : ISchemaClass { public ref int FirstSecondHalfRound { get; } public ref int BombSite { get; } + + public ref CHandle BombPlanter { get; } public void MatchSeedUpdated(); public void BlockersPresentUpdated(); public void RoundInProgressUpdated(); public void FirstSecondHalfRoundUpdated(); public void BombSiteUpdated(); + public void BombPlanterUpdated(); } \ No newline at end of file diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CSoundPatch.cs b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CSoundPatch.cs index 646bd4ccc..657ea8084 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CSoundPatch.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CSoundPatch.cs @@ -11,7 +11,7 @@ namespace SwiftlyS2.Shared.SchemaDefinitions; public partial interface CSoundPatch : ISchemaClass { static CSoundPatch ISchemaClass.From(nint handle) => new CSoundPatchImpl(handle); - static int ISchemaClass.Size => 168; + static int ISchemaClass.Size => 176; public CSoundEnvelope Pitch { get; } diff --git a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/SummaryTakeDamageInfo_t.cs b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/SummaryTakeDamageInfo_t.cs index 2b705d49a..ad154baad 100644 --- a/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/SummaryTakeDamageInfo_t.cs +++ b/managed/src/SwiftlyS2.Generated/Schemas/Interfaces/SummaryTakeDamageInfo_t.cs @@ -11,7 +11,7 @@ namespace SwiftlyS2.Shared.SchemaDefinitions; public partial interface SummaryTakeDamageInfo_t : ISchemaClass { static SummaryTakeDamageInfo_t ISchemaClass.From(nint handle) => new SummaryTakeDamageInfo_tImpl(handle); - static int ISchemaClass.Size => 344; + static int ISchemaClass.Size => 352; public ref int SummarisedCount { get; } diff --git a/managed/src/SwiftlyS2.Shared/Natives/Structs/CRecipientFilter.cs b/managed/src/SwiftlyS2.Shared/Natives/Structs/CRecipientFilter.cs index c9aaf8d25..c59d6278b 100644 --- a/managed/src/SwiftlyS2.Shared/Natives/Structs/CRecipientFilter.cs +++ b/managed/src/SwiftlyS2.Shared/Natives/Structs/CRecipientFilter.cs @@ -16,8 +16,10 @@ public struct CRecipientFilter { private nint _pVTable; public ulong RecipientsMask; + public int PredictedSlot; public NetChannelBufType_t BufferType; public bool InitMessage; + public bool DisabledPrediction; public CRecipientFilter( NetChannelBufType_t BufType = NetChannelBufType_t.BUF_RELIABLE, bool bInitMessage = false ) { @@ -129,13 +131,35 @@ public unsafe static bool IsInitMessage( CRecipientFilter* filter ) return &filter->RecipientsMask; } + [UnmanagedCallersOnly] + public unsafe static int* GetPredictedSlotWindows( CRecipientFilter* filter, int* pPlayerSlot ) + { + *pPlayerSlot = filter->PredictedSlot; + return pPlayerSlot; + } + + [UnmanagedCallersOnly] + public unsafe static int GetPredictedSlotLinux( CRecipientFilter* filter ) + { + return filter->PredictedSlot; + } + + static unsafe CRecipientFilterVtable() { - pCRecipientFilterVTable = Marshal.AllocHGlobal(sizeof(nint) * 4); - Span vtable = new((void*)pCRecipientFilterVTable, 4); + pCRecipientFilterVTable = Marshal.AllocHGlobal(sizeof(nint) * 5); + Span vtable = new((void*)pCRecipientFilterVTable, 5); vtable[0] = (nint)(delegate* unmanaged< CRecipientFilter*, void >)(&Destructor); vtable[1] = (nint)(delegate* unmanaged< CRecipientFilter*, NetChannelBufType_t >)(&GetNetworkBufType); vtable[2] = (nint)(delegate* unmanaged< CRecipientFilter*, bool >)(&IsInitMessage); vtable[3] = (nint)(delegate* unmanaged< CRecipientFilter*, ulong* >)(&GetRecipients); + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + vtable[4] = (nint)(delegate* unmanaged< CRecipientFilter*, int*, int* >)(&GetPredictedSlotWindows); + } + else + { + vtable[4] = (nint)(delegate* unmanaged< CRecipientFilter*, int >)(&GetPredictedSlotLinux); + } } } \ No newline at end of file diff --git a/src/api/sdk/recipientfilter.h b/src/api/sdk/recipientfilter.h index a8f15ba07..1cbc15197 100644 --- a/src/api/sdk/recipientfilter.h +++ b/src/api/sdk/recipientfilter.h @@ -30,6 +30,7 @@ class CRecipientFilter : public IRecipientFilter NetChannelBufType_t GetNetworkBufType(void) const override { return m_nBufType; } bool IsInitMessage(void) const override { return m_bInitMessage; } const CPlayerBitVec& GetRecipients(void) const override { return m_Recipients; } + CPlayerSlot GetPredictedPlayerSlot(void) const override { return m_PredictedSlot; } void AddAllPlayers(void) { @@ -72,9 +73,11 @@ class CRecipientFilter : public IRecipientFilter } protected: + CPlayerBitVec m_Recipients; + CPlayerSlot m_PredictedSlot = INVALID_PLAYER_SLOT; NetChannelBufType_t m_nBufType; bool m_bInitMessage; - CPlayerBitVec m_Recipients; + bool m_bDisabledPrediction; }; class CBroadcastRecipientFilter : public CRecipientFilter diff --git a/vendor/s2sdk b/vendor/s2sdk index 817642500..e3240e279 160000 --- a/vendor/s2sdk +++ b/vendor/s2sdk @@ -1 +1 @@ -Subproject commit 817642500769a527abe45466d1d5ada4a70db94a +Subproject commit e3240e279308094414e36720548bd25eaa2864e0