kyonshi/grenzland-mud
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Standardize on American spellings.

Browse Source 
Full internationalization would be much cooler, but that's never going
to happen.  Given that, this will at least prevent folks from constantly
having to look and switch between typing "armor" and "armour", depending
on which zone each item originated in, etc.

I could flip these either way, but a survey of the current state shows
that about 80% of the mixed cases use the American spellings, while 20%
use the British.  And, most words *only* exist in this data in their
American forms.  So, it seems the majority prefer these spellings.

In case anyone likes trivia:
* The most common mixed words in here were "armour" and "colour", each of
  which occured about half as often as "armor" and "color", respectively.
* The most British word in here was "theatre" (including other forms),
  which occured about twice as often as "theater".

This stanardizes all of these (and other forms of these same words):
* armour -> armor
* colour -> color
* favour -> favor
* honour -> honor
* civilise -> civilize
* centre -> center
* theatre -> theater
* defence -> defense
* offence -> offense
* realise -> realize
This commit is contained in:
Steaphan Greene
2019-11-24 11:52:22 -05:00
parent 2fba5240c1
commit 1f7c168121
145 changed files with 694 additions and 694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/world/trg/106.trg
View File

@@ -1,5 +1,5 @@
#10600
Armourer - 10634~
Armorer - 10634~
0 g 100
~
if %actor.is_pc%

4
lib/world/trg/11.trg
View File

@@ -1349,8 +1349,8 @@ new trigger~
test~
%echo% var is %var%
%echo% var2 is %var2%
%echo% coloured var is @Y%var%@n
%echo% colored var is @Y%var%@n
set col Y
%echo% var coloured var is %col%%var%@n
%echo% var colored var is %col%%var%@n
~
$~

8
lib/world/trg/118.trg
View File

@@ -340,7 +340,7 @@ break
done
~
#11814
(02) colouring message~
(02) coloring message~
0 gh 100
~
if %actor.is_pc%
@@ -485,7 +485,7 @@ if %object.vnum% == 11807
wait 1 s
say Yes, there is something I could write in that...
wait 1 s
say but would you do me a favour first?
say but would you do me a favor first?
wait 2 s
say My father keeps a little bird locked away...
wait 2 s
@@ -847,7 +847,7 @@ if %object.vnum% == 11807
wait 3 s
emote turns his attention back to the twirling journal.
wait 2 s
say You do realise shadow-person... that this quest of yours will destroy me?
say You do realize shadow-person... that this quest of yours will destroy me?
wait 3 s
say Indeed, not just myself, but all who dwell here.
wait 2 s
@@ -2604,7 +2604,7 @@ elseif %object.vnum% == 11807
remote zn118_scarreddone %actor.id%
wait 1 s
%load% obj 11868
say Do me one more favour?
say Do me one more favor?
wait 1 s
give book %actor.name%
drop book

30
lib/world/trg/19.trg
View File

@@ -770,7 +770,7 @@ dg_affect %actor% maxhit 100 24
dg_affect %actor% armor 20 24
%purge% %self%
else
%send% %actor% Try specifying the colour.
%send% %actor% Try specifying the color.
end
end
~
@@ -787,7 +787,7 @@ dg_affect %actor% maxmana 100 24
dg_affect %actor% wis 5 24
%purge% %self%
else
%send% %actor% Try specifying the colour.
%send% %actor% Try specifying the color.
end
end
~
@@ -804,7 +804,7 @@ dg_affect %actor% maxmove 100 24
dg_affect %actor% invis on 24
%purge% %self%
else
%send% %actor% Try specifying the colour.
%send% %actor% Try specifying the color.
end
end
~
@@ -971,18 +971,18 @@ tur~
*This trig is meant to be used as part of a trio (1954, 1960, 1961)
*This one is what gives you the finished product after tallying up
*all the ingredients.
*If everything has been done properly, a lovely coloured potion is
*If everything has been done properly, a lovely colored potion is
*the reward. Otherwise, you end up with nothing.. or a big mess ;)
**************
set product 1949
set colour colourless
set color colorless
if %actor.varexists(zn19_red1)%
rdelete zn19_red1 %actor.id%
if %actor.varexists(zn19_red2)%
rdelete zn19_red2 %actor.id%
if %actor.varexists(zn19_all)%
set product 1945
set colour red
set color red
end
end
end
@@ -992,7 +992,7 @@ if %actor.varexists(zn19_blue2)%
rdelete zn19_blue2 %actor.id%
if %actor.varexists(zn19_all)%
set product 1946
set colour blue
set color blue
end
end
end
@@ -1002,21 +1002,21 @@ if %actor.varexists(zn19_green2)%
rdelete zn19_green2 %actor.id%
if %actor.varexists(zn19_all)%
set product 1947
set colour green
set color green
end
end
end
if %actor.varexists(zn19_black)%
rdelete zn19_black %actor.id%
set product 1952
set colour black
set color black
end
eval in_bag %self.contents%
if %in_bag.vnum%==1949
%echo% A stream of %colour% fluid gushes out of the machine's nozzle into the empty vial.
%echo% A stream of %color% fluid gushes out of the machine's nozzle into the empty vial.
%load% obj %product%
else
%echo% A stream of %colour% fluid gushes out of the machine's nozzle and splashes all over the floor.
%echo% A stream of %color% fluid gushes out of the machine's nozzle and splashes all over the floor.
end
rdelete zn19_all %actor.id%
%load% obj 1948
@@ -1035,7 +1035,7 @@ dg_affect %actor% maxmove -50 24
dg_affect %actor% maxhit -50 24
%purge% %self%
else
%send% %actor% Try specifying the colour.
%send% %actor% Try specifying the color.
end
end
~
@@ -1415,8 +1415,8 @@ if fireworks /= %arg%
set col[5] M
set col[6] Y
set col[7] W
set colour %%col[%cx%]%%
eval colour %colour%
set color %%col[%cx%]%%
eval color %color%
eval sx %random.7%
set sou[1] an almighty bang
set sou[2] a piercing whistle
@@ -1427,7 +1427,7 @@ if fireworks /= %arg%
set sou[7] a shower of sparks
set sound %%sou[%sx%]%%
eval sound %sound%
%echo% With %sound%, a %colour% F I R E W O R K@n explodes into light.@n
%echo% With %sound%, a %color% F I R E W O R K@n explodes into light.@n
%purge% self
else
%send% %actor% Light what?

