* Several fixes to various scripts.

- Resolves: bugreport:351, bugreport:379, bugreport:393, bugreport:407, bugreport:414, partially resolves bug report:414


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

2 files changed, 8 insertions, 5 deletions

diff --git a/npc/quests/quests_yuno.txt b/npc/quests/quests_yuno.txt
index 6838293b2..25850f893 100644
--- a/npc/quests/quests_yuno.txt
+++ b/npc/quests/quests_yuno.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= eAthena Dev Team; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.7
+//= 1.8
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -29,6 +29,7 @@
 //=	Added the Juno portion of the Doomed Swords quest.
 //= 1.6 Fixed various errors in the Bajin NPC. [L0ne_W0lf]
 //= 1.7 Changed ALCH_Q check and set to corrispond to new alchemist job quest. [L0ne_W0lf]
+//= 1.8 Fixed metto_q never reaching 2. Made some names more unique. [L0ne_W0lf]
 //============================================================ 
 
 // Metto Quest
@@ -46,6 +47,7 @@ yuno_in03,26,39,3	script	Metto#juno	709,{
 		close;
 	}
 	else if (metto_q == 1) {
+		set metto_q,2;
 		mes "I'm going to ask my colleague ^FF0000Stangckle^000000 to help me. I am sure he will be more than willing to help out an old friend.";
 		next;
 		mes "[Metto]";
@@ -314,7 +316,7 @@ yuno_in01,17,95,5	script	Stangckle#juno	99,{
 	}
 }
 
-yuno_in01,19,183,5	script	Kato	55,{
+yuno_in01,19,183,5	script	Kato#juno	55,{
 	mes "[Kato]";
 	if (metto_q == 4) {
 		mes "I am a scientist researching all sorts of things.";
@@ -402,7 +404,7 @@ yuno_in01,19,183,5	script	Kato	55,{
 	}
 }
 
-yuno_in03,178,43,0	script	CiCi	121,{
+yuno_in03,178,43,0	script	CiCi#juno	121,{
 	if (metto_q == 6) {
 		mes "[CiCi]";
 		mes "My name is CiCi. I am one of the three great scientists in this city.";
diff --git a/npc/quests/skills/rogue_skills.txt b/npc/quests/skills/rogue_skills.txt
index 17c33fe08..e6559a77c 100644
--- a/npc/quests/skills/rogue_skills.txt
+++ b/npc/quests/skills/rogue_skills.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Lupus, Reddozen
 //===== Current Version: ===================================== 
-//= 1.6
+//= 1.6a
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -13,6 +13,7 @@
 //= 1.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
 //= 1.5 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
 //= 1.6 Bug fixes as pointed out by Brainstorm in bugreport:351 [L0ne_W0lf]
+//= 1.6a Fixed(?) antoher problem (NPCs not disabling) hopefully. [L0ne_W0lf]
 //============================================================
 
 in_rogue,359,177,0	script	#killershow01	-1,{
@@ -1434,7 +1435,7 @@ function	script	F_Kienna	{
 		mes "of this training.";
 		set ROG_SK,6;
 		close2;
-		disablenpc "Kienna#8th";
+		disablenpc "Kienna#"+getarg(0);
 		donpcevent "#1stmove::OnEnable";
 		warp "prt_are01",150,150;
 		end;