* Merged changes from trunk [14688:14739/trunk].

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

1 files changed, 66 insertions, 65 deletions

diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index e1b885d5d..a85c3173d 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.6
+//= 1.7
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -33,6 +33,7 @@
 //= 1.4 Changed killmonsterall -> killmonster. (bugreport:4131)
 //= 1.5 Removed a 'close;' which should have been 'close2'. (bugreport:4276)
 //= 1.6 Fixed check in cat hand agent.
+//= 1.7 Moved the close in Cat Hand Service Warps. (bugreport:4079) [L0ne_W0lf]
 //============================================================ 
 
 // Onward to the New World
@@ -8956,8 +8957,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 2:
 					break;
 				}
@@ -8972,8 +8973,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 2:
 					if (Zeny >= 5500) {
 						set zeny,zeny-5500;
@@ -8982,8 +8983,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 3:
 					break;
 				}
@@ -8998,8 +8999,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 2:
 					if (Zeny >= 5025) {
 						set zeny,zeny-5025;
@@ -9008,8 +9009,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 3:
 					if (Zeny >= 5025) {
 						set zeny,zeny-5025;
@@ -9018,8 +9019,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 4:
 					break;
 				}
@@ -9034,8 +9035,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 2:
 					if (Zeny >= 5025) {
 						set zeny,zeny-5025;
@@ -9044,8 +9045,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 3:
 					if (Zeny >= 5025) {
 						set zeny,zeny-5025;
@@ -9054,8 +9055,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 4:
 					if (Zeny >= 5025) {
 						set zeny,zeny-5025;
@@ -9064,8 +9065,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 5:
 					break;
 				}
@@ -9080,8 +9081,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 2:
 					if (Zeny >= 4765) {
 						set zeny,zeny-4765;
@@ -9090,8 +9091,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 3:
 					if (Zeny >= 4765) {
 						set zeny,zeny-4765;
@@ -9100,8 +9101,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 4:
 					if (Zeny >= 4765) {
 						set zeny,zeny-4765;
@@ -9110,8 +9111,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 5:
 					if (Zeny >= 4765) {
 						set zeny,zeny-4765;
@@ -9120,8 +9121,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 6:
 					break;
 				}
@@ -9136,8 +9137,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 2:
 					if (Zeny >= 4765) {
 						set zeny,zeny-4765;
@@ -9146,8 +9147,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 3:
 					if (Zeny >= 4765) {
 						set zeny,zeny-4765;
@@ -9156,8 +9157,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 4:
 					if (Zeny >= 4765) {
 						set zeny,zeny-4765;
@@ -9166,8 +9167,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 5:
 					if (Zeny >= 4765) {
 						set zeny,zeny-4765;
@@ -9176,8 +9177,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 6:
 					if (Zeny >= 4765) {
 						set zeny,zeny-4765;
@@ -9186,8 +9187,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 7:
 					break;
 				}
@@ -9202,8 +9203,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 2:
 					if (Zeny >= 4590) {
 						set zeny,zeny-4590;
@@ -9212,8 +9213,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 3:
 					if (Zeny >= 4590) {
 						set zeny,zeny-4590;
@@ -9222,8 +9223,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 4:
 					if (Zeny >= 4590) {
 						set zeny,zeny-4590;
@@ -9232,8 +9233,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 5:
 					if (Zeny >= 4590) {
 						set zeny,zeny-4590;
@@ -9242,8 +9243,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 6:
 					if (Zeny >= 4590) {
 						set zeny,zeny-4590;
@@ -9252,8 +9253,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 7:
 					if (Zeny >= 4590) {
 						set zeny,zeny-4590;
@@ -9262,8 +9263,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 8:
 					break;
 				}
@@ -9338,8 +9339,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 2:
 					if (Zeny >= 4590) {
 						set zeny,zeny-4590;
@@ -9348,8 +9349,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 3:
 					if (Zeny >= 4590) {
 						set zeny,zeny-4590;
@@ -9358,8 +9359,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 4:
 					if (Zeny >= 4590) {
 						set zeny,zeny-4590;
@@ -9368,8 +9369,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 5:
 					if (Zeny >= 4590) {
 						set zeny,zeny-4590;
@@ -9378,8 +9379,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 6:
 					if (Zeny >= 4590) {
 						set zeny,zeny-4590;
@@ -9388,8 +9389,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 7:
 					if (Zeny >= 4590) {
 						set zeny,zeny-4590;
@@ -9398,8 +9399,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 8:
 					break;
 				}
@@ -9414,8 +9415,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 2:
 					if (Zeny >= 4170) {
 						set zeny,zeny-4170;
@@ -9424,8 +9425,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 3:
 					if (Zeny >= 4170) {
 						set zeny,zeny-4170;
@@ -9434,8 +9435,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 4:
 					if (Zeny >= 4170) {
 						set zeny,zeny-4170;
@@ -9444,8 +9445,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 5:
 					if (Zeny >= 4170) {
 						set zeny,zeny-4170;
@@ -9454,8 +9455,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 6:
 					if (Zeny >= 4170) {
 						set zeny,zeny-4170;
@@ -9464,8 +9465,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 7:
 					if (Zeny >= 4170) {
 						set zeny,zeny-4170;
@@ -9474,8 +9475,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 8:
 					if (Zeny >= 4170) {
 						set zeny,zeny-4170;
@@ -9484,8 +9485,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 9:
 					break;
 				}
@@ -9500,8 +9501,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 2:
 					if (Zeny >= 4025) {
 						set zeny,zeny-4025;
@@ -9510,8 +9511,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 3:
 					if (Zeny >= 4025) {
 						set zeny,zeny-4025;
@@ -9520,8 +9521,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 4:
 					if (Zeny >= 4025) {
 						set zeny,zeny-4025;
@@ -9530,8 +9531,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 5:
 					if (Zeny >= 4025) {
 						set zeny,zeny-4025;
@@ -9540,8 +9541,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 6:
 					if (Zeny >= 4025) {
 						set zeny,zeny-4025;
@@ -9550,8 +9551,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 7:
 					if (Zeny >= 4025) {
 						set zeny,zeny-4025;
@@ -9560,8 +9561,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 8:
 					if (Zeny >= 4025) {
 						set zeny,zeny-4025;
@@ -9570,8 +9571,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 9:
 					if (Zeny >= 4025) {
 						set zeny,zeny-4025;
@@ -9580,8 +9581,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 10:
 					break;
 				}
@@ -9596,8 +9597,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 2:
 					if (Zeny >= 3970) {
 						set zeny,zeny-3970;
@@ -9606,8 +9607,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 3:
 					if (Zeny >= 3970) {
 						set zeny,zeny-3970;
@@ -9616,8 +9617,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 4:
 					if (Zeny >= 3970) {
 						set zeny,zeny-3970;
@@ -9626,8 +9627,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 5:
 					if (Zeny >= 3970) {
 						set zeny,zeny-3970;
@@ -9636,8 +9637,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 6:
 					if (Zeny >= 3970) {
 						set zeny,zeny-3970;
@@ -9646,8 +9647,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 7:
 					if (Zeny >= 3970) {
 						set zeny,zeny-3970;
@@ -9656,8 +9657,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 8:
 					if (Zeny >= 3970) {
 						set zeny,zeny-3970;
@@ -9666,8 +9667,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 9:
 					if (Zeny >= 3970) {
 						set zeny,zeny-3970;
@@ -9676,8 +9677,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 10:
 					if (Zeny >= 3970) {
 						set zeny,zeny-3970;
@@ -9686,8 +9687,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 					else {
 						mes "[Cat Hand Agent]";
 						mes "Don't play with money.";
-						close;
 					}
+					close;
 				case 11:
 					break;
 				}
@@ -9708,8 +9709,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 				else {
 					mes "[Cat Hand Agent]";
 					mes "Don't play with money.";
-					close;
 				}
+				close;
 			case 2:
 				if (Zeny >= 5500) {
 					set zeny,zeny-5500;
@@ -9718,8 +9719,8 @@ mid_camp,62,125,4	script	Cat Hand Agent	421,{
 				else {
 					mes "[Cat Hand Agent]";
 					mes "Don't play with money.";
-					close;
 				}
+				close;
 			case 3:
 				mes "[Cat Hand Agent]";
 				mes "Thank you for using our service.";