changeset 526:a987eadbc08e

Namespace cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 22 Sep 2006 15:20:39 +0000
parents ebc5dbf6c128
children 82145c6d8d93
files TODO.txt ggrtf-tf5.tf ggrtf.tf
diffstat 3 files changed, 18 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/TODO.txt	Fri Sep 22 15:07:45 2006 +0000
+++ b/TODO.txt	Fri Sep 22 15:20:39 2006 +0000
@@ -11,6 +11,6 @@
 
 - Idle-state (disable any output and actions to MUD, if user becomes idle)
 
-- GgrTF::TF5 - fix aura support
+- GgrTF::TF5 - fix aura support *************
 
 - /opts -style panel for other things too.
--- a/ggrtf-tf5.tf	Fri Sep 22 15:07:45 2006 +0000
+++ b/ggrtf-tf5.tf	Fri Sep 22 15:20:39 2006 +0000
@@ -60,7 +60,7 @@
 	/test gstatus_add_lightc(0, "camp", "c", "gstatus_getcamp()")%;\
 	/test gstatus_add(0, "\\\"]\\\"")%;\
 	/test gstatus_add(1, "-c \\\"[\\\"")%;\
-	/test gstatus_add(1, "str_prots2::Cgreen")%;\
+	/test gstatus_add(1, "status_protstr2::Cgreen")%;\
 	/test gstatus_add(1, "\\\"]\\\"")%;\
 	/def -i gstatus_update = %{gstatus_tmps}%;\
 	/unset gstatus_tmps
--- a/ggrtf.tf	Fri Sep 22 15:07:45 2006 +0000
+++ b/ggrtf.tf	Fri Sep 22 15:20:39 2006 +0000
@@ -1,8 +1,8 @@
 ;;
-;; GgrTF v0.6.1.8-svn - TinyFugue script for BatMUD
+;; GgrTF v0.6.1.9-svn - TinyFugue script for BatMUD
 ;; (C) Copyright 2004-2006 Matti Hämäläinen (Ggr Pupunen)
 ;;
-/set ggrtf_ver=0.6.1.8-svn
+/set ggrtf_ver=0.6.1.9-svn
 ;;
 ;; This triggerset is Free Software distributed under
 ;; GNU General Public License version 2.
@@ -791,8 +791,8 @@
 	/gstatus_add_val ep E%;\
 	/set status_pstr=%{status_pstr} "[" "%{prmove_last}":2:BCgreen "C":1:$[gstatus_getval(ceremony_st)] "S":1:$[gstatus_getval(spell_st)] "K":1:$[gstatus_getval(skill_st)] "c":1:$[gstatus_getcamp()] "]"%;\
 	/gstatus_add_aura%;\
-	/let qtmpw=$[columns() - status_w]%;\
-	/if (qtmpw > 3) /set status_pstr=%{status_pstr} :1 "%{str_prots2}":%{qtmpw}:Cgreen%;/endif%;\
+	/let _qw=$[columns() - status_w]%;\
+	/if (_qw > 3) /set status_pstr=%{status_pstr} :1 "%{status_protstr2}":%{_qw}:Cgreen%;/endif%;\
 	/set status_fields=$[{status_pstr}]
 
 
@@ -800,10 +800,10 @@
 ;; Status short score/prompt grabbing triggers
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 /def -i prgetdiff =\
-	/let tmps=%;/let tmpval=$[{1} - {2}]%;\
-	/if (tmpval < 0) /let tmps=@{Cred}%{tmpval}@{n}%;\
-	/elseif (tmpval > 0) /let tmps=@{Cgreen}+%{tmpval}@{n}%;/endif%;\
-	/return "[%{tmps}]"
+	/let _ts=%;/let _tv=$[{1} - {2}]%;\
+	/if (_tv < 0) /let _ts=@{Cred}%{_tv}@{n}%;\
+	/elseif (_tv > 0) /let _ts=@{Cgreen}+%{_tv}@{n}%;/endif%;\
+	/return "[%{_ts}]"
 
 /def -i prgetqd =\
 	/return "@{$[prgetnlite({1},{2})]}%{1}@{n}/%{2} $[prgetdiff({1},{3})]"
@@ -1046,24 +1046,24 @@
 		/if (qtval > 1) /let _qts=(%{qtval})%;/endif%;\
 		/if (qtval_e & qtval_w > 0) /let _qts=%{_qts}<%{qtval_w}>%;/endif%;\
 		/let _qss=%{qtval_n}%{_qts}$[prgetstime(qtval_t)]%;\
-		/if (str_prots!~"")\
-			/set str_prots=%{str_prots} | %{_qss}%;\
-			/set str_prots2=%{str_prots2}|%{qtval_n}%{_qts}%;\
+		/if (status_protstr!~"")\
+			/set status_protstr=%{status_protstr} | %{_qss}%;\
+			/set status_protstr2=%{status_protstr2}|%{qtval_n}%{_qts}%;\
 		/else \
-			/set str_prots=%{_qss}%;\
-			/set str_prots2=%{qtval_n}%{_qts}%;\
+			/set status_protstr=%{_qss}%;\
+			/set status_protstr2=%{qtval_n}%{_qts}%;\
 		/endif%;\
 	/endif%;\
 	/shift%;\
 /done
 
 /def -i gprots_get =\
-	/set str_prots=%;\
-	/set str_prots2=%;\
+	/set status_protstr=%;\
+	/set status_protstr2=%;\
 	/set cnt_prots=0%;\
 	/eval /gprots_doget %{lst_prots}%;\
 	/if (cnt_prots > 0)\
-		/return str_prots%;\
+		/return status_protstr%;\
 		/else \
 		/return "No prots."%;\
 	/endif