Removed aria's devnpc and fixed typo in map_athena.conf

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@15 54d463be-8e91-2dee-dedb-b68131a5f0ec

3 files changed, 4 insertions, 92 deletions

diff --git a/Changelog.txt b/Changelog.txt
index a732c3ae6..c6b8ce63b 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,8 @@
 Date	Added

 

+11/05

+	* Fixed committed typo in map_athena.conf, remove aria's dev npc (was giving errors preventing server startup). [Valaris]

+

 11/04

 	* Added sara-chan's packet db with support for 11-1 [Valaris]

 	* [alot of files >_<]: Changed connecting a bit, from oA source; it connected easier/better in my opinion so... [Codemaster]

diff --git a/conf-tmpl/map_athena.conf b/conf-tmpl/map_athena.conf
index 7e4cabb04..0769aef9b 100644
--- a/conf-tmpl/map_athena.conf
+++ b/conf-tmpl/map_athena.conf
@@ -273,7 +273,7 @@ npc: npc/kafras/kafras_new.txt
 

 

 //---------------------------- Events --------------------------------

-npc: ncp/events/easter.txt

+npc: npc/events/easter.txt

 //npc: npc/events/valentinesday.txt

 //npc: npc/events/alchemist.txt

 //npc: npc/events/twintowers.txt

diff --git a/npc/other/devnpc.txt b/npc/other/devnpc.txt
index 15390e671..4a06cfcdd 100644
--- a/npc/other/devnpc.txt
+++ b/npc/other/devnpc.txt
@@ -16,97 +16,6 @@
 //= he has no biography

 //============================================================ 

 

-// Aria =========================================================>\\

-prontera.gat,156,179,4	script	Aria	805,{

- 	npcspeed 150;

-	announce "Your wedding has been cancelled.",3;

-	npctalk strcharinfo(0)+ " , you suck.";

-	mes "[Aria]";

-	mes "Okay, I'm Evera's brother, Aria!";

-	mes "^FF00FFReal Name^000000: Brandon";

-	mes "^FF00FFAge^000000: 13 Years";

-	mes "^FF00FFWhere I live^000000: Near Los Angeles, California";

-	next;

-	mes "[Aria]";

-	mes "^FF00FFWhat I Do^000000: NPCs and Graphics! =D";

-	mes "^FF00FFWhy I'm here^000000: Cuz of Evera =o";

-	next;

-	mes "[Aria]";

-	mes "Anyway, here. I get to talk about myself now!";

-	mes "I'm from California, and I wub MMORPGS";

-	mes "So yeah that's it. GO EA!";

- 	initnpctimer;

-	close;

- OnTimer15000:

-	npcwalkto 150+rand(17),169+rand(16);

-	setnpctimer 0;

-

-Lariatalk:

-	set $ariatalk,rand(10);

-	if($ariatalk == 0) goto Lquote0;

-	if($ariatalk == 1) goto Lquote1;

-	if($ariatalk == 2) goto Lquote2;

-	if($ariatalk == 3) goto Lquote3;

-	if($ariatalk == 4) goto Lquote4;

-	if($ariatalk == 5) goto Lquote5;

-	if($ariatalk == 6) goto Lquote6;

-	if($ariatalk == 7) goto Lquote7;

-	if($ariatalk == 8) goto Lquote8;

-	if($ariatalk == 9) goto Lquote9;

-	if($ariatalk == 10) goto Lquote10;

-	goto Lariatalk;

-

-Lquote0:

-	npctalk "OMGWTFBBQ";

-	setnpctimer 0;

-	break;

-Lquote1:

-	npctalk "So its u -> 0";

-	timer 500;

-	npctalk "... That did not look right";

-	setnpctimer 0;

-	break;

-Lquote2:

-	npctalk "OMGITSJEEBUS!#!@%!";

-	setnpctimer 0;

-	break;

-Lquote3:

-	npctalk "Evera died. I guess.";

-	setnpctimer 0;

-	break;

-Lquote4:

-	npctalk "I CLICK THE BUTTON AND THEY DON'T DIE!";

-	setnpctimer 0;

-	break;

-Lquote5:

-	npctalk "RO? wtf?";

-	timer 500;

-	npctalk "Oh yeah.";

-	setnpctimer 0;

-	break;

-Lquote6:

-	npctalk "omgnoob. DIE!";

-	setnpctimer 0;

-	break;

-Lquote7:

-	npctalk "WooT!";

-	setnpctimer 0;

-	break;

-Lquote8:

-	npctalk "(I'm not here, so ignore me and mob Valaris)";

-	setnpctimer 0;

-	break;

-Lquote9:

-	npctalk "Is that why u bought windows";

-	timer 500;

-	npctalk "cuz bill has red hair?";

-	setnpctimer 0;

-	break;

-Lquote10:

-	setnpctimer 0;

-	break;

-}

-

 // MouseJstr =========================================================>\\

 ayothaya.gat,76,145,5	script	MouseJstr	763,{

  	npcspeed 100;