From 04cfbfc7520ddd31425088ffb6fa61dfff67dcc5 Mon Sep 17 00:00:00 2001 From: DoktorSAS Date: Thu, 30 Jun 2022 19:53:36 +0200 Subject: [PATCH] Named some tokens and method (#139) --- src/client/game/scripting/function_tables.cpp | 268 +++++++++++++++--- 1 file changed, 223 insertions(+), 45 deletions(-) diff --git a/src/client/game/scripting/function_tables.cpp b/src/client/game/scripting/function_tables.cpp index 3eeb275e..65e6ccff 100644 --- a/src/client/game/scripting/function_tables.cpp +++ b/src/client/game/scripting/function_tables.cpp @@ -1290,9 +1290,9 @@ namespace scripting {"_meth_8215", 0x8215}, // SP 0x2CB4A0 MP 0x44CB00 {"_meth_8216", 0x8216}, // SP 0x2CB5D0 MP 0x44CCA0 {"_meth_8217", 0x8217}, // SP 0x2CB720 MP 0x44CCF0 - {"circle", 0x8218}, // SP 0x2D0720 MP 0x439750 + {"circle", 0x8218}, // SP 0x2D0720 MP 0x439750 - iw6 name is WorldPointInReticle_Circle {"rect", 0x8219}, // SP 0x2D12D0 MP 0x439F20 - {"_meth_821a", 0x821A}, // SP 0x2D1850 MP 0x43A680 + {"getpointinbounds", 0x821A}, // SP 0x2D1850 MP 0x43A680 {"transfermarkstonewscriptmodel", 0x821B}, // SP 0x2D1FC0 MP 0x43B020 {"setwatersheeting", 0x821C}, // SP 0x2C47C0 MP 0x445400 {"_meth_821d", 0x821D}, // SP 0x2C02D0 MP 0x000000 @@ -1303,8 +1303,8 @@ namespace scripting {"_meth_8222", 0x8222}, // SP 0x2CDCF0 MP 0x437140 {"_meth_8223", 0x8223}, // SP 0x2CD9F0 MP 0x436F30 {"_meth_8224", 0x8224}, // SP 0x2CE3A0 MP 0x437750 - {"_meth_8225", 0x8225}, // SP 0x2D1E80 MP 0x438700 - {"_meth_8226", 0x8226}, // SP 0x2C2210 MP 0x4432D0 + {"isitemunlocked", 0x8225}, // SP 0x2D1E80 MP 0x438700 + {"getrankedplayerdata", 0x8226}, // SP 0x2C2210 MP 0x4432D0 {"vehicleturretcontroloff", 0x8227}, // SP 0x4E7230 MP 0x60E170 {"isturretready", 0x8228}, // SP 0x4E7310 MP 0x609890 {"_meth_8229", 0x8229}, // SP 0x4E7560 MP 0x609B20 @@ -1332,7 +1332,7 @@ namespace scripting {"_meth_8240", 0x8240}, // SP 0x2C4AD0 MP 0x000000 {"_meth_8241", 0x8241}, // SP 0x274CF0 MP 0x000000 {"_meth_8242", 0x8242}, // SP 0x2750F0 MP 0x000000 - {"_meth_8243", 0x8243}, // SP 0x2C2550 MP 0x443C20 + {"setcommonplayerdata", 0x8243}, // SP 0x2C2550 MP 0x443C20 - Could be also setrankedplayerdata {"_meth_8244", 0x8244}, // SP 0x2C2A00 MP 0x4442D0 {"_meth_8245", 0x8245}, // SP 0x2C3190 MP 0x444850 {"trackerupdate", 0x8246}, // SP 0x2C51C0 MP 0x447650 @@ -1492,7 +1492,7 @@ namespace scripting {"player_recoilscaleoff", 0x82E0}, // SP 0x28D920 MP 0x4092D0 {"weaponlockstart", 0x82E1}, // SP 0x28DA00 MP 0x409530 {"weaponlockfinalize", 0x82E2}, // SP 0x28DCC0 MP 0x4097A0 - {"disableautoreload", 0x82E3}, // SP 0x28DFC0 MP 0x409C50 + {"weaponlockfree", 0x82E3}, // SP 0x28DFC0 MP 0x409C50 - was disableautoreload {"setentertime", 0x82E4}, // SP 0x28E060 MP 0x409E60 {"usinggamepad", 0x82E5}, // SP 0x000000 MP 0x411680 {"_meth_82e6", 0x82E6}, // SP 0x000000 MP 0x411700 @@ -2718,10 +2718,10 @@ namespace scripting {"killanimscript", 0x233}, {"killcamentity", 0x234}, {"killcamentitylookat", 0x235}, - {"_not_kills", 0x236}, // was "kills" + {"kills", 0x236}, {"killstreak", 0x237}, {"killstreakcount", 0x238}, - {"kills", 0x239}, // was "killstreakrestricted" + {"killstreakrestricted", 0x239}, {"killstreakunlocked", 0x23A}, {"knife_off", 0x23B}, {"knife_on", 0x23C}, @@ -2981,10 +2981,10 @@ namespace scripting {"primaryfurniturekit", 0x33A}, {"primaryoffhand", 0x33B}, {"primaryreticle", 0x33C}, - {"primaryweapon", 0x33D}, + {"_not_primaryweapon", 0x33D}, {"privatematchactivesquadmember", 0x33E}, {"privatematchcustomclasses", 0x33F}, - {"privatematchsquadmembers", 0x340}, + {"primaryweapon", 0x340}, // was privatematchsquadmembers {"projectile_impact", 0x341}, {"projectile_impact_player", 0x342}, {"prone", 0x343}, @@ -3096,10 +3096,10 @@ namespace scripting {"secondaryfurniturekit", 0x3AD}, {"secondaryoffhand", 0x3AE}, {"secondaryreticle", 0x3AF}, - {"secondaryweapon", 0x3B0}, + {"_not_secondaryweapon", 0x3B0}, // was secondaryweapon {"sentry", 0x3B1}, {"sentry_manual", 0x3B2}, - {"sentry_offline", 0x3B3}, + {"secondaryweapon", 0x3B3}, // was sentry_offline {"servertimecount", 0x3B4}, {"servertimeexceedcount", 0x3B5}, {"servertimemax", 0x3B6}, @@ -3492,12 +3492,12 @@ namespace scripting {"codescripts/struct", 0x53E}, {"codescripts/message", 0x53F}, {"maps/mp/gametypes/_callbacksetup", 0x540}, - - // additional findings from gametype/map scripts - mikey (6/26/2022) - {"common_scripts/_fx", 0xA4FB}, - {"common_scripts/_pipes", 0xA4F9}, - {"common_scripts/utility", 0xA4FA}, - + {"_createfx", 0x575}, + {"_effect", 0x58f}, + {"ac130", 0x6ce}, + {"ac130player", 0x6d1}, + {"atBrinkOfDeath", 0xD82}, + {"blockWeaponDrops", 0x14B5}, {"QuickMessageToAll", 0x70a2}, {"SetupCallbacks", 0x8301}, {"_effect", 0x58f}, @@ -3509,22 +3509,58 @@ namespace scripting {"addToCharactersArray", 0x848}, {"addToTeam", 0x851}, {"allowUse", 0xab2}, + {"anim_prop_models", 0xbec}, {"applyLoadout", 0xcae}, // has applyLoadout notify like IW6's giveLoadout does at the end + similar logic + {"audio", 0x10f0}, + {"baseFontScale", 0x1309}, + {"beingRevived", 0x13ab}, + {"bombSquadIds", 0x154d}, + {"bombSquadIcons", 0x154c}, + {"bot_funcs", 0x161b}, + {"breathingStopTime", 0x17e6}, + {"brinkOfDeathKillStreak", 0x1818}, + {"c4explodethisframe", 0x1974}, {"Callback_PlayerDamage", 0x19f5}, {"callbackPlayerDamage", 0x19fe}, + {"canDoCombat", 0x1ac6}, + {"carryFlag", 0x1bb4}, + {"challengeInfo", 0x1c62}, + {"changingWeapon", 0x1c87}, {"characters", 0x1c8e}, {"checkDynamicSpawns", 0x1cfa}, + {"chopper", 0x1d48}, + {"claymoreDetectionDot", 0x1e44}, + {"claymoreDetectionMinDist", 0x1e46}, {"clearOnVictimDisconnect", 0x1ef9}, + {"clientid", 0x1f0f}, + {"clientMatchDataId", 0x1f10}, + {"combatHigh", 0x20ab}, {"conf_fx", 0x20e9}, {"console", 0x2153}, {"createUseObject", 0x244c}, {"curOrigin", 0x24c8}, + {"curProgress", 0x24C9}, + {"defaultvalue", 0x27a1}, {"deleteObjPoint", 0x2859}, + {"detectedExploit", 0x2991}, + {"detectExplosives", 0x2992}, + {"detectId", 0x2994}, + {"disabled", 0x2afd}, {"disableSpawning", 0x2b28}, {"dogtags", 0x2cdf}, + {"doingSplash", 0x2ce9}, + {"dont_delete_grenades_on_next_spawn",0x2d1e}, + {"droppedDeathWeapon",0x2f74}, + {"entityHeadIcons", 0x331a}, {"finalKill", 0x373e}, {"findBoxCenter", 0x3779}, + {"flashDuration", 0x38ae}, + {"flashEndTime", 0x38b1}, + {"flashRumbleDuration", 0x38c4}, {"forfeitInProgress", 0x39df}, + {"friendlydamage", 0x3a97}, + {"freeplayers", 0x3a2a}, + {"fx", 0x3b23}, {"gameended", 0x3bda}, {"gamemodeModifyPlayerDamage", 0x3bf6}, {"getNextObjID", 0x4041}, @@ -3534,44 +3570,102 @@ namespace scripting {"getTeamSpawnPoints", 0x411f}, {"getWeaponClass", 0x4167}, {"giveLoadout", 0x41e0}, // this may not even be giveLoadout but it's a wrapper for it and it does the same logic so + {"gotPullbackNotify", 0x428b}, {"guid", 0x4450}, + {"gunner", 0x4473}, + {"hardcoreMode", 0x46ca}, + {"healthRegenerationStreak", 0x4791}, + {"healthOverlayCutoff", 0x478d}, + {"healthRegenDisabled", 0x478e}, + {"hits", 0x4926}, + {"hitsThisMag", 0x4929}, + {"hud", 0x4ab3}, + {"iDFlags", 0x4b56}, + {"iDFLAGS_NO_KNOCKBACK", 0x4b58}, + {"iDFLAGS_SHIELD_EXPLOSIVE_SPLASH ", 0x4b60 }, + {"iDFLAGS_SHIELD_EXPLOSIVE_IMPACT", 0x4b5e}, + {"iDFLAGS_SHIELD_EXPLOSIVE_IMPACT_HUGE", 0x4b5f}, + {"iDFLAGS_STUN", 0x4b61}, + {"iDFlagsTime", 0x4b62}, + {"initedEntityHeadIcons", 0x4Db6}, + {"inc", 0x4c13}, + {"inFrames", 0x4c67}, {"inGracePeriod", 0x4c6d}, + {"init_animatedmodels", 0x4c77}, {"initSpawns", 0x4e26}, + {"inPlayerSmokeScreen", 0x4e42}, + {"inlaststand ", 0x4e3c}, {"initializeMatchRules", 0x4de0}, {"initializeTagPathVariables", 0x4de3}, + {"iscooked", 0x50e8}, {"isKillstreakWeapon", 0x513d}, + {"isRocketCorpse", 0x5193}, + {"joining_team", 0x528c}, + {"kill_streak", 0x533c}, + {"killstreakRoundDelay", 0x53a2}, + {"killstreakSpawnShield", 0x53a8}, + {"largeProjectileDamage", 0x54c0}, + {"lastDamageWasFromEnemy", 0x5591}, + {"lastDeathIcon", 0x5592}, + {"lastDroppableWeapon", 0x5598}, + {"lastFlashedTime", 0x55a1}, + {"lastConcussedTime", 0x558b}, + {"lastGrenadeSuicideTime", 0x55a5}, + {"lastHitTime", 0x55ab}, + {"lastPrimaryWeaponSwapTime", 0x55cd}, + {"lastShotFiredTime", 0x55d9}, {"lastWave", 0x560e}, + {"leaving_team", 0x566d}, + {"lowerTextFontSize", 0x58a8}, + {"lowerTextY", 0x58a9}, + {"lowerTextYAlign", 0x58aa}, + {"plantedLethalEquip",0x5979}, {"mapCenter", 0x5986}, - {"waveDelay", 0xa2ab}, - {"maps/mp/_compass", 0xa731}, - {"maps/mp/_crib", 0xa733}, // sp files, missing on mikey dump - {"maps/mp/_hud_util", 0xa747}, - {"maps/mp/_load", 0xa74c}, - {"maps/mp/_utility", 0xa764}, - {"maps/mp/gametypes/_class", 0xa78B}, - {"maps/mp/gametypes/_damage", 0xa78D}, - {"maps/mp/gametypes/_gamelogic", 0xa793}, - {"maps/mp/gametypes/_gameobjects", 0xa794}, - {"maps/mp/gametypes/_globallogic", 0xa797}, - {"maps/mp/gametypes/_hostmigration", 0xa7e4}, - {"maps/mp/gametypes/_menus", 0xa7a9}, - {"maps/mp/gametypes/_objpoints", 0xa7ac}, - {"maps/mp/gametypes/_presistence", 0xa7ae}, - {"maps/mp/gametypes/_playerlogic", 0xa7b1}, - {"maps/mp/gametypes/_spawnlogic", 0xa7b9}, - {"maps/mp/gametypes/_spawnscoring", 0xa7ba}, - {"maps/mp/gametypes/_perks", 0xa7e4}, + {"mapSize", 0x5990}, + {"matchbonus", 0x59df}, {"matchRules_damageMultiplier", 0x59e6}, {"matchRules_vampirism", 0x59eb}, + {"maxClients", 0x5a29}, + {"MaxEvents", 0x5a37}, + {"maxFontScale", 0x5a39}, + {"MaxKillstreaks", 0x5a3c}, + {"MaxLives", 0x5a40}, + {"MaxNumAwardsPerPlayer", 0x5a41}, + {"MaxLogClients", 0x5a42}, + {"MaxNumChallengesPerPlayer", 0x5a45}, {"modifyPlayerDamage", 0x5d51}, + {"missionCallbacks", 0x5cdc }, + {"modifyPlayerDamage", 0x5d51}, + {"moveSpeedScaler", 0x5f7b}, + {"mp_createfx", 0x5fac}, + {"multiTeamBased", 0x5fec}, {"objId", 0x6304}, + {"teamObjIds", 0x6305}, + {"OMAClassChanged", 0x6436}, {"onForfeit", 0x64af}, {"onNormalDeath", 0x64bf}, + {"onPlayerConnectAudioInit", 0x64c9}, {"onPlayerScore", 0x64d5}, {"onStartGameType", 0x64ec}, {"onUse", 0x64f8}, + {"outFrames", 0x65c4}, {"participants", 0x669d}, - {"reInitializeMatchRulesOnMigration", 0x7307}, + {"tookWeaponFrom", 0x680b}, + {"placement", 0x6861}, + {"planeModel", 0x687c}, + {"player_speed", 0x6c19}, + {"playerHealth_RegularRegenDelay", 0x6cc3}, + {"bonusUpdateTotal",0x6e8a}, + {"primaryProgressBarFontSize", 0x6f85}, + {"primaryProgressBarHeight", 0x6f86}, + {"primaryProgressBarTextX", 0x6f87}, + {"primaryProgressBarTextY", 0xf88}, + {"primaryProgressBarWidth", 0x6f89}, + {"primaryProgressBarX", 0x6f8a}, + {"primaryProgressBarY", 0x6f8b}, + {"rankTable", 0x713a}, + {"recoilScale", 0x7268}, + {"regenSpeed", 0x72d4}, {"registerHalfTimeDvar", 0x72ef}, {"registerNumLivesDvar", 0x72f4}, {"registerRoundLimitDvar", 0x72f6}, @@ -3579,7 +3673,15 @@ namespace scripting {"registerScoreLimitDvar", 0x72f8}, {"registerTimeLimitDvar", 0x72f9}, {"registerWinLimitDvar", 0x72fe}, + {"reInitializeMatchRulesOnMigration", 0x7307}, {"removeFromCharactersArray", 0x73a7}, + {"requiredMapAspectRatio", 0x740c}, + {"reverb_settings", 0x74f1}, + {"riotShieldXPBullets", 0x7446}, + {"script_accumulate", 0x792B}, + {"script_destructable_area", 0x799b}, + {"script_fxid", 0x79f1}, + {"script_threshold", 0x7af4}, {"setClass", 0x7f3b}, {"setCommonRulesFromMatchRulesData", 0x7f3f}, {"setObjectiveHintText", 0x7fc3}, @@ -3587,20 +3689,96 @@ namespace scripting {"setObjectiveText", 0x7fc5}, {"setUseTime", 0x834c}, {"setupMiniMap", 0x8324}, + {"shieldBulletHits", 0x84c5}, + {"shieldDamage", 0x84c6}, {"showToTeam", 0x8535}, + {"softLanding", 0x885f}, + {"softLandingTriggers", 0x8860}, {"spawnDogTags", 0x899e}, + {"spawnPoints", 0x8a01}, + {"splashQueue", 0x8a6b}, + {"splitscreen", 0x8a7c}, + {"stingerLockStartTime", 0x8e48}, + {"stingerLostSightlineTime", 0x8e49}, + {"stingerStage", 0x8e59}, + {"stingerTarget", 0x8e5a}, + {"stingerUseEntered", 0x8e5c}, + {"stunScaler", 0x8f77}, {"spawnMaxs", 0x89f3}, {"spawnMins", 0x89f6}, - {"spawnPoints", 0x8a01}, - {"splitscreen", 0x8a7c}, + {"stuckEnemyEntity", 0x8f6c}, + {"suicides", 0x8faf}, + {"switching_teams", 0x907e}, {"tag_stowed_hip", 0x90d3}, {"tagTeamUpdater", 0x910a}, - {"teamBased", 0x91eb}, - {"teamNameList", 0x91f7}, - {"teamObjIds", 0x6305}, + {"teamBalance", 0x91e9}, + {"teamBased", 0x91eb }, + {"teamkillsThisRound", 0x91f3}, + {"teamNameList", 0x91f7 }, + {"teamProgressBarFontSize", 0x91fb}, + {"teamProgressBarHeight", 0x91fc}, + {"teamProgressBarTextY", 0x91fd}, + {"teamProgressBarWidth", 0x91fe}, + {"teamProgressBarY", 0x91ff}, + {"throwingGrenade", 0x933e}, + {"timePlayed", 0x9372}, {"teamSpawnPoints", 0x9201}, + {"useRate", 0x9c10}, + {"useStartSpawns", 0x9c14}, + {"usingRemote", 0x9c34}, {"v", 0x9c42}, - {"visuals", 0x9e9c}, - {"multiTeamBased", 0x5fec}, + {"visuals", 0x9e9c }, + {"teamNameList", 0x91f7}, + {"whizby_settings", 0xa315}, + {"wasAliveAtMatchStart", 0xa1be }, + {"wasChained", 0xa1c0}, + {"wasDamaged", 0xa1c3}, + {"wasDamagedFromBulletPenetration", 0xa1c5}, + {"waveDelay", 0xa2ab}, + {"scoreInfo", 0xa3a5}, + {"xpUpdateTotal", 0xa3ab}, + // additional findings from gametype/map scripts - mikey (6/26/2022) + {"common_scripts/_fx", 0xa4fb }, + {"common_scripts/_pipes", 0xa4f9 }, + {"common_scripts/utility", 0xa4fa }, + {"maps/mp/_animatedmodels", 0xa72b}, + {"maps/mo/_areas", 0xa72c}, + {"maps/mp/_audio", 0xa72e}, + {"maps/mp/_compass", 0xa731}, + {"masp/mp/_createfx", 0xa732}, + {"maps/mp/_crib", 0xa733}, // sp files, missing on mikey dump + {"maps/mp/_destructables", 0xa734}, + {"maps/mp/_entityheadicons", 0xa737}, + {"maps/mp/_matchdata", 0xa74e}, + {"maps/mp/_flashgranades", 0xa747}, + {"maps/mp/_global_fx", 0xa749}, + {"maps/mp/_global_fx_code", 0xa74a}, + {"maps/mp/_load", 0xa74c}, + {"maps/mp/_scoreboard", 0xa758}, + {"maps/mp/_shutter", 0xa759}, + {"maps/mp/_stinger", 0xa75b}, + {"maps/mp/_utility", 0xa764}, + {"maps/mp/gametypes/_class", 0xa78b}, + {"maps/mp/gametypes/_damage", 0xa78d}, + {"maps/mp/gametypes/_damagefeedback", 0xa78e}, + {"maps/mp/gametypes/_deathicons", 0xa78f}, + {"maps/mp/gametypes/_gamelogic", 0xa793}, + {"maps/mp/gametypes/_gameobjects", 0xa794}, + {"maps/mp/gametypes/_globallogic", 0xa797}, + {"maps/mp/gametypes/_healthoverlay", 0xa799}, + {"maps/mp/gametypes/_hostmigration", 0xa7a4}, + {"maps/mp/gametypes/_hud", 0xa7a5 }, + {"maps/mp/gametypes/_hud_message", 0xa7a6}, + {"maps/mp/gametypes/_hud_util", 0xa7a7 }, + {"maps/mp/gametypes/_menus", 0xa7a9}, + {"maps/mp/gametypes/_objpoints", 0xa7ac}, + {"maps/mp/gametypes/_presistence", 0xa7ae}, + {"maps/mp/gametypes/_playerlogic", 0xa7b1}, + {"maps/mp/gametypes/_rank", 0xa7b4}, + {"maps/mp/gametypes/_spawnlogic", 0xa7b9}, + {"maps/mp/gametypes/_spawnscoring", 0xa7ba}, + {"maps/mp/gametypes/_teams", 0xa7bc}, + {"maps/mp/gametypes/_perks", 0xa7e4}, + {"maps/mp/gametypes/_perkfunctions", 0xa7e5} }; }