* Merged changes from trunk [14895:14966/trunk].

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

11 files changed, 56 insertions, 25 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 96fa0b0c6..ced0b31dd 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -4,10 +4,20 @@ Date		Added
 	* Rev. 14941 Added Archbishop job quest, and missing Brasilis files. [L0ne_W0lf]
 2011/08/10
 	* Rev. 14931 Added scripts and NPC Brasilis updates from trunk r14928. [L0ne_W0lf]
+	* Updated the quests_brasilis ontouchNPC warp command to use unitwarp instead. [Skotlex]
+2011/08/09
+	* Rev. 14928 Implemented the rest of Brasilis, and updated existing Brasilis NPCs. [L0ne_W0lf]
 2011/07/26
 	* Rev. 14922 Added Renewal Guides, and made the filenames uniform. [L0ne_W0lf]
 2011/07/21
 	* Rev. 14920 Updated most active NPCs that give EXP to renewal standards. [L0ne_W0lf]
+2011/07/16
+	* Rev. 14912 Updated dialog in monster_race.txt [L0ne_W0lf]
+2011/07/16
+	* Rev. 14900 Have been working on this for months: Added Nidhoggr's Nest instance. [L0ne_W0lf]
+	* Tweaks to how checkquest is used in orc's memory and sealed shrine.
+2011/07/13
+	* Rev. 14905 Tweaked the sealed shrine entrance NPCs. Hopefully the damn thing works now. [L0ne_W0lf]
 2011/07/3
 	* Rev. 14884 Updated Tutorial quests, and added back NPCs needed for Priest quest. [L0ne_W0lf]
 2011/06/11
diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt
index 7140477ab..5d1b9d82b 100644
--- a/npc/cities/alberta.txt
+++ b/npc/cities/alberta.txt
@@ -325,7 +325,7 @@ alberta,190,173,4	script	Phelix	85,{
 				case 2:
 					mes "[Phelix]";
 					mes "I'm not giving you more then 100 at a time so don't bother, OK? If you don't want any, just say '0'.";
-					mes "Right now, the most you can get is " + gap + " but remember, 100 at most, you want to break my back?.";
+					mes "Right now, the most you can get is " + .@max + " but remember, 100 at most, you want to break my back?.";
 					input .@amount;
 					next;
 					mes "[Phelix]";
diff --git a/npc/guides/guides_brasilis.txt b/npc/guides/guides_brasilis.txt
index 73e7c73b6..54b11ae1b 100644
--- a/npc/guides/guides_brasilis.txt
+++ b/npc/guides/guides_brasilis.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //= eAthena  SVN
 //===== Description: ========================================= 
@@ -11,6 +11,7 @@
 //= Guide for the city of Brasilis
 //===== Additional Comments: ================================= 
 //= 1.0 First Version, Renewal guide.
+//= 1.1 Added a missing close.
 //============================================================ 
 
 brasilis,219,97,3	script	Brasilis Guide	478,{
@@ -74,5 +75,23 @@ brasilis,219,97,3	script	Brasilis Guide	478,{
 			mes "Wandering on your own is always the best way to explore. Anyway, take care.";
 			close;
 		}
+		close;
+		break;
+	case 2:
+		viewpoint 2,273,149,2,0xFF0000;
+		viewpoint 2,308,333,3,0xCC6600;
+		viewpoint 0,133,167,4,0x00FF00;
+		viewpoint 0,238,248,5,0x00FF00;
+		set .@compass_check,0;
+		mes "[Brasilis Guide]";
+		mes "I've deleted all marks on the mini-map.";
+		mes "Whenever you'd like to put marks";
+		mes "there, you can ask me.";
+		close;
+	case 3:
+		mes "[Brasilis Guide]";
+		mes "Exploring things here on your own can also be fun.";
+		mes "Anyway, take care.";
+		close;
 	}
 }
diff --git a/npc/instances/NydhoggsNest.txt b/npc/instances/NydhoggsNest.txt
index aab699570..9aa4bf7da 100644
--- a/npc/instances/NydhoggsNest.txt
+++ b/npc/instances/NydhoggsNest.txt
@@ -1,5 +1,5 @@
 //===== eAthena Script ======================================= 

-//= Nidhoggr's Nest 

+//= Nidhoggr's Nest

 //===== By: ================================================== 

 //= L0ne_W0lf, various sources

 //===== Current Version: ===================================== 

@@ -11,7 +11,7 @@
 //= Nidhoggr's Nest Instance

 //===== Additional Comments: ================================= 

 //= 1.0 First version.

-//= 1.1 Updated dialog slightly, adjusted EXP gained.

+//= 1.1 Minor dialog updates.

 //= 1.2 No longer glitches when anyone but party leader talks to the first NPC.

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

 

@@ -1188,7 +1188,7 @@ spl_in01,104,56,3	script	Aide Arioss#edq	437,3,3,{
 			next;

 			mes "[Aide Arioss]";

 			mes "It can't compare with the effort you have put in for us... but please accept our token of friendship.";

