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

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

View File

@@ -18,7 +18,7 @@ if %actor.is_pc%
Eval test %test1.strlen%
Eval che %sum%/1
If %che% == %sum%
%echo% WComputing results... n
%echo% @WComputing results...@n
if (%speech%/===)
if (%sum%==1)
set sum Yes
@@ -44,23 +44,23 @@ if %actor.is_pc%
end
eval opt1 8 + %test%
eval opt2 (2*%wid1.strlen%)+%sumslen.strlen%+5
%echo% WWizzzzzzzzzz.... n
%echo% @WWizzzzzzzzzz....@n
if (%opt1%-2) == (%opt2%)
%echo% c...%y%... n
%echo% c: C..%y%.. c: n
%echo% c: C: G %speech% C : c: n
%echo% c: C:.%y%.: c: n
%echo% c: C: %wid1% G %sum% C%wid1% : c: n
%echo% c: C:.%y%.: c: n
%echo% c:..%y%..: n
%echo% @c...%y%...@n
%echo% @c:@C..%y%..@c:@n
%echo% @c:@C:@G %speech% @C :@c:@n
%echo% @c:@C:.%y%.:@c:@n
%echo% @c:@C: %wid1%@G %sum% @C%wid1% :@c:@n
%echo% @c:@C:.%y%.:@c:@n
%echo% @c:..%y%..:@n
else
%echo% r....%y%... n
%echo% r: R...%y%.. r: n
%echo% r: R: G %speech% R : r: n
%echo% r: R:..%y%.: r: n
%echo% r: R: %wid1% G %sum% R%wid1% : r: n
%echo% r: R:..%y%.: r: n
%echo% r:...%y%..: n
%echo% @r....%y%...@n
%echo% @r:@R...%y%..@r:@n
%echo% @r:@R:@G %speech% @R :@r:@n
%echo% @r:@R:..%y%.:@r:@n
%echo% @r:@R: %wid1%@G %sum% @R%wid1% :@r:@n
%echo% @r:@R:..%y%.:@r:@n
%echo% @r:...%y%..:@n
end
end
end
@@ -226,46 +226,46 @@ end
eval forest_sounds %random.25%
switch %forest_sounds%
case 1
%echo% gThe gently chirping of crickets peacefully resonate across the forest. n
%echo% @gThe gently chirping of crickets peacefully resonate across the forest.@n
break
case 2
%echo% A haze of yfir Wefl yies n dart inbetween some ancient cedars.
%echo% A haze of @yfir@Wefl@yies@n dart inbetween some ancient cedars.
break
case 3
%echo% DA thick fog drifts in, dampening the moss. n
%echo% @DA thick fog drifts in, dampening the moss.@n
break
case 4
%echo% DThe area is surrounded by a visually impeneratable mist. n
%echo% @DThe area is surrounded by a visually impeneratable mist.@n
break
case 5
%echo% DThe grey haze starts to glow a dim silvery shade as the moonlight strikes it. n
%echo% @DThe grey haze starts to glow a dim silvery shade as the moonlight strikes it.@n
break
case 6
%echo% DThe damp fallen clouds swirl slightly in an eddying wind. n
%echo% @DThe damp fallen clouds swirl slightly in an eddying wind.@n
break
case 7
%echo% DThe thick brume shifts and ebbs away slightly. n
%echo% @DThe thick brume shifts and ebbs away slightly.@n
break
case 8
%echo% A hushed whispering sound seems to emanate from the patch of rt wo ra wd rs wt ro wo rl ws n.
%echo% A hushed whispering sound seems to emanate from the patch of @rt@wo@ra@wd@rs@wt@ro@wo@rl@ws@n.
break
case 9
%echo% The largest rt wo ra wd rs wt ro wo rl n yawns openly and mumbles something to one of its friends.
%echo% The largest @rt@wo@ra@wd@rs@wt@ro@wo@rl@n yawns openly and mumbles something to one of its friends.
break
case 10
%echo% Like a diminutive choir, the patch of rt wo ra wd rs wt ro wo rl ws n let loose a high-pitched song of peace.
%echo% Like a diminutive choir, the patch of @rt@wo@ra@wd@rs@wt@ro@wo@rl@ws@n let loose a high-pitched song of peace.
break
case 11
%echo% From the east, tiny voices talk amongst themselves in their own plant-like language.
break
case 12
%echo% The patch of rt wo ra wd rs wt ro wo rl ws n sway synchronisingly in the silver moonlight.
%echo% The patch of @rt@wo@ra@wd@rs@wt@ro@wo@rl@ws@n sway synchronisingly in the silver moonlight.
break
case 13
%echo% The peaceful chirping of bird-song floats down from above.
break
case 14
%echo% gA piping little note sings down to you from above. n
%echo% @gA piping little note sings down to you from above.@n
break
case 15
%echo% The tweeting of a newly born bird calling to its mother echoes around the forest.
@@ -277,16 +277,16 @@ switch %forest_sounds%
%echo% The sound of ruffling and the snapping of small twigs reaches your ears.
break
case 18
%echo% gA rapid chattering drifts down from the giant trees to the northeast. n
%echo% @gA rapid chattering drifts down from the giant trees to the northeast.@n
break
case 19
%echo% With inequable grace, a snowy white owl ghosts in on silent wings.
break
case 20
%echo% A dblack Dbat n flutters across the forest, high above.
%echo% A @dblack @Dbat@n flutters across the forest, high above.
break
case 21
%echo% gA relaxed nattering can be heard in the top of a tree to the south. n
%echo% @gA relaxed nattering can be heard in the top of a tree to the south.@n
break
case 22
%echo% A hedgehog slowly wanders inbetween some trees and out of view.
@@ -295,10 +295,10 @@ switch %forest_sounds%
%echo% A faint wind breathes in from all directions, steeping the mists.
break
case 24
%echo% A rr ya bi gn cb mo rw n-colored butterfly floats across the clearing.
%echo% A @rr@ya@bi@gn@cb@mo@rw@n-colored butterfly floats across the clearing.
break
case 25
%echo% A strange Yglowing wluminescence n drifts off to the north, fading into the damp fog.
%echo% A strange @Yglowing @wluminescence@n drifts off to the north, fading into the damp fog.
break
default
break
@@ -473,7 +473,7 @@ if %cmd% == go
set p_dir %arg%
extract px 1 %playerco%
extract py 2 %playerco%
set [%py%][%px%] g\* n
set [%py%][%px%] @g\*@n
switch %p_dir%
case right
if %px%!=10
@@ -522,7 +522,7 @@ if %cmd% == go
eval holech %%[%py%][%px%]%%
if %holech%/=@@
if !(%chase%>0)
set alert MYou fall into a bottomless pit! n
set alert @MYou fall into a bottomless pit!@n
unset points
set nextlev 0
global nextlev
@@ -543,14 +543,14 @@ if %cmd% == go
global points
eval exo (%nextlev%*950)
nop %actor.exp(%exo%)%
set [%py%][%px%] c. n
set [%py%][%px%] @c.@n
global [%py%][%px%]
eval prize_count (%prize_count%)+1
set winner [%prize_count%]
if %prize_count%>=%numofprizes%
eval nextlev (%nextlev%)+1
global nextlev
set winner YYou Win!!! n Moving to level %nextlev%.
set winner @YYou Win!!!@n Moving to level %nextlev%.
set px 10
set py 10
set ax 1
@@ -577,22 +577,22 @@ if %cmd% == go
eval spec_prize [%random.10%][%random.10%]
global spec_prize
else
set %spec_prize% yY n
set %spec_prize% @yY@n
eval spec_prize
global spec_prize
end
end
if %sizem%
set [%py%][%px%] GO n
set [%py%][%px%] @GO@n
unset sizem
else
set [%py%][%px%] Go n
set [%py%][%px%] @Go@n
set sizem 1
global sizem
end
extract ax 1 %animal%
extract ay 2 %animal%
set [%ay%][%ax%] r\* n
set [%ay%][%ax%] @r\*@n
if !%dir_chosen%
set dir_chosen 1
if %px%>%ax%
@@ -665,7 +665,7 @@ if %cmd% == go
set animal %ax% %ay%
global animal
end
eval [%ay%][%ax%] Ra n
eval [%ay%][%ax%] @Ra@n
eval ch_3 %%[%py%][%px%]%%
set ch_3 %ch_3%
if %ch_3.contains(a)%
@@ -685,7 +685,7 @@ if %cmd% == go
set py 10
%force% %actor% createnewgame
else
set alert You have been eaten by the Ranimal n.
set alert You have been eaten by the @Ranimal@n.
set points 0
global points
set nextlev 0
@@ -731,26 +731,26 @@ if %cmd% == go
if %cht%>0
set chy You can FLY and chase the animal %cht% more times.
end
set snd %send% %actor% n
set snd %send% %actor% @n
%force% %actor% cls
%snd% ) \\ / (
%snd% /\|\\ )\\_/( /\|\\
%snd% \* / \| \\ (/\\\|/\\) / \| \\ \*
%snd% \|\`._____________/__\|__o____\\\`\|'/___o__\|__\\______.'\|
%snd% \| '\^\` \| \\\|/ '\^\` \|
%snd% \| \| V level: %levlev% \| Dir: C %arg% n
%snd% \| %printrow10% \| M@@ n = Bottomless Pit \| Points: Y%points% n
%snd% \| %printrow9% \| yY n = Power Up \| Exp: C%exx% n
%snd% \| %printrow8% \| Wp n = Prize \| AMU: %dedu%
%snd% \| %printrow7% \| Go n = You \|
%snd% \| %printrow6% \| Ra n = Animal \|
%snd% \| %printrow5% \| cTo Move Type: n \|
%snd% \| %printrow4% \| Cgo <up\|down\|left\|right> n\|
%snd% \| \| V level: %levlev% \| Dir: @C %arg%@n
%snd% \| %printrow10% \| @M@@@n = Bottomless Pit \| Points: @Y%points%@n
%snd% \| %printrow9% \| @yY@n = Power Up \| Exp: @C%exx%@n
%snd% \| %printrow8% \| @Wp@n = Prize \| AMU: %dedu%
%snd% \| %printrow7% \| @Go@n = You \|
%snd% \| %printrow6% \| @Ra@n = Animal \|
%snd% \| %printrow5% \| @cTo Move Type:@n \|
%snd% \| %printrow4% \| @Cgo <up\|down\|left\|right>@n\|
%snd% \| %printrow3% \| \|
%snd% \| %printrow2% \| BCost of AMU exp per MV n \|
%snd% \| %printrow1% \| BIf you have exp. n \|
%snd% \| %printrow2% \| @BCost of AMU exp per MV@n \|
%snd% \| %printrow1% \| @BIf you have exp.@n \|
%snd% \| \| \|
%snd% \| \| NEEDED: R%numop% n HAVE: G%przc% n \|
%snd% \| \| NEEDED: @R%numop%@n HAVE: @G%przc%@n \|
%snd% \| .______________________\|______________________. \|
%snd% \|' l /\\ / \\\\ \\ /\\ l \`\|
%snd% \* l / V )) V \\ l \*
@@ -807,8 +807,8 @@ eval animal 1 1
global animal
eval playerco 10 10
global playerco
set [1][1] ra n
set [10][10] Go n
set [1][1] @ra@n
set [10][10] @Go@n
global [1][1]
global [10][10]
eval numofprizes 0
@@ -823,25 +823,25 @@ while (%ww%>1)
eval n %ww%
eval row %random.10%
eval r_col (%random.3%-1)
set [%n%][1] c. n
set [%n%][1] @c.@n
global [%n%][1]
set [%n%][2] c. n
set [%n%][2] @c.@n
global [%n%][2]
set [%n%][3] c. n
set [%n%][3] @c.@n
global [%n%][3]
set [%n%][4] c. n
set [%n%][4] @c.@n
global [%n%][4]
set [%n%][5] c. n
set [%n%][5] @c.@n
global [%n%][5]
set [%n%][6] c. n
set [%n%][6] @c.@n
global [%n%][6]
set [%n%][7] c. n
set [%n%][7] @c.@n
global [%n%][7]
set [%n%][8] c. n
set [%n%][8] @c.@n
global [%n%][8]
set [%n%][9] c. n
set [%n%][9] @c.@n
global [%n%][9]
set [%n%][10] c. n
set [%n%][10] @c.@n
global [%n%][10]
if (%r_col%)
while (%r_col%<3)
@@ -850,7 +850,7 @@ while (%ww%>1)
if !(%posis%/=[%n%][%jj%])
eval numofprizes %numofprizes%+1
global numofprizes
eval [%n%][%jj%] Wp n
eval [%n%][%jj%] @Wp@n
global [%n%][%jj%]
set posis %posis% [%n%][%jj%]
end
@@ -866,13 +866,13 @@ if (%r_ttt%>0)
eval j9 %random.10%
eval cer %%[%j9%][%j8%]%%
if !(%cer%/=p)
eval [%j9%][%j8%] M\@@ n
eval [%j9%][%j8%] @M\@@@n
global [%j9%][%j8%]
end
done
end
if !(%[10][10]%/=p)
set [10][10] c. n
set [10][10] @c.@n
global [10][10]
end
~
@@ -894,7 +894,7 @@ while %self.varexists(%j%)%
done
eval j %j%+1
done
%echo% yO===============SCORE======BOARD=====================O n
%echo% @yO===============SCORE======BOARD=====================O@n
wait 1
%echo% O=#==NAME============\|=Level=\|=Points==\|=EXP=========O
set i 1
@@ -932,7 +932,7 @@ while %self.varexists(%j%)%
if %d%<9
set d 0%j%
end
%echo% \| g%d% n: w%nam% n %sp%\| c%ll% n \| y%points% n \| W%exp% n
%echo% \|@g%d%@n: @w%nam%@n %sp%\| @c%ll%@n \| @y%points%@n \| @W%exp%@n
eval j %j%+1
done
%echo% O=#==================================================O
@@ -1114,9 +1114,9 @@ end
autolook for (rm 1269) Elaseth's Oubliette~
2 g 100
~
%echo% n
%echo% n
%echo% DWelcome to hell. Next time heed the gods, they don't play games. n
%echo% @n
%echo% @n
%echo% @DWelcome to hell. Next time heed the gods, they don't play games.@n
~
#1269
harp~
@@ -1513,7 +1513,7 @@ remote spech %world_global.id%
~
set fire %random.900%
wait %fire% sec
%echo% bThe fire crackles softly in the fireplace. n
%echo% @bThe fire crackles softly in the fireplace.@n
~
#1289
(1209) Taylors Random Office Noises~
@@ -1522,19 +1522,19 @@ wait %fire% sec
set office_noises %random.5%
switch %office_noises%
case 1
%echo% bLoud footsteps can be heard coming from the hall outside. n
%echo% @bLoud footsteps can be heard coming from the hall outside.@n
break
case 2
%echo% bThe sound of thunder echoes in from outside. n
%echo% @bThe sound of thunder echoes in from outside.@n
break
case 3
%echo% bA large book falls off the desk, hitting the floor with a loud thud. n
%echo% @bA large book falls off the desk, hitting the floor with a loud thud.@n
break
case 4
%echo% bTalking can be heard coming from outside the door. n
%echo% @bTalking can be heard coming from outside the door.@n
break
case 5
%echo% bThe sound of chirping birds flows in though the window. n
%echo% @bThe sound of chirping birds flows in though the window.@n
break
default
break