2
lib/world/trg/201.trg
View File

@@ -517,7 +517,7 @@ if (%arg%==aurorafall)
%echoaround% %actor% @W%actor.name% whirls @bO@Bc@Ce@Wa@Cn@Ba @bM@Be@Cr@Widia@Cn@Bu@bs@W around %actor.himher% creating @bf@Br@Co@Wzen illusions of the blade.@n
%send% %actor% @WYou whirl @bO@Bc@Ce@Wa@Cn@Ba @bM@Be@Cr@Widia@Cn@Bu@bs@W around you, creating @bf@Br@Co@Wsted illusions of the sacred blade.@n
wait 2 secs
%echo% @WThe surroundings @Dloose@W their colours as @bO@Bc@Ce@Wa@Cn@Ba @bM@Be@Cr@Widia@Cn@Bu@bs@W rapidly @Ddrains@W energy from them.@n
%echo% @WThe surroundings @Dloose@W their colors as @bO@Bc@Ce@Wa@Cn@Ba @bM@Be@Cr@Widia@Cn@Bu@bs@W rapidly @Ddrains@W energy from them.@n
wait 2 secs
if (%actor.fighting%)
if ((%victim.is_pc%))

8
lib/world/trg/27.trg
View File

@@ -586,7 +586,7 @@ end
%echo% @yAs the wrm collapses in death, one of its spines breaks off.@n
~
#2732
(2726) shard changes colour~
(2726) shard changes color~
1 g 100
~
wait 1 s
@@ -657,7 +657,7 @@ end
(2764) Deathtrap message~
2 g 100
~
%echo% You realise too late that only an empty chasm lies below. Plummeting faster and faster, you don't even have time to pray before you hit the ground!
%echo% You realize too late that only an empty chasm lies below. Plummeting faster and faster, you don't even have time to pray before you hit the ground!
wait 2 s
%purge%
eval person %self.people%
@@ -1265,13 +1265,13 @@ wait 5 s
say Shunned through fear and isolated from every other form of life, Nevim become bitter and angry, forces of destruction and causing much pain in an attempt to exorcise their own.
wait 1 s
elseif %room.vnum% == 2793
say The second wave brings forth the Denuo, the lesser beings, the second-born who live and die without changing form, colouring the lamen that flows through them but being entirely of miru.
say The second wave brings forth the Denuo, the lesser beings, the second-born who live and die without changing form, coloring the lamen that flows through them but being entirely of miru.
wait 3 s
say The Khan'li, the Dynar, and myself of Memlin kind, are all examples of Denuo life.
elseif %room.vnum% == 2794
say Khan'li embrace the darkness of night and the heat of summer, inheriting through their forebearer Cui a kinship with fire, which they are not harmed by, though simple water acts like acid on their skin.
wait 4 s
say Black and red are their colours and they enjoy sharp points, reflective surfaces for their inclination to repel light and singular works of beauty, believing themselves superior as the firstborn.
say Black and red are their colors and they enjoy sharp points, reflective surfaces for their inclination to repel light and singular works of beauty, believing themselves superior as the firstborn.
wait 4 s
say They live mainly underground or in caves, seeking to escape the occasional rains and sculpting their showy palaces into mountains.
wait 3 s

4
lib/world/trg/3.trg
View File

@@ -212,14 +212,14 @@ if %actor.level% < 30
return 0
%send% %actor% The Staff of Sanctum whispers: I will not serve you!
%echoaround% %actor% The Staff of Sanctum exclaims: 'I will not serve
those without honour.'
those without honor.'
%purge% self
else
wait 1s
%send% %actor% The Staff of Sanctum whispers: I was made to serve,
great one!
%echoaround% %actor% The Staff of Sanctus exclaims: 'I will serve you
honourable one.'
honorable one.'
end
~
#314