Some fixes for npcs

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

3 files changed, 106 insertions, 8 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 67153576f..ae18f0341 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -39,6 +39,7 @@ Date		Added
 	* Added custom WOE warper (now you can get to Novice Castles from Prontera) [Lupus]
 	* Prontera.txt (Sewers) anti-novice exploit fix. should be added to any quests/banks where u once get free items/zeny [Lupus]
 11/17
+	* Added poetry npc to ayothaya [MouseJstr]
 	* Fixed valkyrie.txt (wrong condition check, temp var->perm vars) but it still has no exit for common players [Lupus]
 	* - Fixed guardians hp not updating when investment in defense is made.
 	  - Moved treasure spawn times to ev_agit_event.txt.
diff --git a/npc/other/devnpc.txt b/npc/other/devnpc.txt
index 6b61b4615..15cf4c502 100644
--- a/npc/other/devnpc.txt
+++ b/npc/other/devnpc.txt
@@ -18,13 +18,12 @@
 
 // MouseJstr =========================================================>\\
 ayothaya.gat,76,145,5	script	MouseJstr	763,{
- 	npcspeed 100;
+ 	npcspeed 50;
 	mes "[MouseJstr]";
 	mes "Yo homeslices..";
 	mes "I am MouseJstr on AIM and josh in real life..";
 	next;
 	mes "I enjoy maintaining a RO server because of the abuse I get";
- 	initnpctimer;
 	close;
  OnTimer15000:
 	npcwalkto 70+rand(17),135+rand(16);
@@ -59,11 +58,14 @@ Lquote4:
 	npctalk "I am the dark angel of eAthena.. withen weeks of my arrival, almost everybody was gone or dead..  fear me...";
 	setnpctimer 0;
 	break;
+OnInit:
+ 	initnpctimer;
+        break;
 }
 
 // MC Cameri =========================================================>\\
 morocc.gat,160,97,4	script	MC Cameri	706,{
- 	npcspeed 150;
+ 	npcspeed 50;
 	mes "[MC Cameri]";
 	mes "I'm the @command guy from oA...";
 	mes "^FF00FFReal Name^000000: Can't tell you my name";
@@ -76,7 +78,6 @@ morocc.gat,160,97,4	script	MC Cameri	706,{
 	next;
 	mes "[MC Cameri]";
 	mes "I'm a senior student, programmer, body builder(yes, I lift weights), etc.";
- 	initnpctimer;
 	close;
  OnTimer15000:
 	npcwalkto 154+rand(17),87+rand(16);
@@ -139,17 +140,19 @@ Lquote9:
 Lquote10:
 	setnpctimer 0;
 	break;
+OnInit:
+ 	initnpctimer;
+        break;
 }
 
 
 // Davidsiaw =========================================================>\\
 payon.gat,182,104,4	script	Davidsiaw	1002,{
- 	npcspeed 150;
+ 	npcspeed 50;
 	mes "[Davidsiaw]";
 	mes "omghi";
- 	initnpctimer;
 	close;
- OnTimer15000:
+OnTimer15000:
 	npcwalkto 176+rand(17),94+rand(16);
 	setnpctimer 0;
 
@@ -190,4 +193,7 @@ Lquote5:
 Lquote6:
 	setnpctimer 0;
 	break;
-}
\ No newline at end of file
+OnInit:
+ 	initnpctimer;
+        break;
+}
diff --git a/npc/other/poetry/ayothaya.txt b/npc/other/poetry/ayothaya.txt
new file mode 100644
index 000000000..b3f34aa35
--- /dev/null
+++ b/npc/other/poetry/ayothaya.txt
@@ -0,0 +1,91 @@
+//===== eAthena Script =======================================
+//= Wandering poet NPC
+//===== By: ==================================================
+//= by MouseJstr
+//===== Current Version: =====================================
+//= 0.1
+//===== Compatible With: =====================================
+//= eAthena 1.0 Final +
+//===== Description: =========================================
+
+ayothaya.gat,58,134,5	script	Louise Gluck	763,{
+	mes "[Louise Gluck]";
+	mes "What is the next line? ";
+	close;
+
+OnTimer5000:
+	npcwalkto 65,129;
+	npctalk "Twas brillig, and the slithy toves Did gyre and gimble in the wabe: ";
+	break;
+
+OnTimer10000:
+	npcwalkto 71,131;
+	npctalk " All mimsy were the bogoroves, And the mome raths outgrabe.  ";
+	break;
+
+OnTimer15000:
+	npcwalkto 75,127;
+	npctalk "Beware the Jabberwock, my son!  The jaws that bite, theh claws that catch!";
+	break;
+
+OnTimer20000:
+	npcwalkto 80,122;
+	npctalk " Beware the Jubjub bird and shun The frumious Bandersnatch!";
+	break;
+
+OnTimer25000:
+	npcwalkto 82,118;
+	npctalk " He took his vorpal sword in hand: Long time the manxome foe he sought- ";
+	break;
+
+OnTimer30000:
+	npcwalkto 93,115;
+	npctalk " So rested he by the Tumtum tree, And stood a while in thought.  ";
+	break;
+
+OnTimer35000:
+	npcwalkto 94,112;
+	npctalk " And, as in uffish thought he stood, The Jabberwock, with eyes of flame, ";
+	break;
+
+OnTimer40000:
+	npcwalkto 88,124;
+	npctalk " Came whiffling through the tulgey wood, And burbled as it came!  ";
+	break;
+
+OnTimer45000:
+	npcwalkto 81,129;
+	npctalk " One, two! One, two! And through and through The vorpal blade went snicker-snack!  ";
+	break;
+
+OnTimer50000:
+	npcwalkto 76,139;
+	npctalk " He left it dead, and with its head He went galumphing back.  ";
+	break;
+
+OnTimer55000:
+	npcwalkto 67,138;
+	npctalk "And hast though slain the Jabberwock?  Come to my arms beamish boy!  ";
+	break;
+
+OnTimer60000:
+	npcwalkto 59,144;
+	npctalk " O frabjous day! Callooh! Callay! He chortled in his joy.  ";
+	break;
+
+OnTimer65000:
+	npcwalkto 55,124;
+	npctalk " Twas brillig, and the slithy toves Did gyre and gimble in the wabe: ";
+	break;
+
+OnTimer70000:
+	npcwalkto 58,134;
+	npctalk " All mimsy were the bogoroves, And the mome raths outgrabe.  ";
+	setnpctimer 0;
+	break;
+
+OnInit:
+ 	npcspeed 150;
+ 	initnpctimer;
+        break;
+}