changeset 1399:4b911e5a5177

Actually show on 'sc' lines on which heartbeat it occured, but only on detected ticks. However, we only "sanely" detect ticks based on sp/ep for now ...
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 06 Aug 2011 09:09:44 +0300
parents 088eacdcd884
children 4ff8733f93d9
files ggrtf.tf
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ggrtf.tf	Sat Aug 06 09:05:35 2011 +0300
+++ b/ggrtf.tf	Sat Aug 06 09:09:44 2011 +0300
@@ -1014,8 +1014,10 @@
 	/set status_oldhp=%{status_hp}%;/set status_hp=%{1}%;/set status_hpmax=%{2}%;\
 	/set status_oldsp=%{status_sp}%;/set status_sp=%{3}%;/set status_spmax=%{4}%;\
 	/set status_oldep=%{status_ep}%;/set status_ep=%{5}%;/set status_epmax=%{6}%;\
-	/set status_money=%{7}%;/set status_exp=%{8}%;\
-	/prexecfuncs %{event_sc_printed}%;/gprots_update%;/gstatus_update
+	/set status_money=%{7}%;/set status_exp=%{8}%;/set status_qline=%{9}%;\
+	/gprots_update%;/gstatus_update%;\
+	/prexecfuncs %{event_sc_printed}%;\
+	/if (opt_gagsc=~"on") /substitute -ag%;/endif
 
 
 ;; Grab SHORT SCORE (sc)
@@ -1026,8 +1028,7 @@
 ;; trouble when upgrading to new version of GgrTF.
 
 /def -i -F -p9999 -mregexp -t"^H:(-?[0-9]+)/(-?[0-9]+) \[[+-]?[0-9]*\] S:(-?[0-9]+)/(-?[0-9]+) \[[+-]?[0-9]*\] E:(-?[0-9]+)/(-?[0-9]+) \[[+-]?[0-9]*\] \$:(-?[0-9]+) \[[+-]?[0-9]*\] exp:(-?[0-9]+) \[[+-]?[0-9]*\]$" gstatus_sc =\
-	/test gstatus_scupd({P1},{P2},{P3},{P4},{P5},{P6},{P7},{P8})%;\
-	/if (opt_gagsc=~"on")/substitute -ag%;/endif
+	/test gstatus_scupd({P1},{P2},{P3},{P4},{P5},{P6},{P7},{P8},{*})
 
 
 ;; Grab PROMPT
@@ -2085,6 +2086,7 @@
 	/if (status_sp - status_oldsp > 30 | status_ep - status_oldep > 5)\
 		/gheartbeat_do%;\
 		/gheartbeat_tick NORMAL%;\
+		/substitute -p %{status_qline} @{BCred}[HB %{heartbeat_cnt}]@{n}%;\
 	/endif
 
 ;; Detect certain events that cause potentially "false" ticks to occur.