Mercurial > hg > batmud > ggrtf
changeset 333:47de1833c029
Copyright cleanup (again); Shape reporting can now be "configured" via
preinit variable "fmt_shape".
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Thu, 09 Mar 2006 17:41:48 +0000 |
| parents | 36c9ff0c16af |
| children | 62e0d0fb6ed2 |
| files | ggrtf-alch.tf ggrtf-barb.tf ggrtf-binds.tf ggrtf-chann.tf ggrtf-hc.tf ggrtf-loc.tf ggrtf-magical.tf ggrtf-merchant.tf ggrtf-misc.tf ggrtf-pre.tf ggrtf-pssmangle.tf ggrtf-rais.tf ggrtf-spiders.tf ggrtf-temp.tf ggrtf.tf salve.tf |
| diffstat | 16 files changed, 29 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/ggrtf-alch.tf Wed Mar 08 18:13:57 2006 +0000 +++ b/ggrtf-alch.tf Thu Mar 09 17:41:48 2006 +0000 @@ -1,6 +1,6 @@ ;; ;; GgrTF::Alchemist - Alchemists guild support @ BatMUD -;; (C) Copyright 2005 Ggr Pupunen +;; (C) Copyright 2005 Matti Hämäläinen (Ggr) ;; ;; This file (triggerset) is Free Software distributed under ;; GNU General Public License version 2.
--- a/ggrtf-barb.tf Wed Mar 08 18:13:57 2006 +0000 +++ b/ggrtf-barb.tf Thu Mar 09 17:41:48 2006 +0000 @@ -1,6 +1,6 @@ ;; ;; GgrTF::Barbarian - Barbarian guild support @ BatMUD -;; (C) Copyright 2005 Jeskko & Ggr Pupunen +;; (C) Copyright 2005 Jarkko Vääräniemi (Jeskko) & Matti Hämäläinen (Ggr) ;; ;; This file (triggerset) is Free Software distributed under ;; GNU General Public License version 2.
--- a/ggrtf-binds.tf Wed Mar 08 18:13:57 2006 +0000 +++ b/ggrtf-binds.tf Thu Mar 09 17:41:48 2006 +0000 @@ -1,6 +1,6 @@ ;; ;; GgrTF::Binds - Module for hooks and bindings -;; (C) Copyright 2006 Ggr Pupunen +;; (C) Copyright 2006 Matti Hämäläinen (Ggr) ;; ;; This file (triggerset) is Free Software distributed under ;; GNU General Public License version 2.
--- a/ggrtf-chann.tf Wed Mar 08 18:13:57 2006 +0000 +++ b/ggrtf-chann.tf Thu Mar 09 17:41:48 2006 +0000 @@ -1,6 +1,6 @@ ;; ;; GgrTF::Channellers - Channellers guild support @ BatMUD -;; (C) Copyright 2004-2006 Ggr Pupunen +;; (C) Copyright 2004-2006 Matti Hämäläinen (Ggr) ;; ;; This file (triggerset) is Free Software distributed under ;; GNU General Public License version 2.
--- a/ggrtf-hc.tf Wed Mar 08 18:13:57 2006 +0000 +++ b/ggrtf-hc.tf Thu Mar 09 17:41:48 2006 +0000 @@ -1,6 +1,6 @@ ;; ;; GgrTF::HC - Hardcore BatMUD support module -;; (C) Copyright 2005 Ggr Pupunen +;; (C) Copyright 2005 Matti Hämäläinen (Ggr) ;; ;; This file (triggerset) is Free Software distributed under ;; GNU General Public License version 2.
--- a/ggrtf-loc.tf Wed Mar 08 18:13:57 2006 +0000 +++ b/ggrtf-loc.tf Thu Mar 09 17:41:48 2006 +0000 @@ -1,6 +1,6 @@ ;; ;; GgrTF::LoC - Lords of Chaos guild support @ BatMUD -;; (C) Copyright 2005 Jeskko & Ggr Pupunen +;; (C) Copyright 2005 Jarkko Vääräniemi (Jeskko) & Matti Hämäläinen (Ggr) ;; ;; This file (triggerset) is Free Software distributed under ;; GNU General Public License version 2.
--- a/ggrtf-magical.tf Wed Mar 08 18:13:57 2006 +0000 +++ b/ggrtf-magical.tf Thu Mar 09 17:41:48 2006 +0000 @@ -1,6 +1,6 @@ ;; ;; GgrTF::Magical - Module for generic magical stuff @ BatMUD -;; (C) Copyright 2004-2006 Ggr Pupunen +;; (C) Copyright 2004-2006 Matti Hämäläinen (Ggr) ;; ;; This file (triggerset) is Free Software distributed under ;; GNU General Public License version 2.
--- a/ggrtf-merchant.tf Wed Mar 08 18:13:57 2006 +0000 +++ b/ggrtf-merchant.tf Thu Mar 09 17:41:48 2006 +0000 @@ -1,6 +1,6 @@ ;; ;; GgrTF::Merchant - Merchant guild support and utility macros -;; (C) Copyright 2005-2006 Ggr Pupunen +;; (C) Copyright 2005-2006 Matti Hämäläinen (Ggr) ;; ;; This file (triggerset) is Free Software distributed under ;; GNU General Public License version 2.
--- a/ggrtf-misc.tf Wed Mar 08 18:13:57 2006 +0000 +++ b/ggrtf-misc.tf Thu Mar 09 17:41:48 2006 +0000 @@ -1,6 +1,6 @@ ;; ;; GgrTF::Misc - Additional macros/triggers (some modules require this) -;; (C) Copyright 2004-2005 Ggr Pupunen +;; (C) Copyright 2004-2005 Matti Hämäläinen (Ggr) ;; ;; This file (triggerset) is Free Software distributed under ;; GNU General Public License version 2.
--- a/ggrtf-pre.tf Wed Mar 08 18:13:57 2006 +0000 +++ b/ggrtf-pre.tf Thu Mar 09 17:41:48 2006 +0000 @@ -1,6 +1,6 @@ ;; ;; GgrTF::PreInit - Module for loading saved settings and pre-initialization -;; (C) Copyright 2006 Ggr Pupunen +;; (C) Copyright 2006 Matti Hämäläinen (Ggr) ;; ;; This file (triggerset) is Free Software distributed under ;; GNU General Public License version 2.
--- a/ggrtf-pssmangle.tf Wed Mar 08 18:13:57 2006 +0000 +++ b/ggrtf-pssmangle.tf Thu Mar 09 17:41:48 2006 +0000 @@ -1,6 +1,6 @@ ;; ;; GgrTF::PSSMangle - 'pss' output parser/mangler -;; (C) Copyright 2005-2006 Ggr & Jeskko Pupunen +;; (C) Copyright 2005-2006 Matti Hämäläinen (Ggr) & Jarkko Vääräniemi (Jeskko) ;; ;; This file (triggerset) is Free Software distributed under ;; GNU General Public License version 2.
--- a/ggrtf-rais.tf Wed Mar 08 18:13:57 2006 +0000 +++ b/ggrtf-rais.tf Thu Mar 09 17:41:48 2006 +0000 @@ -1,6 +1,6 @@ ;; ;; GgrTF::Raise - Support for rais/ress/body/reinc spells -;; (C) Copyright 2006 Ggr Pupunen +;; (C) Copyright 2006 Matti Hämäläinen (Ggr) ;; ;; This file (triggerset) is Free Software distributed under ;; GNU General Public License version 2.
--- a/ggrtf-spiders.tf Wed Mar 08 18:13:57 2006 +0000 +++ b/ggrtf-spiders.tf Thu Mar 09 17:41:48 2006 +0000 @@ -1,6 +1,6 @@ ;; ;; GgrTF::Spiders - Spider guild support @ BatMUD -;; (C) Copyright 2005 Jeskko & Ggr Pupunen +;; (C) Copyright 2005 Jarkko Vääräniemi (Jeskko) & Matti Hämäläinen (Ggr) ;; ;; This file (triggerset) is Free Software distributed under ;; GNU General Public License version 2.
--- a/ggrtf-temp.tf Wed Mar 08 18:13:57 2006 +0000 +++ b/ggrtf-temp.tf Thu Mar 09 17:41:48 2006 +0000 @@ -1,6 +1,6 @@ ;; ;; GgrTF::Temp - TEMPORARY HIGHLY EXPERIMENTAL STUFF MODULE! -;; (C) Copyright 2005 Ggr Pupunen +;; (C) Copyright 2005 Matti Hämäläinen (Ggr) ;; ;; This file (triggerset) is Free Software distributed under ;; GNU General Public License version 2.
--- a/ggrtf.tf Wed Mar 08 18:13:57 2006 +0000 +++ b/ggrtf.tf Thu Mar 09 17:41:48 2006 +0000 @@ -1307,24 +1307,26 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Report shape /def shape =\ -/if (battle_target!~"")\ - /msr %{battle_shape} (%{battle_target})%;\ + /if (battle_target!~"")\ + /msr %{battle_shape} (%{battle_target})%;\ /else \ - /msr %{battle_shape}%;\ + /msr %{battle_shape}%;\ /endif%;\ + ;; Update/set new shape -/def -i gbattle_ss =\ - /if ({4}=~"He"|{4}=~"She"|{4}=~"It")\ - /msw @{Cgreen}%{4} is in %{5}@{n} [@{%{1}}%{2}@{n}] (@{%{1}}%{3}%%@{n})%;\ - /else \ - /if (battle_st)\ - /msw @{Cgreen}%{4}@{n} [@{%{1}}%{2}@{n}] (@{%{1}}%{3}%%@{n})%;\ - /set battle_pshape=%{battle_shape}%;\ - /set battle_shape=%{2}%;\ - /endif%;\ +/prdefvar -n"fmt_shape" \ + -v"@{Cgreen}%%{4} %%{5}@{n} [@{%%{1}}%%{2}@{n}] (@{%%{1}}%%{3}%%%@{n})" \ + -c"Format string for shape reporting. %{1}=shape colour, %{2}=shape short name, %{3}=percentage, %{4}=target name, %{5}=shape long name" + +/eval /def -i gbattle_ss =\ + /msw %{fmt_shape}%%;\ + /if (battle_st)\ + /set battle_pshape=%%{battle_shape}%%;\ + /set battle_shape=%%{2}%%;\ /endif + ;; Update/set new target /def -i gbattle_target =\ /set battle_oldtarget=%{battle_target}%;\
--- a/salve.tf Wed Mar 08 18:13:57 2006 +0000 +++ b/salve.tf Thu Mar 09 17:41:48 2006 +0000 @@ -1,5 +1,5 @@ ;; Salve testing helper triggers -;; (C) Copyright 2005 Ggr Pupunen +;; (C) Copyright 2005 Matti Hämäläinen (Ggr) ;; ;; This file (triggerset) is Free Software distributed under ;; GNU General Public License version 2.