Merge pull request #48 from RGLgg/beta

RGLgg · May 16, 2022 · 3734f00 · 3734f00
2 parents 51ec3cb + f65c3d7
commit 3734f00
Show file tree

Hide file tree

Showing 12 changed files with 67 additions and 17 deletions.
diff --git 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
@@ -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 }}/
 

diff --git a/addons/sourcemod/plugins/roundtimer_override.smx b/addons/sourcemod/plugins/roundtimer_override.smx
diff --git a/addons/sourcemod/scripting/rglqol.sp b/addons/sourcemod/scripting/rglqol.sp
@@ -5,7 +5,7 @@
 #include <regex>
 
 #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/addons/sourcemod/scripting/roundtimer_override.sp 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 <sdkhooks>
+#include <sdktools>
+
+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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 
 

diff --git 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
@@ -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