Mercurial > hg > batmud > ggrtf

changeset 289:26be894717c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 28 Feb 2006 13:33:03 +0000
parents dda7c6c66f7d
children 89458d89ed04
files ggrtf-magical.tf ggrtf-pssmangle.tf ggrtf.tf
diffstat 3 files changed, 65 insertions(+), 62 deletions(-) [+]
line wrap: on
line diff
--- a/ggrtf-magical.tf	Tue Feb 28 11:32:04 2006 +0000
+++ b/ggrtf-magical.tf	Tue Feb 28 13:33:03 2006 +0000
@@ -82,7 +82,7 @@
 /def -i -p9999 -ag -msimple -t"You start chanting." spell_start =\
 	/set ceremony_st=off%;\
 	/set spell_t=$[time()]%;\
-	/set cnt_casts=$[cnt_casts + 1]%;\
+	/set cnt_casts=$[cnt_casts+1]%;\
 	/set spell_rfirst=on%;\
 	/set spell_st=on%;\
 	/set spell_st2=off%;\
@@ -95,12 +95,12 @@
 
 ;; Spell done
 /def -i -p9999 -ag -msimple -t"You are done with the chant." spell_end =\
-	/set cnt_trounds=$[cnt_trounds + spell_rcount]%;\
-	/set cnt_scasts=$[cnt_scasts + 1]%;\
+	/set cnt_trounds=$[cnt_trounds+spell_rcount]%;\
+	/set cnt_scasts=$[cnt_scasts+1]%;\
 	/set spell_st=off%;\
 	/set spell_st2=on%;\
 	/set cast_info=%;\
-	/set cnt_ctime=$[cnt_ctime + time() - spell_t]%;\
+	/set cnt_ctime=$[cnt_ctime+time()-spell_t]%;\
 	/msq @{Cbggreen} ---- SPELL DONE ---- @{n} in [@{BCred}%{spell_rcount}@{n}] @{BCgreen}rounds!@{n} @{Cyellow}$[prgetstime(spell_t)]@{n}%;\
 	/status_update
 
@@ -117,16 +117,16 @@
 ;; Spell failed
 /def -i spell_fail =\
 	/if (spell_st2=~"on")\
-		/set cnt_scasts=$[cnt_scasts - 1]%;\
-		/set cnt_fcasts=$[cnt_fcasts + 1]%;\
+		/set cnt_scasts=$[cnt_scasts-1]%;\
+		/set cnt_fcasts=$[cnt_fcasts+1]%;\
 		/set spell_st2=off%;\
 	/endif
 
 ;; Spell fumbled
 /def -i spell_fumble =\
 	/if (spell_st2=~"on")\
-		/set cnt_scasts=$[cnt_scasts - 1]%;\
-		/set cnt_fucasts=$[cnt_fucasts + 1]%;\
+		/set cnt_scasts=$[cnt_scasts-1]%;\
+		/set cnt_fucasts=$[cnt_fucasts+1]%;\
 		/set spell_st2=off%;\
 	/endif
 
@@ -134,7 +134,7 @@
 /def -i spell_interrupt =\
 	/if (spell_st=~"on")\
 		/msq @{Cbgred} ---- SPELL INTERRUPTED ---- @{n}%;\
-		/set cnt_icasts=$[cnt_icasts + 1]%;\
+		/set cnt_icasts=$[cnt_icasts+1]%;\
 		/set spell_st=off%;\
 		/set cast_info=%;\
 		/status_update%;\
@@ -168,24 +168,24 @@
 
 ;; Cast burden/slow
 /def -i -p9999 -aCgreen -msimple -t"Your heavy burden slows down your casting." spell_burden =\
-	/set spell_rleft=$[spell_rleft + 1]%;\
-	/set spell_rcount=$[spell_rcount + 1]%;\
+	/set spell_rleft=$[spell_rleft+1]%;\
+	/set spell_rcount=$[spell_rcount+1]%;\
 	/msb%;/if (opt_rmagic=~"on") @@emote slows down%;/endif
 
 
 ;; Cast haste
 /def -i -p9999 -aCgreen -msimple -t"You skillfully cast the spell with haste." spell_haste =\
