Gamedata Update for 4/18 (#197) [M]

If problems still occur, be sure to open an issue or pull request!
Batfoxkid · Apr 19, 2024 · c3ebc98 · c3ebc98
1 parent f1b91e9
commit c3ebc98
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 97 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ Required:
 
 - [SourceMod 1.11+](https://www.sourcemod.net/downloads.php)
 - [TF2Attributes 1.7.0+](https://github.com/FlaminSarge/tf2attributes)
-- [TF2Items](https://github.com/asherkin/TF2Items)
+- [TF2Items](https://github.com/nosoop/SMExt-TF2Items)
 
 Recommended:
 

diff --git a/addons/sourcemod/gamedata/ff2.txt b/addons/sourcemod/gamedata/ff2.txt
@@ -4,51 +4,47 @@
 	{
 		"Signatures"
 		{
-			"CBaseObject::FindSnapToBuildPos"
-			{
-				"linux"		"@_ZN11CBaseObject18FindSnapToBuildPosEPS_"
-				"windows"	"\x55\x8B\xEC\x83\xEC\x38\x57\x8B\xF9\xE8\x2A\x2A\x2A\x2A\x84\xC0"
-			}
 			"CLagCompensationManager::StartLagCompensation"
 			{
+				// "Trying to start a new lag compensation "
 				"library"	"server"
 				"linux"		"@_ZN23CLagCompensationManager20StartLagCompensationEP11CBasePlayerP8CUserCmd"
-				"windows"	"\x55\x8B\xEC\x83\xEC\x24\x57\x8B\xF9\x89\x7D\xE8"
+				"windows"	"\x55\x8B\xEC\x83\xEC\x28\x57\x8B\xF9\x89\x7D\xE4"
 			}
 			"CLagCompensationManager::FinishLagCompensation"
 			{
+				// "FinishLagCompensation"
 				"library"	"server"
 				"linux"		"@_ZN23CLagCompensationManager21FinishLagCompensationEP11CBasePlayer"
-				"windows"	"\x55\x8B\xEC\x83\xEC\x38\xA1\x2A\x2A\x2A\x2A\x53"
-			}
-			"CObjectSapper::ApplyRoboSapperEffects"
-			{
-				"linux"		"@_ZN13CObjectSapper22ApplyRoboSapperEffectsEP9CTFPlayerf"
-				"windows"	"\x55\x8B\xEC\x53\x57\x8B\x7D\x08\x8B\xD9\x85\xFF\x75\x2A\x5F\x32\xC0\x5B\x5D\xC2\x08\x00"
+				"windows"	"\x55\x8B\xEC\x83\xEC\x40\x8B\x15\x2A\x2A\x2A\x2A\x53\x56\x33\xF6\x8B\xD9"
 			}
 			"CTFDroppedWeapon::Create"
 			{
+				// "tf_dropped_weapon" Single Large Function
 				"library"	"server"
 				"linux"		"@_ZN16CTFDroppedWeapon6CreateEP9CTFPlayerRK6VectorRK6QAnglePKcPK13CEconItemView"
-				"windows"	"\x55\x8B\xEC\x51\xA1\x2A\x2A\x2A\x2A\x80\xB8\x2A\x2A\x2A\x2A\x00\x74\x2A\x33\xC0\x8B\xE5\x5D\xC3"
+				"windows"	"\x55\x8B\xEC\x51\xA1\x2A\x2A\x2A\x2A\x80\xB8\x72\x0C\x00\x00\x00"
 			}
 			"CTFDroppedWeapon::InitDroppedWeapon"
 			{
+				// "ChargeLevelDegradeThink" Called by 3 Funcs
 				"library"	"server"
 				"linux"		"@_ZN16CTFDroppedWeapon17InitDroppedWeaponEP9CTFPlayerP13CTFWeaponBasebb"
-				"windows"	"\x55\x8B\xEC\x83\xEC\x24\x56\x57\x8B\xF9\x8B\x4D\x08"
+				"windows"	"\x55\x8B\xEC\x83\xEC\x30\x56\x57\x8B\xF9\x8B\x4D\x08"
 			}
 			"CTFDroppedWeapon::InitPickedUpWeapon"
 			{
+				// "ChargeLevelDegradeThink" Called only by CTFPlayer::PickupWeaponFromOther
 				"library"	"server"
 				"linux"		"@_ZN16CTFDroppedWeapon18InitPickedUpWeaponEP9CTFPlayerP13CTFWeaponBase"
 				"windows"	"\x55\x8B\xEC\x83\xEC\x08\xD9\xEE\x53\x56\x57"
 			}
 			"CTFGameStats::ResetRoundStats"
 			{
+				// "stats_resetround"
 				"library"	"server"
 				"linux"		"@_ZN12CTFGameStats15ResetRoundStatsEv"
-				"windows"	"\x53\x8B\xD9\x56\x57\xBE\x66\x00\x00\x00"
+				"windows"	"\x53\x8B\xD9\x56\xBE\x66\x00\x00\x00"
 			}
 			"CTFGameStats::IncrementStat"
 			{
@@ -58,69 +54,62 @@
 			}
 			"CTFPlayer::CanAirDash"
 			{
+				// "set_scout_doublejump_disabled"
 				"library"	"server"
 				"linux"		"@_ZNK9CTFPlayer10CanAirDashEv"
-				"windows"	"\x55\x8B\xEC\x83\xEC\x08\x57\x8B\xF9\xF7\x87\xB4\x1B\x00\x00\x00\x00\x04\x00"
-			}
-			"CTFPlayer::CanBuild"
-			{
-				"library"	"server"
-				"linux"		"@_ZN9CTFPlayer8CanBuildEii"
-				"windows"	"\x55\x8B\xEC\x83\xEC\x0C\x53\x8B\x5D\x08\x57\x8B\xF9\x83\xFB\x03"
+				"windows"	"\x55\x8B\xEC\x83\xEC\x08\x53\x57\x8B\xF9\x8B\x87\xB4\x1B\x00\x00"
 			}
 			"CTFPlayer::CanPickupDroppedWeapon"
 			{
 				"library"	"server"
 				"linux"		"@_ZN9CTFPlayer22CanPickupDroppedWeaponEPK16CTFDroppedWeapon"
-				"windows"	"\x55\x8B\xEC\x53\x8B\x5D\x08\x56\x8B\xF1\x80\xBB\x04\x05\x00\x00\x00"
+				"windows"	"\x55\x8B\xEC\x51\x8B\x45\x08\x53\x56\x57\x80\xB8\x04\x05\x00\x00\x00"
 			}
 			"CTFPlayer::CheckBlockBackstab"
 			{
+				// "set_blockbackstab_once"
 				"library"	"server"
 				"linux"		"@_ZN9CTFPlayer18CheckBlockBackstabEPS_"
-				"windows"	"\x55\x8B\xEC\x83\xEC\x14\x53\x56\x57\x8B\xF9\x8D\x9F\xE0\x1A\x00\x00"
+				"windows"	"\x55\x8B\xEC\x83\xEC\x14\x53\x56\x57\x8B\xF9\x8D\x8F\xE0\x1A\x00\x00"
 			}
 			"CTFPlayer::DropAmmoPack"
 			{
+				// "models/items/ammopack_medium.mdl"
 				"library"	"server"
 				"linux"		"@_ZN9CTFPlayer12DropAmmoPackERK15CTakeDamageInfobb"
-				"windows"	"\x55\x8B\xEC\x83\xEC\x28\x53\x8B\xD9\xC7\x45\xFC\x00\x00\x00\x00"
+				"windows"	"\x55\x8B\xEC\x83\xEC\x2C\x53\x56\x8B\xF1\xC7\x45\xFC\x00\x00\x00\x00"
 			}
 			"CTFPlayer::GetMaxAmmo"
 			{
 				"library"	"server"
 				"linux"		"@_ZN9CTFPlayer10GetMaxAmmoEii"
-				"windows"	"\x55\x8B\xEC\x8B\x45\x0C\x56\x57\x8B\xF9\x83\xF8\xFF\x75\x2A\xFF\xB7\x2A\x2A\x2A\x2A\xEB\x01\x50\xE8"
+				"windows"	"\x55\x8B\xEC\x8B\x45\x0C\x53\x8B\xD9"
 			}
 			"CTFPlayer::PickupWeaponFromOther"
 			{
 				"library"	"server"
 				"linux"		"@_ZN9CTFPlayer21PickupWeaponFromOtherEP16CTFDroppedWeapon"
-				"windows"	"\x55\x8B\xEC\x83\xEC\x24\x56\x8B\x75\x08\x57\x8B\xF9\x81\xC6\xB0\x04\x00\x00"
+				"windows"	"\x55\x8B\xEC\x83\xEC\x24\x53\x56\x57\x8B\x7D\x08\x8B\xF1\x81\xC7\xB0\x04\x00\x00"
 			}
 			"CTFPlayer::RegenThink"
 			{
+				// "add_health_regen"
 				"library"	"server"
 				"linux"		"@_ZN9CTFPlayer10RegenThinkEv"
-				"windows"	"\x55\x8B\xEC\x83\xEC\x74\x57\x8B\xF9\x8B\x07"
+				"windows"	"\x55\x8B\xEC\x83\xEC\x7C\x56\x8B\xF1"
 			}
 			"CTFPlayer::TeamFortress_SetSpeed"
 			{
 				"library"	"server"
 				"linux"		"@_ZN9CTFPlayer21TeamFortress_SetSpeedEv"
-				"windows"	"\x55\x8B\xEC\xA1\x2A\x2A\x2A\x2A\x83\xEC\x1C\x53"
-			}
-			"CTFWeaponBuilder::StartBuilding"
-			{
-				"library"	"server"
-				"linux"		"@_ZN16CTFWeaponBuilder13StartBuildingEv"
-				"windows"	"\x55\x8B\xEC\x51\x8B\xD1\x53\x89\x55\xFC"
+				"windows"	"\x55\x8B\xEC\x83\xEC\x28\xA1\x2A\x2A\x2A\x2A\x56"
 			}
 			"CTFPowerup::DropSingleInstance"
 			{
+				// "PowerupRemoveThink"
 				"library"	"server"
 				"linux"		"@_ZN10CTFPowerup18DropSingleInstanceER6VectorP20CBaseCombatCharacterff"
-				"windows"	"\x55\x8B\xEC\x53\x56\x57\x6A\x01"
+				"windows"	"\x55\x8B\xEC\x51\x53\x56\x57\x6A\x01\x6A\x05"
 			}
 		}
 		"Offsets"
@@ -207,20 +196,6 @@
 					}
 				}
 			}
-			"CBaseObject::FindSnapToBuildPos"
-			{
-				"signature"	"CBaseObject::FindSnapToBuildPos"
-				"callconv"	"thiscall"
-				"return"	"bool"
-				"this"		"entity"
-				"arguments"
-				{
-					"pObjectOverride"
-					{
-						"type"	"cbaseentity"
-					}
-				}
-			}
 			"CBasePlayer::ForceRespawn"
 			{
 				"offset"	"CBasePlayer::ForceRespawn"
@@ -260,24 +235,6 @@
 					}
 				}
 			}
-			"CObjectSapper::ApplyRoboSapperEffects"
-			{
-				"signature"	"CObjectSapper::ApplyRoboSapperEffects"
-				"callconv"	"thiscall"
-				"return"	"bool"
-				"this"		"entity"
-				"arguments"
-				{
-					"pTarget"
-					{
-						"type"	"cbaseentity"
-					}
-					"flDuration"
-					{
-						"type"	"float"
-					}
-				}
-			}
 			"CTeamplayRoundBasedRules::RoundRespawn"
 			{
 				"offset"	"CTeamplayRoundBasedRules::RoundRespawn"
@@ -347,24 +304,6 @@
 				"return"	"bool"
 				"this"		"entity"
 			}
-			"CTFPlayer::CanBuild"
-			{
-				"signature"	"CTFPlayer::CanBuild"
-				"callconv"	"thiscall"
-				"return"	"int"
-				"this"		"entity"
-				"arguments"
-				{
-					"iObjectType"
-					{
-						"type"	"int"
-					}
-					"iObjectMode"
-					{
-						"type"	"int"
-					}
-				}
-			}
 			"CTFPlayer::CanPickupDroppedWeapon"
 			{
 				"signature"	"CTFPlayer::CanPickupDroppedWeapon"
@@ -462,13 +401,6 @@
 					}
 				}
 			}
-			"CTFWeaponBuilder::StartBuilding"
-			{
-				"signature"	"CTFWeaponBuilder::StartBuilding"
-				"callconv"	"thiscall"
-				"return"	"void"
-				"this"		"entity"
-			}
 		}
 	}
-}
+}
diff --git a/addons/sourcemod/scripting/freak_fortress_2/filenetwork.sp b/addons/sourcemod/scripting/freak_fortress_2/filenetwork.sp
@@ -77,7 +77,8 @@ stock void FileNet_ClientPutInServer(int client)
 {
 	#if defined _filenetwork_included
 	FileNet_ClientDisconnect(client);
-	SendNextFile(client);
+	if(!IsFakeClient(client))
+		SendNextFile(client);
 	#endif
 }
 

diff --git a/addons/sourcemod/scripting/freak_fortress_2/gamemode.sp b/addons/sourcemod/scripting/freak_fortress_2/gamemode.sp
@@ -947,7 +947,7 @@ void Gamemode_UpdateHUD(int team, bool healing = false, bool nobar = false)
 			}
 
 			float refresh = Cvar[RefreshTime].FloatValue;
-			if(setting == 1 || nobar)
+			if(setting == 2 || nobar)
 			{
 			}
 			else if(count < 3)