From 458447512d01a75bcfaa498e2c0a7a8a3bdc8341 Mon Sep 17 00:00:00 2001 From: Steaphan Greene Date: Mon, 18 Nov 2019 13:06:53 -0800 Subject: [PATCH] Normalize case in many TBA script commands. Since circle/tba is not case-sensitive, this should be a non-change. I confirmed this by verifying that `diff -i` shows zero changes. So, to tba, this is just a cosmetic cleanup. However, to others that use this data, the case might be important. ...this includes my own separate MUD codebase. :) --- lib/world/trg/0.trg | 26 +++++++++++++------------- lib/world/trg/115.trg | 2 +- lib/world/trg/117.trg | 18 +++++++++--------- lib/world/trg/12.trg | 40 ++++++++++++++++++++-------------------- lib/world/trg/13.trg | 2 +- lib/world/trg/19.trg | 2 +- lib/world/trg/201.trg | 4 ++-- lib/world/trg/211.trg | 6 +++--- lib/world/trg/274.trg | 12 ++++++------ lib/world/trg/3.trg | 28 ++++++++++++++-------------- lib/world/trg/30.trg | 26 +++++++++++++------------- lib/world/trg/343.trg | 4 ++-- lib/world/trg/345.trg | 6 +++--- lib/world/trg/43.trg | 2 +- 14 files changed, 89 insertions(+), 89 deletions(-) diff --git a/lib/world/trg/0.trg b/lib/world/trg/0.trg index 0143fbb..db8a2e2 100644 --- a/lib/world/trg/0.trg +++ b/lib/world/trg/0.trg @@ -2436,21 +2436,21 @@ if %actor.is_pc% && %actor.level% < 3 halt end if !%actor.eq(light)% - Say you really shouldn't be wandering these parts without a light source %actor.name%. + say you really shouldn't be wandering these parts without a light source %actor.name%. shake %load% obj 50 give generic %actor.name% halt end if !%actor.eq(rfinger)% || !%actor.eq(lfinger)% - Say did you lose one of your rings? + say did you lose one of your rings? sigh %load% obj 51 give generic %actor.name% halt end if !%actor.eq(neck1)% || !%actor.eq(neck2)% - Say you lose everything don't you? + say you lose everything don't you? roll %load% obj 53 give generic %actor.name% @@ -2463,62 +2463,62 @@ if %actor.is_pc% && %actor.level% < 3 halt end if !%actor.eq(head)% - Say protect that noggin of yours, %actor.name%. + say protect that noggin of yours, %actor.name%. %load% obj 56 give generic %actor.name% halt end if !%actor.eq(legs)% - Say why do you always lose your pants %actor.name%? + say why do you always lose your pants %actor.name%? %load% obj 57 give generic %actor.name% halt end if !%actor.eq(feet)% - Say you can't go around barefoot %actor.name%. + say you can't go around barefoot %actor.name%. %load% obj 58 give generic %actor.name% halt end if !%actor.eq(hands)% - Say need some gloves %actor.name%? + say need some gloves %actor.name%? %load% obj 59 give generic %actor.name% halt end if !%actor.eq(arms)% - Say you must be freezing %actor.name%. + say you must be freezing %actor.name%. %load% obj 60 give generic %actor.name% halt end if !%actor.eq(shield)% - Say you need one of these to protect yourself %actor.name%. + say you need one of these to protect yourself %actor.name%. %load% obj 61 give generic %actor.name% halt end if !%actor.eq(about)% - Say you are going to catch a cold %actor.name%. + say you are going to catch a cold %actor.name%. %load% obj 62 give generic %actor.name% halt end if !%actor.eq(waist)% - Say better use this to hold your pants up %actor.name%. + say better use this to hold your pants up %actor.name%. %load% obj 63 give generic %actor.name% halt end if !%actor.eq(rwrist)% || !%actor.eq(lwrist)% - Say misplace something? + say misplace something? smile %load% obj 65 give generic %actor.name% halt end if !%actor.eq(wield)% - Say without a weapon you will be Fido food %actor.name%. + say without a weapon you will be Fido food %actor.name%. %load% obj 66 give generic %actor.name% halt diff --git a/lib/world/trg/115.trg b/lib/world/trg/115.trg index 01c6e10..0914b1b 100644 --- a/lib/world/trg/115.trg +++ b/lib/world/trg/115.trg @@ -4,7 +4,7 @@ Man Trigger~ ~ if %actor.is_pc% wait 5 - Say "Run, Run, Fast, Fast, Get Out Of Here !! " + say "Run, Run, Fast, Fast, Get Out Of Here !! " end ~ $~ diff --git a/lib/world/trg/117.trg b/lib/world/trg/117.trg index 51d69ff..4b6abf2 100644 --- a/lib/world/trg/117.trg +++ b/lib/world/trg/117.trg @@ -497,7 +497,7 @@ Give Ring - 11723~ * in this file are not changed, and will have to be edited by hand. * This zone was number 117 on The Builder Academy, so you * should be looking for 117xx, where xx is 00-99. -If %object.vnum% == 11700 +if %object.vnum% == 11700 %purge% %object% say Oh, thank you, now I can finally go back! %echo% %self.name% Runs out of the tower screaming with joy! @@ -584,7 +584,7 @@ if %actor.is_pc% %send% %actor% %self.name% gives you a small stone. %load% obj 11730 %actor% inv say Regrettably, your request must be denied. - Wait 1s + wait 1s %echo% Suddenly, the doors slam shut behing you! %door% 11720 south flags d wait 1s @@ -595,16 +595,16 @@ if %actor.is_pc% %at% 11709 %purge% wait 2s say It seems to me That my council has failed to serve me right - Wait 1s - Say This city is now mine. Those who oppose me will be vanquished! - Wait 2s + wait 1s + say This city is now mine. Those who oppose me will be vanquished! + wait 2s %echo% %self.name% pulls out a gigantic claw that she kept hidden before. - Wait 2s - Say You will be the first. Good bye, %actor.name%! + wait 2s + say You will be the first. Good bye, %actor.name%! %echo% %self.name% lunges at you, aiming to slice you in two! - Wait 1s + wait 1s %echo% suddenly, the door opens, and a bright flash of light consumes the entire room, blinding both you and %self.name%! - Wait 3s + wait 3s %send% %actor% You wake up at the entrance to Los Torres, and everything seems normal for some reason. What the heck happened?? %send% %actor% @g+@n@bQUEST COMPLETE@n@g+@n %teleport% %actor% 11701 diff --git a/lib/world/trg/12.trg b/lib/world/trg/12.trg index 3a8ac8a..f812fcc 100644 --- a/lib/world/trg/12.trg +++ b/lib/world/trg/12.trg @@ -12,12 +12,12 @@ Calculator By Mordecai~ *~ * By Mordecai if %actor.is_pc% - Return 0 - Eval sum %speech% - Eval test1 "%speech%" - Eval test %test1.strlen% - Eval che %sum%/1 - If %che% == %sum% + return 0 + eval sum %speech% + eval test1 "%speech%" + eval test %test1.strlen% + eval che %sum%/1 + if %che% == %sum% %echo% @WComputing results...@n if (%speech%/===) if (%sum%==1) @@ -26,19 +26,19 @@ if %actor.is_pc% set sum No end end - Eval st 2+%test% - Eval o . - Eval sumslen "%sum% - Eval len %st% - (%sumslen.strlen%-2) - If %len% > 0 - Eval dif (%len%/2) - While %y.strlen% < %st% - Eval o .%o% - Eval y %o% - Eval m ?%m% - Eval p %m% - If %dif% == %y.strlen% - Eval wid1 %p% + eval st 2+%test% + eval o . + eval sumslen "%sum% + eval len %st% - (%sumslen.strlen%-2) + if %len% > 0 + eval dif (%len%/2) + while %y.strlen% < %st% + eval o .%o% + eval y %o% + eval m ?%m% + eval p %m% + if %dif% == %y.strlen% + eval wid1 %p% end done end @@ -1545,7 +1545,7 @@ actor.eq(*) test~ 0 g 100 ~ if !%actor.eq(*)% - Say you are wearing nothing! + say you are wearing nothing! else say you are wearing something. end diff --git a/lib/world/trg/13.trg b/lib/world/trg/13.trg index 8bd5456..9f30bc4 100644 --- a/lib/world/trg/13.trg +++ b/lib/world/trg/13.trg @@ -2703,7 +2703,7 @@ end Room Command Detach Example~ 2 c 100 detach~ -Detach 1388 %self.id% +detach 1388 %self.id% %echo% detached ~ #1389 diff --git a/lib/world/trg/19.trg b/lib/world/trg/19.trg index 166a3a0..387e56f 100644 --- a/lib/world/trg/19.trg +++ b/lib/world/trg/19.trg @@ -1125,7 +1125,7 @@ end test load~ 2 c 100 *~ -If %actor.name% == Detta +if %actor.name% == Detta return 0 else %send% %actor% An unmeasurable power holds you frozen. diff --git a/lib/world/trg/201.trg b/lib/world/trg/201.trg index 958298f..d3c410d 100644 --- a/lib/world/trg/201.trg +++ b/lib/world/trg/201.trg @@ -204,7 +204,7 @@ end Player can't move! - 20104~ 0 c 0 *~ -If %actor.name% == Elixias +if %actor.name% == Elixias return 0 else if (%actor.sex%==male) @@ -336,7 +336,7 @@ end Haplessness - 20146~ 2 c 100 *~ -If %actor.name% == Elixias +if %actor.name% == Elixias return 0 else %send% %actor% You are unconscious, unable to do anything... diff --git a/lib/world/trg/211.trg b/lib/world/trg/211.trg index 633699d..f5e4b81 100644 --- a/lib/world/trg/211.trg +++ b/lib/world/trg/211.trg @@ -398,7 +398,7 @@ while %word% %load% obj %zone%49 mgoto %zone%02 else - Say I'm sorry. Sibyl is with another client right now. + say I'm sorry. Sibyl is with another client right now. say Please choose one of the available readers. end end @@ -420,7 +420,7 @@ while %word% %load% obj %zone%52 mgoto %zone%02 else - Say I'm sorry. Esmerelda is with another client right now. + say I'm sorry. Esmerelda is with another client right now. say Please choose one of the available readers. end end @@ -442,7 +442,7 @@ while %word% %load% obj %zone%50 mgoto %zone%02 else - Say I'm sorry. Jaelle is with another client right now. + say I'm sorry. Jaelle is with another client right now. say Please choose one of the available readers. end end diff --git a/lib/world/trg/274.trg b/lib/world/trg/274.trg index 39c451c..fc51347 100644 --- a/lib/world/trg/274.trg +++ b/lib/world/trg/274.trg @@ -78,7 +78,7 @@ Broderick~ 0 g 100 ~ if %actor.is_pc% -Say Welcome to Saint Brigid, the hand of the Lady be upon thee. +say Welcome to Saint Brigid, the hand of the Lady be upon thee. wait 10 nod say To view my wares type 'List' to show everything i have in stock. @@ -89,7 +89,7 @@ nod wait 5 say So What'll it be? else - Say Blessings upon you this Day! + say Blessings upon you this Day! end ~ #27406 @@ -101,7 +101,7 @@ Child mob st brigid~ set actor %random.char% switch %random.4% case 1 - Say MommY!!! Daday!!! + say MommY!!! Daday!!! if %actor.sex% = man say its a mean old man! else @@ -127,7 +127,7 @@ done Std greeting shop mobs~ 0 g 100 ~ -Say Welcome to Saint Brigid, the hand of the Lady be upon thee. +say Welcome to Saint Brigid, the hand of the Lady be upon thee. wait 10 nod say To view my wares type 'List' to show everything i have in stock. @@ -148,10 +148,10 @@ if %actor.is_pc% say Hey baby, how bout a little action and some say small bit of fun~ I am all that. elseif %actor.sex% == female - SAY Get lost you bitch... I am not into Women! + say Get lost you bitch... I am not into Women! say what a whacko pervert! else -Say Sotrry I'm not into Neuterless ones! +say Sotrry I'm not into Neuterless ones! end else say Take off you Mob Swine! diff --git a/lib/world/trg/3.trg b/lib/world/trg/3.trg index 71522c7..d3238d5 100644 --- a/lib/world/trg/3.trg +++ b/lib/world/trg/3.trg @@ -569,21 +569,21 @@ Mob Greet - Kind Soul - 13~ if %actor.is_pc% wait 2 sec if !%actor.eq(light)% - Say you really shouldn't be wondering these parts without a light source %actor.name%. + say you really shouldn't be wondering these parts without a light source %actor.name%. shake %load% obj 200 give light %actor.name% halt end if !%actor.eq(rfinger)% || !%actor.eq(lfinger)% - Say did you lose one of your rings? + say did you lose one of your rings? sigh %load% obj 201 give ring %actor.name% halt end if !%actor.eq(neck1)% || !%actor.eq(neck2)% - Say you lose everything don't you? + say you lose everything don't you? roll %load% obj 203 give necklace %actor.name% @@ -596,68 +596,68 @@ if %actor.is_pc% halt end if !%actor.eq(head)% - Say protect that noggin of yours, %actor.name%. + say protect that noggin of yours, %actor.name%. %load% obj 206 give helm %actor.name% halt end if !%actor.eq(legs)% - Say why do you always lose your pants %actor.name%? + say why do you always lose your pants %actor.name%? %load% obj 207 give leggings %actor.name% halt end if !%actor.eq(feet)% - Say you can't go around barefoot %actor.name%. + say you can't go around barefoot %actor.name%. %load% obj 208 give boots %actor.name% halt end if !%actor.eq(hands)% - Say need some gloves %actor.name%? + say need some gloves %actor.name%? %load% obj 209 give gloves %actor.name% halt end if !%actor.eq(arms)% - Say you must be freezing %actor.name%. + say you must be freezing %actor.name%. %load% obj 210 give sleeves %actor.name% halt end if !%actor.eq(shield)% - Say you need one of these to protect yourself %actor.name%. + say you need one of these to protect yourself %actor.name%. %load% obj 211 give shield %actor.name% halt end if !%actor.eq(about)% - Say you are going to catch a cold %actor.name%. + say you are going to catch a cold %actor.name%. %load% obj 212 give cape %actor.name% halt end if !%actor.eq(waist)% - Say better use this to hold your pants up %actor.name%. + say better use this to hold your pants up %actor.name%. %load% obj 213 give belt %actor.name% halt end if !%actor.eq(rwrist)% || !%actor.eq(lwrist)% - Say misplace something? + say misplace something? smile %load% obj 215 give wristguard %actor.name% halt end if !%actor.eq(wield)% - Say without a weapon you will be fido food %actor.name%. + say without a weapon you will be fido food %actor.name%. %load% obj 216 give weapon %actor.name% halt end if !%actor.eq(hold)% - Say this might help you %actor.name%. + say this might help you %actor.name%. %load% obj 217 give staff %actor.name% halt diff --git a/lib/world/trg/30.trg b/lib/world/trg/30.trg index ce39d66..942936b 100644 --- a/lib/world/trg/30.trg +++ b/lib/world/trg/30.trg @@ -463,21 +463,21 @@ if %actor.is_pc% && %actor.level% < 5 halt end if !%actor.eq(light)% - Say you really shouldn't be wandering these parts without a light source %actor.name%. + say you really shouldn't be wandering these parts without a light source %actor.name%. shake %load% obj 3037 give candle %actor.name% halt end if !%actor.eq(rfinger)% || !%actor.eq(lfinger)% - Say did you lose one of your rings? + say did you lose one of your rings? sigh %load% obj 3083 give ring %actor.name% halt end if !%actor.eq(neck1)% || !%actor.eq(neck2)% - Say you lose everything don't you? + say you lose everything don't you? roll %load% obj 3082 give neck %actor.name% @@ -490,62 +490,62 @@ if %actor.is_pc% && %actor.level% < 5 halt end if !%actor.eq(head)% - Say protect that noggin of yours, %actor.name%. + say protect that noggin of yours, %actor.name%. %load% obj 3076 give cap %actor.name% halt end if !%actor.eq(legs)% - Say why do you always lose your pants %actor.name%? + say why do you always lose your pants %actor.name%? %load% obj 3080 give leggings %actor.name% halt end if !%actor.eq(feet)% - Say you can't go around barefoot %actor.name%. + say you can't go around barefoot %actor.name%. %load% obj 3084 give boots %actor.name% halt end if !%actor.eq(hands)% - Say need some gloves %actor.name%? + say need some gloves %actor.name%? %load% obj 3071 give gloves %actor.name% halt end if !%actor.eq(arms)% - Say you must be freezing %actor.name%. + say you must be freezing %actor.name%. %load% obj 3086 give sleeve %actor.name% halt end if !%actor.eq(shield)% - Say you need one of these to protect yourself %actor.name%. + say you need one of these to protect yourself %actor.name%. %load% obj 3042 give shield %actor.name% halt end if !%actor.eq(about)% - Say you are going to catch a cold %actor.name%. + say you are going to catch a cold %actor.name%. %load% obj 3087 give cape %actor.name% halt end if !%actor.eq(waist)% - Say better use this to hold your pants up %actor.name%. + say better use this to hold your pants up %actor.name%. %load% obj 3088 give belt %actor.name% halt end if !%actor.eq(rwrist)% || !%actor.eq(lwrist)% - Say misplace something? + say misplace something? smile %load% obj 3089 give wristguard %actor.name% halt end if !%actor.eq(wield)% - Say without a weapon you will be Fido food %actor.name%. + say without a weapon you will be Fido food %actor.name%. %load% obj 3021 give sword %actor.name% halt diff --git a/lib/world/trg/343.trg b/lib/world/trg/343.trg index 9c29c43..6e39b5e 100644 --- a/lib/world/trg/343.trg +++ b/lib/world/trg/343.trg @@ -6,7 +6,7 @@ Barney script~ eval number %random.16% switch %number% case 0 - Say I love you...... + say I love you...... wait 2 say you love me..... wait 2 @@ -133,7 +133,7 @@ Drunk spirit text~ eval number %random.6% switch %number% case 0 -Say S-set me up Kenny... +say S-set me up Kenny... wait 2 say A-an-another rwound here... wait 2 diff --git a/lib/world/trg/345.trg b/lib/world/trg/345.trg index b8a9128..7a590b6 100644 --- a/lib/world/trg/345.trg +++ b/lib/world/trg/345.trg @@ -39,7 +39,7 @@ start quest 2~ wait 1 s if %actor.varexists(accepted_quest_two)% say Have you returned with the head, %actor.alias%? -Else +else say Can you help me?, %actor.alias% emote rings his hands nerviously, looking around. end @@ -94,12 +94,12 @@ if %object.vnum( 34502 )% say Perhaps you should go over and look around some %purge% %object% rdelete accepted_quest_two %actor.id% -Else +else return 0 wait 3 say Thats not a head! -End +end ~ #34508 atmosphere for rooms (Fog)~ diff --git a/lib/world/trg/43.trg b/lib/world/trg/43.trg index 23861f3..699793f 100644 --- a/lib/world/trg/43.trg +++ b/lib/world/trg/43.trg @@ -25,7 +25,7 @@ Eskimo Butcher - 4312~ 0 g 25 ~ if %actor.is_pc% - Say Go away! I'm about to cut off his head! + say Go away! I'm about to cut off his head! end ~ #4304