-	/set spell_rleft=$[spell_rleft - 1]%;\
-	/set spell_rcount=$[spell_rcount - 1]%;\
-	/set cnt_hastes=$[cnt_hastes + 1]%;\
+	/set spell_rleft=$[spell_rleft-1]%;\
+	/set spell_rcount=$[spell_rcount-1]%;\
+	/set cnt_hastes=$[cnt_hastes+1]%;\
 	/msb%;/if (opt_rmagic=~"on") @@emote hastes%;/endif
 
 
 ;; Cast greater haste
 /def -i -p9999 -aCgreen -msimple -t"You skillfully cast the spell with greater haste." spell_ghaste =\
-	/set spell_rleft=$[spell_rleft - 2]%;\
-	/set spell_rcount=$[spell_rcount - 2]%;\
-	/set cnt_ghastes=$[cnt_ghastes + 1]%;\
+	/set spell_rleft=$[spell_rleft-2]%;\
+	/set spell_rcount=$[spell_rcount-2]%;\
+	/set cnt_ghastes=$[cnt_ghastes+1]%;\
 	/msb%;/if (opt_rmagic=~"on") @@emote ghastes%;/endif
 
 
@@ -250,22 +250,22 @@
 ;; Damage criticality
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 /def -i -p9999 -aCgreen -msimple -t'You feel like your spell gained additional power.' gmagic_dcrit1 =\
-	/set cnt_damcrits=$[cnt_damcrits + 1]%;\
-	/set cnt_dcrit1=$[cnt_dcrit1 + 1]%;\
+	/set cnt_damcrits=$[cnt_damcrits+1]%;\
+	/set cnt_dcrit1=$[cnt_dcrit1+1]%;\
 	/mse dcrits (1)
 
 /def -i -p9999 -aCgreen -msimple -t'You feel like you managed to channel additional POWER to your spell.' gmagic_dcrit2 =\
-	/set cnt_damcrits=$[cnt_damcrits + 1]%;\
-	/set cnt_dcrit2=$[cnt_dcrit2 + 1]%;\
+	/set cnt_damcrits=$[cnt_damcrits+1]%;\
+	/set cnt_dcrit2=$[cnt_dcrit2+1]%;\
 	/mse dcrits (2)
 
 /def -i -p9999 -aCgreen -msimple -t'Your fingertips are surrounded with swirling ENERGY as you cast the spell.' gmagic_dcrit3 =\
-	/set cnt_damcrits=$[cnt_damcrits + 1]%;\
-	/set cnt_dcrit3=$[cnt_dcrit3 + 1]%;\
+	/set cnt_damcrits=$[cnt_damcrits+1]%;\
+	/set cnt_dcrit3=$[cnt_dcrit3+1]%;\
 	/mse dcrits (3)
 
 /def -i -p9999 -aCgreen -msimple -t'You feel connected to the very essence of magic.' gmagic_dcrit4 =\
-	/set cnt_damcrits=$[cnt_damcrits + 1]%;\
-	/set cnt_dcrit4=$[cnt_dcrit4 + 1]%;\
+	/set cnt_damcrits=$[cnt_damcrits+1]%;\
+	/set cnt_dcrit4=$[cnt_dcrit4+1]%;\
 	/mse is connected to very essence of magic!
 
--- a/ggrtf-pssmangle.tf	Tue Feb 28 11:32:04 2006 +0000
+++ b/ggrtf-pssmangle.tf	Tue Feb 28 13:33:03 2006 +0000
@@ -1,6 +1,6 @@
 ;;
 ;; GgrTF::PSSMangle - 'pss' output parser/mangler
