Mercurial > hg > batmud > maputils

changeset 2788:91dfafad1c33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 26 Mar 2024 13:23:46 +0200
parents b58f261314f8 (current diff) 9626cbbc9238 (diff)
children 21ded4483c60
files
diffstat 5 files changed, 24 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/misc/dortlewall.loc	Tue Mar 26 13:23:36 2024 +0200
+++ b/misc/dortlewall.loc	Tue Mar 26 13:23:46 2024 +0200
@@ -2,17 +2,17 @@
 # Refer to README.loc for more information.
 #
 9	; 6	; 0	;Barracks;;;;
-11	; 6	; 0	;Northern gatehouse;;;;
-16	; 6	; 0	;Ivory tower;;;;
+11	; 6	; 0	;Northern gatehouse|Dawnmist the dryad|tutorial portal;;;;
+16	; 6	; 0	;Ivory tower|Tayrien the wizard;;;;
 13	; 8	; 0	;Healer's shrine;;;;
 15	; 8	; 0	;Monastery of Aeo;;;;
-6	; 10	; 0	;Guildhouse - Houses;;;;
-9	; 10	; 0	;Guildhouse - Main entrance;;;;
-6	; 12	; 0	;Western gatehouse;;;;
+6	; 10	; 0	;Guildhouse west entrance;;;;
+9	; 10	; 0	;Guildhouse south entrance|advguild|quest room / Ileana Constantia|race shrine portal|Damogran portal|House joining room;;;;
+6	; 12	; 0	;Western gatehouse|tutorial portal;;;;
 12	; 13	; 0	;Halls of the duke of Dortlewall;;;;
-8	; 14	; 0S	;Weapon store;;;;
-8	; 16	; 0S	;Armour store;;;;
+8	; 14	; 0S	;Weapon store|Ionel Casom;;;;
+8	; 16	; 0S	;Armour store|Dragos Skald;;;;
 12	; 17	; 2C	;Bank of Dortlewall;;;;
-8	; 18	; 0S	;General store;;;;
+8	; 18	; 0S	;General store|Hirbar Tordugan;;;;
 12	; 19	; 0S	;Crystite trading post;;;;
-10	; 20	; 0S	;Last Keg Inn;;;;
+10	; 20	; 0S	;Last Keg Inn|Bargo, the innkeeper;;;;
--- a/world/laenor.loc	Tue Mar 26 13:23:36 2024 +0200
+++ b/world/laenor.loc	Tue Mar 26 13:23:46 2024 +0200
@@ -1,7 +1,7 @@
 # MapUtils LOC file (version 4.1)
 # Refer to README.loc for more information.
 #
-365	; 471	; 0c	;@Arelium;Blasterr,Gore,Melemkor;#07.12.2006;https://tnsp.org/maps/arelium.html;Main city of Laenor. AQ "Quest Room", AQ "City Tour", AQ "Visit", AQ "View Artwork", AQ "Kitty", LQ19 "Sewer ring", LQ20 "Register", LQ21 "Rules 101", LQ25 "Roulette", LQ31 "Gong" and AQ "Robbery in Moonlight".
+365	; 471	; 0c	;@Arelium;Blasterr,Gore,Melemkor;#07.12.2006;https://tnsp.org/maps/arelium.html;Main city of Laenor. AQ "Quest Room", AQ "City Tour", AQ "Visit", AQ "View Artwork", AQ "Kitty", LQ19 "Sewer ring", LQ20 "Register", LQ21 "Rules 101", LQ25 "Roulette", LQ31 "Gong", AQ "Robbery in Moonlight" and AQ "Folklorist road trip".
 580	; 379	; 1?	;@Dortlewall;@Heidel,Darol;!08.03.2014;;The starting area of new players. Crystite mine part is level limited to lvl40. AQ "It's a drill" and AQ "Dortlewall town patrol".
 594	; 367	; 0?	;@Mountaineer cottage;@Darol;!29.03.2014;;
 339	; 494	; 2c	;Pleasantville|@Newbie Village;@Pahvi,@Shardik,Dralith;!04.02.2003;;Access is limited to a definition of "new player" only, except on first day of the RL month.
@@ -76,9 +76,9 @@
 542	; 509	; 0?	;@Kender Mansion;@Zhaman;?25.10.2004;;
 459	; 533	; 0?	;@School of Lumine;@Heidel;!05.12.2007;;Soft level limited to lvl55 by a blocking monster. AQ "Rescue Hannah's parents".
 319	; 462	; 2?	;@Old Oak Forest;@Malar;!02.01.2008;;LQ21 "Help the hobbit".
-228	; 476	; 2?	;@Conifer Forest;@Neth;!07.01.2008;;Level limited to lvl50. LQ19 "Acquire Documents".
+228	; 476	; 2?	;@Conifer Forest;@Neth;!07.01.2008;;Level limited to lvl50. LQ19 "Acquire documents".
 524	; 606	; 2?	;@Beastlands;@Malar;!06.06.2003;;LQ23 "Help Liezeb".
-516	; 585	; 2?	;Village of Stouby|@Stouby;@Heidel;!09.08.2008;;Level limited to lvl50. LQ32 "Wicked Witch".
+516	; 585	; 2?	;Village of Stouby|@Stouby;@Heidel;!09.08.2008;;Level limited to lvl50. LQ32 "Wicked witch".
 489	; 303	; 2?P	;wihne+|@Wihne+ ss;;;;
 596	; 411	; 2?	;@Tyr Farwyn;@Heidel,@Gurth;!29.01.2009;https://tnsp.org/maps/tyr_farwyn.html;AQ "Moonlight Murders", AQ "Competing architects".
 264	; 408	; 2?	;Wrecked ship hull|@Landfall;@Melemkor;!07.12.2006;;Starting location of Age of Exiles.
