Update gamedata for NMRiH 1.12 (#1623)

dysphie · asherkin · commit 2a85bcb631c6 · 2021-11-01T12:06:28.000Z
* Fix NMRiH's sdktools gamedata

* Fix NMRiH's sdkhooks gamedata

* Fix GroundEntChanged linux offset
diff --git a/gamedata/sdkhooks.games/game.nmrih.txt b/gamedata/sdkhooks.games/game.nmrih.txt
@@ -6,141 +6,141 @@
 		{
 			"Blocked"
 			{
-				"windows"	"104"
-				"linux"		"105"
-				"mac"		"105"
+				"windows"	"106"
+				"linux"		"107"
+				"mac"		"107"
 			}
 			"EndTouch"
 			{
-				"windows"	"102"
-				"linux"		"103"
-				"mac"		"103"
+				"windows"	"104"
+				"linux"		"105"
+				"mac"		"105"
 			}
 			"FireBullets"
 			{
-				"windows"	"114"
-				"linux"		"115"
-				"mac"		"115"
+				"windows"	"116"
+				"linux"		"117"
+				"mac"		"117"
 			}
 			"GroundEntChanged"
 			{
-				"windows"	"179"
-				"linux"		"181"
-				"mac"		"181"
+				"windows"	"181" 
+				"linux"		"183"
+				"mac"		"183"
 			}
 			"OnTakeDamage"
 			{
-				"windows"	"62"
-				"linux"		"63"
-				"mac"		"63"
+				"windows"	"64"
+				"linux"		"65"
+				"mac"		"65"
 			}
 			"OnTakeDamage_Alive"
 			{
-				"windows"	"275"
-				"linux"		"276"
-				"mac"		"276"
+				"windows"	"280"
+				"linux"		"281"
+				"mac"		"281"
 			}
 			"PreThink"
 			{
-				"windows"	"347"
-				"linux"		"348"
-				"mac"		"348"
+				"windows"	"352"
+				"linux"		"353"
+				"mac"		"353"
 			}
 			"PostThink"
 			{
-				"windows"	"327"
-				"linux"		"328"
-				"mac"		"328"
+				"windows"	"332"
+				"linux"		"333"
+				"mac"		"333"
 			}
 			"Reload"
 			{
-				"windows"	"272"
-				"linux"		"273"
-				"mac"		"273"
+				"windows"	"275"
+				"linux"		"276"
+				"mac"		"276"
 			}
 			"SetTransmit"
 			{
-				"windows"	"20"
-				"linux"		"21"
-				"mac"		"21"
+				"windows"	"22"
+				"linux"		"23"
+				"mac"		"23"
 			}
 			"ShouldCollide"
 			{
-				"windows"	"16"
-				"linux"		"17"
-				"mac"		"17"
+				"windows"	"17"
+				"linux"		"18"
+				"mac"		"18"
 			}
 			"Spawn"
 			{
-				"windows"	"22"
-				"linux"		"23"
-				"mac"		"23"
+				"windows"	"24"
+				"linux"		"25"
+				"mac"		"25"
 			}
 			"StartTouch"
 			{
-				"windows"	"100"
-				"linux"		"101"
-				"mac"		"101"
+				"windows"	"102"
+				"linux"		"103"
+				"mac"		"103"
 			}
 			"Think"
 			{
-				"windows"	"47"
-				"linux"		"48"
-				"mac"		"48"
+				"windows"	"49"
+				"linux"		"50"
+				"mac"		"50"
 			}
 			"Touch"
 			{
-				"windows"	"101"
-				"linux"		"102"
-				"mac"		"102"
+				"windows"	"103"
+				"linux"		"104"
+				"mac"		"104"
 			}
 			"TraceAttack"
 			{
-				"windows"	"60"
-				"linux"		"61"
-				"mac"		"61"
+				"windows"	"62"
+				"linux"		"63"
+				"mac"		"63"
 			}
 			"Use"
 			{
-				"windows"	"98"
-				"linux"		"99"
-				"mac"		"99"
+				"windows"	"100"
+				"linux"		"101"
+				"mac"		"101"
 			}
 			"VPhysicsUpdate"
 			{
-				"windows"	"159"
-				"linux"		"160"
-				"mac"		"160"
+				"windows"	"161"
+				"linux"		"162"
+				"mac"		"162"
 			}
 			"Weapon_CanSwitchTo"
 			{
-				"windows"	"269"
-				"linux"		"270"
-				"mac"		"270"
+				"windows"	"274"
+				"linux"		"275"
+				"mac"		"275"
 			}
 			"Weapon_CanUse"
 			{
-				"windows"	"263"
-				"linux"		"264"
-				"mac"		"264"
+				"windows"	"268"
+				"linux"		"269"
+				"mac"		"269"
 			}
 			"Weapon_Drop"
 			{
-				"windows"	"266"
-				"linux"		"267"
-				"mac"		"267"
+				"windows"	"271"
+				"linux"		"272"
+				"mac"		"272"
 			}
 			"Weapon_Equip"
 			{
-				"windows"	"264"
-				"linux"		"265"
-				"mac"		"265"
+				"windows"	"269"
+				"linux"		"270"
+				"mac"		"270"
 			}
 			"Weapon_Switch"
 			{
-				"windows"	"267"
-				"linux"		"268"
-				"mac"		"268"
+				"windows"	"272"
+				"linux"		"273"
+				"mac"		"273"
 			}
 		}
 	}