-;; (C) Copyright 2005 Ggr & Jeskko Pupunen
+;; (C) Copyright 2005-2006 Ggr & Jeskko Pupunen
 ;;
 ;; This file (triggerset) is Free Software distributed under
 ;; GNU General Public License version 2.
@@ -14,28 +14,28 @@
 /set gparty_gag=0
 /def pstatus = /set gparty_gag=1%;@party status short
 
-/def -i gparty_sval =\
+/def -i gparty_v =\
 	/if (!{1}) /let qtemp=-%;/else /let qtemp=%{1}%;/endif%;\
 	/return "@{$[prgetnlite({1},{2})]}$[pad(qtemp,4)]@{n}"
 
 /def -i gparty_schar =\
-	/eval /set p_s=$$[gparty_%{1}_%{2}_s]%;\
-	/eval /set p_pl=$$[gparty_%{1}_%{2}_pl]%;\
-	/eval /set p_hp=$$[gparty_%{1}_%{2}_hp]%;\
-	/eval /set p_hpm=$$[gparty_%{1}_%{2}_hpm]%;\
-	/eval /set p_sp=$$[gparty_%{1}_%{2}_sp]%;\
-	/eval /set p_spm=$$[gparty_%{1}_%{2}_spm]%;\
-	/eval /set p_ep=$$[gparty_%{1}_%{2}_ep]%;\
-	/eval /set p_epm=$$[gparty_%{1}_%{2}_epm]%;\
-	/if (p_pl=~"unc")\
+	/eval /set gp_s=$$[gparty_%{1}_%{2}_s]%;\
+	/eval /set gp_pl=$$[gparty_%{1}_%{2}_pl]%;\
+	/eval /set gp_hp=$$[gparty_%{1}_%{2}_hp]%;\
+	/eval /set gp_hpm=$$[gparty_%{1}_%{2}_hpm]%;\
+	/eval /set gp_sp=$$[gparty_%{1}_%{2}_sp]%;\
+	/eval /set gp_spm=$$[gparty_%{1}_%{2}_spm]%;\
+	/eval /set gp_ep=$$[gparty_%{1}_%{2}_ep]%;\
+	/eval /set gp_epm=$$[gparty_%{1}_%{2}_epm]%;\
+	/if (gp_pl=~"unc")\
 		/let tmpc=@{BCwhite,BCbgred}%;\
-	/elseif (p_pl=~"stun")\
+	/elseif (gp_pl=~"stun")\
 		/let tmpc=@{BCred}%;\
-	/elseif (p_pl=~"form"|p_pl=~"mbr"|p_pl=~"rest")\
+	/elseif (gp_pl=~"form"|gp_pl=~"mbr"|gp_pl=~"rest")\
 		/let tmpc=@{Cmagenta}%;\
 	/else /let tmpc=@{BCwhite}%;/endif%;\
-	/let tmps=$[substr(p_s,0,8)]%;\
-	/return "%{tmpc}$[pad(tmps,8)]@{n}@{Cblue}:@{n}$[gparty_sval(p_hp,p_hpm)]@{Cblue}:@{n}$[gparty_sval(p_sp,p_spm)]@{Cblue}:@{n}$[gparty_sval(p_ep,p_epm)]"
+	/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)]"
 
 /def -i gparty_show1 =\
 	/echo ,-----------------------------------------------------------------------.%;\
--- a/ggrtf.tf	Tue Feb 28 11:32:04 2006 +0000
+++ b/ggrtf.tf	Tue Feb 28 13:33:03 2006 +0000
@@ -25,6 +25,9 @@
 ;;
 ;; /comppath		- Shows current path as compressed
 ;; /csavepath <name>	- Save compressed path as BatMUD command-alias by given name.
+;;
+;; For more information, please read "GgrTF User's Manual".
+;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; The actual scriptcode starts here: initialize, load prereqs
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -498,7 +501,7 @@
 
 ;; Add value item (hp/sp/ep/etc) to status string
 /def -i status_add_val =\
