From 4fd68939d323692fce5630dfbb0188f9467931f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Troch?= Date: Tue, 20 Mar 2018 00:19:01 +0100 Subject: [PATCH] [ZPS] Update gamedata and engine migration (#782) * Migrate ZPS from EP2 to SDK 2013 engine * Update ZPS gamedata (for version 3.0.7-Hotfix3) --- gamedata/core.games/engine.ep2.txt | 1 - gamedata/core.games/engine.sdk2013.txt | 1 + gamedata/sdkhooks.games/game.zpanic.txt | 84 +++++------ gamedata/sdktools.games/engine.ep2.txt | 1 - gamedata/sdktools.games/game.zpanic.txt | 178 ++++++++++++------------ 5 files changed, 132 insertions(+), 133 deletions(-) diff --git a/gamedata/core.games/engine.ep2.txt b/gamedata/core.games/engine.ep2.txt index b35b37b6..587dd967 100644 --- a/gamedata/core.games/engine.ep2.txt +++ b/gamedata/core.games/engine.ep2.txt @@ -17,7 +17,6 @@ "#supported" { "game" "ageofchivalry" - "game" "zps" "game" "bg2" "game" "pvkii" "game" "gesource" diff --git a/gamedata/core.games/engine.sdk2013.txt b/gamedata/core.games/engine.sdk2013.txt index d5f6764d..20fd5e9d 100644 --- a/gamedata/core.games/engine.sdk2013.txt +++ b/gamedata/core.games/engine.sdk2013.txt @@ -19,6 +19,7 @@ { "game" "synergy" "game" "empires" + "game" "zps" } "Offsets" diff --git a/gamedata/sdkhooks.games/game.zpanic.txt b/gamedata/sdkhooks.games/game.zpanic.txt index 84ba0638..51dc56cd 100644 --- a/gamedata/sdkhooks.games/game.zpanic.txt +++ b/gamedata/sdkhooks.games/game.zpanic.txt @@ -1,105 +1,105 @@ "Games" { - /* Zombic Panic Source 2.0 */ + /* Zombic Panic Source 3.0.7 (Hotfix-3) */ "zps" { "Offsets" { "EndTouch" { - "windows" "96" - "linux" "97" + "windows" "113" + "linux" "114" } "FireBullets" { - "windows" "108" - "linux" "109" + "windows" "125" + "linux" "126" } "OnTakeDamage" { - "windows" "61" - "linux" "62" + "windows" "74" + "linux" "75" } "PreThink" { - "windows" "295" - "linux" "296" + "windows" "351" + "linux" "352" } "PostThink" { - "windows" "296" - "linux" "297" + "windows" "352" + "linux" "353" } "SetTransmit" { - "windows" "19" - "linux" "20" + "windows" "26" + "linux" "27" } "ShouldCollide" { - "windows" "15" - "linux" "16" + "windows" "22" + "linux" "23" } "Spawn" { - "windows" "21" - "linux" "22" + "windows" "28" + "linux" "29" } "StartTouch" { - "windows" "94" - "linux" "95" + "windows" "111" + "linux" "112" } "Think" { - "windows" "46" - "linux" "47" + "windows" "57" + "linux" "58" } "Touch" { - "windows" "95" - "linux" "96" + "windows" "112" + "linux" "113" } "TraceAttack" { - "windows" "59" - "linux" "60" + "windows" "70" + "linux" "71" } "Use" { - "windows" "93" - "linux" "94" + "windows" "110" + "linux" "111" } "VPhysicsUpdate" { - "windows" "149" - "linux" "150" + "windows" "170" + "linux" "171" } "Weapon_CanSwitchTo" { - "windows" "240" - "linux" "241" + "windows" "281" + "linux" "282" } "Weapon_CanUse" { - "windows" "234" - "linux" "235" + "windows" "274" + "linux" "275" } "Weapon_Drop" { - "windows" "237" - "linux" "238" + "windows" "277" + "linux" "278" } "Weapon_Equip" { - "windows" "235" - "linux" "236" + "windows" "275" + "linux" "276" + } + "Weapon_Switch" + { + "windows" "278" + "linux" "279" } - //"Weapon_Switch" - //{ - // "windows" "234" - // "linux" "235" - //} } } } diff --git a/gamedata/sdktools.games/engine.ep2.txt b/gamedata/sdktools.games/engine.ep2.txt index 2e34f6a0..e2ce0ffa 100644 --- a/gamedata/sdktools.games/engine.ep2.txt +++ b/gamedata/sdktools.games/engine.ep2.txt @@ -91,7 +91,6 @@ "#supported" { "game" "ageofchivalry" - "game" "zps" "game" "bg2" "game" "gesource" "game" "RnLBeta" diff --git a/gamedata/sdktools.games/game.zpanic.txt b/gamedata/sdktools.games/game.zpanic.txt index ab4110f5..b3544c50 100644 --- a/gamedata/sdktools.games/game.zpanic.txt +++ b/gamedata/sdktools.games/game.zpanic.txt @@ -18,130 +18,130 @@ { "GiveNamedItem" { - "windows" "358" - "linux" "359" + "windows" "552" + "linux" "553" } "RemovePlayerItem" { - "windows" "247" - "linux" "248" + "windows" "289" + "linux" "290" } "Weapon_GetSlot" { - "windows" "242" - "linux" "243" + "windows" "284" + "linux" "285" } "Ignite" { - "windows" "199" - "linux" "200" + "windows" "223" + "linux" "224" } "Extinguish" { - "windows" "203" - "linux" "204" + "windows" "227" + "linux" "228" } "Teleport" { - "windows" "104" - "linux" "105" + "windows" "121" + "linux" "122" } "CommitSuicide" { - "windows" "405" - "linux" "405" + "windows" "465" + "linux" "465" } "GetVelocity" { - "windows" "133" - "linux" "134" + "windows" "153" + "linux" "154" } "EyeAngles" { - "windows" "125" - "linux" "126" + "windows" "144" + "linux" "145" } "AcceptInput" { - "windows" "35" - "linux" "36" - } - "SetEntityModel" - { - "windows" "24" - "linux" "25" - } - "WeaponEquip" - { - "windows" "235" - "linux" "236" + "windows" "42" + "linux" "43" } + //"SetEntityModel" + //{ + // "windows" "24" + // "linux" "25" + //} + //"WeaponEquip" + //{ + // "windows" "235" + // "linux" "236" + //} "Activate" { - "windows" "32" - "linux" "33" + "windows" "39" + "linux" "40" } - "PlayerRunCmd" + "PlayerRunCommand" { - "windows" "377" - "linux" "378" - } - } - "Signatures" - { - "FindEntityByClassname" - { - "library" "server" - "windows" "\x55\x8B\xEC\x53\x56\x8B\xF1\x8B\x4D\x2A\x57\x85\xC9\x74\x2A\x8B\x01\x8B\x50\x2A\xFF\xD2\x8B\x00\x25\x2A\x2A\x2A\x2A\x40\xC1\xE0\x2A\x8B\x3C\x30\xEB\x2A\x8B\x2A\x2A\x2A\x2A\x2A\x85\xFF\x74\x2A\x8B\x5D\x2A\x8B\x37\x85\xF6\x75\x2A\x68\x2A\x2A\x2A\x2A\xFF\x2A\x2A\x2A\x2A\x2A\x83\xC4\x2A\xEB\x2A\x39" - "linux" "@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc" - } - "FireOutput" - { - "library" "server" - "windows" "\x55\x8B\xEC\x81\x2A\x2A\x2A\x2A\x2A\x53\x56\x8B\x71\x2A\x57" - "linux" "@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f" + "windows" "443" + "linux" "444" } } + //"Signatures" + //{ + // "FindEntityByClassname" + // { + // "library" "server" + // "windows" "\x55\x8B\xEC\x53\x56\x8B\xF1\x8B\x4D\x2A\x57\x85\xC9\x74\x2A\x8B\x01\x8B\x50\x2A\xFF\xD2\x8B\x00\x25\x2A\x2A\x2A\x2A\x40\xC1\xE0\x2A\x8B\x3C\x30\xEB\x2A\x8B\x2A\x2A\x2A\x2A\x2A\x85\xFF\x74\x2A\x8B\x5D\x2A\x8B\x37\x85\xF6\x75\x2A\x68\x2A\x2A\x2A\x2A\xFF\x2A\x2A\x2A\x2A\x2A\x83\xC4\x2A\xEB\x2A\x39" + // "linux" "@_ZN17CGlobalEntityList21FindEntityByClassnameEP11CBaseEntityPKc" + // } + // "FireOutput" + // { + // "library" "server" + // "windows" "\x55\x8B\xEC\x81\x2A\x2A\x2A\x2A\x2A\x53\x56\x8B\x71\x2A\x57" + // "linux" "@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f" + // } + //} } - "zps" - { - "Offsets" - { - /* Offset into CBaseTempEntity constructor */ - "s_pTempEntities" - { - "windows" "19" - } - "GetTEName" - { - "windows" "4" - "linux" "4" - } - "GetTENext" - { - "windows" "8" - "linux" "8" - } - "TE_GetServerClass" - { - "windows" "0" - "linux" "0" - } - } + //"zps" + //{ + // "Offsets" + // { + // /* Offset into CBaseTempEntity constructor */ + // "s_pTempEntities" + // { + // "windows" "19" + // } + // "GetTEName" + // { + // "windows" "4" + // "linux" "4" + // } + // "GetTENext" + // { + // "windows" "8" + // "linux" "8" + // } + // "TE_GetServerClass" + // { + // "windows" "0" + // "linux" "0" + // } + // } - "Signatures" - { - "CBaseTempEntity" - { - "library" "server" - "windows" "\x55\x8B\xEC\x8B\xC1\x8B\x4D\x2A\xC7\x2A\x2A\x2A\x2A\x2A\x89" - } - "s_pTempEntities" - { - "library" "server" - "linux" "@_ZN15CBaseTempEntity15s_pTempEntitiesE" - } - } - } + // "Signatures" + // { + // "CBaseTempEntity" + // { + // "library" "server" + // "windows" "\x55\x8B\xEC\x8B\xC1\x8B\x4D\x2A\xC7\x2A\x2A\x2A\x2A\x2A\x89" + // } + // "s_pTempEntities" + // { + // "library" "server" + // "linux" "@_ZN15CBaseTempEntity15s_pTempEntitiesE" + // } + // } + //} }