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

2 files changed, 85 insertions, 3 deletions

diff --git a/db/item_db.txt b/db/item_db.txt
index b1c0dcb7a..00b424dd1 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -956,7 +956,7 @@
 2407,Crystal_Pumps,Crystal Pumps,5,20,0,100,,0,,0,10477567,0,64,,0,0,{},{ bonus bMdef,10; bonus bLuk,5; }
 2408,Cuffs,Cuffs,5,5000,0,3000,,3,,0,10477567,2,64,,0,0,{},{}
 2409,Spiky_Heel,Spiky Heel,5,8500,0,600,,2,,0,10477567,2,64,,0,0,{},{ bonus bMdef,5; }
-2410,Sleipnir,Sleipnir,5,20,0,3500,,5,,0,10477567,2,64,,94,0,{},{ bonus bMdef,10; bonus bMaxHPrate,20; bonus bMaxSPrate,20; bonus bSPrecovRate,15; bonus bSpeedRate,25; }
+2410,Sleipnir,Sleipnir,5,20,0,3500,,5,,0,10477567,2,64,,94,0,{},{ bonus bMaxHPrate,20; bonus bMaxSPrate,20;}
 2411,Greaves,Greaves,5,48000,0,750,,5,,0,16512,2,64,,65,0,{},{},,,,
 2412,Greaves_,Greaves,5,48000,0,750,,5,,1,16512,2,64,,65,0,{},{},,,,
 2413,Safety_Shoes,Safety Shoes,5,20,0,350,,6,,0,16514,2,64,,30,0,{},{},,,,
@@ -1005,8 +1005,8 @@
 2626,Rosary_,Ancient Rosary,5,15000,0,200,,0,,1,10477567,2,136,,90,0,{},{ bonus bMdef,3; bonus bLuk,1; },,,
 2627,Belt,Ancient Belt,5,20000,0,1200,,0,,1,10477567,2,136,,25,0,{},{},,,,,
 2628,Novice_Armlet,Novice Armlet,5,400,0,200,,0,,1,8388609,2,136,,0,0,{},{ bonus bStr,1; bonus bInt,1; bonus bLuk,1; },,
-2629,Megingjard,Megingjard,5,20,0,8000,,2,,0,10477567,2,136,,94,0,{},{ bonus bStr,40; bonus bMdef,7; },,,
-2630,Brisingamen,Brisingamen,5,20,0,1500,,1,,0,10477567,2,136,,94,0,{},{ bonus bStr,6; bonus bAgi,6; bonus bVit,6; bonus bInt,6; bonus bLuk,10; bonus bMdef,5; }
+2629,Megingjard,Megingjard,5,20,0,8000,,2,,0,10477567,2,136,,94,0,{},{ bonus bStr,6; bonus bAgi,6; bonus bVit,6; bonus bLuk,10; },,,
+2630,Brisingamen,Brisingamen,5,20,0,1500,,1,,0,10477567,2,136,,94,0,{},{ bonus bStr,3; bonus bAgi,3; bonus bVit,3; bonus bInt,3; bonus bMdef,5; }
 2631,Celebration_Ring,Celebration Ring,5,20,0,10,,0,,0,10477567,2,136,,0,0,{},{ bonus bStr,2; bonus bAgi,2; bonus bVit,2; bonus bInt,2; bonus bDex,2; bonus bLuk,2; }
 2634,Wedding_Ring_M,Wedding Ring,4,20,0,0,,,,0,10477567,1,136,,0,,{},{ skill 334,1; skill 335,1; skill 336,1; }
 2635,Wedding_Ring_F,Wedding Ring,4,20,0,0,,,,0,10477567,0,136,,0,,{},{ skill 334,1; skill 335,1; skill 336,1; }
diff --git a/npc/other/devnpc.txt b/npc/other/devnpc.txt
index d1af636a2..33c67d03f 100644
--- a/npc/other/devnpc.txt
+++ b/npc/other/devnpc.txt
@@ -197,3 +197,85 @@ OnInit:
  	initnpctimer;
         break;
 }
+
+//Aria\\
+Aria
+prontera.gat,156,179,4	script	Aria	805,{
+ 	npcspeed 150;
+	mes "[Aria]";
+	mes "Okay, I'm Evera's brother, Aria";
+	mes "^FF00FFAge^000000: 13 years";
+	mes "^FF00FFWhat I do^000000: Graphics and NPCs";
+	mes "^FF00FFWhy I'm here^000000: Cuz eAthena ROX";
+	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";
+
+Lquote1:
+	npctalk "So its u -> 0";
+	npctalk "... That did not look right";
+
+Lquote3:
+	npctalk "OMGITSJEEBUS!#!@%!";
+	setnpctimer 0;
+	break;
+
+Lquote4:
+	npctalk "Evera died. I guess.";
+	setnpctimer 0;
+	break;
+
+Lquote5:
+	npctalk "I CLICK THE BUTTON AND THEY DON'T DIE!";
+	setnpctimer 0;
+	break;
+
+Lquote6:
+	npctalk "RO? wtf?";
+	npctalk "Oh yeah.";
+	setnpctimer 0;
+	break;
+
+Lquote7:
+	npctalk "omgnoob. DIE!";
+	setnpctimer 0;
+	break;
+
+Lquote8:
+	npctalk "WooT!";
+	setnpctimer 0;
+	break;
+
+Lquote9:
+	npctalk "is that why u bought windows";
+	npctalk "cuz bill has red hair";
+	setnpctimer 0;
+	break;
+
+Lquote10:
+	setnpctimer 0;
+	break;
+
+OnInit:
+ 	initnpctimer;
+        break;
+}