Andreas/tbamud
1
0
Fork 0
mirror of https://github.com/tbamud/tbamud.git synced 2025-09-22 05:50:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #68 from steaphangreene/case-fixes

Browse source 
Normalize case in many TBA script commands.
This commit is contained in:
Jason 'Opie' Babo 2019-11-18 21:16:38 +00:00 • committed by GitHub
commit 6b9df83fe3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 89 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

26
lib/world/trg/0.trg
View file

@ -2436,21 +2436,21 @@ if %actor.is_pc% && %actor.level% < 3
halt halt
end end
if !%actor.eq(light)% 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 shake
%load% obj 50 %load% obj 50
give generic %actor.name% give generic %actor.name%
halt halt
end end
if !%actor.eq(rfinger)% || !%actor.eq(lfinger)% if !%actor.eq(rfinger)% || !%actor.eq(lfinger)%
Say did you lose one of your rings? say did you lose one of your rings?
sigh sigh
%load% obj 51 %load% obj 51
give generic %actor.name% give generic %actor.name%
halt halt
end end
if !%actor.eq(neck1)% || !%actor.eq(neck2)% if !%actor.eq(neck1)% || !%actor.eq(neck2)%
Say you lose everything don't you? say you lose everything don't you?
roll roll
%load% obj 53 %load% obj 53
give generic %actor.name% give generic %actor.name%
@ -2463,62 +2463,62 @@ if %actor.is_pc% && %actor.level% < 3
halt halt
end end
if !%actor.eq(head)% if !%actor.eq(head)%
Say protect that noggin of yours, %actor.name%. say protect that noggin of yours, %actor.name%.
%load% obj 56 %load% obj 56
give generic %actor.name% give generic %actor.name%
halt halt
end end
if !%actor.eq(legs)% 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 %load% obj 57
give generic %actor.name% give generic %actor.name%
halt halt
end end
if !%actor.eq(feet)% 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 %load% obj 58
give generic %actor.name% give generic %actor.name%
halt halt
end end
if !%actor.eq(hands)% if !%actor.eq(hands)%
Say need some gloves %actor.name%? say need some gloves %actor.name%?
%load% obj 59 %load% obj 59
give generic %actor.name% give generic %actor.name%
halt halt
end end
if !%actor.eq(arms)% if !%actor.eq(arms)%
Say you must be freezing %actor.name%. say you must be freezing %actor.name%.
%load% obj 60 %load% obj 60
give generic %actor.name% give generic %actor.name%
halt halt
end end
if !%actor.eq(shield)% 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 %load% obj 61
give generic %actor.name% give generic %actor.name%
halt halt
end end
if !%actor.eq(about)% 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 %load% obj 62
give generic %actor.name% give generic %actor.name%
halt halt
end end
if !%actor.eq(waist)% 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 %load% obj 63
give generic %actor.name% give generic %actor.name%
halt halt
end end
if !%actor.eq(rwrist)% || !%actor.eq(lwrist)% if !%actor.eq(rwrist)% || !%actor.eq(lwrist)%
Say misplace something? say misplace something?
smile smile
%load% obj 65 %load% obj 65
give generic %actor.name% give generic %actor.name%
halt halt
end end
if !%actor.eq(wield)% 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 %load% obj 66
give generic %actor.name% give generic %actor.name%
halt halt

2
lib/world/trg/115.trg
View file

@ -4,7 +4,7 @@ Man Trigger~
~ ~
if %actor.is_pc% if %actor.is_pc%
wait 5 wait 5
Say "Run, Run, Fast, Fast, Get Out Of Here !! " say "Run, Run, Fast, Fast, Get Out Of Here !! "
end end
~ ~
$~ $~

18
lib/world/trg/117.trg
View file

@ -497,7 +497,7 @@ Give Ring - 11723~
* in this file are not changed, and will have to be edited by hand. * 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 * This zone was number 117 on The Builder Academy, so you
* should be looking for 117xx, where xx is 00-99. * should be looking for 117xx, where xx is 00-99.
If %object.vnum% == 11700 if %object.vnum% == 11700
%purge% %object% %purge% %object%
say Oh, thank you, now I can finally go back! say Oh, thank you, now I can finally go back!
%echo% %self.name% Runs out of the tower screaming with joy! %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. %send% %actor% %self.name% gives you a small stone.
%load% obj 11730 %actor% inv %load% obj 11730 %actor% inv
say Regrettably, your request must be denied. say Regrettably, your request must be denied.
Wait 1s wait 1s
%echo% Suddenly, the doors slam shut behing you! %echo% Suddenly, the doors slam shut behing you!
%door% 11720 south flags d %door% 11720 south flags d
wait 1s wait 1s
@ -595,16 +595,16 @@ if %actor.is_pc%
%at% 11709 %purge% %at% 11709 %purge%
wait 2s wait 2s
say It seems to me That my council has failed to serve me right say It seems to me That my council has failed to serve me right
Wait 1s wait 1s
Say This city is now mine. Those who oppose me will be vanquished! say This city is now mine. Those who oppose me will be vanquished!
Wait 2s wait 2s
%echo% %self.name% pulls out a gigantic claw that she kept hidden before. %echo% %self.name% pulls out a gigantic claw that she kept hidden before.
Wait 2s wait 2s
Say You will be the first. Good bye, %actor.name%! say You will be the first. Good bye, %actor.name%!
%echo% %self.name% lunges at you, aiming to slice you in two! %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%! %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% 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 %send% %actor% @g+@n@bQUEST COMPLETE@n@g+@n
%teleport% %actor% 11701 %teleport% %actor% 11701

