Mercurial > hg > batmud > ggrtf

changeset 299:f807316cf9a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Generic cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 02 Mar 2006 00:21:57 +0000
parents 3daaeb706478
children 4133575d83fd
files ggrtf-alch.tf ggrtf-barb.tf ggrtf-pssmangle.tf ggrtf.tf
diffstat 4 files changed, 53 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/ggrtf-alch.tf	Thu Mar 02 00:21:41 2006 +0000
+++ b/ggrtf-alch.tf	Thu Mar 02 00:21:57 2006 +0000
@@ -309,16 +309,16 @@
 /def -ag -mregexp -t"^This is a .* jar in which you can store ([0-9]+) herbs\.$" ajar_get1 =\
 	/set ajar_st=1%;/set ajar_max=%{P1}
 
-/def -E({ajar_st}=1) -ag -mregexp -t"^This item is in ([a-z]+) condition\.$" ajar_get4 =\
+/def -E(ajar_st=1) -ag -mregexp -t"^This item is in ([a-z]+) condition\.$" ajar_get4 =\
 	/set ajar_st=2%;/set ajar_cond=%{P1}
 
-/def -E({ajar_st}=2) -ag -mregexp -t"^It is labeled as '([A-z0-9_-]+)'\.$" ajar_get2 =\
+/def -E(ajar_st=2) -ag -mregexp -t"^It is labeled as '([A-z0-9_-]+)'\.$" ajar_get2 =\
 	/set ajar_st=3%;/set ajar_label=%{P1}
 
-/def -E({ajar_st}=3) -ag -mregexp -t"^The label can be set with 'label' command\.$" ajar_get3 =\
+/def -E(ajar_st=3) -ag -mregexp -t"^The label can be set with 'label' command\.$" ajar_get3 =\
 	/set ajar_st=4
 
-/def -E({ajar_st}=4) -ag -mregexp -t"^There are ([0-9]+) herbs in it:$" ajar_get5 =\
+/def -E(ajar_st=4) -ag -mregexp -t"^There are ([0-9]+) herbs in it:$" ajar_get5 =\
 	/set ajar_st=5%;/set ajar_num=%{P1}%;\
 	/prcherb Unknown%;\
 	/prcherb seed%;\
@@ -380,16 +380,16 @@
 	/prcherb wormwood%;\
 	/prcherb yarrow
 
-/def -E({ajar_st}>4) -ag -mregexp -t"^  ([A-Z][a-z '-]*[a-z]) +([A-Z][a-z '-]*[a-z]) *$" ajar_get6 =\
+/def -E(ajar_st>4) -ag -mregexp -t"^  ([A-Z][a-z '-]*[a-z]) +([A-Z][a-z '-]*[a-z]) *$" ajar_get6 =\
 	/set ajar_st=6%;/set ajar_q1=$[herb_get1({P1})]%;/set ajar_q2=$[herb_get1({P2})]%;\
 	/eval /set ajar_c_%{ajar_q1}=$$[ajar_c_%{ajar_q1} + 1]%;\
 	/eval /set ajar_c_%{ajar_q2}=$$[ajar_c_%{ajar_q2} + 1]
 
-/def -E({ajar_st}>4) -ag -mregexp -t"^  ([A-Z][a-z '-]*[a-z]) *$" ajar_get7 =\
+/def -E(ajar_st>4) -ag -mregexp -t"^  ([A-Z][a-z '-]*[a-z]) *$" ajar_get7 =\
 	/set ajar_st=6%;/set ajar_q1=$[herb_get1({P1})]%;\
 	/eval /set ajar_c_%{ajar_q1}=$$[ajar_c_%{ajar_q1} + 1]
 
-/def -E({ajar_st}=6) -ag -mregexp -t"^It looks ([A-z ]+)\.$" ajar_final =\
+/def -E(ajar_st=6) -ag -mregexp -t"^It looks ([A-z ]+)\.$" ajar_final =\
 	/set ajar_st=0%;/set prstr=%;\
 	/prpherb Unknown%;\
 	/prpherb seed%;\
