Andreas/tbamud
1
0
Fork 0
mirror of https://github.com/tbamud/tbamud.git synced 2026-02-09 09:24:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Undo apparent accidental @-color replaces in upstream TBA files. (#62)

Browse source 
I am guessing some script or tool used upstream is doing an unsafe
search-and-replace for '@' with TAB, and accidentally changing these.
They seem to have been creeping into the repo for years.

I produced this fix commit automatically with:
  sed -i 's|\t\([bcdgmnoruwyBCDGMRWY]\)|@\1|g' tba/*/*.*
...and then a few files' changes had to be undone.

I looked through all of the rest, and they look like correct fixes.

I also ran all the other letters, and they only make incorrect "fixes".
This commit is contained in:
Steaphan Greene 2019-11-17 12:46:39 -08:00 • committed by wyld-sw
parent 3e03332f0a
commit 3f1ea5e7a5
34 changed files with 561 additions and 561 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/world/obj/1.obj
View file

@ -735,7 +735,7 @@ A list of directions to important areas within Sanctus lies here.~
1 1 0 0 0
E
list directions sanctus~
n
@n
recall Room - teleport Sanctus
Newbie Zones - teleport Newbie
Food - 1d, 3s, 1e, 1n
@ -932,7 +932,7 @@ T 157
E
ten sided dice die~
The die has been carefully carved out of bone with black spots painted on
each of its 10 sides accordingly. RROLL DIE n
each of its 10 sides accordingly. @RROLL DIE@n
~
#174
hairball~

122
lib/world/obj/104.obj
View file

@ -52,9 +52,9 @@ A tacky wooden sign is tacked into the ground by a tall oak.~
E
wooden sign tacky~
+----------------------------+
| DMiz'real n and Orchan Forest |
| @DMiz'real@n and Orchan Forest |
+----------------------------------+
| The forest of DMiz'real n lies |
| The forest of @DMiz'real@n lies |
| to the north of this forest. |
|----------------------------------|
| To the south lies the Orchan |
@ -339,27 +339,27 @@ A maze map(not for mortals)~
1 1 0 30 0
E
map maze~
r-------------------------------------------------------
@r-------------------------------------------------------
b DED
b |
b DED DED DED--MOD--DED X --MOD
b | | | | |
b X -- X -- X CNT-- X X --MOD--DED
b | | | |
b DED-- X X --MOD-- X -- X -- X -- X
b | | | |
b X -- X -- X DED X MOD
b | |
b X DED
b |
b ENT
@b DED
@b |
@b DED DED DED--MOD--DED X --MOD
@b | | | | |
@b X -- X -- X CNT-- X X --MOD--DED
@b | | | |
@b DED-- X X --MOD-- X -- X -- X -- X
@b | | | |
@b X -- X -- X DED X MOD
@b | |
@b X DED
@b |
@b ENT
r-------------------------------------------------------
yENT: Beginning MOD: Monsters Den
yDED: Dead End X: Just a Regular Maze Room
yCNT: Center of the Maze BRooms: 31
r------------------------------------------------------- n
@r-------------------------------------------------------
@yENT: Beginning MOD: Monsters Den
@yDED: Dead End X: Just a Regular Maze Room
@yCNT: Center of the Maze @BRooms: 31
@r-------------------------------------------------------@n
~
#10429
Infa Armor~
@ -400,34 +400,34 @@ A Master Map lies on the ground here.~
4 1000 0 0 0
E
3~
r-------------------------------------------------------
@r-------------------------------------------------------
b DED
b |
b DED DED DED--MOD--DED X --MOD
b | | | | |
b X -- X -- X CNT-- X X --MOD--DED
b | | | |
b DED-- X X --MOD-- X -- X -- X -- X
b | | | |
b X -- X -- X DED X MOD
b | |
b X DED
b |
b ENT
@b DED
@b |
@b DED DED DED--MOD--DED X --MOD
@b | | | | |
@b X -- X -- X CNT-- X X --MOD--DED
@b | | | |
@b DED-- X X --MOD-- X -- X -- X -- X
@b | | | |
@b X -- X -- X DED X MOD
@b | |
@b X DED
@b |
@b ENT
r-------------------------------------------------------
yENT: Beginning MOD: Monsters Den
yDED: Dead End X: Just a Regular Maze Room
yCNT: Center of the Maze BRooms: 31
r------------------------------------------------------- n
@r-------------------------------------------------------
@yENT: Beginning MOD: Monsters Den
@yDED: Dead End X: Just a Regular Maze Room
@yCNT: Center of the Maze @BRooms: 31
@r-------------------------------------------------------@n
~
E
2~
bArea : Orchan Village
@bArea : Orchan Village
Level : Any
r-------------------------------------------------------
b
@r-------------------------------------------------------
@b
MSH
|
MST--MST--VIW
@ -438,43 +438,43 @@ Level : Any
| | |
ELD WPS--ROR
r-------------------------------------------------------
bGTE: Gate ELD: Village Elder
@r-------------------------------------------------------
@bGTE: Gate ELD: Village Elder
ROR: Rock Road VIW: Village Warrior
WPS: Weapon Shop MST: Main Street
ACS: Amor Shop MSH: Map Shop
r-------------------------------------------------------
@r-------------------------------------------------------
~
E
1~
bArea : A Small Forest
bLevel : Any Level
r-------------------------------------------------------
b WOD
@bArea : A Small Forest
@bLevel : Any Level
@r-------------------------------------------------------
@b WOD
|
BET--WOP--NTF--FTF ENF
| | | |
HSE LLP--ENF SHK--LKE
r-------------------------------------------------------
bWOD: Further into the Woods LLP: Lightly Lit Path
@r-------------------------------------------------------
@bWOD: Further into the Woods LLP: Lightly Lit Path
BET: Barricade of Trees ENF: End of Forest
WOP: Woodland Path NTF: Near the Tree Fort
FTF: Foot of the Fort SHK: A Small Shack
LKE: Lake
r-------------------------------------------------------
@r-------------------------------------------------------
~
E
master map~
bMaster Map
r*=================+==================================*
r| bPage 1 r| bForest Map r|
r| bPage 2 r| bVillage Map r|
r| bPage 3 r| bMaze Map r|
r+=================+==================================+
@bMaster Map
@r*=================+==================================*
@r| @bPage 1 @r| @bForest Map @r|
@r| @bPage 2 @r| @bVillage Map @r|
@r| @bPage 3 @r| @bMaze Map @r|
@r+=================+==================================+
| |
| b uTo look at any of these maps, it is look (#) n r |
| @b@uTo look at any of these maps, it is look (#)@n@r |
| |
*====================================================* n
*====================================================*@n
~
#10432
map~

8
lib/world/obj/117.obj
View file

@ -191,7 +191,7 @@ A @RRoad@n @Yto@n @CHeaven@n has been left here.~
15 750 0 0 0
E
road heaven wine~
This dark red wine is called the RRoad n Yto n CHeaven n because it is
This dark red wine is called the @RRoad@n @Yto@n @CHeaven@n because it is
extremely intoxicating but filling. The bottle that contains it is huge and
probably will keep you busy for quite some time. The wine has a smell of a
mixture of many fruits, though it is difficult to tell which ones were used.
@ -259,7 +259,7 @@ A Chalice of Red Something has been left here.~
7 400 0 0 0
E
chalice wine~
WO n DM n WG n WO n DM n WG n that isn't mwine n it's rblood!!!!! n
@WO@n@DM@n@WG@n @WO@n@DM@n@WG@n that isn't @mwine@n it's @rblood!!!!! @n
~
#11720
defender~
@ -271,7 +271,7 @@ The @rD@n@me@n@rf@n@me@n@rn@n@md@n@re@n@mr@n has been left here.~
15 2000000 0 10 0
E
defender~
The rD n me n rf n me n rn n md n re n mr n is a valiant sword only usable
The @rD@n@me@n@rf@n@me@n@rn@n@md@n@re@n@mr@n is a valiant sword only usable
by masters of the world. The blade is a dull gray and the hilt is made of
silver with a leather bound handle for a good grip. Legend goes it was used to
protect Los Torres from i nvasion of the Valdurain Army. It is only wieldable
@ -504,7 +504,7 @@ A bouquet of exotic flowers has been left here.~
1 1 0 0 0
E
bouquet exotic flowers~
A hand picked bouquet of rred n, ggreen n, yyellow n and bblue n flowers
A hand picked bouquet of @rred@n, @ggreen@n, @yyellow@n and @bblue@n flowers
nicely arranged into a bouquet could make the perfect gift for anyone.
~
#11736

2
lib/world/obj/12.obj
View file

@ -9,7 +9,7 @@ A list of the staff's emails has been left here.~
T 1205
E
list email staff~
RHELP CONTACT n for the most recent listing or:
@RHELP CONTACT@n for the most recent listing or:
~
#1201
pamphlet trigedit~

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

@ -312,7 +312,7 @@ A builder intro note has been dropped here.~
1 1 0 0 0
E
introduction note paper~
This has been moved to RHELP INTRO n.
This has been moved to @RHELP INTRO@n.
~
#1329
test backpack~

34
lib/world/obj/201.obj
View file

@ -54,7 +54,7 @@ A weather-beaten sign solemnly stands here.~
0 0 0 0 0
E
sign words word~
n
@n
North: Forbidden Forest
West: An Abandoned Lighthouse
South: Konolua Beach
@ -136,7 +136,7 @@ E
harp~
This harp is made of a metal that shifts and changes its colours every now
and then. Carved into the column of it are strange elvish designs, while the
neck of the harp is a simple S-shape. Rplay harp n to produce sensational
neck of the harp is a simple S-shape. @Rplay harp@n to produce sensational
music.
~
#20110
@ -173,12 +173,12 @@ The blade itself is made of a bluish metal, yet it cannot be determined for the
tones of blue are always changing. You may say the blade itself is made of a
solid type of flowing liquid, while the hilt has been creatively designed to
form the shape of Leviathan, the legendary dragon that sleeps beneath the ocean.
W uTo Use this blade: n At the expense of 50 mana points, this blade will
@W@uTo Use this blade:@n At the expense of 50 mana points, this blade will
constantly heal you for 10 hp every 2-3 seconds. To use this command, type
BEXECUTE FUSION n. For 100 of your own hp you can damage the opponent for 1000
@BEXECUTE FUSION@n. For 100 of your own hp you can damage the opponent for 1000
in return, provided that it is not a player character. A drawback to this
ability is the time taken to fully execute the damage, it takes time to recharge
before striking down the opponent. To use this type BPERFORM AURORAFALL n.
before striking down the opponent. To use this type @BPERFORM AURORAFALL@n.
~
#20112
chest~
@ -262,7 +262,7 @@ T 20146
T 20147
E
cushion~
The Rred n cushion is big, nice, and exceptionally nice to cuddle or sit on.
The @Rred@n cushion is big, nice, and exceptionally nice to cuddle or sit on.
~
#20118
@ -277,7 +277,7 @@ T 20146
T 20147
E
cushion~
The Bblue n cushion is big, nice, and exceptionally nice to cuddle or sit
The @Bblue@n cushion is big, nice, and exceptionally nice to cuddle or sit
on.
~
#20119
@ -292,7 +292,7 @@ T 20146
T 20147
E
cushion~
The Yyellow n cushion is big, nice, and exceptionally nice to cuddle or sit
The @Yyellow@n cushion is big, nice, and exceptionally nice to cuddle or sit
on.
~
#20120
@ -305,7 +305,7 @@ A glittering anklet sparkles silently here.~
6 2500 500 0 0
E
anklet~
This MP Wr Mi ms Wm MA Wn Mk ml We mt n is made from prism, a rare mineral
This @MP@Wr@Mi@ms@Wm @MA@Wn@Mk@ml@We@mt@n is made from prism, a rare mineral
that is created after being buried under the sand for many years. The white
powdery substance it is made from makes it glitters, enhancing the beauty of
this wonderful object.
@ -320,7 +320,7 @@ A nearly transparent dress lies here, sparkling silently.~
8 7500 1000 0 0
E
dress~
This MP Wr Mi ms Wm MD Wr Me ms Ws n is made from prism, a rare mineral
This @MP@Wr@Mi@ms@Wm @MD@Wr@Me@ms@Ws@n is made from prism, a rare mineral
that is created after being buried under the sand for many years. The white
powdery substance it is made from makes it glitters, enhancing the beauty of
this wonderful object.
@ -335,7 +335,7 @@ A glittering collar sparkles alone.~
5 2500 500 0 0
E
collar~
This MP Wr Mi ms Wm MC Wo Ml ml Wa Mr n is made from prism, a rare mineral
This @MP@Wr@Mi@ms@Wm @MC@Wo@Ml@ml@Wa@Mr@n is made from prism, a rare mineral
that is created after being buried under the sand for many years. The white
powdery substance it is made from makes it glitters, enhancing the beauty of
this wonderful object.
@ -350,7 +350,7 @@ A wooden sign has been planted here.~
0 0 0 0 0
E
sign~
The sign says: When you wish to go home, just CJUMP n into the water.
The sign says: When you wish to go home, just @CJUMP@n into the water.
~
#20124
book manual guide~
@ -362,7 +362,7 @@ A simple guidebook of @WSapphire Islands@g lies here.~
1 10 0 0 0
E
4~
n
@n
SECRETS
There are a list of things that will not appear anywhere on this zone. They
are for immortals only ;) Type olist to bring out a list of them. Items
@ -402,7 +402,7 @@ There may be a lot more hidden errors, so mail me if you see any ;)
~
E
1~
OVERVIEW type Rgoto 20100 n and look ;)
OVERVIEW type @Rgoto 20100@n and look ;)
~
E
index~
@ -432,7 +432,7 @@ E
sword nirvana~
Deathly Nirvana is a blade made of pure runestone. Its edge is razor-sharp
and dangerously thin - a characteristic that enables it to slice through any
material with utmost ease. RSlash n releases its hidden power.
material with utmost ease. @RSlash@n releases its hidden power.
~
#20191
icecream ice cone~
@ -484,8 +484,8 @@ Someone has dropped a pair of glasses here.~
1 500 0 0 0
E
glasses specs spectacle spectacles~
The glass of this pair of spectacle is heavily tinted in Cblue n! Looking
through it will probably make everything look Cblue n as well.
The glass of this pair of spectacle is heavily tinted in @Cblue@n! Looking
through it will probably make everything look @Cblue@n as well.
~
#20195
shorts short~

4
lib/world/obj/211.obj
View file

@ -1271,8 +1271,8 @@ E
etching side~
Flowing letters spell out:
wWhat lies ahead of you? Visit Tarot. n
w Sibyl, Esmerelda and Jaelle n
@wWhat lies ahead of you? Visit Tarot.@n
@w Sibyl, Esmerelda and Jaelle@n
~
E
glass~

16
lib/world/obj/27.obj
View file

@ -102,15 +102,15 @@ A ragged book has been left here.~
E
ragged diary~
This dark leather book is almost falling apart, although there appears to be
very little written inside it. The word gPRIVATE n has been carefully carved
very little written inside it. The word @gPRIVATE@n has been carefully carved
into the cover.
(type look 1, 2, or 3 to view pages)
~
E
3~
G
gEntry 3 n
@G
@gEntry 3@n
Somehow I fear this may be my last entry. I have been recruited, along with
several others for a secret task by the sorceress' evil bird. What the task is
I do not yet know, but I know that the sorceress has a particular way of
@ -118,8 +118,8 @@ keeping her secrets, and it does not involve the survival of witnesses.
~
E
2~
G
gEntry 2 n
@G
@gEntry 2@n
Someone came to help us today, he told me he knew how to destroy the
sorceress once and for all. I thought he would be the one to succeed but he
was killed by the toothy one. Now the abominable creature has holed itself
@ -127,8 +127,8 @@ into a cave from which there is no return... or so it is claimed.
~
E
1~
G
gEntry 1 n
@G
@gEntry 1@n
I have lost all interest in keeping this diary. Since the sorceress has
taken over, life has not been worth writing about. I shall instead record
anything I observe that may aid in her demise, though it will mean my death
@ -1233,7 +1233,7 @@ icy mana ring~
This cool glassy ring has been forged from a silvery metal and interwoven
with blue crystal, the two substances spiralling around each other in a
never-ending circle, a symbol of the flowing of unseen forces. It looks as
though it may impart some powerful magic unto the wearer if c used n.
though it may impart some powerful magic unto the wearer if@c used@n.
~
#2777
Goethite staff flame fire~

2
lib/world/obj/310.obj
View file

@ -58,7 +58,7 @@ E
book chronicles~
You open the book and begin to read:
Many ages ago, the great paladin knight Graye defeated
@Many ages ago, the great paladin knight Graye defeated
the Demon lord, and his disciples Irgon and Scrytin, and banished
them to to bowels of the earth from which they came. Years passed
and Graye's descendants prospered. The city of Graye has been ruled