fixed mjolnir seal bugs, fixed the sign bugs

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

3 files changed, 35 insertions, 29 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 676a829b9..a547df751 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -29,6 +29,12 @@ Playtester
 

 Date		Added

 ======

+10/20	* Fixed The Sign Exploits [Lupus]

+	- Fixed The Sign bugs, thanks to Tantarian

+		+ added get rid of sobbing pieces to let people reborn

+		If u finished the Sign Quest and have some undeleted sobbing pieces, then visit this man

+		mjo_dun02.gat 88,295 Flaming Spirit Man - he'll wipe them 8)

+	- Fixed wrong label names in mjolnir_seal.txt, thanks to Tantarian

 10/19

 	* Official kRO 10.1 spawns for Byalan [Playtester]

 	- Payon Cave

diff --git a/npc/quests/The_Sign_Quest.txt b/npc/quests/The_Sign_Quest.txt
index 0d6538eaf..6fc60a264 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.4
+//= 1.5
 //===== Compatible With: ===================================== 
 //= eAthena SVN 3422+(Requires jA Script System)
 //===== Description: ========================================= 
@@ -22,6 +22,8 @@
 //=     Fixed a major bug that was allowing players to continue before
 //=     getting all the Sobbing Starlight pieces.
 //=     Also moved the Alberta sign since another NPC was on top of it. [Llyr]
+//= 1.5 Fixed exploits and bugs. Plus add a removal of exttra sobbing pieces
+//= 	as suggested Tantarian, to let people Reborn [Lupus]
 //============================================================ 
 //===== Configuration : ======================================
 prontera.gat,1,1,1	script	TheSignConfig	-1,{
@@ -1894,7 +1896,6 @@ s_No:
 s_Last:
 	if(@DaewoonTest == 5)
 {
-	getitem 7177,1;
 	mes "[Daewoon]";
 	mes "You know, after talking with";
 	mes "you for a while, I now feel fairly";
@@ -1918,6 +1919,7 @@ s_Last:
 	mes "Alright, then.";
 	mes "Good luck in";
 	mes "Al de Baran~!";
+	getitem 7177,1;
 	set signquest,6;
 	close;
 }
@@ -2121,13 +2123,13 @@ if(@sign_jore$ == "Red Gemstone") {
 	mes "any power.";
 	next;
 	getitem 7177,1;
+	set signquest,9;
 	mes "[Sir Jore]";
 	mes "Take that starry fragment.";
 	mes "I'll inform my friend about you.";
 	mes "Look for ^FF0000Jesqurienne^000000.";
 	mes "She often spends her time";
 	mes "in the bars of Geffen.";
-	set signquest,9;
 	next;
 	mes "[Sir Jore]";
 	mes "I have to return to my researches..";
@@ -3668,6 +3670,7 @@ L_quiztime:
 	mes "to keep it, but I suppose";
 	mes "you're its true owner...";
 	getitem 7177,1;
+	set signquest,10;
 	next;
 	mes "[Jesqurienne]";
 	mes "If you want to know more about the";
@@ -3684,7 +3687,6 @@ L_quiztime:
 	mes "so I think I'll stay here";
 	mes "and have another drink.";
 	mes "Farewell, " + @quizname$ + ".";
-	set signquest,10;
 	close;
 }
 
@@ -5542,6 +5544,8 @@ L_Cherish:
 }
 
 mjo_dun02.gat,88,295,3		script	Flaming Spirit Man	85,{
+	//get rid of some pieces, to let player reborn in future
+	if(signquest > 22) delitem 7177,countitem(7177);
 
 	if(signquest > 62) goto L_Improve;
 	if(signquest > 61) goto L_Hour;
@@ -5687,16 +5691,13 @@ L_Check:
 	mes "Let me see what you've";
 	mes "brought.";
 	next;
-	if((countitem(612) > 4) && countitem(615) > 1)
-{
-	if(countitem(986)) { set signanvil,1; goto L_Forge1; }
-	if(countitem(987)) { set signanvil,2; goto L_Forge2; }
-	if(countitem(988)) { set signanvil,3; goto L_Forge3; }
-	if(countitem(989)) { set signanvil,4; goto L_Forge4; }
-	goto L_NotEnough;
-}
-	else
-{
+	if((countitem(612) > 4) && countitem(615) > 1){
+		if(countitem(986)) { set signanvil,1; goto L_Forge1; }
+		if(countitem(987)) { set signanvil,2; goto L_Forge2; }
+		if(countitem(988)) { set signanvil,3; goto L_Forge3; }
+		if(countitem(989)) { set signanvil,4; goto L_Forge4; }
+	}
+
 L_NotEnough:
 	mes "[Engel]";
 	mes "I'm sorry but you didn't";
@@ -5712,7 +5713,6 @@ L_NotEnough:
 	mes "anvils won't be good enough for";
 	mes "this kind of work.";
 	close;
-}
 
 L_Forge1:
 	mes "[Engel]";
@@ -5760,6 +5760,8 @@ L_Forge4:
 	goto L_Forge;
 
 L_Forge:
+	delitem 612,5;
+	delitem 615,2;
 	next;
 	if(signquest == 22) goto L_Refine;
 	mes "[Engel]";
@@ -5774,11 +5776,9 @@ L_Forge:
 	mes "Well then...";
 	mes "I wish you safety";
 	mes "in your travels.";
-	set signquest,19;
-	delitem 612,5;
-	delitem 615,2;
-	delitem 7177,7;
+	delitem 7177,5; //we'll delete all sobbing pieces later
 	getitem 7278,1;
+	set signquest,19;
 	close;
 
 L_Refine:
@@ -5800,12 +5800,12 @@ L_Refine:
 	close;
 
 L_Success:
+	delitem 7177,countitem(7177); //we delete all the pieces, or else u can't reborn
 	mes "While you were gone, I managed to";
 	mes "restore the Sobbing Starlight. Why";
 	mes "dont you go ahead and take a";
 	mes "look?";
 	next;
-	delitem 7177,7;
 	getitem 7178,1;
 	set signquest,23;
 	specialeffect2 94;
@@ -6037,6 +6037,7 @@ L_Ok:
 	mes "thank you thank you";
 	mes "soooooooooo much!";
 	delitem 2278,1;
+	set signquest,26;
 	next;
 	mes "[Laotan]";
 	mes "Oh right~!";
@@ -6044,7 +6045,6 @@ L_Ok:
 	mes "was in our village for a while, but";
 	mes "ever since he went into that big";
 	mes "tree, nobody's seen him!";
-	set signquest,26;
 	close;
 
 L_Thanks:
@@ -6407,7 +6407,6 @@ L_FirstTouch:
 L_Warp:
 	warp "himinn.gat",49,10;
 	end;
-
 }
 
 himinn.gat,48,86,5	script	Valkyrie#2	811,{