-	/set status_w=$[status_w + 13]%;\
+	/set status_w=$[status_w+13]%;\
 	/eval /set qtval1v=$$[status_%{1}]%;\
 	/eval /set qtval2v=$$[status_%{1}max]%;\
 	/let qtval1=status_%{1}%;\
@@ -515,12 +518,12 @@
 	/if (prot_eaura_weak=~"on")\
 		/let qttimes=$[prgetstime(prot_eaura_weak_t)]%;\
 		/let qtweak=/" "WEAK":4:Cred "%{qttimes}" "%;\
-		/set status_w=$[status_w + 5 + strlen(qttimes)]%;\
+		/set status_w=$[status_w+5+strlen(qttimes)]%;\
 	/else \
 		/let qtweak=%;\
 	/endif%;\
 	/let qttimes=$[prgetstime(prot_eaura_t)]%;\
-	/set status_w=$[status_w + 2 + strlen(qttimes)]%;\
+	/set status_w=$[status_w+2+strlen(qttimes)]%;\
 	/set status_pstr=%{status_pstr} "[" "Aura%{prot_eaura}":5:%{qtcolor} "%{qttimes}%{qtweak}]"%;\
 /endif
 
@@ -545,7 +548,7 @@
 			/let qtmps=%;\
 		/endif%;\
 		/set status_pstr=%{status_pstr} "[" "$[pad(qtmps,6)]":6:BCyellow "]"%;\
-		/set status_w=$[status_w + 8]%;\
+		/set status_w=$[status_w+8]%;\
 	/endif%;\
 	/status_add_aura%;\
 	/let qtmpw=$[columns() - status_w]%;\
@@ -595,12 +598,12 @@
 		/if (tick_d >= set_tickmin | tick_n < 2)\
 			/if (tick_n > 10) /prtick_reset%;/endif%;\
 			/set tick_t=$[time()]%;\
-			/set tick_avg_t=$[tick_avg_t + tick_d]%;\
-			/set tick_nt=$[tick_t + (tick_avg_t / tick_n)]%;\
-			/set tick_n=$[tick_n + 1]%;\
-			/set tick_avg_hp=$[tick_avg_hp + qhp]%;\
-			/set tick_avg_sp=$[tick_avg_sp + qsp]%;\
-			/set tick_avg_ep=$[tick_avg_ep + qep]%;\
+			/set tick_avg_t=$[tick_avg_t+tick_d]%;\
+			/set tick_nt=$[tick_t+(tick_avg_t / tick_n)]%;\
+			/set tick_n=$[tick_n+1]%;\
+			/set tick_avg_hp=$[tick_avg_hp+qhp]%;\
+			/set tick_avg_sp=$[tick_avg_sp+qsp]%;\
+			/set tick_avg_ep=$[tick_avg_ep+qep]%;\
 			/if (set_tickres < 2 | set_tickres > 12)\
 				/msq @{BCred}ERROR!@{n} /tickres setting must be between @{BCwhite}2 - 12@{n}!%;\
 				/msq @{Cred}Enforcing@{n} tickres=8 @{Cred}(default)@{n}%;\