--- a/ggrtf-barb.tf	Thu Mar 02 00:21:41 2006 +0000
+++ b/ggrtf-barb.tf	Thu Mar 02 00:21:57 2006 +0000
@@ -28,9 +28,9 @@
 		/set repu_gag=0%;\
 		/set repu_old=%{repu_cur}%;\
 		/set repu_cur=%{repval}%;\
-		/echo -p Reputation: @{BCwhite}%{repu_cur}@{n} $[prgetdiff(%{repu_cur},%{repu_old})]%;\
+		/msw Reputation: @{BCwhite}%{repu_cur}@{n} $[prgetdiff(%{repu_cur},%{repu_old})]%;\
 	/else \
-		/echo -p Reputation: @{BCwhite}%{repval}@{n} [@{BCred}%{P1}@{nBCgreen}$[replace("@","@@",{P2})]@{nCgreen}%{P3}@{nBCyellow}%{P4}@{nCyellow}%{P5}@{n}]%;\
+		/msw Reputation: @{BCwhite}%{repval}@{n} [@{BCred}%{P1}@{nBCgreen}$[replace("@","@@",{P2})]@{nCgreen}%{P3}@{nBCyellow}%{P4}@{nCyellow}%{P5}@{n}]%;\
 	/endif
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/ggrtf-pssmangle.tf	Thu Mar 02 00:21:41 2006 +0000
+++ b/ggrtf-pssmangle.tf	Thu Mar 02 00:21:57 2006 +0000
@@ -14,11 +14,11 @@
 /set gparty_gag=0
 /def pstatus = /set gparty_gag=1%;@party status short
 
-/def -i gparty_v =\
+/def -i gparty_val =\
 	/if (!{1}) /let qtemp=-%;/else /let qtemp=%{1}%;/endif%;\
 	/return "@{$[prgetnlite({1},{2})]}$[pad(qtemp,4)]@{n}"
 
-/def -i gparty_schar =\
+/def -i gparty_sc1 =\
 	/eval /set gp_s=$$[gparty_%{1}_%{2}_s]%;\
 	/eval /set gp_pl=$$[gparty_%{1}_%{2}_pl]%;\
 	/eval /set gp_hp=$$[gparty_%{1}_%{2}_hp]%;\
@@ -35,13 +35,21 @@
 		/let tmpc=@{Cmagenta}%;\
 	/else /let tmpc=@{BCwhite}%;/endif%;\
 	/let tmps=$[substr(gp_s,0,8)]%;\
-	/return "%{tmpc}$[pad(tmps,8)]@{n}@{Cblue}:@{n}$[gparty_v(gp_hp,gp_hpm)]@{Cblue}:@{n}$[gparty_v(gp_sp,gp_spm)]@{Cblue}:@{n}$[gparty_v(gp_ep,gp_epm)]"
+	/return "%{tmpc}$[pad(tmps,8)]@{n}@{Cblue}:@{n}$[gparty_val(gp_hp,gp_hpm)]@{Cblue}:@{n}$[gparty_val(gp_sp,gp_spm)]@{Cblue}:@{n}$[gparty_val(gp_ep,gp_epm)]"
+
 
 /def -i gparty_show1 =\
 	/echo ,-----------------------------------------------------------------------.%;\
-	/echo -p |$[gparty_schar(1,1)]|$[gparty_schar(1,2)]|$[gparty_schar(1,3)]|%;\
-	/echo -p |$[gparty_schar(2,1)]|$[gparty_schar(2,2)]|$[gparty_schar(2,3)]|%;\
-	/echo -p |$[gparty_schar(3,1)]|$[gparty_schar(3,2)]|$[gparty_schar(3,3)]|%;\
+	/msw |$[gparty_sc1(1,1)]|$[gparty_sc1(1,2)]|$[gparty_sc1(1,3)]|%;\
+	/msw |$[gparty_sc1(2,1)]|$[gparty_sc1(2,2)]|$[gparty_sc1(2,3)]|%;\
+	/msw |$[gparty_sc1(3,1)]|$[gparty_sc1(3,2)]|$[gparty_sc1(3,3)]|%;\
+	/echo `-----------------------------------------------------------------------'
+
+/def -i gparty_show2 =\
+	/echo ,-----------------------------------------------------------------------.%;\
+	/msw |$[gparty_sc1(1,1)]|$[gparty_sc1(2,1)]|$[gparty_sc1(3,1)]|%;\
+	/msw |$[gparty_sc1(1,2)]|$[gparty_sc1(2,2)]|$[gparty_sc1(3,2)]|%;\
+	/msw |$[gparty_sc1(1,3)]|$[gparty_sc1(2,3)]|$[gparty_sc1(3,3)]|%;\
 	/echo `-----------------------------------------------------------------------'
 
 