@@ -9076,6 +9075,7 @@ L_Work:
 	mes "humans know it, may actually be";
 	mes "different than the truth.";
 	getitem 7025,1;
+	set signquest,66;
 	next;
 	mes "[Lady Hell]";
 	mes "^881010In other words, there";
@@ -9090,7 +9090,6 @@ L_Work:
 	mes "you for now, mortal. It will";
 	mes "be your job to discover the";
 	mes "truth of the legends...";
-	set signquest,66;
 	close;
 
 L_Greet:
diff --git a/npc/quests/seals/mjolnir_seal.txt b/npc/quests/seals/mjolnir_seal.txt
index fe7d33ec1..438244452 100644
--- a/npc/quests/seals/mjolnir_seal.txt
+++ b/npc/quests/seals/mjolnir_seal.txt
@@ -3,13 +3,14 @@
 //===== By: ================================================== 

 //= SinSloth

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

-//= 1.0

+//= 1.1

 //===== Compatible With: ===================================== 

 //= eAthena

 //===== Description: ========================================= 

 //= Quest for breaking the seal of Mjolnir.

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

 // 1.0 First version. Thanks to SinSloth for scripting it. [MasterOfMuppets]

+// 1.1 Fixed wrong label names [Luups]

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

 

 prontera.gat,124,297,3	script	Tialfi	706,{

@@ -1773,19 +1774,19 @@ mjolnir_09.gat,209,341,3	script	Dwarf Blacksmith#south	826,{
 				menu "...?!",case41,"Dodge!",case42,"Block!",case43,"Jump!",case44,"Counter back!",case45;

 					case41:

 						set @player_def,0;

-						goto L_PlayerDef2;

+						goto L_DefPlayer2;

 					case42:

 						set @player_def,1;

-						goto L_PlayerDef2;

+						goto L_DefPlayer2;

 					case43:

 						set @player_def,2;

-						goto L_PlayerDef2;

+						goto L_DefPlayer2;

 					case44:

 						set @player_def,3;

-						goto L_PlayerDef2;

+						goto L_DefPlayer2;

 					case45:

 						set @player_def,4;

-						goto L_PlayerDef2;

+						goto L_DefPlayer2;

 				L_DefPlayer2:

 				set @sudri_atk,rand(1,3);

 				set @damage,rand(20,25);