diff --git a/gamedata/sdktools.games/game.nmrih.txt b/gamedata/sdktools.games/game.nmrih.txt
@@ -46,7 +46,7 @@
 			}
 		}
 	}
-	
+
 	/* CBaseEntityOutput::FireOutput */
 	"#default"
 	{
@@ -55,7 +55,7 @@
 			"FireOutput"
 			{
 				"library"	"server"
-				"windows"	"\x55\x8B\xEC\x81\xEC\x28\x01\x00\x00\xD9\x45\x24\x53\x8B\xD9\xC7\x45\xF0\x00\x00\x00\x00\x8B\x4D\x1C\x56\x57\x8B"
+				"windows"	"\x55\x8B\xEC\x81\xEC\x28\x01\x00\x00\xD9\x45\x24\x53\x8B\xD9\xC7"
 				"linux"		"@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f"
 				"mac"		"@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f"
 			}
@@ -69,93 +69,93 @@
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"415"
-				"linux"		"416"
-				"mac"		"416"
+				"windows"	"420"
+				"linux"		"421"
+				"mac"		"421"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"273"
-				"linux"		"274"
-				"mac"		"274"
+				"windows"	"278"
+				"linux"		"279"
+				"mac"		"279"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"271"
-				"linux"		"272"
-				"mac"		"272"
+				"windows"	"276"
+				"linux"		"277"
+				"mac"		"277"
 			}
 			"Ignite"
 			{
-				"windows"	"211"
-				"linux"		"212"
-				"mac"		"212"
+				"windows"	"214"
+				"linux"		"215"
+				"mac"		"215"
 			}
 			"Extinguish"
 			{
-				"windows"	"215"
-				"linux"		"216"
-				"mac"		"216"
+				"windows"	"218"
+				"linux"		"219"
+				"mac"		"219"
 			}
 			"Teleport"
 			{
-				"windows"	"110"
-				"linux"		"111"
-				"mac"		"111"
+				"windows"	"112"
+				"linux"		"113"
+				"mac"		"113"
 			}
 			"CommitSuicide"
 			{
-				"windows"	"454"
-				"linux"		"454"
-				"mac"		"454"
+				"windows"	"459"
+				"linux"		"460"
+				"mac"		"460"
 			}
 			"GetVelocity"
 			{
-				"windows"	"142"
-				"linux"		"143"
-				"mac"		"143"
+				"windows"	"144"
+				"linux"		"145"
+				"mac"		"145"
 			}
 			"EyeAngles"
 			{
-				"windows"	"133"
-				"linux"		"134"
-				"mac"		"134"
+				"windows"	"135"
+				"linux"		"136"
+				"mac"		"136"
 			}
 			"AcceptInput"
 			{
-				"windows"	"36"
-				"linux"		"37"
-				"mac"		"37"
+				"windows"	"38"
+				"linux"		"39"
+				"mac"		"39"
 			}
 			"SetEntityModel"
 			{
-				"windows"	"24"
-				"linux"		"25"
-				"mac"		"25"
+				"windows"	"26"
+				"linux"		"27"
+				"mac"		"27"
 			}
 			"WeaponEquip"
 			{
-				"windows"	"264"
-				"linux"		"265"
-				"mac"		"265"
+				"windows"	"269"
+				"linux"		"270"
+				"mac"		"270"
 			}
 			"Activate"
 			{
-				"windows"	"33"
-				"linux"		"34"
-				"mac"		"34"
+				"windows"	"35"
+				"linux"		"36"
+				"mac"		"36"
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"433"
-				"linux"		"434"
-				"mac"		"434"
+				"windows"	"438"
+				"linux"		"439"
+				"mac"		"439"
 			}
 			"GiveAmmo"
 			{
-				"windows"	"255"
-				"linux"		"255"
-				"mac"		"255"
+				"windows"	"260"
+				"linux"		"260"
+				"mac"		"260"
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -6,141 +6,141 @@`
`6`	`6`	`{`
`7`	`7`	`"Blocked"`
`8`	`8`	`{`
`9`		`- "windows" "104"`
`10`		`- "linux" "105"`
`11`		`- "mac" "105"`
	`9`	`+ "windows" "106"`
	`10`	`+ "linux" "107"`
	`11`	`+ "mac" "107"`
`12`	`12`	`}`
`13`	`13`	`"EndTouch"`
`14`	`14`	`{`
`15`		`- "windows" "102"`
`16`		`- "linux" "103"`
`17`		`- "mac" "103"`
	`15`	`+ "windows" "104"`
	`16`	`+ "linux" "105"`
	`17`	`+ "mac" "105"`
`18`	`18`	`}`
`19`	`19`	`"FireBullets"`
`20`	`20`	`{`
`21`		`- "windows" "114"`
`22`		`- "linux" "115"`
`23`		`- "mac" "115"`
	`21`	`+ "windows" "116"`
	`22`	`+ "linux" "117"`
	`23`	`+ "mac" "117"`
`24`	`24`	`}`
`25`	`25`	`"GroundEntChanged"`
`26`	`26`	`{`
`27`		`- "windows" "179"`
`28`		`- "linux" "181"`
`29`		`- "mac" "181"`
	`27`	`+ "windows" "181"`
	`28`	`+ "linux" "183"`
	`29`	`+ "mac" "183"`
`30`	`30`	`}`
`31`	`31`	`"OnTakeDamage"`
`32`	`32`	`{`
`33`		`- "windows" "62"`
`34`		`- "linux" "63"`
`35`		`- "mac" "63"`
	`33`	`+ "windows" "64"`
	`34`	`+ "linux" "65"`
	`35`	`+ "mac" "65"`
`36`	`36`	`}`
`37`	`37`	`"OnTakeDamage_Alive"`
`38`	`38`	`{`
`39`		`- "windows" "275"`
`40`		`- "linux" "276"`
`41`		`- "mac" "276"`
	`39`	`+ "windows" "280"`
	`40`	`+ "linux" "281"`
	`41`	`+ "mac" "281"`
`42`	`42`	`}`
`43`	`43`	`"PreThink"`
`44`	`44`	`{`
`45`		`- "windows" "347"`
`46`		`- "linux" "348"`
`47`		`- "mac" "348"`
	`45`	`+ "windows" "352"`
	`46`	`+ "linux" "353"`
	`47`	`+ "mac" "353"`
`48`	`48`	`}`
`49`	`49`	`"PostThink"`
`50`	`50`	`{`
`51`		`- "windows" "327"`
`52`		`- "linux" "328"`
`53`		`- "mac" "328"`
	`51`	`+ "windows" "332"`
	`52`	`+ "linux" "333"`
	`53`	`+ "mac" "333"`
`54`	`54`	`}`
`55`	`55`	`"Reload"`
`56`	`56`	`{`
`57`		`- "windows" "272"`
`58`		`- "linux" "273"`
`59`		`- "mac" "273"`
	`57`	`+ "windows" "275"`
	`58`	`+ "linux" "276"`
	`59`	`+ "mac" "276"`
`60`	`60`	`}`
`61`	`61`	`"SetTransmit"`
`62`	`62`	`{`
`63`		`- "windows" "20"`
`64`		`- "linux" "21"`
`65`		`- "mac" "21"`
	`63`	`+ "windows" "22"`
	`64`	`+ "linux" "23"`
	`65`	`+ "mac" "23"`
`66`	`66`	`}`
`67`	`67`	`"ShouldCollide"`
`68`	`68`	`{`
`69`		`- "windows" "16"`
`70`		`- "linux" "17"`
`71`		`- "mac" "17"`
	`69`	`+ "windows" "17"`
	`70`	`+ "linux" "18"`
	`71`	`+ "mac" "18"`
`72`	`72`	`}`
`73`	`73`	`"Spawn"`
`74`	`74`	`{`
`75`		`- "windows" "22"`
`76`		`- "linux" "23"`
`77`		`- "mac" "23"`
	`75`	`+ "windows" "24"`
	`76`	`+ "linux" "25"`
	`77`	`+ "mac" "25"`
`78`	`78`	`}`
`79`	`79`	`"StartTouch"`
`80`	`80`	`{`
`81`		`- "windows" "100"`
`82`		`- "linux" "101"`
`83`		`- "mac" "101"`
	`81`	`+ "windows" "102"`
	`82`	`+ "linux" "103"`
	`83`	`+ "mac" "103"`
`84`	`84`	`}`
`85`	`85`	`"Think"`
`86`	`86`	`{`
`87`		`- "windows" "47"`
`88`		`- "linux" "48"`
`89`		`- "mac" "48"`
	`87`	`+ "windows" "49"`
	`88`	`+ "linux" "50"`
	`89`	`+ "mac" "50"`
`90`	`90`	`}`
`91`	`91`	`"Touch"`
`92`	`92`	`{`
`93`		`- "windows" "101"`
`94`		`- "linux" "102"`
`95`		`- "mac" "102"`
	`93`	`+ "windows" "103"`
	`94`	`+ "linux" "104"`
	`95`	`+ "mac" "104"`
`96`	`96`	`}`
`97`	`97`	`"TraceAttack"`
`98`	`98`	`{`
`99`		`- "windows" "60"`
`100`		`- "linux" "61"`
`101`		`- "mac" "61"`
	`99`	`+ "windows" "62"`
	`100`	`+ "linux" "63"`
	`101`	`+ "mac" "63"`
`102`	`102`	`}`
`103`	`103`	`"Use"`
`104`	`104`	`{`
`105`		`- "windows" "98"`
`106`		`- "linux" "99"`
`107`		`- "mac" "99"`
	`105`	`+ "windows" "100"`
	`106`	`+ "linux" "101"`
	`107`	`+ "mac" "101"`
`108`	`108`	`}`
`109`	`109`	`"VPhysicsUpdate"`
`110`	`110`	`{`
`111`		`- "windows" "159"`
`112`		`- "linux" "160"`
`113`		`- "mac" "160"`
	`111`	`+ "windows" "161"`
	`112`	`+ "linux" "162"`
	`113`	`+ "mac" "162"`
`114`	`114`	`}`
`115`	`115`	`"Weapon_CanSwitchTo"`
`116`	`116`	`{`
`117`		`- "windows" "269"`
`118`		`- "linux" "270"`
`119`		`- "mac" "270"`
	`117`	`+ "windows" "274"`
	`118`	`+ "linux" "275"`
	`119`	`+ "mac" "275"`
`120`	`120`	`}`
`121`	`121`	`"Weapon_CanUse"`
`122`	`122`	`{`
`123`		`- "windows" "263"`
`124`		`- "linux" "264"`
`125`		`- "mac" "264"`
	`123`	`+ "windows" "268"`
	`124`	`+ "linux" "269"`
	`125`	`+ "mac" "269"`
`126`	`126`	`}`
`127`	`127`	`"Weapon_Drop"`
`128`	`128`	`{`
`129`		`- "windows" "266"`
`130`		`- "linux" "267"`
`131`		`- "mac" "267"`
	`129`	`+ "windows" "271"`
	`130`	`+ "linux" "272"`
	`131`	`+ "mac" "272"`
`132`	`132`	`}`
`133`	`133`	`"Weapon_Equip"`
`134`	`134`	`{`
`135`		`- "windows" "264"`
`136`		`- "linux" "265"`
`137`		`- "mac" "265"`
	`135`	`+ "windows" "269"`
	`136`	`+ "linux" "270"`
	`137`	`+ "mac" "270"`
`138`	`138`	`}`
`139`	`139`	`"Weapon_Switch"`
`140`	`140`	`{`
`141`		`- "windows" "267"`
`142`		`- "linux" "268"`
`143`		`- "mac" "268"`
	`141`	`+ "windows" "272"`
	`142`	`+ "linux" "273"`
	`143`	`+ "mac" "273"`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`	`}`
`49`		`-`
	`49`	`+`
`50`	`50`	`/* CBaseEntityOutput::FireOutput */`
`51`	`51`	`"#default"`
`52`	`52`	`{`
`@@ -55,7 +55,7 @@`
`55`	`55`	`"FireOutput"`
`56`	`56`	`{`
`57`	`57`	`"library" "server"`
`58`		`- "windows" "\x55\x8B\xEC\x81\xEC\x28\x01\x00\x00\xD9\x45\x24\x53\x8B\xD9\xC7\x45\xF0\x00\x00\x00\x00\x8B\x4D\x1C\x56\x57\x8B"`
	`58`	`+ "windows" "\x55\x8B\xEC\x81\xEC\x28\x01\x00\x00\xD9\x45\x24\x53\x8B\xD9\xC7"`
`59`	`59`	`"linux" "@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f"`
`60`	`60`	`"mac" "@_ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f"`
`61`	`61`	`}`
`@@ -69,93 +69,93 @@`
`69`	`69`	`{`
`70`	`70`	`"GiveNamedItem"`
`71`	`71`	`{`
`72`		`- "windows" "415"`
`73`		`- "linux" "416"`
`74`		`- "mac" "416"`
	`72`	`+ "windows" "420"`
	`73`	`+ "linux" "421"`
	`74`	`+ "mac" "421"`
`75`	`75`	`}`
`76`	`76`	`"RemovePlayerItem"`
`77`	`77`	`{`
`78`		`- "windows" "273"`
`79`		`- "linux" "274"`
`80`		`- "mac" "274"`
	`78`	`+ "windows" "278"`
	`79`	`+ "linux" "279"`
	`80`	`+ "mac" "279"`
`81`	`81`	`}`
`82`	`82`	`"Weapon_GetSlot"`
`83`	`83`	`{`
`84`		`- "windows" "271"`
`85`		`- "linux" "272"`
`86`		`- "mac" "272"`
	`84`	`+ "windows" "276"`
	`85`	`+ "linux" "277"`
	`86`	`+ "mac" "277"`
`87`	`87`	`}`
`88`	`88`	`"Ignite"`
`89`	`89`	`{`
`90`		`- "windows" "211"`
`91`		`- "linux" "212"`
`92`		`- "mac" "212"`
	`90`	`+ "windows" "214"`
	`91`	`+ "linux" "215"`
	`92`	`+ "mac" "215"`
`93`	`93`	`}`
`94`	`94`	`"Extinguish"`
`95`	`95`	`{`
`96`		`- "windows" "215"`
`97`		`- "linux" "216"`
`98`		`- "mac" "216"`
	`96`	`+ "windows" "218"`
	`97`	`+ "linux" "219"`
	`98`	`+ "mac" "219"`
`99`	`99`	`}`
`100`	`100`	`"Teleport"`
`101`	`101`	`{`
`102`		`- "windows" "110"`
`103`		`- "linux" "111"`
`104`		`- "mac" "111"`
	`102`	`+ "windows" "112"`
	`103`	`+ "linux" "113"`
	`104`	`+ "mac" "113"`
`105`	`105`	`}`
`106`	`106`	`"CommitSuicide"`
`107`	`107`	`{`
`108`		`- "windows" "454"`
`109`		`- "linux" "454"`
`110`		`- "mac" "454"`
	`108`	`+ "windows" "459"`
	`109`	`+ "linux" "460"`
	`110`	`+ "mac" "460"`
`111`	`111`	`}`
`112`	`112`	`"GetVelocity"`
`113`	`113`	`{`
`114`		`- "windows" "142"`
`115`		`- "linux" "143"`
`116`		`- "mac" "143"`
	`114`	`+ "windows" "144"`
	`115`	`+ "linux" "145"`
	`116`	`+ "mac" "145"`
`117`	`117`	`}`
`118`	`118`	`"EyeAngles"`
`119`	`119`	`{`
`120`		`- "windows" "133"`
`121`		`- "linux" "134"`
`122`		`- "mac" "134"`
	`120`	`+ "windows" "135"`
	`121`	`+ "linux" "136"`
	`122`	`+ "mac" "136"`
`123`	`123`	`}`
`124`	`124`	`"AcceptInput"`
`125`	`125`	`{`
`126`		`- "windows" "36"`
`127`		`- "linux" "37"`
`128`		`- "mac" "37"`
	`126`	`+ "windows" "38"`
	`127`	`+ "linux" "39"`
	`128`	`+ "mac" "39"`
`129`	`129`	`}`
`130`	`130`	`"SetEntityModel"`
`131`	`131`	`{`
`132`		`- "windows" "24"`
`133`		`- "linux" "25"`
`134`		`- "mac" "25"`
	`132`	`+ "windows" "26"`
	`133`	`+ "linux" "27"`
	`134`	`+ "mac" "27"`
`135`	`135`	`}`
`136`	`136`	`"WeaponEquip"`
`137`	`137`	`{`
`138`		`- "windows" "264"`
`139`		`- "linux" "265"`
`140`		`- "mac" "265"`
	`138`	`+ "windows" "269"`
	`139`	`+ "linux" "270"`
	`140`	`+ "mac" "270"`
`141`	`141`	`}`
`142`	`142`	`"Activate"`
`143`	`143`	`{`
`144`		`- "windows" "33"`
`145`		`- "linux" "34"`
`146`		`- "mac" "34"`
	`144`	`+ "windows" "35"`
	`145`	`+ "linux" "36"`
	`146`	`+ "mac" "36"`
`147`	`147`	`}`
`148`	`148`	`"PlayerRunCmd"`
`149`	`149`	`{`
`150`		`- "windows" "433"`
`151`		`- "linux" "434"`
`152`		`- "mac" "434"`
	`150`	`+ "windows" "438"`
	`151`	`+ "linux" "439"`
	`152`	`+ "mac" "439"`
`153`	`153`	`}`
`154`	`154`	`"GiveAmmo"`
`155`	`155`	`{`
`156`		`- "windows" "255"`
`157`		`- "linux" "255"`
`158`		`- "mac" "255"`
	`156`	`+ "windows" "260"`
	`157`	`+ "linux" "260"`
	`158`	`+ "mac" "260"`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`	`}`