Mercurial > hg > batmud > ggrtf

changeset 56:bd9b390958f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Various code cleanups
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 24 Sep 2005 16:57:51 +0000
parents 694b54a99114
children 6d7430101548
files ggrtf-loc.tf ggrtf-magical.tf ggrtf-misc.tf ggrtf-spiders.tf ggrtf.tf
diffstat 5 files changed, 50 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/ggrtf-loc.tf	Sat Sep 24 13:19:42 2005 +0000
+++ b/ggrtf-loc.tf	Sat Sep 24 16:57:51 2005 +0000
@@ -1,11 +1,11 @@
 ;;
 ;; GGRTF::LoC - TinyFugue module for Lords of Chaos @ BatMUD
-;; (C) Copyright 2005 Matti 'ccr' Hämäläinen (aka Ggr Pupunen)
+;; (C) Copyright 2005 Ggr & Jeskko Pupunen
 ;;
 ;; This file (triggerset) is Free Software distributed under
 ;; GNU General Public License version 2.
 ;;
-;; NOTICE! This file requires GGRTF (version 0.4.22 or later) to be loaded.
+;; NOTICE! This file requires GGRTF (version 0.5.0 or later) to be loaded.
 ;;
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -44,14 +44,14 @@
 	/set lst_hits=%{lst_hits} %{1}%;\
 	/set hst_%{1}=0%;\
 	/set name_%{1}=%{-1}%;\
-	/def -i -F -mregexp -t"^You %{-1} " loc_hst_%{1} = /set hst_total=$$[{hst_total} + 1]%%;/set hst_%{1}=$$[{hst_%{1}} + 1]
+	/def -i -F -mregexp -t"^You %{-1} " loc_hst_%{1} = /set hst_total=$$[hst_total + 1]%%;/set hst_%{1}=$$[hst_%{1} + 1]
 
 /set lst_crits=
 /def -i defcrit=\
 	/set lst_crits=%{lst_crits} %{1}%;\
 	/set hst_c%{1}=0%;\
 	/set name_c%{1}=%{-1}%;\
-	/def -i -F -mregexp -t"^Grinning diabolically you %{-1} " loc_hst_c%{1} = /set hst_c%{1}=$$[{hst_c%{1}} + 1]
+	/def -i -F -mregexp -t"^Grinning diabolically you %{-1} " loc_hst_c%{1} = /set hst_c%{1}=$$[hst_c%{1} + 1]
 
 
 /defhit miss miss
@@ -85,11 +85,11 @@
 	/if ({cnttmp} > 0) \
 		/set hstats_count=$[hstats_count + 1]%;\
 		/if ({hst_total} > 0) \
-			/eval /set cnttmp=$$[({cnttmp} * 100) / {hst_total}]%;\
+			/eval /set cnttmp=$$[(cnttmp * 100) / hst_total]%;\
 			/else \
 			/set cnttmp=0%;\
 			/endif%;\
