changeset 1112:b80d263baf9f

Sync.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 02 Jul 2011 18:04:36 +0300
parents 2429d6666c07
children 243867ec3300
files www/index.php www/loc.php www/wizards.txt
diffstat 3 files changed, 135 insertions(+), 78 deletions(-) [+]
line wrap: on
line diff
--- a/www/index.php	Sat Jul 02 17:59:30 2011 +0300
+++ b/www/index.php	Sat Jul 02 18:04:36 2011 +0300
@@ -69,7 +69,6 @@
 ?>
 <h1><? echo $pageTitle; ?></h1>
 
-
 <div id="intro">
 Maps and information about <a href="http://www.bat.org/">BatMUD realm</a>, including
 maps of the continents, some areas and cities. As an alternative for the continent maps,
--- a/www/loc.php	Sat Jul 02 17:59:30 2011 +0300
+++ b/www/loc.php	Sat Jul 02 18:04:36 2011 +0300
@@ -3,6 +3,17 @@
 require "common.inc.php";
 
 
+// Wizard info box special formatting tags
+$specTags = array(
+  "b"     => "<b>",
+  "\/b"   => "</b>",
+  "i"     => "<i>",
+  "\/i"   => "</i>",
+  "p"     => "<br /><br />",
+  "br"    => "<br />",
+);
+
+
 function printTitleLink($afilter, $filter, $coders, $desc, $qname, $qclass)
 {
   $s = "";
@@ -140,27 +151,35 @@
 </div>
 
 <?
-/* Coder/creator information box
+/* Wizard/coder/creator information box
  */
 if (isset($coderName) && isset($wizTable[$coderName]) && count($wizTable[$coderName]) > 1) {
-  
+
+  // Profile picture  
   $s = $wizTable[$coderName]["imageURL"];
   if (isset($s)) {
     if (substr($s, 0, 6) == "bat://")
       $s = "img/unknown.png";
   } else
     $s = "img/unknown.png";
-  
+
   echo "<div class=\"wizinfo\">\n <table>\n  <tr>\n".
   "   <td class=\"img\"><img src=\"".$s."\" alt=\"".$coderName."\" /></td>\n".
   "   <td class=\"info\">\n".
   "    <h2>".$coderName."</h2>\n";
 
+  // Description block
   $s = $wizTable[$coderName]["desc"];
   if (isset($s)) {
+    $s = preg_replace("/\~([A-Z][a-z]+)\~/i", "<a href=\"".$_SERVER["PHP_SELF"]."?a=\${1}\">\${1}</a>", $s);
+
+    foreach ($specTags as $tag => $rep)
+      $s = preg_replace("/\[".$tag."\]/i", $rep, $s);
+
     echo "    <p>".$s."</p>\n";
   }
 
+  // Links, etc.
   echo "    [<a href=\"".fingerURL($coderName)."\">Finger</a>]\n";
 
   $s = $wizTable[$coderName]["homeURL"];
--- a/www/wizards.txt	Sat Jul 02 17:59:30 2011 +0300
+++ b/www/wizards.txt	Sat Jul 02 18:04:36 2011 +0300
@@ -2,7 +2,7 @@
 # name;[http://homepageURL|bat];[http://pictureURL];freeform description$
 Darol;bat;img/darol.jpg;
 	The funniest wizard in BatMUD .. at least in his own mind.
-	<b>No, really! He is funny.</b>
+	[b]No, really! He is funny.[/b]
 	The most notable of Darol's works so far is the Ancona manor,
 	but he has contributed to different kinds of smaller projects
 	as well. Amongst the fellow wizards he is known for his
@@ -13,7 +13,7 @@
 	The kinky wizard from Germany, the land of beer and bratwurst,
 	und lederhosen. His known work includes sub-areas in the
 	Valley of the Kings, such as the ship in Sesmia and Liscom's tower.
-	<br /><br />
+	[p]
 	It is also rumoured that he is working on a new secret project (a
 	guild)...
 	$
@@ -27,35 +27,39 @@
 Juggelo;;img/juggelo.jpg;
 	During his wizardly career, mr. Juggelo has been a real all-around
 	handyman. His contributions include coding the feared eq-monster,
-	<b>ancient beholder Gou'ljeg</b>; working on maintaining areas and
+	[b]ancient beholder Gou'ljeg[/b]; working on maintaining areas and
 	monsters; working on the mudlib, fixing bugs, recoding, etc.
-	<i>He has probably touched the code of almost every single eq-monster
-	in the game</i>. He is also known for making several well-known tunes
+	[i]He has probably touched the code of almost every single eq-monster
+	in the game[/i]. He is also known for making several well-known tunes
 	(for example the race-tune of 2006), usually related to maintaining
-	game balance.<br /><br />
+	game balance.[p]
 
 	He ascended to archwizardhood in May 2007.$
 
 Shinarae;;img/shinarae.jpg;
-	Archwizard with several areas <i>(many of them, like Wildspace and Drow Tower,
-	are not directly accessible from outworld)</i>, of which some are interconnected
-	thematically, or at least loosely through the master thief
-	Trilloch's story. His areas and monsters are rich in diversity
-	and content, both characteristics they are often either
-	loved or hated for. Ascended to archwizardhood with Shardik
-	in 2005. Main author of following major (single-shot) game events in BatMUD:
+	Archwizard with several areas [i](many of them, like Wildspace and
+	Drow Tower, are not directly accessible from outworld)[/i], of which
+	some are interconnected thematically, or at least loosely through
+	the master thief Trilloch's story. His areas and monsters are rich
+	in diversity and content, both characteristics they are often either
+	loved or hated for. Ascended to archwizardhood with ~Shardik~
+	in 2005. Main author of following major (one-shot) game events in BatMUD:
 	<ul>
 	<li>Arelium Invasion (2007)</li>
 	<li>Crimson Moon, coming of demon Kurenakuma (2009)</li>
+	<li>Blitzkrieg event (early 2010)</li>
+	<li>Halloween event 2010 aka "Redfang event"</li>
+	<li>Shinarae has also often ran various special un-named one-shot events
+	during April's Fool's day etc.</li>
 	</ul>
-	Tarken interviewed Shinarae in 2006,
+	~Tarken~ interviewed Shinarae in 2006,
 	<a href="http://www.maroon.com/bat/interviews/shinarae.asp">read
 	it</a> for many interesting insights into his mysterious world,
-	and the origins of <b>Trilloch</b> himself.
+	and the origins of [b]Trilloch[/b] himself.
 	$
 
 Zin;bat;img/zin.jpg;
-	Feared, hated and loved, <b>Zin</b> is one of the grand archwizards of the
+	Feared, hated and loved, [b]Zin[/b] is one of the grand archwizards of the
 	realm. His contributions include areas and the whole new Nun
 	guild (Sisters of Las), and the related quests/tasks.$
 
@@ -69,8 +73,11 @@
 	rocking the BatWorld as immortal. His first finished project
 	was "Small Meadow" area with G'naa'Byeh in 2007. Several
 	industry analysts consider G'naa'Byeh to be one of the most
-	annoying eq-monsters in the game.<br /><br />
-	<b>Remorted in December 2008, so Kukkonen Tykittää again!</b>
+	annoying eq-monsters in the game.
+	[p]
+	[b]Remorted in December 2008, so Kukkonen Tykittää again![/b]
+	[p]
+	Maintainership of his code seems to have been taken up by ~Darol~.
 	$
 
 Favorit;bat;img/favorit.jpg;
@@ -78,7 +85,7 @@
 	has worked mostly on non-game elements ever since. His best
 	known works include the improved news reader, exp-leecher
 	and Capture the Flag events. He ascended to archwizardhood
-	in October 2006.<br /><br />
+	in October 2006.[p]
 	Dryad did an in-depth interview with Favorit in 2005,
 	<a href="http://www.maroon.com/bat/interviews/favorit.asp">read
 	it</a> for some additional musings.$
@@ -86,10 +93,10 @@
 Durand;bat;img/durand.jpg;
 	Durand likes to eat torches, and prefers them lit before
 	consumption. Rumours tell that his other favourite snack is
-	<b>cookies</b> of various kinds.<br /><br />
+	[b]cookies[/b] of various kinds.[p]
 	Bat-wise Durand's contributions include one of the
-	"ultimate" eq-monsters in game, <b>Tiamat, the Chromatic Dragon</b>
-	(coded with Tormac). His current work mainly involves
+	"ultimate" eq-monsters in game, [b]Tiamat, the Chromatic Dragon[/b]
+	(coded with ~Tormac~). His current work mainly involves
 	system maintenance of BatMUD servers. Sometimes he
 	fixes bugs and codes nice things like BatURL.
 	$
@@ -99,7 +106,7 @@
 	the rainbow and EP-eater events and the blog command. He also acted
 	as a leading architect in creation of Valley of the Kings,
 	one of the biggest areas in game.
-	<br /><br />
+	[p]
 	He also personally claims to have coded Durand.
 	$
 
@@ -117,8 +124,8 @@
 	herbs and animals (for organs) - very useful feature for
 	alchemists all around! Regrettably she has been busy with real life
 	lately, but has two areas "in the making", so stay tuned.
-	<br /><br />
-	Tarken interviewed Kitsune in 2006, <a
+	[p]
+	~Tarken~ interviewed Kitsune in 2006, <a
 	href="http://www.maroon.com/bat/interviews/kitsune.asp">read about
 	it</a> on Dryad's site.
 	$
@@ -129,22 +136,22 @@
 	the new sailor guilds and ships in general being just one part of
 	his repertoire. Besides those, he is also the mastermind behind
 	shipquests, though some of the work was delegated to other wizards
-	(Malack, Hablo, etc.)<br /><br />
+	(Malack, Hablo, etc.)[p]
 	Last, but certainly not least, we should mention his involvement
-	with the great continent tune, which moved us into the <b>Age of
-	Exiles</b>. Melemkor was the major architect behind this major change,
+	with the great continent tune, which moved us into the [b]Age of
+	Exiles[/b]. Melemkor was the major architect behind this major change,
 	although many other wizards also worked on the new content.
-	<br /><br />
-	Melemkor speaks: <i>"Thanks for playing :) Some of my projects have been really
+	[p]
+	Melemkor speaks: [i]"Thanks for playing :) Some of my projects have been really
 	popular, others have had decidedly mixed opinions; I hope things
 	have generally worked out well, but it's always keeping things exciting
-	for the players that keeps me coding."</i>.
+	for the players that keeps me coding."[/i].
 	$
 
 Noctur;;img/noctur.jpg;
-	<b>Noctur! This wizard originating from Finland, but often living
+	[b]Noctur! This wizard originating from Finland, but often living
 	abroad, brings light to our days - and every single
-	time he is on-line, happiness fills our hearts!</b> Seriously speaking,
+	time he is on-line, happiness fills our hearts![/b] Seriously speaking,
 	Noctur has contributed areas, and designed perhaps few of the most visible
 	things in current BatWorld: terrain maps of Desolathya, Lucentium,
 	Furnachia and half of Rothikgen. He also wrote the background lore and
@@ -156,11 +163,11 @@
 	quickly by working on countless problems, fixing bugs, and
 	also creating new content. He is known to maintain the new
 	city code (used in New Rilynttar, Arelium, etc.) with Dralith.
-	<br /><br />
+	[p]
 	Ascended to archwizardhood in 14th of August, 2008.
-	<br /><br />
+	[p]
 	(fsay) You quack 'haluaakos Ulathi sanoa j&auml;lkipolville jotain hienoa
-	arkkiutumisensa johdosta?'<br />
+	arkkiutumisensa johdosta?'[br]
 	(fsay) Ulath exclaims 'Profit!'
 	$
 
@@ -174,10 +181,10 @@
 
 Jaf;http://www.jafdif.com/;img/jaf.jpg;
 	Janne Fr&ouml;sen, the Creator of BatMUD and one of the BatMUD's
-	"God"-level wizards. <b>Jaf started development of BatMUD for a
-	school project and it was opened in April 14th 1990</b>. He has not been
+	"God"-level wizards. [b]Jaf started development of BatMUD for a
+	school project and it was opened in April 14th 1990[/b]. He has not been
 	active in Bat for many, many years, and practically none of his code
-	has survived after 17 years.<br /><br />
+	has survived after 17 years.[p]
 
 	(An incomplete history of BatMUD describes what has happened since
 	the beginning is available on Ggr's mirror of the old bat.org page,
@@ -201,7 +208,7 @@
 
 Zoso;bat;;
 	His best known work includes Caverns of the Undying (aka "Tunnel")
-	area, which has also been expanded by Merri.<br /><br />
+	area, which has also been expanded by Merri.[p]
 	Ramjett interviewed Zoso in 2006,
 	<a href="http://www.maroon.com/bat/interviews/zoso.asp">read it</a>
 	for fun and profit!
@@ -212,11 +219,11 @@
 	Creator of the feared Great Northern Swamps aka Zonni Swamp and
 	the infamous eq-monster Burglefloogah.
 	Was known for his unparalled cruelty towards players, in the
-	<i>good old times</i>. Was demoted to Avatar in 2008 by joint decision
-	of the archwizards.<br /><br />
-	<b>Mon Oct 13 12:01:40 2008 [general] by Gore</b><br />
-	<i>The cosmic vortex shifts, and an old god who had recently awoken
-	from its slumber has lost its power.</i>
+	[i]good old times[/i]. Was demoted to Avatar in 2008 by joint decision
+	of the archwizards.[p]
+	[b]Mon Oct 13 12:01:40 2008 [general] by Gore[/b][br]
+	[i]The cosmic vortex shifts, and an old god who had recently awoken
+	from its slumber has lost its power.[/i]
 	$
 
 Dazzt;bat;bat://album90/aax.sized.jpg;
@@ -235,7 +242,7 @@
 Neth;;img/neth.jpg;
 	Mr. Neth is mostly concentrating on producing new areas for newbies
 	and harder/more difficult content for high-end of the playerbase.
-	Working as an unofficial co-op development team with <b>Enandor</b>.
+	Working as an unofficial co-op development team with [b]Enandor[/b].
 	$
 
 Souc;bat;img/souc.jpg;
@@ -243,22 +250,27 @@
 	most of which are currently (since late 2006) not in the game.
 	It has been mentioned, that the areas will be back "soon".
 	Souc has also authored events (hiking) and commands.
-	<br /><br />
+	[p]
 	List of the areas not reinstated (as of July 2008):
-	<b>Nishapur</b> (based on a book), <b>Frog Pond</b>,
-	<b>Rudraprayag</b> (home of LQ42, based on a book) and
-	<b>Refuse Dump</b> (expanded by Henri in 2003).
+	[b]Nishapur[/b] (based on a book), [b]Frog Pond[/b],
+	[b]Rudraprayag[/b] (home of LQ42, based on a book) and
+	[b]Refuse Dump[/b] (expanded by Henri in 2003).
 	$
 
-Corto;bat;;
+Corto;;img/corto.jpg;
 	One of the regular adjusters of saato+ during his mortal career.
 	Was known as Mudax for most of his pre-immort mortal career.
-	Created one area during his wizardhood until remorting.<br /><br />
-	<b>Sun Sep 27 19:21:38 2009 [general] by Ulath</b><br />
+	Created one area during his wizardhood until remorting.
+	[p]
+	[b]Sun Sep 27 19:21:38 2009 [general] by Ulath[/b][br]
 	In a huge cloud of flatulence, Corto disappears. Where he went,
 	nobody knows. So long, and thanks for all the area... er, fish.
 	$
 
+Ens;;;
+	
+	$
+
 
 ############################# WIP ################################
 
@@ -284,9 +296,9 @@
 	Among other things he has coded LQ46 (Master Hunter) and
 	area quest "Spirits of vengeance", but has also created
 	two guilds and many areas of very high quality.
-	<br /><br/>
-	He also obviously likes bunnies, which, as we all know, is a good
-	thing.
+	[br]<br/>
+	He also obviously likes bunnies, which, as we all know,
+	[b]is a good thing[/b].
 	$
 
 Malar;bat;bat://album78/aav.sized.jpg;
@@ -295,21 +307,21 @@
 	presence event (Nora), fishing extravaganza event, 'wear replacing'
 	command, and the old eq restore room in Arelium (not in use
 	anymore).
-	<br /><br />
+	[p]
 	Check out his wizard homepage for more information.
 	$
 
 Aarugotti;;;
-	Level 200 archwizard. <b>Passed away on Monday, March 13th of 2000
-	at his home.</b> May he rest in peace.$
+	Level 200 archwizard. [b]Passed away on Monday, March 13th of 2000
+	at his home.[/b] May he rest in peace.$
 
 Bj;;;
 	Original coder of the Shrine Search quest (LQ 41) and Unholy Cathedral area.
-	<i>Has passed away, may he rest in peace.</i>
-	<br /><br />
-	<b>Bj is a level 43 Angel (wizard).</b><br />
-	He was created before 1997 and he is 73d, 21h, 41min and 2s old.<br />
-	He was last on Sun Feb 08 04:05:11 1998 (9y, 138d, 20h and 28s ago).<br />
+	[i]Has passed away, may he rest in peace.[/i]
+	[p]
+	[b]Bj is a level 43 Angel (wizard).[/b][br]
+	He was created before 1997 and he is 73d, 21h, 41min and 2s old.[br]
+	He was last on Sun Feb 08 04:05:11 1998 (9y, 138d, 20h and 28s ago).[br]
 	$
 
 Anipa;;;
@@ -337,7 +349,7 @@
 #Mandrake;;bat://fdsa;$
 
 Enandor;;;
-	Working as an unofficial co-op development team with <b>Neth</b>.
+	Working as an unofficial co-op development team with [b]Neth[/b].
 	$
 
 Hackop;;img/hackop.jpg;
@@ -353,8 +365,9 @@
 
 Plura;;;
 	The first swedish archwizard and coder of the well-known classic area,
-	"Plura's Castle".<br /><br />
-	<b>UUHUHSSCCAARYY!!! UUHHH!! AHRRUHH!!</b>
+	"Plura's Castle".
+	[p]
+	[b]UUHUHSSCCAARYY!!! UUHHH!! AHRRUHH!![/b]
 	$
 
 Era;bat;img/era.jpg;
@@ -371,7 +384,7 @@
 
 Marlor;;;Original coder of Stifsim, the elemental wyrm.$
 
-Gem;;;Mudmarried to Jaf, the creator of BatMUD. Was supposedly married to <b>Franco</b> in real life
+Gem;;;Mudmarried to Jaf, the creator of BatMUD. Was supposedly married to [b]Franco[/b] in real life
 	(help rumors).$
 
 Coren;bat;;Tastes good, try 'lick coren' for that sugary flavour!$
@@ -401,11 +414,12 @@
 	driving forces behind completing the conversion in 1996. He left bat
 	short after the conversion, because of all the whines."$
 
-Saruman;;;Original coder of the Wrebie forest, which was finished 1998 by Souc
-	and re-coded again by Grizzt in 2010.$
+Saruman;;;
+	Original coder of the Wrebie forest, which was finished 1998 by
+	~Souc~ and re-coded again by ~Grizzt~ in 2010.$
 
 Ramjett;bat;;Immorted 6 Dec 2006, coded one area and one event (Dragon
-	Attack, with Hackop). Remorted in early 2009.$
+	Attack, with ~Hackop~). Remorted in early 2009.$
 
 Nerya;bat;img/nerya.jpg;Nerya. The Name. The Man. The Legend. His finished
 	projects include in-game news RSS-feed generator and many delicious
@@ -414,7 +428,6 @@
 
 Malack;;;Coded the player quests system.$
 
-Grizzt;;;$
 
 Ooga;;;One of the most feared pirates on Bat-seas as a mortal, he
 	appropriately works on ship code and related things as a wizard.$
@@ -423,7 +436,34 @@
 	immorted in September 2010 and has since worked on game-balance issues,
 	minor tunes and improvements.$
 
-Tarken;bat;;$
+Grizzt;bat;;
+	One of the quiet codeslaves who work in the shadows, Grizzt's
+	work for the greater good of BatMUD has gone mostly unknown to the
+	general public.
+	[p]
+	As a notable exception to the rule, he did the recoding of ~Saruman~'s
+	popular old area "Wrebies".
+	$
+
+Tarken;;;
+	Known as a "trigger-master" and "Tarken the robot" as mortal,
+	Tarken was practically forced to wizardhood to pay for his
+	sins as a cheater. But as they say, good cheaters make the
+	best wizards...
+	[p]
+	During his wizardly career Tarken has worked on the usual
+	bugfixes, but has mainly concentrated on improving ship code.
+	He is also (as of July 2011) responsible for the Nergal subguild
+	of Lords of Chaos.
+	$
+
+Moss;;;
+	$
+
+Seance;;;
+	Original coder of the area complex collectively known as "Seance's",
+	aka Foul's Creche + Guard's Gap + Seance's platform + Kevin's watch
+	+ Mithil Stonedown + Revelstone + Urvile tree/Woodhelven.$
 
 ####################################################################
 Arakorni;;;$
@@ -483,7 +523,6 @@
 Sarku;;;$
 Scarlet;;;$
 Scrounge;;;$
-Seance;;;$
 Serje;;;$
 Shades;;;$
 Shadowjack;;;$