* Fixed two minor bugs in the Sign Quest and Thanatos Tower ascension.

- Players do not lose time anymore if they return the Sign around midnight.
- Thanatos Tower code game now resets properly when entering a wrong value in the box.

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

2 files changed, 8 insertions, 4 deletions

diff --git a/npc/quests/The_Sign_Quest.txt b/npc/quests/The_Sign_Quest.txt
index 9627ed70c..843c7b796 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: ===================================== 
-//= 2.1
+//= 2.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN 3422+(Requires jA Script System)
 //===== Description: ========================================= 
@@ -34,6 +34,7 @@
 //= 1.9 Made some changes in last event to reflect recent bug exploit fix. [SinSloth]
 //= 2.0 Fixed some various minor bugs. [SinSloth]
 //= 2.1 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
+//= 2.2 Fixed a small bug which occured when people had to return The Sign around midnight. [SinSloth]
 //============================================================ 
 //===== Configuration : ======================================
 prontera,1,1,1	script	TheSignConfig	-1,{
@@ -648,7 +649,7 @@ L_Where:
         cutin "",255;
         end;
     } else if (signquest == 60) {
-        if (gettime(3) == signmetzhour || gettime(3) == signmetzhour +1 || gettime(3) == signmetzhour +2) {
+        if (gettime(3) == signmetzhour || gettime(3) == signmetzhour +1 || gettime(3) == signmetzhour +2 || (signmetzhour +1 == 24 && gettime(3) == 0) || (signmetzhour +2 == 24 && gettime(3) == 0) || (signmetzhour +2 == 25 && gettime(3) == 1)) {
             mes "[Metz]";
             mes "Fascinating...";
             mes "This was made with";
@@ -5729,7 +5730,7 @@ L_Sign:
     close;
 
 L_Hour:
-    if (gettime(3) == signengelhour || gettime(3) == signengelhour +1 || gettime(3) == signengelhour +2) {
+    if (gettime(3) == signengelhour || gettime(3) == signengelhour +1 || gettime(3) == signengelhour +2 || (signengelhour +1 == 24 && gettime(3) == 0) || (signengelhour +2 == 24 && gettime(3) == 0) || (signengelhour +2 == 25 && gettime(3) == 1)) {
         mes "[Engel]";
         mes "This is now yours to keep.";
         mes "Thank you for giving me the";
diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt
index d3df4847f..138d3b276 100644
--- a/npc/quests/thana_quest.txt
+++ b/npc/quests/thana_quest.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= [Ishizu-chan]
 //===== Current Version: =====================================
-//= 1.6
+//= 1.7
 //===== Compatible With: =====================================
 //= Any eAthena Version i guess?
 //===== Description: =========================================
@@ -18,6 +18,7 @@
 //= 1.4a You may enter either "Charmstone" or "Charm Stone" [Lupus]
 //= 1.5 Fixed a bug in the number part of the quest. [SinSloth]
 //= 1.6 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
+//= 1.7 Fixed a minor bug with prevented code part from reseting properly. [SinSloth]
 //============================================================
 
 hu_fild01,140,163,5	script	Tower Keeper	852,3,3,{
@@ -898,6 +899,7 @@ tha_t04,195,195,0	script	Machine Device	111,{
 	mes "single number more than";
 	mes "once or use the number 0.";
 	next;
+	if(@thanatry) goto L_Input;
 L_Recode:
 	set @thanacode1,rand(1,9);
 	set @thanacode2,rand(1,9);
@@ -950,6 +952,7 @@ L_Input:
 		mes "[Screen]";
 		mes "Input number accepted.";
 		mes "Access authorized.";
+		set @thanatry,0;
 		next;
 		mes "^3355FFAfter the screen displays";
 		mes "the access authorization";