40
lib/world/trg/12.trg
View file

@ -12,12 +12,12 @@ Calculator By Mordecai~
*~ *~
* By Mordecai * By Mordecai
if %actor.is_pc% if %actor.is_pc%
Return 0 return 0
Eval sum %speech% eval sum %speech%
Eval test1 "%speech%" eval test1 "%speech%"
Eval test %test1.strlen% eval test %test1.strlen%
Eval che %sum%/1 eval che %sum%/1
If %che% == %sum% if %che% == %sum%
%echo% @WComputing results...@n %echo% @WComputing results...@n
if (%speech%/===) if (%speech%/===)
if (%sum%==1) if (%sum%==1)
@ -26,19 +26,19 @@ if %actor.is_pc%
set sum No set sum No
end end
end end
Eval st 2+%test% eval st 2+%test%
Eval o . eval o .
Eval sumslen "%sum% eval sumslen "%sum%
Eval len %st% - (%sumslen.strlen%-2) eval len %st% - (%sumslen.strlen%-2)
If %len% > 0 if %len% > 0
Eval dif (%len%/2) eval dif (%len%/2)
While %y.strlen% < %st% while %y.strlen% < %st%
Eval o .%o% eval o .%o%
Eval y %o% eval y %o%
Eval m ?%m% eval m ?%m%
Eval p %m% eval p %m%
If %dif% == %y.strlen% if %dif% == %y.strlen%
Eval wid1 %p% eval wid1 %p%
end end
done done
end end
@ -1545,7 +1545,7 @@ actor.eq(*) test~
0 g 100 0 g 100
~ ~
if !%actor.eq(*)% if !%actor.eq(*)%
Say you are wearing nothing! say you are wearing nothing!
else else
say you are wearing something. say you are wearing something.
end end

2
lib/world/trg/13.trg
View file

@ -2703,7 +2703,7 @@ end
Room Command Detach Example~ Room Command Detach Example~
2 c 100 2 c 100
detach~ detach~
Detach 1388 %self.id% detach 1388 %self.id%
%echo% detached %echo% detached
~ ~
#1389 #1389

2
lib/world/trg/19.trg
View file

@ -1125,7 +1125,7 @@ end
test load~ test load~
2 c 100 2 c 100
*~ *~
If %actor.name% == Detta if %actor.name% == Detta
return 0 return 0
else else
%send% %actor% An unmeasurable power holds you frozen. %send% %actor% An unmeasurable power holds you frozen.

4
lib/world/trg/201.trg
View file

@ -204,7 +204,7 @@ end
Player can't move! - 20104~ Player can't move! - 20104~
0 c 0 0 c 0
*~ *~
If %actor.name% == Elixias if %actor.name% == Elixias
return 0 return 0
else else
if (%actor.sex%==male) if (%actor.sex%==male)
@ -336,7 +336,7 @@ end
Haplessness - 20146~ Haplessness - 20146~
2 c 100 2 c 100
*~ *~
If %actor.name% == Elixias if %actor.name% == Elixias
return 0 return 0
else else
%send% %actor% You are unconscious, unable to do anything... %send% %actor% You are unconscious, unable to do anything...

6
lib/world/trg/211.trg
View file

@ -398,7 +398,7 @@ while %word%
%load% obj %zone%49 %load% obj %zone%49
mgoto %zone%02 mgoto %zone%02
else 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. say Please choose one of the available readers.
end end
end end
@ -420,7 +420,7 @@ while %word%
%load% obj %zone%52 %load% obj %zone%52
mgoto %zone%02 mgoto %zone%02
else 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. say Please choose one of the available readers.
end end
end end
@ -442,7 +442,7 @@ while %word%
%load% obj %zone%50 %load% obj %zone%50
mgoto %zone%02 mgoto %zone%02
else 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. say Please choose one of the available readers.
end end
end end

