fix: render readyup message on a timer at half-time (playliga/applica…

…tion#309)
playliga · Dec 17, 2024 · 0c2f34f · 0c2f34f
1 parent 9444fdb
commit 0c2f34f
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/config/csgo/addons/sourcemod/plugins/liga.smx b/config/csgo/addons/sourcemod/plugins/liga.smx
diff --git a/config/csgo/addons/sourcemod/scripting/liga.sp b/config/csgo/addons/sourcemod/scripting/liga.sp
@@ -236,8 +236,9 @@ public Action CS_OnTerminateRound(float &delay, CSRoundEndReason &reason) {
   // handle half-time
   if(roundsTotal == roundsHalfTime) {
     say("HALFTIME");
-    say("TO START THE SECOND-HALF TYPE: .ready");
     CreateTimer(float(DELAY_HALF_TIME), Timer_HalfTime);
+    CreateTimer(float(DELAY_WELCOME_MESSAGE), Timer_WelcomeMessage);
+    CreateTimer(float(INTERVAL_WELCOME_MESSAGE), Timer_WelcomeMessage, 0, TIMER_REPEAT);
     return Plugin_Continue;
   }
 
@@ -249,8 +250,9 @@ public Action CS_OnTerminateRound(float &delay, CSRoundEndReason &reason) {
   ) {
     overTime = true;
     say("OVERTIME");
-    say("TO START OVERTIME TYPE: .ready");
     CreateTimer(float(DELAY_HALF_TIME), Timer_HalfTime);
+    CreateTimer(float(DELAY_WELCOME_MESSAGE), Timer_WelcomeMessage);
+    CreateTimer(float(INTERVAL_WELCOME_MESSAGE), Timer_WelcomeMessage, 0, TIMER_REPEAT);
     return Plugin_Continue;
   }
 

diff --git a/config/cssource/addons/sourcemod/plugins/liga.smx b/config/cssource/addons/sourcemod/plugins/liga.smx
diff --git a/config/cstrike/addons/amxmodx/plugins/liga.amxx b/config/cstrike/addons/amxmodx/plugins/liga.amxx
diff --git a/config/cstrike/addons/amxmodx/scripting/liga.sma b/config/cstrike/addons/amxmodx/scripting/liga.sma
@@ -37,6 +37,7 @@
 #define MENU_TEAM_SELECT_VGUI_T         26
 #define TEAM_T                          0
 #define TEAM_CT                         1
+#define TIMER_WELCOME_MESSAGE_ID        1337
 
 // cvars
 enum cvars {
@@ -168,7 +169,7 @@ public command_ready(id) {
   }
 
   // execute the config
-  remove_task(id);
+  remove_task(TIMER_WELCOME_MESSAGE_ID);
   server_cmd("competitive");
 
   // run the lo3 task
@@ -240,8 +241,9 @@ public event_end_round() {
   // handle half-time
   if(rounds_total == rounds_half_time) {
     say("HALFTIME");
-    say("TO START THE SECOND-HALF TYPE: .ready");
     set_task(float(DELAY_HALF_TIME), "task_half_time");
+    set_task(float(DELAY_WELCOME_MESSAGE), "task_welcome_message");
+    set_task(float(INTERVAL_WELCOME_MESSAGE), "task_welcome_message", TIMER_WELCOME_MESSAGE_ID, "", 0, "b");
     return PLUGIN_CONTINUE;
   }
 
@@ -255,6 +257,8 @@ public event_end_round() {
     say("TO START OVERTIME TYPE: .ready");
     g_over_time = true;
     set_task(float(DELAY_HALF_TIME), "task_half_time");
+    set_task(float(DELAY_WELCOME_MESSAGE), "task_welcome_message");
+    set_task(float(INTERVAL_WELCOME_MESSAGE), "task_welcome_message", TIMER_WELCOME_MESSAGE_ID, "", 0, "b");
     return PLUGIN_CONTINUE;
   }
 
@@ -285,7 +289,7 @@ public event_join_team() {
 
   g_welcomed = true;
   set_task(float(DELAY_WELCOME_MESSAGE), "task_welcome_message");
-  set_task(float(INTERVAL_WELCOME_MESSAGE), "task_welcome_message", id, "", 0, "b");
+  set_task(float(INTERVAL_WELCOME_MESSAGE), "task_welcome_message", TIMER_WELCOME_MESSAGE_ID, "", 0, "b");
   return PLUGIN_CONTINUE;
 }
 

diff --git a/config/czero/addons/amxmodx/plugins/liga.amxx b/config/czero/addons/amxmodx/plugins/liga.amxx