@@ -696,12 +699,12 @@
 	/while (qi <= {#})\
 		/eval /set qv=%%{%qi}%;\
 		/if (qv=~qp & qc < 20)\
-			/let qc=$[qc + 1]%;\
+			/let qc=$[qc+1]%;\
 		/else \
 			/docomptoken %{qc} %{qp}%;\
 			/let qc=1%;\
 		/endif%;\
-		/let qi=$[qi + 1]%;\
+		/let qi=$[qi+1]%;\
 		/let qp=%{qv}%;\
 	/done%;\
 	/docomptoken %{qc} %{qp}
@@ -832,8 +835,8 @@
 		/set prot_%{1}=1%;\
 	/else \
 		/if (qtval_s)\
-			/set prot_%{1}=$[qtval_c + 1]%;\
-			/let qtstrs=ON [#$[qtval_c + 1]]%;\
+			/set prot_%{1}=$[qtval_c+1]%;\
+			/let qtstrs=ON [#$[qtval_c+1]]%;\
 		/else \
 			/msq ERROR! Prot '%{1}' (%{qtval_l}) increased even though not flagged stackable!%;\
 			/break%;\
@@ -1016,7 +1019,7 @@
 	/proff unstun
 
 /def -i -F -aCgreen -msimple -t"It doesn't hurt at all!" stun_notall =\
-	/set prot_unstun_w=$[prot_unstun_w + 1]%;\
+	/set prot_unstun_w=$[prot_unstun_w+1]%;\
 	/msr Unstun weakened [#%{prot_unstun_w}]
 
 
@@ -1029,7 +1032,7 @@
 	/eval /set qtval_n=$$[prot_%{1}_n]%;\
 	/eval /set qtval_st=$$[prot_%{1}_st]%;\
 	/if (qtval > 0)\
-		/set protcount=$[protcount + 1]%;\
+		/set protcount=$[protcount+1]%;\
 		/if (qtval_st) /let qtstrs=+%;/else /let qtstrs=%;/endif%;\
 		/let qtstr=%{qtval_n}%{qtstrs}$[prgetstime(qtval_t)]%;\
 		/if (protstr!~"")\
@@ -1079,7 +1082,7 @@
 ;; Start of skill
 /def -i -p9999 -ag -msimple -t"You start concentrating on the skill." skill_start =\
 	/set skill_t=$[time()]%;\
-	/set cnt_skills=$[cnt_skills + 1]%;\
+	/set cnt_skills=$[cnt_skills+1]%;\
 	/set skill_st=on%;\
 	/set skill_st2=off%;\
 	/set cast_info=SK%;/set cast_info_n=%;/set cast_info_t=%;@@cast info%;\
@@ -1089,11 +1092,11 @@
 
 ;; Skill done
 /def -i -p9999 -ag -msimple -t"You are prepared to do the skill." skill_end =\
-	/set cnt_sskills=$[cnt_sskills + 1]%;\
+	/set cnt_sskills=$[cnt_sskills+1]%;\
 	/set skill_st=off%;\
 	/set skill_st2=on%;\
 	/set cast_info=%;\
-	/set cnt_sktime=$[cnt_sktime + time() - skill_t]%;\
+	/set cnt_sktime=$[cnt_sktime+time() - skill_t]%;\
 	/msq @{Cbggreen} ---- SKILL DONE ---- @{n} @{Cyellow}$[prgetstime(skill_t)]@{n}%;\
 	/status_update
 
@@ -1110,7 +1113,7 @@
 /def -i skill_fumble =\
 	/if (skill_st2=~"on")\
 		/set cnt_sskills=$[cnt_sskills - 1]%;\
-		/set cnt_fuskills=$[cnt_fuskills + 1]%;\
+		/set cnt_fuskills=$[cnt_fuskills+1]%;\
 		/set skill_st2=off%;\
 	/endif
 
@@ -1118,7 +1121,7 @@
 /def -i skill_fail =\
 	/if (skill_st2=~"on")\
 		/set cnt_sskills=$[cnt_sskills - 1]%;\
-		/set cnt_fskills=$[cnt_fskills + 1]%;\
+		/set cnt_fskills=$[cnt_fskills+1]%;\
 		/set skill_st2=off%;\
 	/endif
 
@@ -1126,7 +1129,7 @@
 /def -i skill_interrupt =\
 	/if (skill_st=~"on")\
 		/msq @{Cbgred} ---- SKILL INTERRUPTED ---- @{n}%;\
-		/set cnt_iskills=$[cnt_iskills + 1]%;\
+		/set cnt_iskills=$[cnt_iskills+1]%;\
 		/set skill_st=off%;\
 		/set cast_info=%;\
 		/status_update%;\