-		/eval /msq | $$[pad({name_%{1}},-30)] - $$[pad({hst_%{1}},4)] / $$[pad({cnttmp},4)]%%% |%;\
+		/eval /msq | $$[pad(name_%{1},-30)] - $$[pad(hst_%{1},4)] / $$[pad(cnttmp,4)]%%% |%;\
 		/endif
 
 /def -i hstats_dolist1 = /while ({#}) /hstats_print %{1}%;/shift%;/done
@@ -103,6 +103,6 @@
 /msq +-----------------------------------------------+%;\
 /hstats_dolist2 %{lst_crits}%;\
 /msq +-----------------------------------------------'%;\
-/msq | Types: $[pad({hstats_count},-3)] | Hits: $[pad({hst_total},-5)] |%;\
+/msq | Types: $[pad(hstats_count,-3)] | Hits: $[pad(hst_total,-5)] |%;\
 /msq `--------------------------'
 
--- a/ggrtf-magical.tf	Sat Sep 24 13:19:42 2005 +0000
+++ b/ggrtf-magical.tf	Sat Sep 24 16:57:51 2005 +0000
@@ -45,7 +45,7 @@
 	/set spell_st=off%;\
 	/set spell_st2=on%;\
 	/set cast_info=%;\
-	/msq @{Cbggreen} ---- SPELL DONE ---- @{n} in [@{BCred}%{spell_rcount}@{n}] @{BCgreen}rounds!@{n} @{Cyellow}$[prgetstime({spell_t})]@{n}
+	/msq @{Cbggreen} ---- SPELL DONE ---- @{n} in [@{BCred}%{spell_rcount}@{n}] @{BCgreen}rounds!@{n} @{Cyellow}$[prgetstime(spell_t)]@{n}
 
 
 ;; Cast info
@@ -185,7 +185,7 @@
 	/elseif ({1}=5)	/let resist_str=winces%;  /let resist_val=80%;	/let resist_col=@{Cred}%;\
 	/elseif ({1}=6)	/let resist_str=shrugs%;  /let resist_val=100%;	/let resist_col=@{BCred}%;\
 	/endif%;\
-	/let resist_type=$[prgetresist({battle_sname})]%;\
+	/let resist_type=$[prgetresist(battle_sname)]%;\
 	/set battle_sname=%;\
 	/echo -p @{BCyellow}%{resist_name}@{n} %{resist_col}%{resist_str}@{n} @{BCcyan}%{resist_type}@{n} (@{BCwhite}%{resist_val}%%@{n} resist)%;\
 	/if ({opt_rresist}=~"on") \
@@ -233,7 +233,7 @@
 /def -i -p9999 -aCred -msimple -t"Your aura is starting to weaken!" rec_auraweak =\
 	/set prot_eaura_weak=on%;/set prot_eaura_weak_t=$[time()]%;\
 	/status_update%;\
-	/msr Energy Aura WEAKENING! $[prgetstime({prot_eaura_t})] / $[prgetstime({prot_eaura_t2})]
+	/msr Energy Aura WEAKENING! $[prgetstime(prot_eaura_t)] / $[prgetstime(prot_eaura_t2)]
 
 ;; Aura recharged
 /def -i -p9999 -aCred -mregexp -t"^(Not all is lost, however, you did just recharge your aura|You try your hardest but cannot focus enough energy|You try to focus more magic energy into your aura but get no useful result).$" rec_aurarecharged =\
--- a/ggrtf-misc.tf	Sat Sep 24 13:19:42 2005 +0000
+++ b/ggrtf-misc.tf	Sat Sep 24 16:57:51 2005 +0000
@@ -100,9 +100,11 @@
 	/set camp_time=$[time()]
 
 /def -i -p9999 -F -aCgreen -msimple -t"You awaken from your short rest, and feel slightly better." camp_end =\
+	/if ({camp_st}=~"on") \
 	/set camp_st=off%;@sc%;\
-	/def -p1 -n1 -F -mregexp -t"^H:" camp_awake = /msr Awake - $$[{status_hp} - {camp_hp}]hp, $$[{status_sp} - {camp_sp}]sp, $$[{status_ep} - {camp_ep}]ep $[prgetstime({camp_time})]
-
+	/def -p1 -n1 -F -mregexp -t"^H:" camp_awake =\
+	/msr Awake - $$[status_hp - camp_hp]hp, $$[status_sp - camp_sp]sp, $$[status_ep - camp_ep]ep $[prgetstime(camp_time)]%;\
+	/endif
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Ceremony
--- a/ggrtf-spiders.tf	Sat Sep 24 13:19:42 2005 +0000
+++ b/ggrtf-spiders.tf	Sat Sep 24 16:57:51 2005 +0000
@@ -1,26 +1,39 @@
-;; some spider demon trigs by Jeskko
-;; FIXME: hardcoded player name
-
-;; spider demon control
+;;
+;; GGRTF::LoC - TinyFugue module for Spiders @ BatMUD
+;; (C) Copyright 2005 Jeskko Pupunen
+;;
+;; This file (triggerset) is Free Software distributed under
+;; GNU General Public License version 2.
+;;
+;; NOTICE! This file requires GGRTF (version 0.5.0 or later) to be loaded.
+;;
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Initializing and options
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 /set cnt_spider=0
 /set spider_t=$[time()]
 
-/def -i -p9999 -ag -msimple -t"You feed Jeskko's spider demon's hunger with your ritual." spider_ctrl =\
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Spider demon control
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+/def -i -p9999 -ag -msimple -t"You feed %{set_plrname}'s spider demon's hunger with your ritual." spider_ctrl =\
 	/set cnt_spider=$[cnt_spider + 1]%;\
-	/msq @{BCgreen}Demon controlled@{n} (@{Cyellow}%{cnt_spider}@{n}) @{Cgreen}last ctrl/chan @{Cyellow}$[prgetstime({spider_t})]@{n}%;\
+	/msq @{BCgreen}Demon controlled@{n} (@{Cyellow}%{cnt_spider}@{n}) @{Cgreen}last ctrl/chan @{Cyellow}$[prgetstime(spider_t)]@{n}%;\
 	/set spider_t=$[time()]
 
 ;; spider demon channelling message
-/def -i -p9999 -ag -msimple -t"Jeskko's spider demon draws power from you." spider_chan =\
-	/msq @{BCgreen}Demon channelled@{n} @{Cyellow}$[prgetstime({spider_t})]@{n}%;\
+/def -i -p9999 -ag -msimple -t"%{set_plrname}'s spider demon draws power from you." spider_chan =\
+	/msq @{BCgreen}Demon channelled@{n} @{Cyellow}$[prgetstime(spider_t)]@{n}%;\
 	/set spider_t=$[time()]
 
 ;; channelling with help from queen
 /def -i -p9999 -ag -msimple -t"Spider Queen smiles upon you and helps you control the demon." spider_queen =\
-	/msq @{BCgreen}Demon channelled with queenhelp@{n} @{Cyellow}$[prgetstime({spider_t})]@{n}%;\
+	/msq @{BCgreen}Demon channelled with queenhelp@{n} @{Cyellow}$[prgetstime(spider_t)]@{n}%;\
 	/set spider_t=$[time()]
 
 ;; time since last chan/ctrl
 /def lastchan =\
-	/msq @{BCgreen}Time from last chan/ctrl:@{n} @{Cyellow}$[prgetstime({spider_t})]@{n}
+	/msq @{BCgreen}Time from last chan/ctrl:@{n} @{Cyellow}$[prgetstime(spider_t)]@{n}
 
--- a/ggrtf.tf	Sat Sep 24 13:19:42 2005 +0000
+++ b/ggrtf.tf	Sat Sep 24 16:57:51 2005 +0000
@@ -101,10 +101,10 @@
 /msq ,------------------.%;\
 /msq | @{BCgreen}ggrTF@{n} @{Cyellow}Statistics@{n} |%;\
 /msq +------------------+-------------------------------------------------.%;\
-/msq | Spells........: $[pad({qs1},-50)] |%;\
-/msq | Cast time.....: $[pad({qs2},-50)] |%;\
-/msq | Damcrits......: $[pad({qs3},-50)] |%;\
-/msq | Skills........: $[pad({qs4},-50)] |%;\
+/msq | Spells........: $[pad(qs1,-50)] |%;\
+/msq | Cast time.....: $[pad(qs2,-50)] |%;\
+/msq | Damcrits......: $[pad(qs3,-50)] |%;\
+/msq | Skills........: $[pad(qs4,-50)] |%;\
 /msq `--------------------------------------------------------------------'
 
 
@@ -156,7 +156,7 @@
 	/eval /set qtval=$$[opt_%{1}]%;\
 	/eval /set qtval_d=$$[opt_%{1}_d]%;\
 	/if ({qtval}=~"on") /set qtval_s=@{BCgreen} ON@{n}%;/else /set qtval_s=@{Cred}OFF@{n}%;/endif%;\
-	/msq | /@{BCyellow}$[pad({1},-10)]@{n} : $[pad({qtval_d},-40)] - [%{qtval_s}]      |%;\
+	/msq | /@{BCyellow}$[pad({1},-10)]@{n} : $[pad(qtval_d,-40)] - [%{qtval_s}]      |%;\
 	/shift%;\
 /done
 
@@ -165,7 +165,7 @@
 	/eval /set qtval=$$[set_%{1}]%;\
 	/eval /set qtval_d=$$[set_%{1}_d]%;\
 	/eval /set qtval_s=$$[set_%{1}_s]%;\
-	/msq | /@{BCyellow}$[pad({1},-10)]@{n} : $[pad({qtval_d},-40)] - [@{Cgreen}$[pad({qtval},8)]@{n}] |%;\
+	/msq | /@{BCyellow}$[pad({1},-10)]@{n} : $[pad(qtval_d,-40)] - [@{Cgreen}$[pad(qtval,8)]@{n}] |%;\
 	/shift%;\
 /done
 
@@ -339,12 +339,12 @@
 	/if ({prot_eaura} == 2) /let qtcolor=BCred%;/endif%;\
 	/if ({prot_eaura} == 3) /let qtcolor=BCblue%;/endif%;\
 	/if ({prot_eaura_weak}=~"on")\
-		/let qttimes=$[prgetstime({prot_eaura_weak_t})]%;\
+		/let qttimes=$[prgetstime(prot_eaura_weak_t)]%;\
 		/let qtweak=/" "WEAK":4:Cred "%{qttimes}" "%;\
 		/else \
 		/let qtweak=%;\
 		/endif%;\
-	/let qttimes=$[prgetstime({prot_eaura_t})]%;\
+	/let qttimes=$[prgetstime(prot_eaura_t)]%;\
 	/set status_pstr=%{status_pstr} :1 "[" "Aura%{prot_eaura}":5:%{qtcolor} "%{qttimes}%{qtweak}]"%;\
 	/endif
 
@@ -488,7 +488,7 @@
 	/if ({qtval_c} == 0 | ({qtval_h} == 1 & {qtval_s} == 0))\
 		/if ({qtval_c} > 0)\
 			/eval /set qtval_t=$$[prot_%{1}_t]%;\
-			/let qtstrs=Renewed! $[prgetstime({qtval_t})]%;\
+			/let qtstrs=Renewed! $[prgetstime(qtval_t)]%;\
 			/else \
 			/let qtstrs=ON!%;\
 			/endif%;\
@@ -524,10 +524,10 @@
 		/break%;\
 		/endif%;\
 	/if ({qtval_s} & {qtval_c} >= 1 & {qtval_h} == 0) \
-		/msr %{qtval_l} Weakened! [#%{qtval_c}] $[prgetstime({qtval_t})]%;\
+		/msr %{qtval_l} Weakened! [#%{qtval_c}] $[prgetstime(qtval_t)]%;\
 		/else \
 		/set prot_%{1}=0%;\
-		/msr %{qtval_l} OFF! $[prgetstime({qtval_t})]%;\
+		/msr %{qtval_l} OFF! $[prgetstime(qtval_t)]%;\
 		/endif
 
 
@@ -614,7 +614,7 @@
 	/eval /set qtval_n=$$[prot_%{1}_n]%;\
 	/if ({qtval} > 0)\
 		/set protcount=$[protcount + 1]%;\
-		/let qtstr=%{qtval_n}$[prgetstime({qtval_t})]%;\
+		/let qtstr=%{qtval_n}$[prgetstime(qtval_t)]%;\
 		/if ({protstr}!~"")\
 			/set protstr=%{protstr}|%{qtstr}%;\
 			/set protstr2=%{protstr2}|%{qtval_n}%;\
@@ -687,7 +687,7 @@
 	/set skill_st=off%;\
 	/set skill_st2=on%;\
 	/set cast_info=%;\
-	/msq @{Cgreen}Skill@{n} @{BCgreen}DONE@{n} @{Cyellow}$[prgetstime({skill_t})]@{n}
+	/msq @{Cgreen}Skill@{n} @{BCgreen}DONE@{n} @{Cyellow}$[prgetstime(skill_t)]@{n}
 
 
 ;; Cast info