* Made some changes due to recent fixes in the Sign Quest.

* Dandelion's Request event now resets properly after it has been completed by a player.

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

2 files changed, 14 insertions, 10 deletions

diff --git a/npc/quests/The_Sign_Quest.txt b/npc/quests/The_Sign_Quest.txt
index 8c5349f4b..13e9388fa 100644
--- a/npc/quests/The_Sign_Quest.txt
+++ b/npc/quests/The_Sign_Quest.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= SinSloth(Most of the NPCs), MasterOfMuppets(Some of the NPCs + bug fixes) & Kargha(The quiz NPCs)
 //===== Current Version: ===================================== 
-//= 1.8
+//= 1.9
 //===== Compatible With: ===================================== 
 //= eAthena SVN 3422+(Requires jA Script System)
 //===== Description: ========================================= 
@@ -30,6 +30,7 @@
 //= 1.7c Reformatted for future bughunt. WIP [Lupus]
 //= 1.8 Fixed some bugs and exploit which allowed players helping in the final
 //= fight to finish the quest as well. Completely revamped quiz system. [SinSloth]
+//= 1.9 Made some changes in last event to reflect recent bug exploit fix. [SinSloth]
 //============================================================ 
 //===== Configuration : ======================================
 prontera,1,1,1	script	TheSignConfig	-1,{
@@ -7177,7 +7178,7 @@ L_BranchB:
     next;
     menu "Yes.",-,"No.",L_No;
     if (($signroom2full > 1) || getareausers("que_sign01",229,77,166,12) > 0) goto L_Full;
-    if(Sign_Branch8B == 2) set Sign_Branch8B,3;
+    if(Sign_Branch8B == 3) set Sign_Branch8B,4;
     mes "[Serin]";
     mes "Please follow me";
     mes "......";
@@ -9100,6 +9101,7 @@ L_TryAgain:
 	mes "Please don't";
 	mes "try to stop me!";
 	close2;
+	set Sign_Branch8A,7;
 	donpcevent "#signserin::OnSummon";
 	end;
 
@@ -9301,6 +9303,7 @@ L_TryAgain:
     mes "Please don't";
     mes "try to stop me!";
     close2;
+    set Sign_Branch8B,3;
     donpcevent "#signserin2::OnSummon";
     end;
 
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt
index fb217a15b..35dc8615d 100644
--- a/npc/quests/quests_morocc.txt
+++ b/npc/quests/quests_morocc.txt
@@ -3,11 +3,11 @@
 //===== By: ================================================== 
 //= kobra_k88
 //===== Current Version: ===================================== 
-//= 1.7
+//= 1.8
 //===== Compatible With: ===================================== 
 //= eAthena 7.15 +
 //===== Description: ========================================= 
-//= Stop Post and Binoculars Quest.
+//= Stop Post / Binoculars Quest / Dandelion's Request
 //===== Additional Comments: ================================= 
 //= 1.1 Fixed exploits [Lupus]
 //= 1.2 Added Dandelion's Request / Morroc Invasion quest. [SinSloth]
@@ -18,6 +18,7 @@
 //= 1.6 Fixed a nasty bug in last part of the quest. [SinSloth]
 //= 1.6a replaced item "names" with item id. [Lupus]
 //= 1.7 Fixed a bug with XP rewards. [SinSloth]
+//= 1.8 Fixed a bug which prevented reset of events. [SinSloth]
 //============================================================ 
 
 
@@ -7963,7 +7964,7 @@ OnTouch:
 		mes "teleported outside.^000000";
 		close2;
 		warp "morocc",100,100;
-		set $maogate1,0;
+		set $mao_gate1,0;
 	}
 	end;
 
@@ -8007,7 +8008,7 @@ OnTimer596000:
 
 OnTimer597000:
 	enablenpc "#maogate1";
-	set $maogate1,0;
+	set $mao_gate1,0;
 	stopnpctimer;
 	end;
 }
@@ -8950,7 +8951,7 @@ OnTouch:
 		donpcevent "#maogate1_battle::OnStop";
 		donpcevent "#maogate1_battle::OnEnter";
 		enablenpc "#maogate1";
-		set $maogate1,0;
+		set $mao_gate1,0;
 		end;
 	}
 }
@@ -8978,7 +8979,7 @@ OnTouch:
 		mes "teleported outside.^000000";
 		close2;
 		warp "morocc",100,100;
-		set $maogate2,0;
+		set $mao_gate2,0;
 	}
 	end;
 
@@ -9022,7 +9023,7 @@ OnTimer596000:
 
 OnTimer597000:
 	enablenpc "#maogate2";
-	set $maogate2,0;
+	set $mao_gate2,0;
 	stopnpctimer;
 	end;
 }
@@ -9975,7 +9976,7 @@ OnTouch:
 		donpcevent "#maogate2_battle::OnStop";
 		donpcevent "#maogate2_battle::OnEnter";
 		enablenpc "#maogate2";
-		set $maogate2,0;
+		set $mao_gate2,0;
 		end;
 	}
 }