12
lib/world/trg/274.trg
View file

@ -78,7 +78,7 @@ Broderick~
0 g 100 0 g 100
~ ~
if %actor.is_pc% 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 wait 10
nod nod
say To view my wares type 'List' to show everything i have in stock. say To view my wares type 'List' to show everything i have in stock.
@ -89,7 +89,7 @@ nod
wait 5 wait 5
say So What'll it be? say So What'll it be?
else else
Say Blessings upon you this Day! say Blessings upon you this Day!
end end
~ ~
#27406 #27406
@ -101,7 +101,7 @@ Child mob st brigid~
set actor %random.char% set actor %random.char%
switch %random.4% switch %random.4%
case 1 case 1
Say MommY!!! Daday!!! say MommY!!! Daday!!!
if %actor.sex% = man if %actor.sex% = man
say its a mean old man! say its a mean old man!
else else
@ -127,7 +127,7 @@ done
Std greeting shop mobs~ Std greeting shop mobs~
0 g 100 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 wait 10
nod nod
say To view my wares type 'List' to show everything i have in stock. 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 Hey baby, how bout a little action and some
say small bit of fun~ I am all that. say small bit of fun~ I am all that.
elseif %actor.sex% == female 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! say what a whacko pervert!
else else
Say Sotrry I'm not into Neuterless ones! say Sotrry I'm not into Neuterless ones!
end end
else else
say Take off you Mob Swine! say Take off you Mob Swine!

28
lib/world/trg/3.trg
View file

@ -569,21 +569,21 @@ Mob Greet - Kind Soul - 13~
if %actor.is_pc% if %actor.is_pc%
wait 2 sec wait 2 sec
if !%actor.eq(light)% 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 shake
%load% obj 200 %load% obj 200
give light %actor.name% give light %actor.name%
halt halt
end end
if !%actor.eq(rfinger)% || !%actor.eq(lfinger)% if !%actor.eq(rfinger)% || !%actor.eq(lfinger)%
Say did you lose one of your rings? say did you lose one of your rings?
sigh sigh
%load% obj 201 %load% obj 201
give ring %actor.name% give ring %actor.name%
halt halt
end end
if !%actor.eq(neck1)% || !%actor.eq(neck2)% if !%actor.eq(neck1)% || !%actor.eq(neck2)%
Say you lose everything don't you? say you lose everything don't you?
roll roll
%load% obj 203 %load% obj 203
give necklace %actor.name% give necklace %actor.name%
@ -596,68 +596,68 @@ if %actor.is_pc%
halt halt
end end
if !%actor.eq(head)% if !%actor.eq(head)%
Say protect that noggin of yours, %actor.name%. say protect that noggin of yours, %actor.name%.
%load% obj 206 %load% obj 206
give helm %actor.name% give helm %actor.name%
halt halt
end end
if !%actor.eq(legs)% 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 %load% obj 207
give leggings %actor.name% give leggings %actor.name%
halt halt
end end
if !%actor.eq(feet)% 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 %load% obj 208
give boots %actor.name% give boots %actor.name%
halt halt
end end
if !%actor.eq(hands)% if !%actor.eq(hands)%
Say need some gloves %actor.name%? say need some gloves %actor.name%?
%load% obj 209 %load% obj 209
give gloves %actor.name% give gloves %actor.name%
halt halt
end end
if !%actor.eq(arms)% if !%actor.eq(arms)%
Say you must be freezing %actor.name%. say you must be freezing %actor.name%.
%load% obj 210 %load% obj 210
give sleeves %actor.name% give sleeves %actor.name%
halt halt
end end
if !%actor.eq(shield)% 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 %load% obj 211
give shield %actor.name% give shield %actor.name%
halt halt
end end
if !%actor.eq(about)% 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 %load% obj 212
give cape %actor.name% give cape %actor.name%
halt halt
end end
if !%actor.eq(waist)% 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 %load% obj 213
give belt %actor.name% give belt %actor.name%
halt halt
end end
if !%actor.eq(rwrist)% || !%actor.eq(lwrist)% if !%actor.eq(rwrist)% || !%actor.eq(lwrist)%
Say misplace something? say misplace something?
smile smile
%load% obj 215 %load% obj 215
give wristguard %actor.name% give wristguard %actor.name%
halt halt
end end
if !%actor.eq(wield)% 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 %load% obj 216
give weapon %actor.name% give weapon %actor.name%
halt halt
end end
if !%actor.eq(hold)% if !%actor.eq(hold)%
Say this might help you %actor.name%. say this might help you %actor.name%.
%load% obj 217 %load% obj 217
give staff %actor.name% give staff %actor.name%
halt halt

26
lib/world/trg/30.trg
View file