-			getexp 150000,35000;

+			getexp 1500000,350000;

 			getitem 6081,10; //Splendide_Coin

 			set ins_nyd,131;

 			mes "[Aide Arioss]";

@@ -2633,7 +2633,7 @@ OnTimer10000:
 }

 

 2@nyd,6,8,0	script	nyd_2f_yellow_c	-1,{

-OnInstanceInit:;

+OnInstanceInit:

 	disablenpc instance_npcname("nyd_2f_yellow_c", instance_id());

 	end;

 

@@ -2935,7 +2935,7 @@ OnTouch:
 }

 

 2@nyd,1,1,0	script	ins_nyd2_spawn_mobs	-1,{

-OnIntanceInit:

+OnInstanceInit:

 	areamonster "2@nyd",200,92,180,80,"Rhyncho",2020,20;

 	areamonster "2@nyd",200,92,180,80,"Phylla",2021,20;

 	areamonster "2@nyd",200,92,180,80,"Dark Shadow",2023,20;

diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt
index 04637210d..bab99664e 100644
--- a/npc/jobs/2-1/blacksmith.txt
+++ b/npc/jobs/2-1/blacksmith.txt
@@ -351,7 +351,7 @@ ein_in01,201,27,3	script	Guildsman#alberta	63,{
 					mes "1. Which one of the following regions is matched incorrectly";
 					mes "with its specialty item?";
 					next;
-					if (select("Morroc - Thief Clothes:Alberta - Two Hand Axe:Comodo - Berserk Potion:Alberta - Swordmace") == 2)
+					if (select("Morroc - Thief Clothes:Alberta - Two Hand Axe:Comodo - Berserk Potion:Alberta - Swordmace") == 4)
 						set .@black_q,.@black_q+10;
 					mes "[Geschupenschte]";
 					mes "2. What status can";
diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt
index 6320e60d9..e1c601fe9 100644
--- a/npc/jobs/2-2/sage.txt
+++ b/npc/jobs/2-2/sage.txt
@@ -2680,7 +2680,8 @@ OnInit:
 
 OnEnable:
 	enablenpc "Arena#2";
-	disablenpc "Arena#1::OnReset";
+	donpcevent "Arena#1::OnReset";
+	disablenpc "Arena#1";
 	set .MyMobs,24;
 	monster "job_sage",111,102,"Numerical Value",1063,1,"Arena#2::OnMyMobDead";
 	monster "job_sage",111,102,"Physics",1063,1,"Arena#2::OnMyMobDead";
diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt
index 4d2f97f07..5243cfc86 100644
--- a/npc/quests/first_class/tu_archer.txt
+++ b/npc/quests/first_class/tu_archer.txt
@@ -1876,7 +1876,7 @@ prt_castle,76,165,6	script	Minister#tu	55,{
 //=================================================Range NPC====================================================
 prt_castle,94,150,4	script	#sound_tu	139,10,10,{
 OnTouch_:
-	if(tu_archer02 != 6) {
+	if(tu_archer02 == 6) {
 		mes "[Minister]";
 		mes "Contact the";
 		mes "Prontera Church.";
diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt
index aa7251446..a3d3a8fbf 100644
--- a/npc/quests/quests_amatsu.txt
+++ b/npc/quests/quests_amatsu.txt
@@ -367,7 +367,7 @@ OnInit:
 
 OnStartArena:
 	disablenpc "Coach#ama";
-	disablenpc "Am Mut::Onreset";
+	donpcevent "Am Mut#ama::Onreset";
 	donpcevent "Dokebi#ez::Onreset";
 	donpcevent "Dokebi#hd::Onreset";
 	enablenpc "Grandma#ama1";
diff --git a/npc/quests/quests_brasilis.txt b/npc/quests/quests_brasilis.txt
index 5aec32d49..417ac78d3 100644
--- a/npc/quests/quests_brasilis.txt
+++ b/npc/quests/quests_brasilis.txt
@@ -51,7 +51,7 @@ brasilis,297,307,5	script	Angelo#br	50,{
 					mes "Oh, thank you. You found all of 3 puppies.";

 					mes "Thanks a lot.";

 					mes "I hope this is useful to you. hoho.";

-					getexp 50000,0;

+					getexp 500000,0;

 					erasequest 9031;

 					setquest 9032;

 					set .@bosang,rand(1,10);

@@ -1230,7 +1230,7 @@ brasilis,187,162,5	script	Candy Maker	476,{
 		set brazil_gua,11;

 		completequest 2200;

 		getitem 12414,1; //Guarana_Candy

-		getexp 70000,10000;

+		getexp 700000,100000;

 		close;

 	}

 	else if (brazil_gua == 11) {

@@ -1923,7 +1923,7 @@ brasilis,203,286,3	script	Botanist Karmen#bra	893,{
 		mes "The water lily must truly be a lucky flower. hahaha";

 		set brazil_regia,10;

 		completequest 2207;

-		getexp 50000,10000;

+		getexp 500000,100000;

 		close;

 	}

 	else {

@@ -2669,7 +2669,7 @@ bra_dun02,67,205,5	script	Recluse#bra	475,3,3,{
 	end;

 

 OnTouchNPC:

-	warp "bra_dun02",67,215;

+	unitwarp 0,"this",67,215;

 	end;

 }

 

@@ -4246,7 +4246,7 @@ bra_in01,206,188,1	script	Open Manhole#todunbra	844,{
 		set brazil_ghost,8;

 		//completequest 2208;

 		completequest 60355;

-		getexp 90000,0;

+		getexp 900000,0;

 		disablenpc "Ghost#bra_end";

 		close;

 	}

diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt
index f156de7bd..fb57b134e 100644
--- a/npc/quests/quests_hugel.txt
+++ b/npc/quests/quests_hugel.txt
@@ -3806,7 +3806,7 @@ hu_fild06,168,359,3	script	Moks Mushrooms#Mush1	111,{
 
 	if(hg_tre > 9 && hg_tre < 15)
 	{
-		mes "- You found mushrooms that is as big as your palm. -";
+		mes "- You found mushrooms that are as big as your palm. -";
 		next;
 		switch( select( "Gather them.","Pass." ) )
 		{
@@ -3843,7 +3843,7 @@ hu_fild06,168,359,3	script	Moks Mushrooms#Mush1	111,{
 			else if(hg_tre == 15)
 				mes "Collected Moks Mushroom Solution: 5ea ";
 			initnpctimer;
-			disablenpc "Moks Mushroom#Mush1";
+			disablenpc "Moks Mushrooms#Mush1";
 			close;
 		break;
 		case 2:
@@ -3860,7 +3860,7 @@ hu_fild06,168,359,3	script	Moks Mushrooms#Mush1	111,{
 	}
 
 OnTimer20000:
-	enablenpc "Moks Mushroom#Mush1";
+	enablenpc "Moks Mushrooms#Mush1";
 	stopnpctimer;
 	end;
 
@@ -3870,7 +3870,7 @@ hu_fild06,194,341,3	script	Moks Mushrooms#Mush2	111,{
 
 	if(hg_tre > 9 && hg_tre < 15)
 	{
-		mes "- You found mushrooms that is as big as your palm. -";
+		mes "- You found mushrooms that are as big as your palm. -";
 		next;
 		switch( select( "Gather them.","Pass." ) )
 		{
@@ -3907,7 +3907,7 @@ hu_fild06,194,341,3	script	Moks Mushrooms#Mush2	111,{
 			else if(hg_tre == 15)
 				mes "Collected Moks Mushroom Solution: 5ea ";
 			initnpctimer;
-			disablenpc "Moks Mushroom#Mush2";
+			disablenpc "Moks Mushrooms#Mush2";
 			close;
 		break;
 		case 2:
@@ -3924,7 +3924,7 @@ hu_fild06,194,341,3	script	Moks Mushrooms#Mush2	111,{
 	}
 
 OnTimer20000:
-	enablenpc "Moks Mushroom#Mush2";
+	enablenpc "Moks Mushrooms#Mush2";
 	stopnpctimer;
 	end;
 
@@ -3934,7 +3934,7 @@ hu_fild06,198,339,3	script	Moks Mushrooms#Mush3	111,{
 
 	if(hg_tre > 9 && hg_tre < 15)
 	{
-		mes "- You found mushrooms that is as big as your palm. -";
+		mes "- You found mushrooms that are as big as your palm. -";
 		next;
 		switch( select( "Gather them.","Pass." ) )
 		{
@@ -3971,7 +3971,7 @@ hu_fild06,198,339,3	script	Moks Mushrooms#Mush3	111,{
 			else if(hg_tre == 15)
 				mes "Collected Moks Mushroom Solution: 5ea ";
 			initnpctimer;
-			disablenpc "Moks Mushroom#Mush3";
+			disablenpc "Moks Mushrooms#Mush3";
 			close;
 		break;
 		case 2:
@@ -3988,7 +3988,7 @@ hu_fild06,198,339,3	script	Moks Mushrooms#Mush3	111,{
 	}
 
 OnTimer20000:
-	enablenpc "Moks Mushroom#Mush3";
+	enablenpc "Moks Mushrooms#Mush3";
 	stopnpctimer;
 	end;
 
diff --git a/npc/scripts_mapflags.conf b/npc/scripts_mapflags.conf
index 93587fe08..485d404cd 100644
--- a/npc/scripts_mapflags.conf
+++ b/npc/scripts_mapflags.conf
@@ -27,4 +27,5 @@ npc: conf/mapflag/battleground.txt
 npc: conf/mapflag/fireworks.txt
 npc: conf/mapflag/novending.txt
 npc: conf/mapflag/town.txt
+npc: conf/mapflag/reset.txt
 // --------------------------------------------------------------