@@ -61,6 +69,14 @@
 
 /def -i gparty_set =\
 	/let gps=$[replace(".","_",{1})]%;\
+	/eval /set gparty_%{gps}_os=$$[gparty_%{gps}_s]%;\
+	/eval /set gparty_%{gps}_opl=$$[gparty_%{gps}_pl]%;\
+	/eval /set gparty_%{gps}_ohp=$$[gparty_%{gps}_hp]%;\
+	/eval /set gparty_%{gps}_ohpm=$$[gparty_%{gps}_hpm]%;\
+	/eval /set gparty_%{gps}_osp=$$[gparty_%{gps}_sp]%;\
+	/eval /set gparty_%{gps}_ospm=$$[gparty_%{gps}_spm]%;\
+	/eval /set gparty_%{gps}_oep=$$[gparty_%{gps}_ep]%;\
+	/eval /set gparty_%{gps}_oepm=$$[gparty_%{gps}_epm]%;\
 	/set gparty_%{gps}_s=%{2}%;\
 	/set gparty_%{gps}_pl=%{3}%;\
 	/set gparty_%{gps}_hp=%{4}%;\
--- a/ggrtf.tf	Thu Mar 02 00:21:41 2006 +0000
+++ b/ggrtf.tf	Thu Mar 02 00:21:57 2006 +0000
@@ -1,8 +1,8 @@
 ;;
-;; GgrTF v0.5.9.22-svn - TinyFugue script for BatMUD
+;; GgrTF v0.5.9.23-svn - TinyFugue script for BatMUD
 ;; (C) Copyright 2004-2006 Matti 'ccr' Hämäläinen (aka Ggr Pupunen)
 ;;
-/set ggrtf_ver=0.5.9.22-svn
+/set ggrtf_ver=0.5.9.23-svn
 ;;
 ;; This triggerset is Free Software distributed under
 ;; GNU General Public License version 2.
@@ -162,6 +162,18 @@
 		/shift%;\
 	/done
 
+;; Create prettyprint version of a numeric value
+/def -i prprettyvalstr =\
+	/let jval=$[abs({1})]%;/let jtmp=$[jval-trunc(jval)]%;\
+	/if (jtmp > 0) /let jstr=$[substr(jtmp,1)]%;/else /let jstr=%;/endif%;\
+	/while (jval >= 1000)\
+		/let jstr=,$[mod(jval, 1000.0)]%{jstr}%;\
+		/let jval=$[trunc(jval / 1000)]%;\
+	/done%;\
+	/let jstr=%{jval}%{jstr}%;\
+	/if ({1} < 0) /let jstr=-%{jstr}%;/endif%;\
+	/return jstr
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Option, setting and hook definition macros
@@ -298,11 +310,11 @@
 
 ;; Save status
 /def -i gsave =\
-	/let qtmpn=%{set_datapath}%{gsave_filename}%;\
+	/let qtmpn=%{set_datapath}%{*}%;\
 	/msq @{BCgreen}Saving settings to@{n} '@{Cyellow}%{qtmpn}@{n}'%;\
 	/set gsave_file=$[tfopen(qtmpn, "w")]%;\
 	/if (gsave_file < 0)\
-		/msq @{BCred}ERROR!@{n} Could not create/open savefile '@{Cyellow}%{gsave_filename}@{n}'!%;\
+		/msq @{BCred}ERROR!@{n} Could not create/open savefile '@{Cyellow}%{qtmpn}@{n}'!%;\
 	/else \
 		/set qtmpa=;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;%;/test tfwrite(gsave_file,qtmpa)%;\
 		/set qtmpa=;; GgrTF v%{ggrtf_ver} savefile (Created: $[ftime("%d %b %Y",time())])%;/test tfwrite(gsave_file,qtmpa)%;\