@@ -92,7 +92,7 @@
 613	; 410	; 0?	;@Iron mine|Mines of Tyr Farwyn|Mountain passage tunnel;@Ggr;!20.02.2012;;Contains AQ "Rescue the bunny".
 613	; 414	; 0-	;Iron mine (south entrance);@Ggr;!23.02.2012;;
 614	; 634	; 0	;@Sewers of Silverfang|Norgak;@Sirdar;!03.05.2015;;AQ "Find Norgak"
-273	; 406	; 1c	;@Vendace Shore;@Heidel;!16.10.2015;https://tnsp.org/maps/vendace_shore.html;AQ "Vendace Shore"
+273	; 406	; 1c	;@Vendace Shore;@Heidel;!16.10.2015;https://tnsp.org/maps/vendace_shore.html;AQ "Vendace Shore".
 633	; 355	; 1?	;@Fulgurite shop;@Heidel;!03.10.2017;;
 321	; 483	; 1?	;@Gallery cave;@Nosunrise;!14.07.2023;;LQ100 "The puzzle of life".
 712	; 60	; 1?	;@Northrend;@Darol;!11.09.2023;;LQ33 "Northern raiders"
--- a/world/rothikgen.loc	Tue Mar 26 13:23:36 2024 +0200
+++ b/world/rothikgen.loc	Tue Mar 26 13:23:46 2024 +0200
@@ -14,7 +14,7 @@
 213	; 124	; 0	;@Abandoned study;@Blasterr;30.01.2006;;
 233	; 128	; 3	;@Cevi village;@Fizzl;?06.10.2002;;
 277	; 131	; 0	;Barbarian arena|@Barb guild event area;@Runeaxe;?23.01.2002;;
-227	; 139	; 0	;@Campsite;@Malitrius;?10.12.1998;;
+227	; 139	; 1	;@Campsite;@Malitrius;?10.12.1998;;
 158	; 147	; 0	;Snow Peaked Mountain|@Snowy peak;@Alannah,Alaron;?30.03.1996;;
 220	; 148	; 0	;King Eowyn's Land|@Knights & Dragons;@Zin;?23.06.1998;;LQ37 "Save the princess Daisy". (Has reputation of being one of the most annoying low level LQs in game.)
 306	; 161	; 0	;@Dark Forest;@Cyberman;04.08.1996;;AQ "IT's dog". Very loosely based on Stephen King's book "IT".
@@ -204,7 +204,7 @@
 262	; 160	; 1C	;Darkvale;;;;
 405	; 214	; 0C	;Thalarion;;22.02.2013;;
 236	; 243	; 1C	;Deimos;;30.03.2013;;
-244	; 140	; 1C	;Nitroplut;;;;
+244	; 140	; 0C	;Nitroplut;;;;
 282	; 207	; 0C	;Batdiamondinc;;;;
 227	; 329	; 0C	;Valgerville;;20.08.2015;;
 37	; 397	; 0C	;Phatt;;27.09.2018;;
--- a/world/special.loc	Tue Mar 26 13:23:36 2024 +0200
+++ b/world/special.loc	Tue Mar 26 13:23:46 2024 +0200
@@ -11,7 +11,7 @@
 10	; 2	; 0?	;@Arelium clocktower;@Blowfish,!Badger;?18.03.1996;;Located in Arelium. Probably even older than early 1996.
 10	; 3	; 0?	;The Rusty Shield Bar;@Hablo;;;Located in Arelium.
 10	; 4	; 0?	;Arelium sewers;;?02.01.1993;;Located in Arelium. LQ19 "Sewer Ring". Originally BatCity sewers, very old area.
-10	; 5	; 0G?	;Folklorist|The School of Folklorists;@Heidel;;;Located in Arelium. AQ "Folklorist road trip".
+10	; 5	; 0G?	;Folklorist|The School of Folklorists;@Heidel;;;Located in Arelium.
 10	; 6	; 0G?	;Mage|Mage main guild;Juggelo,Lampsa;;;Located in Arelium.
 10	; 7	; 0G?	;Infizinity|Tower of Infizinity;@Zin;;;Located in Arelium.
 10	; 8	; 0G?	;Civilized fighters|Civfighters;@Shardik;;;Located in Arelium.
--- a/www/wizards.txt	Tue Mar 26 13:23:36 2024 +0200
+++ b/www/wizards.txt	Tue Mar 26 13:23:46 2024 +0200
@@ -429,7 +429,7 @@
 	[p]
 	Juggelo ascended to archwizardhood in May 2007.
 	[p]
-	He was the secretary and vice-chairman of the <a
+	He served as the secretary and vice-chairman of the <a
 	href="http://www.bat.org/batry">Balanced Alternative Techniques ry
 	("B.A.T. ry") board</a>.
 	[p]
@@ -975,5 +975,12 @@
 Well;;;;$
 Zamphyr;;;;$
 
+Skull;;;;$
+Legolas;;;;$
+Chrime;;;;$
+Accolon;;;;$
+Vyper;;;;$
+Whizz;;;;$
+
 #########################################################