From 2c16c811aed3e2f42c5fbc1aec30d36f6d377396 Mon Sep 17 00:00:00 2001 From: l-Aad-l <7024626+l-Aad-l@users.noreply.github.com> Date: Sun, 15 May 2022 19:31:52 -0400 Subject: [PATCH 1/4] Updated configs and rglqol --- addons/sourcemod/scripting/rglqol.sp | 2 +- cfg/rgl_base.cfg | 4 ++-- cfg/rgl_off.cfg | 30 ++++++++++++++++++---------- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/addons/sourcemod/scripting/rglqol.sp b/addons/sourcemod/scripting/rglqol.sp index 84b192e..2a4550b 100644 --- a/addons/sourcemod/scripting/rglqol.sp +++ b/addons/sourcemod/scripting/rglqol.sp @@ -5,7 +5,7 @@ #include #define PLUGIN_NAME "RGL.gg QoL Tweaks" -#define PLUGIN_VERSION "1.4.2" +#define PLUGIN_VERSION "1.4.3" bool:CfgExecuted; bool:alreadyChanging; diff --git a/cfg/rgl_base.cfg b/cfg/rgl_base.cfg index 2d26dce..451e612 100644 --- a/cfg/rgl_base.cfg +++ b/cfg/rgl_base.cfg @@ -13,12 +13,12 @@ sm_deterministic_fall_damage 1 sm_empty_active_ubercharges_when_dropped 0 sm_fix_ghost_crossbow_bolts 1 sm_fix_post_pause_state 0 -sm_fix_reflect_self_damage 0 +sm_fix_reflect_self_damage 1 sm_fix_slope_bug 1 sm_fix_sticky_delay 1 sm_inhibit_extendfreeze 1 sm_override_pipe_size 0 -sm_projectiles_collide_with_cylinders 0 +sm_projectiles_collide_with_cylinders 0 sm_projectiles_ignore_teammates 0 sm_remove_halloween_souls 1 sm_remove_pipe_spin 0 diff --git a/cfg/rgl_off.cfg b/cfg/rgl_off.cfg index 1991b91..2e4a918 100644 --- a/cfg/rgl_off.cfg +++ b/cfg/rgl_off.cfg @@ -22,16 +22,26 @@ sv_rcon_log "1" // turns on rcon logging (default) // TF2 Comp Fixes // Keep bug fixes enabled even if cfg is off -sm_deterministic_fall_damage 1 -sm_fix_ghost_crossbow_bolts 1 -sm_fix_slope_bug 1 -sm_fix_sticky_delay 1 -sm_gunboats_always_apply 0 -sm_projectiles_ignore_teammates 0 -sm_remove_halloween_souls 0 -sm_remove_medic_attach_speed 0 -sm_remove_pipe_spin 0 -sm_rest_in_peace_rick_may 0 +// TF2 Comp Fixes +sm_deterministic_fall_damage 1 +sm_empty_active_ubercharges_when_dropped 0 +sm_fix_ghost_crossbow_bolts 1 +sm_fix_post_pause_state 0 +sm_fix_reflect_self_damage 1 +sm_fix_slope_bug 1 +sm_fix_sticky_delay 1 +sm_inhibit_extendfreeze 1 +sm_override_pipe_size 0 +sm_projectiles_collide_with_cylinders 0 +sm_projectiles_ignore_teammates 0 +sm_remove_halloween_souls 1 +sm_remove_pipe_spin 0 +sm_rest_in_peace_rick_may 128 +sm_grounded_rj_resistance 0 +sm_gunboats_always_apply 0 +sm_prevent_respawning 0 +sm_remove_medic_attach_speed 0 +sm_solid_buildings 0 sm_winger_jump_bonus_when_fully_deployed 0 sv_contact "" // unsets contact info From 88e9dfff51857c199611fd85bc08ab4c9fef498d Mon Sep 17 00:00:00 2001 From: l-Aad-l <7024626+l-Aad-l@users.noreply.github.com> Date: Sun, 15 May 2022 19:36:02 -0400 Subject: [PATCH 2/4] added roundtimer plugin & updated the 5cp configs --- .../scripting/roundtimer_override.sp | 30 +++++++++++++++++++ cfg/rgl_6s_5cp_gc.cfg | 2 ++ cfg/rgl_6s_5cp_match.cfg | 2 ++ cfg/rgl_6s_5cp_match_half1.cfg | 2 ++ cfg/rgl_6s_5cp_match_half2.cfg | 2 ++ cfg/rgl_6s_5cp_scrim.cfg | 2 ++ 6 files changed, 40 insertions(+) create mode 100644 addons/sourcemod/scripting/roundtimer_override.sp diff --git a/addons/sourcemod/scripting/roundtimer_override.sp b/addons/sourcemod/scripting/roundtimer_override.sp new file mode 100644 index 0000000..1b54cef --- /dev/null +++ b/addons/sourcemod/scripting/roundtimer_override.sp @@ -0,0 +1,30 @@ +// https://github.com/b4nnyBot/TF2-Improved-Round-Timer-Plugin +// Temporarily included for the 6s season the repo is updated + +#include +#include + +ConVar round_time_override = null; + +public void OnPluginStart() +{ + round_time_override = CreateConVar("round_time_override", "-1", "(Seconds) Overrides the round timer on 5cp maps so that instead of 10 minutes, it can be set to any length"); +} + +public void OnEntityCreated(int entity, const char[] classname) +{ + if (round_time_override.IntValue < 0) + return; + + if (StrEqual(classname, "team_round_timer")) + { + SDKHook(entity, SDKHook_SpawnPost, timer_spawn_post); + } +} + +public void timer_spawn_post(int timer) +{ + SetVariantInt(round_time_override.IntValue); + AcceptEntityInput(timer, "SetMaxTime"); + PrintToChatAll("Overrode round timer time to %d seconds", round_time_override.IntValue); +} diff --git a/cfg/rgl_6s_5cp_gc.cfg b/cfg/rgl_6s_5cp_gc.cfg index 0425ede..9a9a2ca 100644 --- a/cfg/rgl_6s_5cp_gc.cfg +++ b/cfg/rgl_6s_5cp_gc.cfg @@ -13,6 +13,8 @@ mp_winlimit "1" // sets number of wins to win the match t mp_windifference "0" // unsets windifference mp_maxrounds "0" // unsets maxrounds +round_time_override 300 // sets round timer to 5 minutes + mp_tournament_restart // restarts the tournament to apply above settings say "RGL 6s GOLDEN CAP 5cp Config Executed." diff --git a/cfg/rgl_6s_5cp_match.cfg b/cfg/rgl_6s_5cp_match.cfg index a96b3d9..8283387 100644 --- a/cfg/rgl_6s_5cp_match.cfg +++ b/cfg/rgl_6s_5cp_match.cfg @@ -11,6 +11,8 @@ mp_winlimit "0" // sets number of wins to win each half to mp_windifference "0" // unsets windifference mp_maxrounds "0" // unsets maxrounds +round_time_override 300 // sets round timer to 5 minutes + sm plugins load disabled/tf2Halftime // loads tf2Halftime plugin mp_tournament_restart // restarts the tournament to apply above settings diff --git a/cfg/rgl_6s_5cp_match_half1.cfg b/cfg/rgl_6s_5cp_match_half1.cfg index e7017ea..34eb7f3 100644 --- a/cfg/rgl_6s_5cp_match_half1.cfg +++ b/cfg/rgl_6s_5cp_match_half1.cfg @@ -11,6 +11,8 @@ mp_winlimit "3" // sets number of wins to win each half t mp_windifference "0" // unsets windifference mp_maxrounds "0" // unsets maxrounds +round_time_override 300 // sets round timer to 5 minutes + mp_tournament_restart // restarts the tournament to apply above settings diff --git a/cfg/rgl_6s_5cp_match_half2.cfg b/cfg/rgl_6s_5cp_match_half2.cfg index 900452e..4a4d10d 100644 --- a/cfg/rgl_6s_5cp_match_half2.cfg +++ b/cfg/rgl_6s_5cp_match_half2.cfg @@ -11,6 +11,8 @@ mp_winlimit "5" // sets number of wins to win each half t mp_windifference "0" // unsets windifference mp_maxrounds "0" // unsets maxrounds +round_time_override 300 // sets round timer to 5 minutes + mp_tournament_restart // restarts the tournament to apply above settings (this is only in here as a kludge because most teams reexec this cfg to end their games instead of rgl_off) diff --git a/cfg/rgl_6s_5cp_scrim.cfg b/cfg/rgl_6s_5cp_scrim.cfg index 4b97642..f8b915e 100644 --- a/cfg/rgl_6s_5cp_scrim.cfg +++ b/cfg/rgl_6s_5cp_scrim.cfg @@ -11,6 +11,8 @@ mp_winlimit "5" // sets number of wins to win the scrim to 5 mp_windifference "0" // unsets windifference mp_maxrounds "0" // unsets maxrounds +round_time_override 300 // sets round timer to 5 minutes + mp_tournament_restart // restarts the tournament to apply above settings From a9a25c010d3cc3a723b4c8a855de29e79b9de53d Mon Sep 17 00:00:00 2001 From: l-Aad-l <7024626+l-Aad-l@users.noreply.github.com> Date: Sun, 15 May 2022 19:40:20 -0400 Subject: [PATCH 3/4] Updated comp fixes and dhooks --- .github/workflows/main.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5b6206b..22dfb98 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -46,8 +46,8 @@ jobs: # wget -q -O tmp.zip https://github.com/ldesgoui/tf2-comp-fixes/releases/latest/download/tf2-comp-fixes.zip && unzip -o tmp.zip -d ../../ && rm tmp.zip - name: Get latest version of TF2 Comp Fixes and its DHooks dependency run: | - wget -q -O tmp.zip https://github.com/ldesgoui/tf2-comp-fixes/releases/download/v1.15.0/tf2-comp-fixes.zip && unzip -o tmp.zip -d ../../ && rm tmp.zip - wget -q -O tmp.zip https://github.com/peace-maker/DHooks2/releases/download/v2.2.0-detours16/dhooks-2.2.0-detours16-sm110.zip && unzip -o tmp.zip -d ../../ && rm tmp.zip + wget -q -O tmp.zip https://github.com/ldesgoui/tf2-comp-fixes/releases/download/v1.16.8/tf2-comp-fixes.zip && unzip -o tmp.zip -d ../../ && rm tmp.zip + wget -q -O tmp.zip https://github.com/peace-maker/DHooks2/releases/download/v2.2.0-detours17/dhooks-2.2.0-detours17-sm110.zip && unzip -o tmp.zip -d ../../ && rm tmp.zip working-directory: ${{ env.SOURCEMOD_PATH }}/ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 57acdc3..1b996b2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -47,8 +47,8 @@ jobs: # wget -q -O tmp.zip https://github.com/ldesgoui/tf2-comp-fixes/releases/latest/download/tf2-comp-fixes.zip && unzip -o tmp.zip -d ../../ && rm tmp.zip - name: Get latest version of TF2 Comp Fixes and its DHooks dependency run: | - wget -q -O tmp.zip https://github.com/ldesgoui/tf2-comp-fixes/releases/download/v1.15.0/tf2-comp-fixes.zip && unzip -o tmp.zip -d ../../ && rm tmp.zip - wget -q -O tmp.zip https://github.com/peace-maker/DHooks2/releases/download/v2.2.0-detours16/dhooks-2.2.0-detours16-sm110.zip && unzip -o tmp.zip -d ../../ && rm tmp.zip + wget -q -O tmp.zip https://github.com/ldesgoui/tf2-comp-fixes/releases/download/v1.16.8/tf2-comp-fixes.zip && unzip -o tmp.zip -d ../../ && rm tmp.zip + wget -q -O tmp.zip https://github.com/peace-maker/DHooks2/releases/download/v2.2.0-detours17/dhooks-2.2.0-detours17-sm110.zip && unzip -o tmp.zip -d ../../ && rm tmp.zip working-directory: ${{ env.SOURCEMOD_PATH }}/ From f65c3d775e192e3a87272d95276931325c171c36 Mon Sep 17 00:00:00 2001 From: l-Aad-l <7024626+l-Aad-l@users.noreply.github.com> Date: Sun, 15 May 2022 19:43:16 -0400 Subject: [PATCH 4/4] Added roundtimer plugin --- addons/sourcemod/plugins/roundtimer_override.smx | Bin 0 -> 3853 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 addons/sourcemod/plugins/roundtimer_override.smx diff --git a/addons/sourcemod/plugins/roundtimer_override.smx b/addons/sourcemod/plugins/roundtimer_override.smx new file mode 100644 index 0000000000000000000000000000000000000000..63ee874ba2338be34872c5a594fae1afe7f92fbe GIT binary patch literal 3853 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 literal 0 HcmV?d00001