@@ -320,7 +332,7 @@
 
 ;; Load status
 /def -i gload =\
-	/let qtmpn=%{set_datapath}%{gsave_filename}%;\
+	/let qtmpn=%{set_datapath}%{*}%;\
 	/msq @{BCgreen}Loading settings from@{n} '@{Cyellow}%{qtmpn}@{n}'%;\
 	/load -q %{qtmpn}%;\
 	/msq @{BCgreen}Done.@{n}%;\
@@ -466,7 +478,7 @@
 /locaction off
 
 /def -i -p9999 -ag -mregexp -t"^([A-Z][a-z]+) holds (.+) over the still form of (its|her|his) fallen foe\.$" loc_blood =\
-	/echo -p @{BCyellow}%{P1}@{n} @{BCwhite}holds@{n} @{Cred}%{P2}@{n} @{BCwhite}over the still form of %{P3} fallen foe.@{n}%;\
+	/msw @{BCyellow}%{P1}@{n} @{BCwhite}holds@{n} @{Cred}%{P2}@{n} @{BCwhite}over the still form of %{P3} fallen foe.@{n}%;\
 	/if (set_locaction=~"dig") /dig_grave%;/endif%;\
 	/if (set_locaction=~"eat") /eat_corpse%;/endif%;\
 	/if (set_locaction=~"get") /get_corpse%;/endif
@@ -664,7 +676,7 @@
 
 ;; Grab SHORT SCORE (sc)
 /def -i -F -ag -p9999 -mregexp -t"^H:([+-]*[0-9]+)/([0-9]+) S:([+-]*[0-9]+)/([0-9]+) E:([+-]*[0-9]+)/([0-9]+) \$:([0-9]+) exp:([0-9]+)$" gstatus_sc1=\
-	/echo -p H:$[prgetqd({P1},{P2},status_qhp)] S:$[prgetqd({P3},{P4},status_qsp)] E:$[prgetqd({P5},{P6},status_qep)] \$:%{P7} $[prgetdiff({P7},status_qmoney)] exp:%{P8} $[prgetdiff({P8},status_qexp)]%;\
+	/msw H:$[prgetqd({P1},{P2},status_qhp)] S:$[prgetqd({P3},{P4},status_qsp)] E:$[prgetqd({P5},{P6},status_qep)] \$:%{P7} $[prgetdiff({P7},status_qmoney)] exp:%{P8} $[prgetdiff({P8},status_qexp)]%;\
 	/test gstatus_scupd({P1},{P2},{P3},{P4},{P5},{P6},{P7},{P8})
 
 /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_sc2=\
@@ -693,7 +705,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 /set ggrtf_copy=(C) Copyright 2004-2006 Matti 'ccr' Hämäläinen (aka Ggr Pupunen)
 /def -i -p9999 -mregexp -t"^@?([A-Z][a-z]+) hopples around you inquisitively, all bunny-like\.$" greport_ver =\
-	@@emoteto %{P1} is using GgrTF v%{ggrtf_ver} %{ggrtf_copy}
+	@@emoteto %{P1} is using GgrTF v%{ggrtf_ver} %{ggrtf_copy} on TinyFugue $[ver()]
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -1168,10 +1180,10 @@
 ;; Update/set new shape
 /def -i gbattle_ss =\
 /if ({3}=~"He"|{3}=~"She"|{3}=~"It")\
-	/echo -p @{Cgreen}%{-2}@{n} (@{Cred}%{2}%%@{n})%;\
+	/msw @{Cgreen}%{-2}@{n} (@{Cred}%{2}%%@{n})%;\
 	/else \
 	/if (battle_st=~"on")\
-		/echo -p @{Cgreen}%{-2}@{n} (@{Cred}%{2}%%@{n})%;\
+		/msw @{Cgreen}%{-2}@{n} (@{Cred}%{2}%%@{n})%;\
 		/set battle_pshape=%{battle_shape}%;\
 		/set battle_shape=%{1}%;\
 		/endif%;\