diff --git a/addons/l4dtoolz/l4dtoolz_mm.dll b/addons/l4dtoolz/l4dtoolz_mm.dll new file mode 100644 index 000000000..bd2ae9294 Binary files /dev/null and b/addons/l4dtoolz/l4dtoolz_mm.dll differ diff --git a/addons/metamod/bin/linux64/metamod.2.csgo.so b/addons/metamod/bin/linux64/metamod.2.csgo.so deleted file mode 100644 index dcca5e8fa..000000000 Binary files a/addons/metamod/bin/linux64/metamod.2.csgo.so and /dev/null differ diff --git a/addons/metamod/bin/metamod.2.blade.so b/addons/metamod/bin/metamod.2.blade.so deleted file mode 100644 index d10831525..000000000 Binary files a/addons/metamod/bin/metamod.2.blade.so and /dev/null differ diff --git a/addons/metamod/bin/metamod.2.bms.so b/addons/metamod/bin/metamod.2.bms.so deleted file mode 100644 index 17a231c40..000000000 Binary files a/addons/metamod/bin/metamod.2.bms.so and /dev/null differ diff --git a/addons/metamod/bin/metamod.2.csgo.so b/addons/metamod/bin/metamod.2.csgo.so deleted file mode 100644 index fc4df7f0c..000000000 Binary files a/addons/metamod/bin/metamod.2.csgo.so and /dev/null differ diff --git a/addons/metamod/bin/metamod.2.css.so b/addons/metamod/bin/metamod.2.css.so deleted file mode 100644 index cad7320ff..000000000 Binary files a/addons/metamod/bin/metamod.2.css.so and /dev/null differ diff --git a/addons/metamod/bin/metamod.2.dods.so b/addons/metamod/bin/metamod.2.dods.so deleted file mode 100644 index 3be6e2e04..000000000 Binary files a/addons/metamod/bin/metamod.2.dods.so and /dev/null differ diff --git a/addons/metamod/bin/metamod.2.doi.so b/addons/metamod/bin/metamod.2.doi.so deleted file mode 100644 index 180766e3f..000000000 Binary files a/addons/metamod/bin/metamod.2.doi.so and /dev/null differ diff --git a/addons/metamod/bin/metamod.2.ep1.so b/addons/metamod/bin/metamod.2.ep1.so deleted file mode 100644 index 90736ca11..000000000 Binary files a/addons/metamod/bin/metamod.2.ep1.so and /dev/null differ diff --git a/addons/metamod/bin/metamod.2.ep2.so b/addons/metamod/bin/metamod.2.ep2.so deleted file mode 100644 index ccdaacdde..000000000 Binary files a/addons/metamod/bin/metamod.2.ep2.so and /dev/null differ diff --git a/addons/metamod/bin/metamod.2.hl2dm.so b/addons/metamod/bin/metamod.2.hl2dm.so deleted file mode 100644 index fffa91838..000000000 Binary files a/addons/metamod/bin/metamod.2.hl2dm.so and /dev/null differ diff --git a/addons/metamod/bin/metamod.2.insurgency.so b/addons/metamod/bin/metamod.2.insurgency.so deleted file mode 100644 index 9d2d8fecc..000000000 Binary files a/addons/metamod/bin/metamod.2.insurgency.so and /dev/null differ diff --git a/addons/metamod/bin/metamod.2.l4d.so b/addons/metamod/bin/metamod.2.l4d.so deleted file mode 100644 index 259b0929b..000000000 Binary files a/addons/metamod/bin/metamod.2.l4d.so and /dev/null differ diff --git a/addons/metamod/bin/metamod.2.l4d2.dll b/addons/metamod/bin/metamod.2.l4d2.dll new file mode 100644 index 000000000..f76d820e2 Binary files /dev/null and b/addons/metamod/bin/metamod.2.l4d2.dll differ diff --git a/addons/metamod/bin/metamod.2.nd.so b/addons/metamod/bin/metamod.2.nd.so deleted file mode 100644 index fe4ad19ba..000000000 Binary files a/addons/metamod/bin/metamod.2.nd.so and /dev/null differ diff --git a/addons/metamod/bin/metamod.2.sdk2013.dll b/addons/metamod/bin/metamod.2.sdk2013.dll new file mode 100644 index 000000000..40fc4d775 Binary files /dev/null and b/addons/metamod/bin/metamod.2.sdk2013.dll differ diff --git a/addons/metamod/bin/metamod.2.tf2.so b/addons/metamod/bin/metamod.2.tf2.so deleted file mode 100644 index 4e4eb3654..000000000 Binary files a/addons/metamod/bin/metamod.2.tf2.so and /dev/null differ diff --git a/addons/metamod/bin/server.dll b/addons/metamod/bin/server.dll new file mode 100644 index 000000000..e9650411d Binary files /dev/null and b/addons/metamod/bin/server.dll differ diff --git a/addons/metamod/bin/win64/server.dll b/addons/metamod/bin/win64/server.dll new file mode 100644 index 000000000..6b5a6b430 Binary files /dev/null and b/addons/metamod/bin/win64/server.dll differ diff --git a/addons/metamod_x64.vdf b/addons/metamod_x64.vdf new file mode 100644 index 000000000..52c203469 --- /dev/null +++ b/addons/metamod_x64.vdf @@ -0,0 +1,5 @@ +"Plugin" +{ + "file" "addons/metamod/bin/win64/server" +} + diff --git a/addons/sourcemod/bin/sourcemod.2.l4d2.dll b/addons/sourcemod/bin/sourcemod.2.l4d2.dll new file mode 100644 index 000000000..af6161e12 Binary files /dev/null and b/addons/sourcemod/bin/sourcemod.2.l4d2.dll differ diff --git a/addons/sourcemod/bin/sourcemod.2.sdk2013.dll b/addons/sourcemod/bin/sourcemod.2.sdk2013.dll new file mode 100644 index 000000000..e4daa3ff5 Binary files /dev/null and b/addons/sourcemod/bin/sourcemod.2.sdk2013.dll differ diff --git a/addons/sourcemod/bin/sourcemod.logic.dll b/addons/sourcemod/bin/sourcemod.logic.dll new file mode 100644 index 000000000..dd6b917b6 Binary files /dev/null and b/addons/sourcemod/bin/sourcemod.logic.dll differ diff --git a/addons/sourcemod/bin/sourcemod_mm.dll b/addons/sourcemod/bin/sourcemod_mm.dll new file mode 100644 index 000000000..5f99a57ab Binary files /dev/null and b/addons/sourcemod/bin/sourcemod_mm.dll differ diff --git a/addons/sourcemod/bin/sourcemod_mm.x64.dll b/addons/sourcemod/bin/sourcemod_mm.x64.dll new file mode 100644 index 000000000..c6221194f Binary files /dev/null and b/addons/sourcemod/bin/sourcemod_mm.x64.dll differ diff --git a/addons/sourcemod/bin/sourcepawn.jit.x86.dll b/addons/sourcemod/bin/sourcepawn.jit.x86.dll new file mode 100644 index 000000000..40fb8a379 Binary files /dev/null and b/addons/sourcemod/bin/sourcepawn.jit.x86.dll differ diff --git a/addons/sourcemod/bin/x64/libsourcepawn.dll b/addons/sourcemod/bin/x64/libsourcepawn.dll new file mode 100644 index 000000000..fbbac2ccd Binary files /dev/null and b/addons/sourcemod/bin/x64/libsourcepawn.dll differ diff --git a/addons/sourcemod/bin/x64/sourcemod.logic.dll b/addons/sourcemod/bin/x64/sourcemod.logic.dll new file mode 100644 index 000000000..db6e6faae Binary files /dev/null and b/addons/sourcemod/bin/x64/sourcemod.logic.dll differ diff --git a/addons/sourcemod/extensions/bintools.ext.dll b/addons/sourcemod/extensions/bintools.ext.dll new file mode 100644 index 000000000..6dac0136c Binary files /dev/null and b/addons/sourcemod/extensions/bintools.ext.dll differ diff --git a/addons/sourcemod/extensions/clientprefs.ext.dll b/addons/sourcemod/extensions/clientprefs.ext.dll new file mode 100644 index 000000000..60ece6222 Binary files /dev/null and b/addons/sourcemod/extensions/clientprefs.ext.dll differ diff --git a/addons/sourcemod/extensions/collisionhook.ext.dll b/addons/sourcemod/extensions/collisionhook.ext.dll new file mode 100644 index 000000000..d83353817 Binary files /dev/null and b/addons/sourcemod/extensions/collisionhook.ext.dll differ diff --git a/addons/sourcemod/extensions/dbi.mysql.ext.dll b/addons/sourcemod/extensions/dbi.mysql.ext.dll new file mode 100644 index 000000000..5cc51ba81 Binary files /dev/null and b/addons/sourcemod/extensions/dbi.mysql.ext.dll differ diff --git a/addons/sourcemod/extensions/dbi.pgsql.ext.dll b/addons/sourcemod/extensions/dbi.pgsql.ext.dll new file mode 100644 index 000000000..5f43cbaf8 Binary files /dev/null and b/addons/sourcemod/extensions/dbi.pgsql.ext.dll differ diff --git a/addons/sourcemod/extensions/dbi.sqlite.ext.dll b/addons/sourcemod/extensions/dbi.sqlite.ext.dll new file mode 100644 index 000000000..f418d34c6 Binary files /dev/null and b/addons/sourcemod/extensions/dbi.sqlite.ext.dll differ diff --git a/addons/sourcemod/extensions/dhooks.ext.dll b/addons/sourcemod/extensions/dhooks.ext.dll new file mode 100644 index 000000000..433f25d1b Binary files /dev/null and b/addons/sourcemod/extensions/dhooks.ext.dll differ diff --git a/addons/sourcemod/extensions/geoip.ext.dll b/addons/sourcemod/extensions/geoip.ext.dll new file mode 100644 index 000000000..644201a83 Binary files /dev/null and b/addons/sourcemod/extensions/geoip.ext.dll differ diff --git a/addons/sourcemod/extensions/impactfix.ext.2.l4d2.dll b/addons/sourcemod/extensions/impactfix.ext.2.l4d2.dll new file mode 100644 index 000000000..5e0cc77f7 Binary files /dev/null and b/addons/sourcemod/extensions/impactfix.ext.2.l4d2.dll differ diff --git a/addons/sourcemod/extensions/regex.ext.dll b/addons/sourcemod/extensions/regex.ext.dll new file mode 100644 index 000000000..89fa5ea03 Binary files /dev/null and b/addons/sourcemod/extensions/regex.ext.dll differ diff --git a/addons/sourcemod/extensions/sdkhooks.ext.2.l4d2.dll b/addons/sourcemod/extensions/sdkhooks.ext.2.l4d2.dll new file mode 100644 index 000000000..4065a881a Binary files /dev/null and b/addons/sourcemod/extensions/sdkhooks.ext.2.l4d2.dll differ diff --git a/addons/sourcemod/extensions/sdkhooks.ext.2.sdk2013.dll b/addons/sourcemod/extensions/sdkhooks.ext.2.sdk2013.dll new file mode 100644 index 000000000..30c99ebbc Binary files /dev/null and b/addons/sourcemod/extensions/sdkhooks.ext.2.sdk2013.dll differ diff --git a/addons/sourcemod/extensions/sdktools.ext.2.l4d2.dll b/addons/sourcemod/extensions/sdktools.ext.2.l4d2.dll new file mode 100644 index 000000000..799e248fa Binary files /dev/null and b/addons/sourcemod/extensions/sdktools.ext.2.l4d2.dll differ diff --git a/addons/sourcemod/extensions/sdktools.ext.2.sdk2013.dll b/addons/sourcemod/extensions/sdktools.ext.2.sdk2013.dll new file mode 100644 index 000000000..9bbf53343 Binary files /dev/null and b/addons/sourcemod/extensions/sdktools.ext.2.sdk2013.dll differ diff --git a/addons/sourcemod/extensions/topmenus.ext.dll b/addons/sourcemod/extensions/topmenus.ext.dll new file mode 100644 index 000000000..f3eab9167 Binary files /dev/null and b/addons/sourcemod/extensions/topmenus.ext.dll differ diff --git a/addons/sourcemod/extensions/updater.ext.dll b/addons/sourcemod/extensions/updater.ext.dll new file mode 100644 index 000000000..675d0efad Binary files /dev/null and b/addons/sourcemod/extensions/updater.ext.dll differ diff --git a/addons/sourcemod/extensions/webternet.ext.dll b/addons/sourcemod/extensions/webternet.ext.dll new file mode 100644 index 000000000..3c6a95874 Binary files /dev/null and b/addons/sourcemod/extensions/webternet.ext.dll differ diff --git a/addons/sourcemod/extensions/x64/bintools.ext.dll b/addons/sourcemod/extensions/x64/bintools.ext.dll new file mode 100644 index 000000000..0de0fd84e Binary files /dev/null and b/addons/sourcemod/extensions/x64/bintools.ext.dll differ diff --git a/addons/sourcemod/extensions/x64/clientprefs.ext.dll b/addons/sourcemod/extensions/x64/clientprefs.ext.dll new file mode 100644 index 000000000..f95c5d74c Binary files /dev/null and b/addons/sourcemod/extensions/x64/clientprefs.ext.dll differ diff --git a/addons/sourcemod/extensions/x64/dbi.mysql.ext.dll b/addons/sourcemod/extensions/x64/dbi.mysql.ext.dll new file mode 100644 index 000000000..1bc3946c2 Binary files /dev/null and b/addons/sourcemod/extensions/x64/dbi.mysql.ext.dll differ diff --git a/addons/sourcemod/extensions/x64/dbi.pgsql.ext.dll b/addons/sourcemod/extensions/x64/dbi.pgsql.ext.dll new file mode 100644 index 000000000..131b85440 Binary files /dev/null and b/addons/sourcemod/extensions/x64/dbi.pgsql.ext.dll differ diff --git a/addons/sourcemod/extensions/x64/dbi.sqlite.ext.dll b/addons/sourcemod/extensions/x64/dbi.sqlite.ext.dll new file mode 100644 index 000000000..73ae657fb Binary files /dev/null and b/addons/sourcemod/extensions/x64/dbi.sqlite.ext.dll differ diff --git a/addons/sourcemod/extensions/x64/geoip.ext.dll b/addons/sourcemod/extensions/x64/geoip.ext.dll new file mode 100644 index 000000000..a35e254a3 Binary files /dev/null and b/addons/sourcemod/extensions/x64/geoip.ext.dll differ diff --git a/addons/sourcemod/extensions/x64/regex.ext.dll b/addons/sourcemod/extensions/x64/regex.ext.dll new file mode 100644 index 000000000..9bb1e2183 Binary files /dev/null and b/addons/sourcemod/extensions/x64/regex.ext.dll differ diff --git a/addons/sourcemod/extensions/x64/topmenus.ext.dll b/addons/sourcemod/extensions/x64/topmenus.ext.dll new file mode 100644 index 000000000..81ce587f9 Binary files /dev/null and b/addons/sourcemod/extensions/x64/topmenus.ext.dll differ diff --git a/addons/sourcemod/extensions/x64/updater.ext.dll b/addons/sourcemod/extensions/x64/updater.ext.dll new file mode 100644 index 000000000..6ee051eed Binary files /dev/null and b/addons/sourcemod/extensions/x64/updater.ext.dll differ diff --git a/addons/sourcemod/extensions/x64/webternet.ext.dll b/addons/sourcemod/extensions/x64/webternet.ext.dll new file mode 100644 index 000000000..16fc56916 Binary files /dev/null and b/addons/sourcemod/extensions/x64/webternet.ext.dll differ diff --git a/addons/sourcemod/gamedata/collisionhook.txt b/addons/sourcemod/gamedata/collisionhook.txt index 2fb2250cb..cfd45d74f 100644 --- a/addons/sourcemod/gamedata/collisionhook.txt +++ b/addons/sourcemod/gamedata/collisionhook.txt @@ -12,7 +12,7 @@ "PassServerEntityFilter" { "library" "server" - "windows" "\x55\x8b\xec\x57\x8b\x7d\x0c\x85\xff\x74\x2a\x8B\x0D\x88\xF3\xA0\x10\x56\x57" + "windows" "\x55\x8b\xec\x57\x8b\x7d\x0c\x85\xff\x75\x2a\xb0\x01\x5f\x5d\xc3\x56\x8b\x75" "linux" "@_Z22PassServerEntityFilterPK13IHandleEntityS1_" } } diff --git a/addons/sourcemod/gamedata/core.games/common.games.txt b/addons/sourcemod/gamedata/core.games/common.games.txt index 989444932..30f6db519 100644 --- a/addons/sourcemod/gamedata/core.games/common.games.txt +++ b/addons/sourcemod/gamedata/core.games/common.games.txt @@ -189,6 +189,8 @@ "game" "doi" "game" "bms" "game" "iosoccer" + "game" "open_fortress" + "game" "tf2classic" } "Keys" @@ -239,6 +241,9 @@ "game" "doi" "game" "bms" "game" "iosoccer" + "game" "reactivedrop" + "game" "open_fortress" + "game" "tf2classic" } "Keys" @@ -299,6 +304,8 @@ "game" "csgo" "game" "reactivedrop" "game" "FortressForever" + "game" "open_fortress" + "game" "tf2classic" } "Keys" diff --git a/addons/sourcemod/gamedata/funcommands.games.txt b/addons/sourcemod/gamedata/funcommands.games.txt index 63030400c..5b2afd9f8 100644 --- a/addons/sourcemod/gamedata/funcommands.games.txt +++ b/addons/sourcemod/gamedata/funcommands.games.txt @@ -75,6 +75,17 @@ } } + "nucleardawn" + { + "Keys" + { + "SpriteBeam" "sprites/widestripe.vmt" + + "Team2BeaconColor" "75,75,255,255" + "Team3BeaconColor" "255,75,75,255" + } + } + "#default" { "#supported" diff --git a/addons/sourcemod/gamedata/sdkhooks.games/master.games.txt b/addons/sourcemod/gamedata/sdkhooks.games/master.games.txt index 70d45eefb..103f27efc 100644 --- a/addons/sourcemod/gamedata/sdkhooks.games/master.games.txt +++ b/addons/sourcemod/gamedata/sdkhooks.games/master.games.txt @@ -199,4 +199,16 @@ { "game" "reactivedrop" } + "game.openfortress.txt" + { + "game" "open_fortress" + } + "game.dystopia.txt" + { + "game" "!Dystopia" + } + "game.tf2classic.txt" + { + "game" "tf2classic" + } } diff --git a/addons/sourcemod/gamedata/sdktools.games/master.games.txt b/addons/sourcemod/gamedata/sdktools.games/master.games.txt index 6f8a0e0fb..6461ad6b0 100644 --- a/addons/sourcemod/gamedata/sdktools.games/master.games.txt +++ b/addons/sourcemod/gamedata/sdktools.games/master.games.txt @@ -259,4 +259,12 @@ { "game" "reactivedrop" } + "game.openfortress.txt" + { + "game" "open_fortress" + } + "game.tf2classic.txt" + { + "game" "tf2classic" + } } diff --git a/addons/sourcemod/gamedata/sm-cstrike.games/game.csgo.txt b/addons/sourcemod/gamedata/sm-cstrike.games/game.csgo.txt index ad5b17344..bcc1e2705 100644 --- a/addons/sourcemod/gamedata/sm-cstrike.games/game.csgo.txt +++ b/addons/sourcemod/gamedata/sm-cstrike.games/game.csgo.txt @@ -31,7 +31,7 @@ // -*(_DWORD *)(v34 + 8) in ida 7 -v34[52] "WeaponPrice" { - "windows" "200" + "windows" "208" "linux" "208" "linux64" "328" "mac64" "328" @@ -39,16 +39,16 @@ //Offset into CheckRestartRound "CTTeamScoreOffset" { - "windows" "98" - "linux" "115" + "windows" "174" + "linux" "142" "linux64" "143" "mac64" "148" } //Offset into CheckRestartRound "TTeamScoreOffset" { - "windows" "125" - "linux" "148" + "windows" "201" + "linux" "169" "linux64" "174" "mac64" "177" } @@ -56,7 +56,7 @@ "CCSPlayerInventoryOffset" { "windows" "57" - "linux" "97" + "linux" "90" "linux64" "107" "mac64" "73" } @@ -108,7 +108,7 @@ { "library" "server" "windows" "\x55\x8B\xEC\x83\xEC\x0C\x53\x56\x57\x8B\xF9\x8B\x0D\x2A\x2A\x2A\x2A\x8B\x01" - "linux" "\x55\x89\xE5\x57\x56\x53\x83\xEC\x4C\xA1\x2A\x2A\x2A\x2A\x8B\x5D\x08\x89\x04\x24" + "linux" "\x55\x89\xE5\x56\x53\x83\xEC\x1C\x8B\x5D\x08\xFF\x35\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x83\xC4\x10\x84\xC0\x0F\x85\x2A\x2A\x2A\x2A\x8B\x13" "linux64" "\x55\x48\x89\xE5\x41\x57\x41\x56\x41\x55\x41\x54\x53\x48\x89\xFB\x48\x83\xEC\x18\x4C\x8B\x25\x85\x17\xB4\x00" "mac64" "\x55\x48\x89\xE5\x41\x57\x41\x56\x41\x54\x53\x48\x83\xEC\x10\x49\x89\xFC\x4C\x8D\x3D\xD7\xB9\x90\x00" } @@ -116,7 +116,7 @@ { "library" "server" "windows" "\x55\x8B\xEC\x83\xEC\x10\x53\x56\x8B\x75\x08\x57\x8B\xF9\x85\xF6\x0F\x88\x2A\x2A\x2A\x2A\x3B\x35" - "linux" "\x55\x89\xE5\x83\xEC\x68\x89\x75\xF8\x8B\x75\x0C\x89\x5D\xF4\x8B\x5D\x08\x89\x7D\xFC\x89\x34\x24\xE8\x2A\x2A\x2A\x2A\x85\xC0" + "linux" "\x55\x89\xE5\x56\x53\x83\xEC\x2C\x8B\x5D\x2A\x8B\x75\x2A\x53" "linux64" "\x55\x48\x89\xE5\x41\x57\x41\x56\x41\x55\x41\x54\x49\x89\xFC\x89\xF7\x53\x89\xF3" "mac64" "\x55\x48\x89\xE5\x41\x57\x41\x56\x41\x55\x41\x54\x53\x48\x83\xEC\x18\x89\xF3\x49\x89\xFC" } @@ -124,7 +124,7 @@ { "library" "server" "windows" "\x2A\x2A\x2A\x2A\x2A\x2A\x53\x56\x57\x6A\x01\x8B\xF9" - "linux" "\x2A\x2A\x2A\x2A\x2A\x2A\x0F\xB6\x55\x14\x89\x75\xF8\x8B\x75\x08" + "linux" "\x2A\x2A\x2A\x2A\x2A\x2A\x83\xEC\x54\x8B\x5D\x2A\x6A\x01\x8B\x7D\x2A\x8B" "linux64" "\x2A\x2A\x2A\x2A\x2A\x2A\x41\x56\x41\x89\xCE\x41\x55\x49\x89\xD5\x41\x54\x41\x89\xF4" "mac64" "\x2A\x2A\x2A\x2A\x2A\x2A\x41\x56\x41\x55\x41\x54\x53\x48\x83\xEC\x58\x41\x89\xCF\x49\x89\xD4" } @@ -132,7 +132,7 @@ { "library" "server" "windows" "\x2A\x2A\x2A\x2A\x2A\x2A\x83\xE4\xF8\x83\xC4\x04\x55\x8B\x6B\x04\x89\x6C\x24\x04\x8B\xEC\x83\xEC\x34\x56" - "linux" "\x2A\x2A\x2A\x2A\x2A\x2A\x83\xEC\x7C\x8B\x5D\x08\x0F\xB6\x7D\x10" + "linux" "\x2A\x2A\x2A\x2A\x2A\x2A\x83\xEC\x48\x8B\x5D\x2A\x8B\x7D\x2A\x8B\x75" "linux64" "\x2A\x2A\x2A\x2A\x2A\x2A\x41\x89\xCE\x41\x55\x41\x89\xD5\x41\x54\x49\x89\xF4" "mac64" "\x2A\x2A\x2A\x2A\x2A\x2A\x41\x56\x41\x54\x53\x48\x83\xEC\x30\x41\x89\xCC\x41\x89\xD7" } @@ -140,7 +140,7 @@ { "library" "server" "windows" "\x55\x8B\xEC\x83\xE4\xF8\x83\xEC\x6C\x53\x56\x8B\xF1\xF3\x0F\x11\x4C\x24\x24" - "linux" "\x55\x89\xE5\x57\x56\x53\x81\xEC\xBC\x00\x00\x00\x8B\x75\x08\x8B\x86\xBC\x0B\x00\x00" + "linux" "\x55\x89\xE5\x57\x56\x53\x83\xEC\x6C\x8B\x7D\x08\x8B\x87" //"linux64" "\x55\x48\x89\xE5\x41\x57\x41\x56\x49\x89\xFE\x41\x55\x41\x54\x53\x48\x81\xEC\x98\x00\x00\x00\x89\xB5\x68\xFF\xFF\xFF" "mac64" "\x55\x48\x89\xE5\x41\x57\x41\x56\x41\x55\x41\x54\x53\x48\x81\xEC\x08\x01\x00\x00\x41\x89\xF6" } @@ -148,8 +148,8 @@ "CheckWinLimit" { "library" "server" - "windows" "\x55\x8B\xEC\x83\xE4\xF8\x83\xEC\x2A\x53\x56\x57\x8B\xF9\x8B\x0D\x2A\x2A\x2A\x2A\x81\xF9" - "linux" "\x55\x89\xE5\x56\x53\x83\xEC\x70\xA1\x2A\x2A\x2A\x2A\x8B\x35\x2A\x2A\x2A\x2A\x8B" + "windows" "\x55\x8B\xEC\x83\xE4\xF8\x83\xEC\x2A\x53\x8B\xD9\x8B\x0D\x2A\x2A\x2A\x2A\x56\x57\x81\xF9" + "linux" "\x55\x89\xE5\x57\x56\x53\x83\xEC\x5C\x8B\x5D\x08\x65\xA1\x14\x00\x00\x00\x89\x45\xE4\x31\xC0\xA1\x2A\x2A\x2A\x2A" "linux64" "\x55\x48\x89\xE5\x41\x57\x41\x56\x41\x55\x41\x54\x53\x48\x89\xFB\x48\x83\xEC\x58\x64\x48\x8B\x04\x25\x28\x00\x00\x00\x48\x89\x45\xC8\x31\xC0\x4C\x8B\x2D\x46\xD3\xBB\x00" "mac64" "\x55\x48\x89\xE5\x41\x57\x41\x56\x41\x55\x41\x54\x53\x48\x83\xEC\x58\x49\x89\xFD\x48\x8B\x1D\x85\x76\x60\x00" } @@ -157,7 +157,7 @@ { "library" "server" "windows" "\x53\x56\x57\x8B\xF9\x8B\x87\x14\x03\x00\x00" - "linux" "\x55\x89\xE5\x83\xEC\x28\x89\x5D\xF4\x8B\x5D\x08\x89\x75\xF8\x89\x7D\xFC\x89\x1C\x24\xE8\x2A\x2A\x2A\x2A\x83\xF8\x02" + "linux" "\x55\x89\xE5\x57\x56\x53\x83\xEC\x18\x8B\x5D\x08\x53\xE8\x2A\x2A\x2A\x2A\x83\xC4\x10\x83\xF8\x02" "linux64" "\x55\x48\x89\xE5\x41\x55\x41\x54\x53\x48\x89\xFB\x48\x83\xEC\x18\xE8\x2A\x2A\x2A\x2A\x83\xF8\x02" "mac64" "\x55\x48\x89\xE5\x41\x57\x41\x56\x41\x54\x53\x49\x89\xFC\xE8\x2A\x2A\x2A\x2A\x83\xF8\x02" } @@ -167,7 +167,7 @@ { "library" "server" "windows" "\x85\xC9\x75\x2A\x33\xC0\xC3\xE8\x2A\x2A\x2A\x2A\x8B" - "linux" "\x55\x89\xE5\x83\xEC\x18\x8B\x45\x08\x85\xC0\x74\x2A\x89\x04\x24" + "linux" "\x55\x89\xE5\x83\xEC\x08\x8B\x45\x2A\x85\xC0\x74\x2A\x83\xEC\x0C\x50\xE8\x2A\x2A\x2A\x2A\x83\xC4\x10\x89\x45" "linux64" "\x48\x85\xFF\x74\x2A\x55\x48\x89\xE5\xE8\x2A\x2A\x2A\x2A\x5D\x48\x89\xC7" "mac64" "\x55\x48\x89\xE5\x41\x56\x53\x31\xC0\x48\x85\xFF\x74\x2A\xE8\x2A\x2A\x2A\x2A\x48" } @@ -236,7 +236,7 @@ // The respective function underneath each are SetClanTag and SetClanName. // To get the offset of the base (m_flGroundAccelLinearFracLastTime) unqiue string is "------- accelspeed = %f, flGoalSpeed = %f, flStoredAccel = %f\n" // Inside that function right above the debug message is an if with a call to CBaseEntity::NetworkStateChanged and a member set with the same offset. - // Do math. + // Do math. // Note: Second offset can be skipped by simply dumping the netprops instead on each os although the distance will probably be the same on all. "#default" @@ -275,7 +275,7 @@ "windows" { "signature" "NET_SendPacket" - "offset" "6" + "offset" "4" } "linux" { @@ -296,9 +296,9 @@ { "library" "engine" // "[NET] Cannot send %d-byte packet to %s. MTU is %u. %02x %02x %02x %02x %02x\n" - "windows" "\x89\x4C\x24\x14\x81\xFF\xB0\x04\x00\x00\x7E" + "windows" "\x8B\xFA\x81\xFB\xB0\x04\x00\x00\x7E" // _Z14NET_SendPacketP11INetChanneliRK10ns_addressPKhiP8bf_writebj - "linux" "\x8B\x7D\x10\x81\xFE\xB0\x04\x00\x00\x0F" + "linux" "\x31\xC0\x81\x7D\x2A\xB0\x04\x00\x00" "linux64" "\x31\xC0\x81\xF9\xB0\x04\x00\x00\x0F" } } diff --git a/addons/sourcemod/plugins/optional/current.smx b/addons/sourcemod/plugins/optional/current.smx index 0c5055134..71b7a46e3 100644 Binary files a/addons/sourcemod/plugins/optional/current.smx and b/addons/sourcemod/plugins/optional/current.smx differ diff --git a/addons/sourcemod/plugins/optional/l4d2lib.smx b/addons/sourcemod/plugins/optional/l4d2lib.smx index e581d0b93..1ddf54d09 100644 Binary files a/addons/sourcemod/plugins/optional/l4d2lib.smx and b/addons/sourcemod/plugins/optional/l4d2lib.smx differ diff --git a/addons/sourcemod/plugins/optional/l4d_tankpunchstuckfix.smx b/addons/sourcemod/plugins/optional/l4d_tankpunchstuckfix.smx index f5058281c..266f376c0 100644 Binary files a/addons/sourcemod/plugins/optional/l4d_tankpunchstuckfix.smx and b/addons/sourcemod/plugins/optional/l4d_tankpunchstuckfix.smx differ diff --git a/addons/sourcemod/plugins/optional/readyup.smx b/addons/sourcemod/plugins/optional/readyup.smx index d57a8b4ff..e7b7b7223 100644 Binary files a/addons/sourcemod/plugins/optional/readyup.smx and b/addons/sourcemod/plugins/optional/readyup.smx differ diff --git a/addons/sourcemod/scripting/current.sp b/addons/sourcemod/scripting/current.sp index 5f24b4c3e..353be01d9 100644 --- a/addons/sourcemod/scripting/current.sp +++ b/addons/sourcemod/scripting/current.sp @@ -14,8 +14,8 @@ public Plugin myinfo = name = "L4D2 Survivor Progress", author = "CanadaRox, Visor", description = "Print survivor progress in flow percents ", - version = "2.0.2", - url = "https://github.com/SirPlease/L4D2-Competitive-Rework" + version = "2.0.3", + url = "https://github.com/SirPlease/L4D2-Competitive-Rework" }; public void OnPluginStart() @@ -45,10 +45,8 @@ float GetMaxSurvivorCompletion() { float flow = 0.0, tmp_flow = 0.0, origin[3]; Address pNavArea; - for (int i = 1; i <= MaxClients; i++) - { - if (IsClientInGame(i) && GetClientTeam(i) == TEAM_SURVIVORS) - { + for (int i = 1; i <= MaxClients; i++) { + if (IsClientInGame(i) && GetClientTeam(i) == TEAM_SURVIVORS && IsPlayerAlive(i)) { GetClientAbsOrigin(i, origin); pNavArea = L4D2Direct_GetTerrorNavArea(origin); if (pNavArea != Address_Null) diff --git a/addons/sourcemod/scripting/include/l4d2_playstats.inc b/addons/sourcemod/scripting/include/l4d2_playstats.inc index b0090e23a..0720a0719 100644 --- a/addons/sourcemod/scripting/include/l4d2_playstats.inc +++ b/addons/sourcemod/scripting/include/l4d2_playstats.inc @@ -6,7 +6,7 @@ native void PLAYSTATS_BroadcastRoundStats(); native void PLAYSTATS_BroadcastGameStats(); -public SharedPlugin __pl_l4d2lib = +public SharedPlugin __pl_l4d2playstats = { name = "l4d2_playstats", file = "l4d2_playstats.smx", @@ -18,7 +18,7 @@ public SharedPlugin __pl_l4d2lib = }; #if !defined REQUIRE_PLUGIN -public void __pl_l4d2lib_SetNTVOptional() +public void __pl_l4d2playstats_SetNTVOptional() { MarkNativeAsOptional("PLAYSTATS_BroadcastRoundStats"); MarkNativeAsOptional("PLAYSTATS_BroadcastGameStats"); diff --git a/addons/sourcemod/scripting/l4d2lib.sp b/addons/sourcemod/scripting/l4d2lib.sp index e133202c6..c56d57d7a 100644 --- a/addons/sourcemod/scripting/l4d2lib.sp +++ b/addons/sourcemod/scripting/l4d2lib.sp @@ -38,7 +38,7 @@ public Plugin myinfo = name = "L4D2Lib", author = "Confogl Team", description = "Useful natives and fowards for L4D2 Plugins", - version = "3.2", + version = "3.2.1", url = "https://github.com/SirPlease/L4D2-Competitive-Rework" }; @@ -53,16 +53,16 @@ public void OnPluginStart() #endif #if MODULE_TANKS - HookEvent("tank_spawn", TankSpawn_Event); - HookEvent("item_pickup", ItemPickup_Event); + HookEvent("tank_spawn", TankSpawn_Event, EventHookMode_Post); + HookEvent("item_pickup", ItemPickup_Event, EventHookMode_Post); #endif #if MODULE_TANKS || MODULE_SURVIVORS - HookEvent("player_death", PlayerDeath_Event); + HookEvent("player_death", PlayerDeath_Event, EventHookMode_Post); #endif #if MODULE_SURVIVORS || MODULE_MAPINFO - HookEvent("player_disconnect", PlayerDisconnect_Event, EventHookMode_PostNoCopy); + HookEvent("player_disconnect", PlayerDisconnect_Event, EventHookMode_Post); #endif #if MODULE_SURVIVORS diff --git a/addons/sourcemod/scripting/l4d_tankpunchstuckfix.sp b/addons/sourcemod/scripting/l4d_tankpunchstuckfix.sp index 2f9ce0f0b..e0c784976 100644 --- a/addons/sourcemod/scripting/l4d_tankpunchstuckfix.sp +++ b/addons/sourcemod/scripting/l4d_tankpunchstuckfix.sp @@ -2,305 +2,31 @@ #pragma newdecls required #include -#include -#include -#include - -#define GAMEDATA_FILE "l4d_tankpunchstuckfix" -#define SIGNATURE_NAME "CTerrorPlayer::WarpToValidPositionIfStuck" - -#define DEBUG_MODE 0 - -#define TEAM_SPECTATOR 1 -#define TEAM_SURVIVOR 2 -#define TEAM_INFECTED 3 - -#define SEQ_FLIGHT_COACH 629 -#define SEQ_FLIGHT_ELLIS 634 -#define SEQ_FLIGHT_ROCHELLE 637 -#define SEQ_FLIGHT_BILL 537 -#define SEQ_FLIGHT_FRANCIS 540 -#define SEQ_FLIGHT_ZOEY 546 - -#define TIMER_CHECKPUNCH 0.025 // interval for checking 'flight' of punched survivors -#define TIME_CHECK_UNTIL 0.5 // try this long to find a stuck-position, then assume it's OK - -Handle - g_hWarpToValidPositionSDKCall = null; - -bool - g_bLateLoad = false, - g_bPlayerFlight[MAXPLAYERS + 1]; // is a player in (potentially stuckable) punched flight? - -float - g_fPlayerPunch[MAXPLAYERS + 1], // when was the last tank punch on this player? - g_fPlayerStuck[MAXPLAYERS + 1], // when did the (potential) 'stuckness' occur? - g_fPlayerLocation[MAXPLAYERS + 1][3]; // where was the survivor last during the flight? - -ConVar - g_hCvarDeStuckTime = null, // convar: how long to wait and de-stuckify a punched player - tpsf_debug_print = null; - -public APLRes AskPluginLoad2(Handle myself, bool late, char[] error, int err_max) -{ - g_bLateLoad = late; - return APLRes_Success; -} +#include public Plugin myinfo = { name = "Tank Punch Ceiling Stuck Fix", - author = "Tabun, Visor, A1m`", + author = "Tabun, Visor, A1m`, Forgetest", description = "Fixes the problem where tank-punches get a survivor stuck in the roof.", - version = "1.3", + version = "2.0", url = "https://github.com/SirPlease/L4D2-Competitive-Rework" }; -public void OnPluginStart() -{ - InitGameData(); - - // cvars - g_hCvarDeStuckTime = CreateConVar("sm_punchstuckfix_unstucktime", "1.0", "How many seconds to wait before detecting and unstucking a punched motionless player.", _, true, 0.05, false); - tpsf_debug_print = CreateConVar("tpsf_debug_print", "1","Enable the Debug Print?", _, true, 0.0, true, 1.0); - - // hooks - HookEvent("round_start", Event_Reset, EventHookMode_PostNoCopy); - HookEvent("round_end", Event_Reset, EventHookMode_PostNoCopy); - -#if DEBUG_MODE - RegConsoleCmd("sm_warp_me", Cmd_WarpMe); -#endif - - // hook already existing clients if loading late - if (g_bLateLoad) { - for (int i = 1; i <= MaxClients; i++) { - if (IsClientInGame(i)) { - OnClientPostAdminCheck(i); - } - } - } -} - -void InitGameData() -{ - Handle hGameData = LoadGameConfigFile(GAMEDATA_FILE); - if (!hGameData) { - SetFailState("Could not load gamedata/%s.txt", GAMEDATA_FILE); - } - - StartPrepSDKCall(SDKCall_Player); - - if (!PrepSDKCall_SetFromConf(hGameData, SDKConf_Signature, SIGNATURE_NAME)) { - SetFailState("Function '%s' not found", SIGNATURE_NAME); - } - - g_hWarpToValidPositionSDKCall = EndPrepSDKCall(); - - if (g_hWarpToValidPositionSDKCall == null) { - SetFailState("Function '%s' found, but something went wrong", SIGNATURE_NAME); - } - - delete hGameData; -} - -public void OnClientPostAdminCheck(int client) -{ - SDKHook(client, SDKHook_OnTakeDamage, OnTakeDamage); -} - -public void OnMapEnd() -{ - fClearArrays(); -} - -public void Event_Reset(Event hEvent, const char[] name, bool dontBroadcast) -{ - fClearArrays(); -} - -public Action OnTakeDamage(int victim, int &attacker, int &inflictor, float &damage, int &damagetype) -{ - if (damagetype != DMG_CLUB || !IsTankWeapon(inflictor)) { - return Plugin_Continue; - } - - if (!IsClientAndInGame(victim) || !IsSurvivor(victim)) { - return Plugin_Continue; - } - -#if DEBUG_MODE - PrintToChatAll("IsTankWeapon - victim: (%N) %d, attacker: (%N) %d, inflictor: %d, damage: %f, damagetype: %d", victim, victim, attacker, attacker, inflictor, damage, damagetype); -#endif - - // tank punched survivor, check the result - fClearArrayIndex(victim); - g_fPlayerPunch[victim] = GetTickedTime(); - - CreateTimer(TIMER_CHECKPUNCH, Timer_CheckPunch, GetClientUserId(victim), TIMER_REPEAT|TIMER_FLAG_NO_MAPCHANGE); - - return Plugin_Continue; -} - -public Action Timer_CheckPunch(Handle hTimer, any userid) -{ - int client = GetClientOfUserId(userid); - // stop the timer when we no longer have a proper client - if (client < 1 || !IsSurvivor(client)) { - return Plugin_Stop; - } - - // stop the time if we're passed the time for checking - if (GetTickedTime() - g_fPlayerPunch[client] > TIME_CHECK_UNTIL && g_fPlayerStuck[client]) { - fClearStuckArrayIndex(client); - return Plugin_Stop; - } - - // get current animation frame and location of survivor - int iSeq = GetEntProp(client, Prop_Send, "m_nSequence"); - - // if the player is not in flight, check if they are - if (iSeq == SEQ_FLIGHT_COACH || iSeq == SEQ_FLIGHT_ELLIS - || iSeq == SEQ_FLIGHT_ROCHELLE || iSeq == SEQ_FLIGHT_BILL - || iSeq == SEQ_FLIGHT_FRANCIS || iSeq == SEQ_FLIGHT_ZOEY - ) { - static float vOrigin[3]; - GetEntPropVector(client, Prop_Send, "m_vecOrigin", vOrigin); - - if (!g_bPlayerFlight[client]) { - // if the player is not detected as in punch-flight, they are now - g_bPlayerFlight[client] = true; - g_fPlayerLocation[client] = vOrigin; - - #if DEBUG_MODE - PrintDebug("[test] %i - flight start [seq:%4i][loc:%.f %.f %.f]", client, iSeq, vOrigin[0], vOrigin[1], vOrigin[2]); - #endif - - } else { - // if the player is in punch-flight, check location / difference to detect stuckness - if (GetVectorDistance(g_fPlayerLocation[client], vOrigin) == 0.0) { - // are we /still/ in the same position? (ie. if stucktime is recorded) - if (g_fPlayerStuck[client]) { - g_fPlayerStuck[client] = GetTickedTime(); - - #if DEBUG_MODE - PrintDebug("[test] %i - stuck start [loc:%.f %.f %.f]", client, vOrigin[0], vOrigin[1], vOrigin[2]); - #endif - - } else { - if (GetTickedTime() - g_fPlayerStuck[client] > g_hCvarDeStuckTime.FloatValue) { - // time passed, player is stuck! fix. - - #if DEBUG_MODE - PrintDebug("[test] %i - stuckness FIX triggered!", client); - #endif - - fClearStuckArrayIndex(client); - - CTerrorPlayer_WarpToValidPositionIfStuck(client); - if (tpsf_debug_print.BoolValue) { - CPrintToChatAll("<{olive}TankPunchStuck{default}> Found {blue}%N{default} stuck after a punch. Warped him to a valid position.", client); - } - return Plugin_Stop; - } - } - } else { - // if we were detected as stuck, undetect - if (g_fPlayerStuck[client]) { - g_fPlayerStuck[client] = 0.0; - - #if DEBUG_MODE - PrintDebug("[test] %i - stuck end (previously detected, now gone) [loc:%.f %.f %.f]", client, vOrigin[0], vOrigin[1], vOrigin[2]); - #endif - } - } - } - } else if (iSeq == (SEQ_FLIGHT_COACH + 1) || iSeq == (SEQ_FLIGHT_ELLIS + 1) - || iSeq == (SEQ_FLIGHT_ROCHELLE + 1) || iSeq == (SEQ_FLIGHT_BILL + 1) - || iSeq == (SEQ_FLIGHT_FRANCIS + 1) || iSeq == (SEQ_FLIGHT_ZOEY + 1) - ) { - if (g_bPlayerFlight[client]) { - // landing frame, so not stuck - fClearStuckArrayIndex(client); - - #if DEBUG_MODE - PrintDebug("[test] %i - flight end (natural)", client); - #endif - } - - return Plugin_Stop; - } - - return Plugin_Continue; -} - -bool IsClientAndInGame(int client) -{ - return (client > 0 && client <= MaxClients && IsClientInGame(client)); -} - -bool IsSurvivor(int client) -{ - return (GetClientTeam(client) == TEAM_SURVIVOR); -} - -bool IsTankWeapon(int entity) -{ - if (IsValidEntity(entity)) { - char eName[32]; - GetEntityClassname(entity, eName, sizeof(eName)); - return (strcmp("weapon_tank_claw", eName) == 0/* || strcmp("tank_rock", eName) == 0*/); - } - - return false; -} - -void fClearArrays() -{ - for (int i = 0; i <= MAXPLAYERS; i++) { - fClearArrayIndex(i); - } -} +ConVar sv_lagcompensationforcerestore; -void fClearArrayIndex(int index) -{ - fClearStuckArrayIndex(index); - for (int j = 0; j < 3; j++) { - g_fPlayerLocation[index][j] = 0.0; - } -} - -void fClearStuckArrayIndex(int index) -{ - g_fPlayerPunch[index] = 0.0; - g_bPlayerFlight[index] = false; - g_fPlayerStuck[index] = 0.0; -} - -void CTerrorPlayer_WarpToValidPositionIfStuck(int client) +public void OnPluginStart() { - SDKCall(g_hWarpToValidPositionSDKCall, client, 0); + sv_lagcompensationforcerestore = FindConVar("sv_lagcompensationforcerestore"); } -#if DEBUG_MODE -stock void PrintDebug(const char[] Message, any ...) +public void L4D_TankClaw_OnPlayerHit_Post(int tank, int claw, int player) { - char DebugBuff[256]; - VFormat(DebugBuff, sizeof(DebugBuff), Message, 2); - //LogMessage(DebugBuff); - //PrintToServer(DebugBuff); - PrintToChatAll(DebugBuff); + sv_lagcompensationforcerestore.BoolValue = false; } -public Action Cmd_WarpMe(int client, int args) +public void L4D_TankClaw_DoSwing_Post(int tank, int claw) { - if (client == 0 || !IsSurvivor(client) || !IsPlayerAlive(client)) { - PrintToChat(client, "Only a living survivor can use this command!"); - return Plugin_Handled; - } - - CTerrorPlayer_WarpToValidPositionIfStuck(client); - PrintToChat(client, "WarpToValidPositionIfStuck call!"); - return Plugin_Handled; -} -#endif + if (!sv_lagcompensationforcerestore.BoolValue) + sv_lagcompensationforcerestore.BoolValue = true; +} \ No newline at end of file diff --git a/addons/sourcemod/scripting/readyup/command.inc b/addons/sourcemod/scripting/readyup/command.inc index 9c980645f..8e992dc09 100644 --- a/addons/sourcemod/scripting/readyup/command.inc +++ b/addons/sourcemod/scripting/readyup/command.inc @@ -32,17 +32,15 @@ Action Ready_Cmd(int client, int args) DoSecrets(client); if (CheckFullReady()) InitiateLiveCountdown(); - return Plugin_Handled; } - return Plugin_Continue; + return Plugin_Handled; } Action Unready_Cmd(int client, int args) { if (inReadyUp && client) { - AdminId id = GetUserAdmin(client); - bool hasflag = (id != INVALID_ADMIN_ID && GetAdminFlag(id, Admin_Ban)); // Check for specific admin flag + bool hasflag = CheckCommandAccess(client, "sm_ban", ADMFLAG_BAN); // Check for specific admin flag if (isForceStart) { @@ -64,9 +62,8 @@ Action Unready_Cmd(int client, int args) } CancelFullReady(client, readyStatus); } - return Plugin_Handled; } - return Plugin_Continue; + return Plugin_Handled; } Action ToggleReady_Cmd(int client, int args) @@ -75,7 +72,7 @@ Action ToggleReady_Cmd(int client, int args) { return IsPlayerReady(client) ? Unready_Cmd(client, 0) : Ready_Cmd(client, 0); } - return Plugin_Continue; + return Plugin_Handled; } // ======================== @@ -87,16 +84,14 @@ Action ForceStart_Cmd(int client, int args) if (inReadyUp && readyUpMode != ReadyMode_AutoStart) { // Check if admin always allowed to do so - AdminId id = GetUserAdmin(client); - if (id != INVALID_ADMIN_ID && GetAdminFlag(id, Admin_Ban)) // Check for specific admin flag + if (CheckCommandAccess(client, "sm_ban", ADMFLAG_BAN)) // Check for specific admin flag { isForceStart = true; InitiateLiveCountdown(); - CPrintToChatAll("%t %t", "Tag", "ForceStartAdmin", client); - return Plugin_Handled; + CPrintToChatAll("%t", "ForceStartAdmin", client); } } - return Plugin_Continue; + return Plugin_Handled; } // ======================== @@ -108,10 +103,9 @@ Action Hide_Cmd(int client, int args) if (inReadyUp) { SetPlayerHiddenPanel(client, true); - CPrintToChat(client, "%t %t", "Tag", "PanelHide"); - return Plugin_Handled; + CPrintToChat(client, "%t", "PanelHide"); } - return Plugin_Continue; + return Plugin_Handled; } Action Show_Cmd(int client, int args) @@ -119,10 +113,9 @@ Action Show_Cmd(int client, int args) if (inReadyUp) { SetPlayerHiddenPanel(client, false); - CPrintToChat(client, "%t %t", "Tag", "PanelShow"); - return Plugin_Handled; + CPrintToChat(client, "%t", "PanelShow"); } - return Plugin_Continue; + return Plugin_Handled; } Action Return_Cmd(int client, int args) @@ -132,7 +125,6 @@ Action Return_Cmd(int client, int args) && GetClientTeam(client) == L4D2Team_Survivor) { ReturnPlayerToSaferoom(client, false); - return Plugin_Handled; } - return Plugin_Continue; + return Plugin_Handled; } diff --git a/addons/stripper/bin/stripper.14.ep1.so b/addons/stripper/bin/stripper.14.ep1.so deleted file mode 100644 index 05f482f4f..000000000 Binary files a/addons/stripper/bin/stripper.14.ep1.so and /dev/null differ diff --git a/addons/stripper/bin/stripper.16.csgo.so b/addons/stripper/bin/stripper.16.csgo.so deleted file mode 100644 index 3bdb6a423..000000000 Binary files a/addons/stripper/bin/stripper.16.csgo.so and /dev/null differ diff --git a/addons/stripper/bin/stripper.16.css.so b/addons/stripper/bin/stripper.16.css.so deleted file mode 100644 index c4e65e00c..000000000 Binary files a/addons/stripper/bin/stripper.16.css.so and /dev/null differ diff --git a/addons/stripper/bin/stripper.16.dods.so b/addons/stripper/bin/stripper.16.dods.so deleted file mode 100644 index c4e65e00c..000000000 Binary files a/addons/stripper/bin/stripper.16.dods.so and /dev/null differ diff --git a/addons/stripper/bin/stripper.16.ep2.so b/addons/stripper/bin/stripper.16.ep2.so deleted file mode 100644 index ee1e697c3..000000000 Binary files a/addons/stripper/bin/stripper.16.ep2.so and /dev/null differ diff --git a/addons/stripper/bin/stripper.16.hl2dm.so b/addons/stripper/bin/stripper.16.hl2dm.so deleted file mode 100644 index c4e65e00c..000000000 Binary files a/addons/stripper/bin/stripper.16.hl2dm.so and /dev/null differ diff --git a/addons/stripper/bin/stripper.16.l4d.so b/addons/stripper/bin/stripper.16.l4d.so deleted file mode 100644 index 4dcaa4fe5..000000000 Binary files a/addons/stripper/bin/stripper.16.l4d.so and /dev/null differ diff --git a/addons/stripper/bin/stripper.16.l4d2.dll b/addons/stripper/bin/stripper.16.l4d2.dll new file mode 100644 index 000000000..c7d5a7ab8 Binary files /dev/null and b/addons/stripper/bin/stripper.16.l4d2.dll differ diff --git a/addons/stripper/bin/stripper.16.nd.so b/addons/stripper/bin/stripper.16.nd.so deleted file mode 100644 index 2aa6611f4..000000000 Binary files a/addons/stripper/bin/stripper.16.nd.so and /dev/null differ diff --git a/addons/stripper/bin/stripper.16.tf2.so b/addons/stripper/bin/stripper.16.tf2.so deleted file mode 100644 index 1f3880879..000000000 Binary files a/addons/stripper/bin/stripper.16.tf2.so and /dev/null differ diff --git a/addons/stripper/bin/stripper.core.dll b/addons/stripper/bin/stripper.core.dll new file mode 100644 index 000000000..443e74b45 Binary files /dev/null and b/addons/stripper/bin/stripper.core.dll differ diff --git a/addons/stripper/bin/stripper_mm.dll b/addons/stripper/bin/stripper_mm.dll new file mode 100644 index 000000000..3e78f1e4e Binary files /dev/null and b/addons/stripper/bin/stripper_mm.dll differ diff --git a/addons/tickrate_enabler.dll b/addons/tickrate_enabler.dll new file mode 100644 index 000000000..39ccce030 Binary files /dev/null and b/addons/tickrate_enabler.dll differ diff --git a/cfg/cfgogl/acemodrv/mapinfo.txt b/cfg/cfgogl/acemodrv/mapinfo.txt index 2dea6416e..f27c1b608 100644 --- a/cfg/cfgogl/acemodrv/mapinfo.txt +++ b/cfg/cfgogl/acemodrv/mapinfo.txt @@ -2566,11 +2566,11 @@ "early" { "min" "0" - "max" "38" + "max" "33" } "late" { - "min" "66" + "min" "70" "max" "100" } } @@ -2581,14 +2581,6 @@ } "noecho_m4" { - "tank_ban_flow" - { - "early" - { - "min" "54" - "max" "100" - } - } "ItemLimits" { "pain_pills" "5" @@ -2650,6 +2642,32 @@ "start_extra_dist" "0.000000" "end_dist" "50.000000" } + "tripday_new_m2" + { + "tank_ban_flow" + { + "cornfield" + { + "min" "45" + "max" "64" + } + } + } + "tripday_new_m3" + { + "tank_ban_flow" + { + "near_building" + { + "min" "72" + "max" "100" + } + } + "ItemLimits" + { + "pain_pills" "3" + } + } "tripday_new_m4" { "tank_ban_flow" diff --git a/cfg/cfgogl/amrv1v1/mapinfo.txt b/cfg/cfgogl/amrv1v1/mapinfo.txt index a88e92904..c5d84323d 100644 --- a/cfg/cfgogl/amrv1v1/mapinfo.txt +++ b/cfg/cfgogl/amrv1v1/mapinfo.txt @@ -2566,11 +2566,11 @@ "early" { "min" "0" - "max" "38" + "max" "33" } "late" { - "min" "66" + "min" "70" "max" "100" } } @@ -2581,14 +2581,6 @@ } "noecho_m4" { - "tank_ban_flow" - { - "early" - { - "min" "54" - "max" "100" - } - } "ItemLimits" { "pain_pills" "2" @@ -2650,6 +2642,32 @@ "start_extra_dist" "0.000000" "end_dist" "50.000000" } + "tripday_new_m2" + { + "tank_ban_flow" + { + "cornfield" + { + "min" "45" + "max" "64" + } + } + } + "tripday_new_m3" + { + "tank_ban_flow" + { + "near_building" + { + "min" "72" + "max" "100" + } + } + "ItemLimits" + { + "pain_pills" "1" + } + } "tripday_new_m4" { "tank_ban_flow" diff --git a/cfg/cfgogl/amrv2v2/mapinfo.txt b/cfg/cfgogl/amrv2v2/mapinfo.txt index 02d04afb0..3526aa31d 100644 --- a/cfg/cfgogl/amrv2v2/mapinfo.txt +++ b/cfg/cfgogl/amrv2v2/mapinfo.txt @@ -2566,11 +2566,11 @@ "early" { "min" "0" - "max" "38" + "max" "33" } "late" { - "min" "66" + "min" "70" "max" "100" } } @@ -2581,14 +2581,6 @@ } "noecho_m4" { - "tank_ban_flow" - { - "early" - { - "min" "54" - "max" "100" - } - } "ItemLimits" { "pain_pills" "3" @@ -2650,6 +2642,32 @@ "start_extra_dist" "0.000000" "end_dist" "50.000000" } + "tripday_new_m2" + { + "tank_ban_flow" + { + "cornfield" + { + "min" "45" + "max" "64" + } + } + } + "tripday_new_m3" + { + "tank_ban_flow" + { + "near_building" + { + "min" "72" + "max" "100" + } + } + "ItemLimits" + { + "pain_pills" "1" + } + } "tripday_new_m4" { "tank_ban_flow" diff --git a/cfg/cfgogl/amrv3v3/mapinfo.txt b/cfg/cfgogl/amrv3v3/mapinfo.txt index a01b81149..4d75c61ff 100644 --- a/cfg/cfgogl/amrv3v3/mapinfo.txt +++ b/cfg/cfgogl/amrv3v3/mapinfo.txt @@ -2566,11 +2566,11 @@ "early" { "min" "0" - "max" "38" + "max" "33" } "late" { - "min" "66" + "min" "70" "max" "100" } } @@ -2581,14 +2581,6 @@ } "noecho_m4" { - "tank_ban_flow" - { - "early" - { - "min" "54" - "max" "100" - } - } "ItemLimits" { "pain_pills" "4" @@ -2650,6 +2642,32 @@ "start_extra_dist" "0.000000" "end_dist" "50.000000" } + "tripday_new_m2" + { + "tank_ban_flow" + { + "cornfield" + { + "min" "45" + "max" "64" + } + } + } + "tripday_new_m3" + { + "tank_ban_flow" + { + "near_building" + { + "min" "72" + "max" "100" + } + } + "ItemLimits" + { + "pain_pills" "2" + } + } "tripday_new_m4" { "tank_ban_flow" diff --git a/cfg/cfgogl/apex/mapinfo.txt b/cfg/cfgogl/apex/mapinfo.txt index 13bf2153e..0caeb3608 100644 --- a/cfg/cfgogl/apex/mapinfo.txt +++ b/cfg/cfgogl/apex/mapinfo.txt @@ -2071,11 +2071,11 @@ "early" { "min" "0" - "max" "38" + "max" "33" } "late" { - "min" "66" + "min" "70" "max" "100" } } @@ -2086,14 +2086,6 @@ } "noecho_m4" { - "tank_ban_flow" - { - "early" - { - "min" "54" - "max" "100" - } - } "ItemLimits" { "pain_pills" "5" @@ -2155,6 +2147,32 @@ "start_extra_dist" "0.000000" "end_dist" "50.000000" } + "tripday_new_m2" + { + "tank_ban_flow" + { + "cornfield" + { + "min" "45" + "max" "64" + } + } + } + "tripday_new_m3" + { + "tank_ban_flow" + { + "near_building" + { + "min" "72" + "max" "100" + } + } + "ItemLimits" + { + "pain_pills" "3" + } + } "tripday_new_m4" { "tank_ban_flow" diff --git a/cfg/cfgogl/apex/shared_settings.cfg b/cfg/cfgogl/apex/shared_settings.cfg index f32c66608..994a20b6b 100644 --- a/cfg/cfgogl/apex/shared_settings.cfg +++ b/cfg/cfgogl/apex/shared_settings.cfg @@ -196,10 +196,6 @@ confogl_addcvar collision_tankrock_common 1 confogl_addcvar collision_smoker_common 1 confogl_addcvar collision_tankrock_incap 1 -// [l4d_stuckpunchfix] -confogl_addcvar sm_punchstuckfix_unstucktime 0.5 -confogl_addcvar tpsf_debug_print 0 - // [l4d2_shotgun_ff.smx] confogl_addcvar l4d2_shotgun_ff_multi 0.5 confogl_addcvar l4d2_shotgun_ff_min 1.0 diff --git a/cfg/cfgogl/deadman/deadman.cfg b/cfg/cfgogl/deadman/deadman.cfg index e31a72c1a..8ac68ae02 100644 --- a/cfg/cfgogl/deadman/deadman.cfg +++ b/cfg/cfgogl/deadman/deadman.cfg @@ -49,9 +49,6 @@ confogl_addcvar l4d_tankdamage_enabled 1 // [l4d_tank_rush.smx] confogl_addcvar l4d_no_tank_rush 1 -// [l4d_tankpunchstuckfix.smx] -confogl_addcvar tpsf_debug_print 0 - // [l4d_weapon_limits.smx] l4d_wlimits_add 0 1 weapon_hunting_rifle l4d_wlimits_lock diff --git a/cfg/cfgogl/deadman/mapinfo.txt b/cfg/cfgogl/deadman/mapinfo.txt index b8c91af16..4a74cb187 100644 --- a/cfg/cfgogl/deadman/mapinfo.txt +++ b/cfg/cfgogl/deadman/mapinfo.txt @@ -2326,11 +2326,11 @@ "early" { "min" "0" - "max" "38" + "max" "33" } "late" { - "min" "66" + "min" "70" "max" "100" } } @@ -2341,14 +2341,6 @@ } "noecho_m4" { - "tank_ban_flow" - { - "early" - { - "min" "54" - "max" "100" - } - } "ItemLimits" { "pain_pills" "2" @@ -2410,6 +2402,32 @@ "start_extra_dist" "0.000000" "end_dist" "50.000000" } + "tripday_new_m2" + { + "tank_ban_flow" + { + "cornfield" + { + "min" "45" + "max" "64" + } + } + } + "tripday_new_m3" + { + "tank_ban_flow" + { + "near_building" + { + "min" "72" + "max" "100" + } + } + "ItemLimits" + { + "pain_pills" "1" + } + } "tripday_new_m4" { "tank_ban_flow" diff --git a/cfg/cfgogl/eq/mapinfo.txt b/cfg/cfgogl/eq/mapinfo.txt index 78efcc746..fa98ab103 100644 --- a/cfg/cfgogl/eq/mapinfo.txt +++ b/cfg/cfgogl/eq/mapinfo.txt @@ -2058,11 +2058,11 @@ "early" { "min" "0" - "max" "38" + "max" "33" } "late" { - "min" "66" + "min" "70" "max" "100" } } @@ -2073,14 +2073,6 @@ } "noecho_m4" { - "tank_ban_flow" - { - "early" - { - "min" "54" - "max" "100" - } - } "ItemLimits" { "pain_pills" "5" @@ -2142,6 +2134,32 @@ "start_extra_dist" "0.000000" "end_dist" "50.000000" } + "tripday_new_m2" + { + "tank_ban_flow" + { + "cornfield" + { + "min" "45" + "max" "64" + } + } + } + "tripday_new_m3" + { + "tank_ban_flow" + { + "near_building" + { + "min" "72" + "max" "100" + } + } + "ItemLimits" + { + "pain_pills" "3" + } + } "tripday_new_m4" { "tank_ban_flow" diff --git a/cfg/cfgogl/eq1v1/mapinfo.txt b/cfg/cfgogl/eq1v1/mapinfo.txt index d833c8203..f01b1e5d7 100644 --- a/cfg/cfgogl/eq1v1/mapinfo.txt +++ b/cfg/cfgogl/eq1v1/mapinfo.txt @@ -2058,11 +2058,11 @@ "early" { "min" "0" - "max" "38" + "max" "33" } "late" { - "min" "66" + "min" "70" "max" "100" } } @@ -2073,14 +2073,6 @@ } "noecho_m4" { - "tank_ban_flow" - { - "early" - { - "min" "54" - "max" "100" - } - } "ItemLimits" { "pain_pills" "2" @@ -2142,6 +2134,32 @@ "start_extra_dist" "0.000000" "end_dist" "50.000000" } + "tripday_new_m2" + { + "tank_ban_flow" + { + "cornfield" + { + "min" "45" + "max" "64" + } + } + } + "tripday_new_m3" + { + "tank_ban_flow" + { + "near_building" + { + "min" "72" + "max" "100" + } + } + "ItemLimits" + { + "pain_pills" "1" + } + } "tripday_new_m4" { "tank_ban_flow" diff --git a/cfg/cfgogl/eq2v2/mapinfo.txt b/cfg/cfgogl/eq2v2/mapinfo.txt index 0f21815c8..d38c1aad9 100644 --- a/cfg/cfgogl/eq2v2/mapinfo.txt +++ b/cfg/cfgogl/eq2v2/mapinfo.txt @@ -2058,11 +2058,11 @@ "early" { "min" "0" - "max" "38" + "max" "33" } "late" { - "min" "66" + "min" "70" "max" "100" } } @@ -2073,14 +2073,6 @@ } "noecho_m4" { - "tank_ban_flow" - { - "early" - { - "min" "54" - "max" "100" - } - } "ItemLimits" { "pain_pills" "3" @@ -2142,6 +2134,32 @@ "start_extra_dist" "0.000000" "end_dist" "50.000000" } + "tripday_new_m2" + { + "tank_ban_flow" + { + "cornfield" + { + "min" "45" + "max" "64" + } + } + } + "tripday_new_m3" + { + "tank_ban_flow" + { + "near_building" + { + "min" "72" + "max" "100" + } + } + "ItemLimits" + { + "pain_pills" "1" + } + } "tripday_new_m4" { "tank_ban_flow" diff --git a/cfg/cfgogl/eq3v3/mapinfo.txt b/cfg/cfgogl/eq3v3/mapinfo.txt index 9fd134eb4..dc8c04ea2 100644 --- a/cfg/cfgogl/eq3v3/mapinfo.txt +++ b/cfg/cfgogl/eq3v3/mapinfo.txt @@ -2058,11 +2058,11 @@ "early" { "min" "0" - "max" "38" + "max" "33" } "late" { - "min" "66" + "min" "70" "max" "100" } } @@ -2073,14 +2073,6 @@ } "noecho_m4" { - "tank_ban_flow" - { - "early" - { - "min" "54" - "max" "100" - } - } "ItemLimits" { "pain_pills" "4" @@ -2142,6 +2134,32 @@ "start_extra_dist" "0.000000" "end_dist" "50.000000" } + "tripday_new_m2" + { + "tank_ban_flow" + { + "cornfield" + { + "min" "45" + "max" "64" + } + } + } + "tripday_new_m3" + { + "tank_ban_flow" + { + "near_building" + { + "min" "72" + "max" "100" + } + } + "ItemLimits" + { + "pain_pills" "2" + } + } "tripday_new_m4" { "tank_ban_flow" diff --git a/cfg/cfgogl/neomod/mapinfo.txt b/cfg/cfgogl/neomod/mapinfo.txt index 281cf639c..41a40117f 100644 --- a/cfg/cfgogl/neomod/mapinfo.txt +++ b/cfg/cfgogl/neomod/mapinfo.txt @@ -2411,11 +2411,11 @@ "early" { "min" "0" - "max" "38" + "max" "33" } "late" { - "min" "66" + "min" "70" "max" "100" } } @@ -2426,14 +2426,6 @@ } "noecho_m4" { - "tank_ban_flow" - { - "early" - { - "min" "54" - "max" "100" - } - } "ItemLimits" { "pain_pills" "5" @@ -2495,6 +2487,32 @@ "start_extra_dist" "0.000000" "end_dist" "50.000000" } + "tripday_new_m2" + { + "tank_ban_flow" + { + "cornfield" + { + "min" "45" + "max" "64" + } + } + } + "tripday_new_m3" + { + "tank_ban_flow" + { + "near_building" + { + "min" "72" + "max" "100" + } + } + "ItemLimits" + { + "pain_pills" "3" + } + } "tripday_new_m4" { "tank_ban_flow" diff --git a/cfg/cfgogl/neomod/shared_settings.cfg b/cfg/cfgogl/neomod/shared_settings.cfg index 9f448bf22..af7fa1092 100644 --- a/cfg/cfgogl/neomod/shared_settings.cfg +++ b/cfg/cfgogl/neomod/shared_settings.cfg @@ -241,10 +241,6 @@ confogl_addcvar collision_tankrock_common 1 confogl_addcvar collision_smoker_common 0 confogl_addcvar collision_tankrock_incap 1 -// [l4d_stuckpunchfix] -confogl_addcvar sm_punchstuckfix_unstucktime 0.5 -confogl_addcvar tpsf_debug_print 0 - // [l4d2_shotgun_ff.smx] confogl_addcvar l4d2_shotgun_ff_multi 0.5 confogl_addcvar l4d2_shotgun_ff_min 1.0 diff --git a/cfg/cfgogl/nextmod/mapinfo.txt b/cfg/cfgogl/nextmod/mapinfo.txt index d89a154d0..2c2542066 100644 --- a/cfg/cfgogl/nextmod/mapinfo.txt +++ b/cfg/cfgogl/nextmod/mapinfo.txt @@ -2128,11 +2128,11 @@ "early" { "min" "0" - "max" "38" + "max" "33" } "late" { - "min" "66" + "min" "70" "max" "100" } } @@ -2143,14 +2143,6 @@ } "noecho_m4" { - "tank_ban_flow" - { - "early" - { - "min" "54" - "max" "100" - } - } "ItemLimits" { "pain_pills" "5" @@ -2212,6 +2204,32 @@ "start_extra_dist" "0.000000" "end_dist" "50.000000" } + "tripday_new_m2" + { + "tank_ban_flow" + { + "cornfield" + { + "min" "45" + "max" "64" + } + } + } + "tripday_new_m3" + { + "tank_ban_flow" + { + "near_building" + { + "min" "72" + "max" "100" + } + } + "ItemLimits" + { + "pain_pills" "3" + } + } "tripday_new_m4" { "tank_ban_flow" diff --git a/cfg/cfgogl/nextmod/shared_settings.cfg b/cfg/cfgogl/nextmod/shared_settings.cfg index d656ca7ac..fc1130614 100644 --- a/cfg/cfgogl/nextmod/shared_settings.cfg +++ b/cfg/cfgogl/nextmod/shared_settings.cfg @@ -243,10 +243,6 @@ confogl_addcvar collision_tankrock_common 1 confogl_addcvar collision_smoker_common 1 confogl_addcvar collision_tankrock_incap 1 -// [l4d_stuckpunchfix] -confogl_addcvar sm_punchstuckfix_unstucktime 0.5 -confogl_addcvar tpsf_debug_print 0 - // [l4d2_shotgun_ff.smx] confogl_addcvar l4d2_shotgun_ff_multi 0.5 confogl_addcvar l4d2_shotgun_ff_min 1.0 diff --git a/cfg/cfgogl/nextmod1v1/mapinfo.txt b/cfg/cfgogl/nextmod1v1/mapinfo.txt index c02fcf6cc..3bf9d3334 100644 --- a/cfg/cfgogl/nextmod1v1/mapinfo.txt +++ b/cfg/cfgogl/nextmod1v1/mapinfo.txt @@ -2128,11 +2128,11 @@ "early" { "min" "0" - "max" "38" + "max" "33" } "late" { - "min" "66" + "min" "70" "max" "100" } } @@ -2143,14 +2143,6 @@ } "noecho_m4" { - "tank_ban_flow" - { - "early" - { - "min" "54" - "max" "100" - } - } "ItemLimits" { "pain_pills" "2" @@ -2212,6 +2204,32 @@ "start_extra_dist" "0.000000" "end_dist" "50.000000" } + "tripday_new_m2" + { + "tank_ban_flow" + { + "cornfield" + { + "min" "45" + "max" "64" + } + } + } + "tripday_new_m3" + { + "tank_ban_flow" + { + "near_building" + { + "min" "72" + "max" "100" + } + } + "ItemLimits" + { + "pain_pills" "1" + } + } "tripday_new_m4" { "tank_ban_flow" diff --git a/cfg/cfgogl/nextmod2v2/mapinfo.txt b/cfg/cfgogl/nextmod2v2/mapinfo.txt index 622030daf..8573fafc8 100644 --- a/cfg/cfgogl/nextmod2v2/mapinfo.txt +++ b/cfg/cfgogl/nextmod2v2/mapinfo.txt @@ -2128,11 +2128,11 @@ "early" { "min" "0" - "max" "38" + "max" "33" } "late" { - "min" "66" + "min" "70" "max" "100" } } @@ -2143,14 +2143,6 @@ } "noecho_m4" { - "tank_ban_flow" - { - "early" - { - "min" "54" - "max" "100" - } - } "ItemLimits" { "pain_pills" "3" @@ -2212,6 +2204,32 @@ "start_extra_dist" "0.000000" "end_dist" "50.000000" } + "tripday_new_m2" + { + "tank_ban_flow" + { + "cornfield" + { + "min" "45" + "max" "64" + } + } + } + "tripday_new_m3" + { + "tank_ban_flow" + { + "near_building" + { + "min" "72" + "max" "100" + } + } + "ItemLimits" + { + "pain_pills" "1" + } + } "tripday_new_m4" { "tank_ban_flow" diff --git a/cfg/cfgogl/nextmod3v3/mapinfo.txt b/cfg/cfgogl/nextmod3v3/mapinfo.txt index f54317237..6c63752a3 100644 --- a/cfg/cfgogl/nextmod3v3/mapinfo.txt +++ b/cfg/cfgogl/nextmod3v3/mapinfo.txt @@ -2128,11 +2128,11 @@ "early" { "min" "0" - "max" "38" + "max" "33" } "late" { - "min" "66" + "min" "70" "max" "100" } } @@ -2143,14 +2143,6 @@ } "noecho_m4" { - "tank_ban_flow" - { - "early" - { - "min" "54" - "max" "100" - } - } "ItemLimits" { "pain_pills" "4" @@ -2212,6 +2204,32 @@ "start_extra_dist" "0.000000" "end_dist" "50.000000" } + "tripday_new_m2" + { + "tank_ban_flow" + { + "cornfield" + { + "min" "45" + "max" "64" + } + } + } + "tripday_new_m3" + { + "tank_ban_flow" + { + "near_building" + { + "min" "72" + "max" "100" + } + } + "ItemLimits" + { + "pain_pills" "2" + } + } "tripday_new_m4" { "tank_ban_flow" diff --git a/cfg/cfgogl/pmelite/mapinfo.txt b/cfg/cfgogl/pmelite/mapinfo.txt index 8934185e8..3bc991de1 100644 --- a/cfg/cfgogl/pmelite/mapinfo.txt +++ b/cfg/cfgogl/pmelite/mapinfo.txt @@ -2243,11 +2243,11 @@ "early" { "min" "0" - "max" "38" + "max" "33" } "late" { - "min" "66" + "min" "70" "max" "100" } } @@ -2258,14 +2258,6 @@ } "noecho_m4" { - "tank_ban_flow" - { - "early" - { - "min" "54" - "max" "100" - } - } "ItemLimits" { "pain_pills" "5" @@ -2327,6 +2319,32 @@ "start_extra_dist" "0.000000" "end_dist" "50.000000" } + "tripday_new_m2" + { + "tank_ban_flow" + { + "cornfield" + { + "min" "45" + "max" "64" + } + } + } + "tripday_new_m3" + { + "tank_ban_flow" + { + "near_building" + { + "min" "72" + "max" "100" + } + } + "ItemLimits" + { + "pain_pills" "3" + } + } "tripday_new_m4" { "tank_ban_flow" diff --git a/cfg/cfgogl/pmelite/pmelite.cfg b/cfg/cfgogl/pmelite/pmelite.cfg index 424561c31..5bf7e926e 100644 --- a/cfg/cfgogl/pmelite/pmelite.cfg +++ b/cfg/cfgogl/pmelite/pmelite.cfg @@ -271,10 +271,6 @@ confogl_addcvar collision_tankrock_common 1 confogl_addcvar collision_smoker_common 1 confogl_addcvar collision_tankrock_incap 1 -// [l4d_stuckpunchfix] -confogl_addcvar sm_punchstuckfix_unstucktime 0.5 -confogl_addcvar tpsf_debug_print 0 - // [l4d2_survivor_ff.smx] confogl_addcvar l4d2_undoff_enable 7 confogl_addcvar l4d2_undoff_blockzerodmg 7 diff --git a/cfg/cfgogl/zh1v1/mapinfo.txt b/cfg/cfgogl/zh1v1/mapinfo.txt index ef5e419fd..2848fc08f 100644 --- a/cfg/cfgogl/zh1v1/mapinfo.txt +++ b/cfg/cfgogl/zh1v1/mapinfo.txt @@ -2561,11 +2561,11 @@ "early" { "min" "0" - "max" "38" + "max" "33" } "late" { - "min" "66" + "min" "70" "max" "100" } } @@ -2576,14 +2576,6 @@ } "noecho_m4" { - "tank_ban_flow" - { - "early" - { - "min" "54" - "max" "100" - } - } "ItemLimits" { "pain_pills" "2" @@ -2645,6 +2637,32 @@ "start_extra_dist" "0.000000" "end_dist" "50.000000" } + "tripday_new_m2" + { + "tank_ban_flow" + { + "cornfield" + { + "min" "45" + "max" "64" + } + } + } + "tripday_new_m3" + { + "tank_ban_flow" + { + "near_building" + { + "min" "72" + "max" "100" + } + } + "ItemLimits" + { + "pain_pills" "1" + } + } "tripday_new_m4" { "tank_ban_flow" diff --git a/cfg/cfgogl/zh2v2/mapinfo.txt b/cfg/cfgogl/zh2v2/mapinfo.txt index 4fb9a3d3d..e75a83ac8 100644 --- a/cfg/cfgogl/zh2v2/mapinfo.txt +++ b/cfg/cfgogl/zh2v2/mapinfo.txt @@ -2561,11 +2561,11 @@ "early" { "min" "0" - "max" "38" + "max" "33" } "late" { - "min" "66" + "min" "70" "max" "100" } } @@ -2576,14 +2576,6 @@ } "noecho_m4" { - "tank_ban_flow" - { - "early" - { - "min" "54" - "max" "100" - } - } "ItemLimits" { "pain_pills" "3" @@ -2645,6 +2637,32 @@ "start_extra_dist" "0.000000" "end_dist" "50.000000" } + "tripday_new_m2" + { + "tank_ban_flow" + { + "cornfield" + { + "min" "45" + "max" "64" + } + } + } + "tripday_new_m3" + { + "tank_ban_flow" + { + "near_building" + { + "min" "72" + "max" "100" + } + } + "ItemLimits" + { + "pain_pills" "1" + } + } "tripday_new_m4" { "tank_ban_flow" diff --git a/cfg/cfgogl/zh3v3/mapinfo.txt b/cfg/cfgogl/zh3v3/mapinfo.txt index eb2b503de..908c9e340 100644 --- a/cfg/cfgogl/zh3v3/mapinfo.txt +++ b/cfg/cfgogl/zh3v3/mapinfo.txt @@ -2561,11 +2561,11 @@ "early" { "min" "0" - "max" "38" + "max" "33" } "late" { - "min" "66" + "min" "70" "max" "100" } } @@ -2576,14 +2576,6 @@ } "noecho_m4" { - "tank_ban_flow" - { - "early" - { - "min" "54" - "max" "100" - } - } "ItemLimits" { "pain_pills" "4" @@ -2645,6 +2637,32 @@ "start_extra_dist" "0.000000" "end_dist" "50.000000" } + "tripday_new_m2" + { + "tank_ban_flow" + { + "cornfield" + { + "min" "45" + "max" "64" + } + } + } + "tripday_new_m3" + { + "tank_ban_flow" + { + "near_building" + { + "min" "72" + "max" "100" + } + } + "ItemLimits" + { + "pain_pills" "2" + } + } "tripday_new_m4" { "tank_ban_flow" diff --git a/cfg/cfgogl/zm1v1/mapinfo.txt b/cfg/cfgogl/zm1v1/mapinfo.txt index ef5e419fd..2848fc08f 100644 --- a/cfg/cfgogl/zm1v1/mapinfo.txt +++ b/cfg/cfgogl/zm1v1/mapinfo.txt @@ -2561,11 +2561,11 @@ "early" { "min" "0" - "max" "38" + "max" "33" } "late" { - "min" "66" + "min" "70" "max" "100" } } @@ -2576,14 +2576,6 @@ } "noecho_m4" { - "tank_ban_flow" - { - "early" - { - "min" "54" - "max" "100" - } - } "ItemLimits" { "pain_pills" "2" @@ -2645,6 +2637,32 @@ "start_extra_dist" "0.000000" "end_dist" "50.000000" } + "tripday_new_m2" + { + "tank_ban_flow" + { + "cornfield" + { + "min" "45" + "max" "64" + } + } + } + "tripday_new_m3" + { + "tank_ban_flow" + { + "near_building" + { + "min" "72" + "max" "100" + } + } + "ItemLimits" + { + "pain_pills" "1" + } + } "tripday_new_m4" { "tank_ban_flow" diff --git a/cfg/cfgogl/zm2v2/mapinfo.txt b/cfg/cfgogl/zm2v2/mapinfo.txt index 4fb9a3d3d..e75a83ac8 100644 --- a/cfg/cfgogl/zm2v2/mapinfo.txt +++ b/cfg/cfgogl/zm2v2/mapinfo.txt @@ -2561,11 +2561,11 @@ "early" { "min" "0" - "max" "38" + "max" "33" } "late" { - "min" "66" + "min" "70" "max" "100" } } @@ -2576,14 +2576,6 @@ } "noecho_m4" { - "tank_ban_flow" - { - "early" - { - "min" "54" - "max" "100" - } - } "ItemLimits" { "pain_pills" "3" @@ -2645,6 +2637,32 @@ "start_extra_dist" "0.000000" "end_dist" "50.000000" } + "tripday_new_m2" + { + "tank_ban_flow" + { + "cornfield" + { + "min" "45" + "max" "64" + } + } + } + "tripday_new_m3" + { + "tank_ban_flow" + { + "near_building" + { + "min" "72" + "max" "100" + } + } + "ItemLimits" + { + "pain_pills" "1" + } + } "tripday_new_m4" { "tank_ban_flow" diff --git a/cfg/cfgogl/zm3v3/mapinfo.txt b/cfg/cfgogl/zm3v3/mapinfo.txt index eb2b503de..908c9e340 100644 --- a/cfg/cfgogl/zm3v3/mapinfo.txt +++ b/cfg/cfgogl/zm3v3/mapinfo.txt @@ -2561,11 +2561,11 @@ "early" { "min" "0" - "max" "38" + "max" "33" } "late" { - "min" "66" + "min" "70" "max" "100" } } @@ -2576,14 +2576,6 @@ } "noecho_m4" { - "tank_ban_flow" - { - "early" - { - "min" "54" - "max" "100" - } - } "ItemLimits" { "pain_pills" "4" @@ -2645,6 +2637,32 @@ "start_extra_dist" "0.000000" "end_dist" "50.000000" } + "tripday_new_m2" + { + "tank_ban_flow" + { + "cornfield" + { + "min" "45" + "max" "64" + } + } + } + "tripday_new_m3" + { + "tank_ban_flow" + { + "near_building" + { + "min" "72" + "max" "100" + } + } + "ItemLimits" + { + "pain_pills" "2" + } + } "tripday_new_m4" { "tank_ban_flow" diff --git a/cfg/cfgogl/zonehunters/mapinfo.txt b/cfg/cfgogl/zonehunters/mapinfo.txt index 4dec495fb..d90d9e7ee 100644 --- a/cfg/cfgogl/zonehunters/mapinfo.txt +++ b/cfg/cfgogl/zonehunters/mapinfo.txt @@ -2561,11 +2561,11 @@ "early" { "min" "0" - "max" "38" + "max" "33" } "late" { - "min" "66" + "min" "70" "max" "100" } } @@ -2576,14 +2576,6 @@ } "noecho_m4" { - "tank_ban_flow" - { - "early" - { - "min" "54" - "max" "100" - } - } "ItemLimits" { "pain_pills" "5" @@ -2645,6 +2637,32 @@ "start_extra_dist" "0.000000" "end_dist" "50.000000" } + "tripday_new_m2" + { + "tank_ban_flow" + { + "cornfield" + { + "min" "45" + "max" "64" + } + } + } + "tripday_new_m3" + { + "tank_ban_flow" + { + "near_building" + { + "min" "72" + "max" "100" + } + } + "ItemLimits" + { + "pain_pills" "3" + } + } "tripday_new_m4" { "tank_ban_flow" diff --git a/cfg/cfgogl/zonehunters/shared_settings.cfg b/cfg/cfgogl/zonehunters/shared_settings.cfg index 22c8bc477..b49d88692 100644 --- a/cfg/cfgogl/zonehunters/shared_settings.cfg +++ b/cfg/cfgogl/zonehunters/shared_settings.cfg @@ -196,10 +196,6 @@ confogl_addcvar collision_tankrock_common 1 confogl_addcvar collision_smoker_common 0 confogl_addcvar collision_tankrock_incap 1 -// [l4d_stuckpunchfix] -confogl_addcvar sm_punchstuckfix_unstucktime 0.5 -confogl_addcvar tpsf_debug_print 0 - // [l4d2_shotgun_ff.smx] confogl_addcvar l4d2_shotgun_ff_multi 0.5 confogl_addcvar l4d2_shotgun_ff_min 1.0 diff --git a/cfg/cfgogl/zonemod/mapinfo.txt b/cfg/cfgogl/zonemod/mapinfo.txt index 4dec495fb..d90d9e7ee 100644 --- a/cfg/cfgogl/zonemod/mapinfo.txt +++ b/cfg/cfgogl/zonemod/mapinfo.txt @@ -2561,11 +2561,11 @@ "early" { "min" "0" - "max" "38" + "max" "33" } "late" { - "min" "66" + "min" "70" "max" "100" } } @@ -2576,14 +2576,6 @@ } "noecho_m4" { - "tank_ban_flow" - { - "early" - { - "min" "54" - "max" "100" - } - } "ItemLimits" { "pain_pills" "5" @@ -2645,6 +2637,32 @@ "start_extra_dist" "0.000000" "end_dist" "50.000000" } + "tripday_new_m2" + { + "tank_ban_flow" + { + "cornfield" + { + "min" "45" + "max" "64" + } + } + } + "tripday_new_m3" + { + "tank_ban_flow" + { + "near_building" + { + "min" "72" + "max" "100" + } + } + "ItemLimits" + { + "pain_pills" "3" + } + } "tripday_new_m4" { "tank_ban_flow" diff --git a/cfg/cfgogl/zonemod/shared_settings.cfg b/cfg/cfgogl/zonemod/shared_settings.cfg index 04b26f575..eb5933683 100644 --- a/cfg/cfgogl/zonemod/shared_settings.cfg +++ b/cfg/cfgogl/zonemod/shared_settings.cfg @@ -253,10 +253,6 @@ confogl_addcvar collision_tankrock_common 1 confogl_addcvar collision_smoker_common 0 confogl_addcvar collision_tankrock_incap 1 -// [l4d_stuckpunchfix] -confogl_addcvar sm_punchstuckfix_unstucktime 0.5 -confogl_addcvar tpsf_debug_print 0 - // [l4d2_shotgun_ff.smx] confogl_addcvar l4d2_shotgun_ff_multi 0.5 confogl_addcvar l4d2_shotgun_ff_min 1.0 diff --git a/cfg/cfgogl/zonemod_mutation12/mapinfo.txt b/cfg/cfgogl/zonemod_mutation12/mapinfo.txt index 4dec495fb..d90d9e7ee 100644 --- a/cfg/cfgogl/zonemod_mutation12/mapinfo.txt +++ b/cfg/cfgogl/zonemod_mutation12/mapinfo.txt @@ -2561,11 +2561,11 @@ "early" { "min" "0" - "max" "38" + "max" "33" } "late" { - "min" "66" + "min" "70" "max" "100" } } @@ -2576,14 +2576,6 @@ } "noecho_m4" { - "tank_ban_flow" - { - "early" - { - "min" "54" - "max" "100" - } - } "ItemLimits" { "pain_pills" "5" @@ -2645,6 +2637,32 @@ "start_extra_dist" "0.000000" "end_dist" "50.000000" } + "tripday_new_m2" + { + "tank_ban_flow" + { + "cornfield" + { + "min" "45" + "max" "64" + } + } + } + "tripday_new_m3" + { + "tank_ban_flow" + { + "near_building" + { + "min" "72" + "max" "100" + } + } + "ItemLimits" + { + "pain_pills" "3" + } + } "tripday_new_m4" { "tank_ban_flow" diff --git a/cfg/cfgogl/zonemod_mutation12/shared_settings.cfg b/cfg/cfgogl/zonemod_mutation12/shared_settings.cfg index 7880e540b..21a472087 100644 --- a/cfg/cfgogl/zonemod_mutation12/shared_settings.cfg +++ b/cfg/cfgogl/zonemod_mutation12/shared_settings.cfg @@ -253,10 +253,6 @@ confogl_addcvar collision_tankrock_common 1 confogl_addcvar collision_smoker_common 0 confogl_addcvar collision_tankrock_incap 1 -// [l4d_stuckpunchfix] -confogl_addcvar sm_punchstuckfix_unstucktime 0.5 -confogl_addcvar tpsf_debug_print 0 - // [l4d2_shotgun_ff.smx] confogl_addcvar l4d2_shotgun_ff_multi 0.5 confogl_addcvar l4d2_shotgun_ff_min 1.0 diff --git a/cfg/cfgogl/zoneretro/mapinfo.txt b/cfg/cfgogl/zoneretro/mapinfo.txt index 4dec495fb..d90d9e7ee 100644 --- a/cfg/cfgogl/zoneretro/mapinfo.txt +++ b/cfg/cfgogl/zoneretro/mapinfo.txt @@ -2561,11 +2561,11 @@ "early" { "min" "0" - "max" "38" + "max" "33" } "late" { - "min" "66" + "min" "70" "max" "100" } } @@ -2576,14 +2576,6 @@ } "noecho_m4" { - "tank_ban_flow" - { - "early" - { - "min" "54" - "max" "100" - } - } "ItemLimits" { "pain_pills" "5" @@ -2645,6 +2637,32 @@ "start_extra_dist" "0.000000" "end_dist" "50.000000" } + "tripday_new_m2" + { + "tank_ban_flow" + { + "cornfield" + { + "min" "45" + "max" "64" + } + } + } + "tripday_new_m3" + { + "tank_ban_flow" + { + "near_building" + { + "min" "72" + "max" "100" + } + } + "ItemLimits" + { + "pain_pills" "3" + } + } "tripday_new_m4" { "tank_ban_flow" diff --git a/cfg/cfgogl/zoneretro/shared_settings.cfg b/cfg/cfgogl/zoneretro/shared_settings.cfg index d1abf6748..2cc7a7b9b 100644 --- a/cfg/cfgogl/zoneretro/shared_settings.cfg +++ b/cfg/cfgogl/zoneretro/shared_settings.cfg @@ -190,10 +190,6 @@ confogl_addcvar collision_tankrock_common 1 confogl_addcvar collision_smoker_common 1 confogl_addcvar collision_tankrock_incap 1 -// [l4d_stuckpunchfix] -confogl_addcvar sm_punchstuckfix_unstucktime 0.5 -confogl_addcvar tpsf_debug_print 0 - // [l4d2_shotgun_ff.smx] confogl_addcvar l4d2_shotgun_ff_multi 0.5 confogl_addcvar l4d2_shotgun_ff_min 1.0 diff --git a/cfg/stripper/zonemod/maps/cwm3_drain.cfg b/cfg/stripper/zonemod/maps/cwm3_drain.cfg index b15718c83..162956ae3 100644 --- a/cfg/stripper/zonemod/maps/cwm3_drain.cfg +++ b/cfg/stripper/zonemod/maps/cwm3_drain.cfg @@ -43,7 +43,31 @@ add: } -; --- RBTV Fixes +; --- Block survivors getting to an unreachable platform in the sewers +{ + "classname" "env_physics_blocker" + "origin" "-1160 -2240 -312" + "mins" "-248 -1 -184" + "maxs" "248 1 184" + "initialstate" "1" + "BlockType" "1" +} +{ + "classname" "env_physics_blocker" + "origin" "-1344 -1860 -256" + "mins" "-32 -628 -128" + "maxs" "32 628 128" + "initialstate" "1" + "BlockType" "1" +} +{ + "classname" "env_physics_blocker" + "origin" "-1290 -1710 -256" + "mins" "-22 -41 -128" + "maxs" "22 41 128" + "initialstate" "1" + "BlockType" "1" +} ; --- Block jumping out of bounds on dirt platforms in sewers { "classname" "env_physics_blocker" @@ -81,7 +105,6 @@ add: "initialstate" "1" "BlockType" "1" } - ; --- Block various skips / props around the bridge event ; --- Pipes { @@ -168,7 +191,15 @@ add: "spawnflags" "1" "OnTrigger" "caralarm_car1,SurvivorStandingOnCar,,0,-1" } - +; --- Block jumping on swing set to skip the alarm car +{ + "classname" "env_physics_blocker" + "origin" "2192 -575 888" + "mins" "-29 -77 -520" + "maxs" "29 77 520" + "initialstate" "1" + "BlockType" "1" +} ; ############# LADDER CHANGES AND FIXES ############ @@ -314,4 +345,4 @@ add: "normal.y" "0" "normal.z" "0" "team" "2" -} \ No newline at end of file +} diff --git a/cfg/stripper/zonemod_anne/maps/cwm3_drain.cfg b/cfg/stripper/zonemod_anne/maps/cwm3_drain.cfg index b15718c83..162956ae3 100644 --- a/cfg/stripper/zonemod_anne/maps/cwm3_drain.cfg +++ b/cfg/stripper/zonemod_anne/maps/cwm3_drain.cfg @@ -43,7 +43,31 @@ add: } -; --- RBTV Fixes +; --- Block survivors getting to an unreachable platform in the sewers +{ + "classname" "env_physics_blocker" + "origin" "-1160 -2240 -312" + "mins" "-248 -1 -184" + "maxs" "248 1 184" + "initialstate" "1" + "BlockType" "1" +} +{ + "classname" "env_physics_blocker" + "origin" "-1344 -1860 -256" + "mins" "-32 -628 -128" + "maxs" "32 628 128" + "initialstate" "1" + "BlockType" "1" +} +{ + "classname" "env_physics_blocker" + "origin" "-1290 -1710 -256" + "mins" "-22 -41 -128" + "maxs" "22 41 128" + "initialstate" "1" + "BlockType" "1" +} ; --- Block jumping out of bounds on dirt platforms in sewers { "classname" "env_physics_blocker" @@ -81,7 +105,6 @@ add: "initialstate" "1" "BlockType" "1" } - ; --- Block various skips / props around the bridge event ; --- Pipes { @@ -168,7 +191,15 @@ add: "spawnflags" "1" "OnTrigger" "caralarm_car1,SurvivorStandingOnCar,,0,-1" } - +; --- Block jumping on swing set to skip the alarm car +{ + "classname" "env_physics_blocker" + "origin" "2192 -575 888" + "mins" "-29 -77 -520" + "maxs" "29 77 520" + "initialstate" "1" + "BlockType" "1" +} ; ############# LADDER CHANGES AND FIXES ############ @@ -314,4 +345,4 @@ add: "normal.y" "0" "normal.z" "0" "team" "2" -} \ No newline at end of file +}