@ -463,21 +463,21 @@ if %actor.is_pc% && %actor.level% < 5
halt halt
end end
if !%actor.eq(light)% 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 shake
%load% obj 3037 %load% obj 3037
give candle %actor.name% give candle %actor.name%
halt halt
end end
if !%actor.eq(rfinger)% || !%actor.eq(lfinger)% if !%actor.eq(rfinger)% || !%actor.eq(lfinger)%
Say did you lose one of your rings? say did you lose one of your rings?
sigh sigh
%load% obj 3083 %load% obj 3083
give ring %actor.name% give ring %actor.name%
halt halt
end end
if !%actor.eq(neck1)% || !%actor.eq(neck2)% if !%actor.eq(neck1)% || !%actor.eq(neck2)%
Say you lose everything don't you? say you lose everything don't you?
roll roll
%load% obj 3082 %load% obj 3082
give neck %actor.name% give neck %actor.name%
@ -490,62 +490,62 @@ if %actor.is_pc% && %actor.level% < 5
halt halt
end end
if !%actor.eq(head)% if !%actor.eq(head)%
Say protect that noggin of yours, %actor.name%. say protect that noggin of yours, %actor.name%.
%load% obj 3076 %load% obj 3076
give cap %actor.name% give cap %actor.name%
halt halt
end end
if !%actor.eq(legs)% 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 %load% obj 3080
give leggings %actor.name% give leggings %actor.name%
halt halt
end end
if !%actor.eq(feet)% 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 %load% obj 3084
give boots %actor.name% give boots %actor.name%
halt halt
end end
if !%actor.eq(hands)% if !%actor.eq(hands)%
Say need some gloves %actor.name%? say need some gloves %actor.name%?
%load% obj 3071 %load% obj 3071
give gloves %actor.name% give gloves %actor.name%
halt halt
end end
if !%actor.eq(arms)% if !%actor.eq(arms)%
Say you must be freezing %actor.name%. say you must be freezing %actor.name%.
%load% obj 3086 %load% obj 3086
give sleeve %actor.name% give sleeve %actor.name%
halt halt
end end
if !%actor.eq(shield)% 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 %load% obj 3042
give shield %actor.name% give shield %actor.name%
halt halt
end end
if !%actor.eq(about)% 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 %load% obj 3087
give cape %actor.name% give cape %actor.name%
halt halt
end end
if !%actor.eq(waist)% 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 %load% obj 3088
give belt %actor.name% give belt %actor.name%
halt halt
end end
if !%actor.eq(rwrist)% || !%actor.eq(lwrist)% if !%actor.eq(rwrist)% || !%actor.eq(lwrist)%
Say misplace something? say misplace something?
smile smile
%load% obj 3089 %load% obj 3089
give wristguard %actor.name% give wristguard %actor.name%
halt halt
end end
if !%actor.eq(wield)% 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 %load% obj 3021
give sword %actor.name% give sword %actor.name%
halt halt

4
lib/world/trg/343.trg
View file

@ -6,7 +6,7 @@ Barney script~
eval number %random.16% eval number %random.16%
switch %number% switch %number%
case 0 case 0
Say I love you...... say I love you......
wait 2 wait 2
say you love me..... say you love me.....
wait 2 wait 2
@ -133,7 +133,7 @@ Drunk spirit text~
eval number %random.6% eval number %random.6%
switch %number% switch %number%
case 0 case 0
Say S-set me up Kenny... say S-set me up Kenny...
wait 2 wait 2
say A-an-another rwound here... say A-an-another rwound here...
wait 2 wait 2

6
lib/world/trg/345.trg
View file

@ -39,7 +39,7 @@ start quest 2~
wait 1 s wait 1 s
if %actor.varexists(accepted_quest_two)% if %actor.varexists(accepted_quest_two)%
say Have you returned with the head, %actor.alias%? say Have you returned with the head, %actor.alias%?
Else else
say Can you help me?, %actor.alias% say Can you help me?, %actor.alias%
emote rings his hands nerviously, looking around. emote rings his hands nerviously, looking around.
end end
@ -94,12 +94,12 @@ if %object.vnum( 34502 )%
say Perhaps you should go over and look around some say Perhaps you should go over and look around some
%purge% %object% %purge% %object%
rdelete accepted_quest_two %actor.id% rdelete accepted_quest_two %actor.id%
Else else
return 0 return 0
wait 3 wait 3
say Thats not a head! say Thats not a head!
End end
~ ~
#34508 #34508
atmosphere for rooms (Fog)~ atmosphere for rooms (Fog)~

2
lib/world/trg/43.trg
View file

@ -25,7 +25,7 @@ Eskimo Butcher - 4312~
0 g 25 0 g 25
~ ~
if %actor.is_pc% 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 end
~ ~
#4304 #4304