* Updated Mail.

* Fixed Waitroom MaxLevel from poring_war (bugreport:5262).
* Added card_trader.
* Added card_trader to scripts_athena (disabled by default).
* Added MidCamp Warper/Ash-Vacuum from quest_13_1 (gogoash).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15514 54d463be-8e91-2dee-dedb-b68131a5f0ec

npc/other/mail.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.6
+//= 1.7
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -18,41 +18,39 @@
 //= 1.4 Added a Mapflag to prevent mail operations in other maps [Zephyrus]
 //= 1.5 Moved Morroc Mail boxes to Morroc Ruins. [L0ne_W0lf]
 //= 1.6 Duplicates now spawn from floating NPCs. [L0ne_W0lf]
+//= 1.7 Updated Script from the Official. [Slim]
 //============================================================
 
 // Floating mailbox npc that all NPCs duplicate from.
 //============================================================
 -	script	Mailbox#dummy::MailBox	-1,{
 	mes "[Mailbox]";
-	mes "If you'd like to use";
-	mes "the Mailbox Service,";
-	mes "you must first pay";
-	mes "the 130 zeny service fee.";
-	mes "Would you like to use the";
-	mes "mailbox now?";
+	mes "To use the mailbox service, you are required";
+	mes "to pay 130 zeny.";
+	mes "Would you like to use the service?";
 	next;
-	if (select("Yes.:No.") == 1) {
+	switch(select("Yes.","No.")) {
+	case 1:
 		if (Zeny < 130) {
 			mes "[Mailbox]";
-			mes "I am sorry, but would";
-			mes "you please check your";
-			mes "money again? You don't";
-			mes "have enough zeny to pay";
-			mes "the 130 zeny service fee.";
-			close;
+			mes "I am sorry, but you do not have enough money.";
+			mes "To use the mailbox service, you are required";
+			mes "to pay 130 zeny.";
+			break;
+		} else {
+			mes "[Mailbox]";
+			mes "Thank you, please come again.";
+			set Zeny,(Zeny - 130);
+			openmail;
+			break;
 		}
+		
+	case 2:
 		mes "[Mailbox]";
-		mes "Thank you for your";
-		mes "patronage. Please come";
-		mes "again soon, and use our";
-		mes "convenient Mailbox Service~";
-		set Zeny,Zeny-130;
-		openmail;
-		close;
+		mes "Thank you, please come again.";
+		break;
 	}
-	mes "[Mailbox]";
-	mes "Thank you, please come again.";
-	close;
+close;
 }
 
 // Prontera

npc/other/poring_war.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Kisuka
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1a
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //===== Additional Comments: ================================= 
 //= 1.0 First version. [Kisuka][5511]
 //= 1.1 Fixed some typos/bugs. [CalciumKid]
+//= 1.1a Fixed Waiting rooms witht he default MAX_LEVEL [Slim]
 //============================================================
 
 // Poring War Recruiter
@@ -357,7 +358,7 @@ poring_w01,91,97,3	script	Poring#wop_door_all	1002,{
 	end;
 	
 OnInit:
-	waitingroom "[Recruiting 10 Battle Participants]",10,"Poring#wop_door_all::OnStartArena",10,500,9,99;
+	waitingroom "[Recruiting 10 Battle Participants]",10,"Poring#wop_door_all::OnStartArena",10,500,9;
 	enablewaitingroomevent;
 	end;
 
@@ -380,7 +381,7 @@ poring_w01,91,68,5	script	Poring#wop_door_a	1002,{
 	end;
 
 OnInit:
-	waitingroom "[Angeling Team Recruiter]",5,"Poring#wop_door_a::OnStartArena",5,0,9,99;
+	waitingroom "[Angeling Team Recruiter]",5,"Poring#wop_door_a::OnStartArena",5,0,9;
 	enablewaitingroomevent;
 	end;
 
@@ -472,7 +473,7 @@ poring_w01,112,68,3	script	Poring#wop_door_d	1002,{
 	end;
 
 OnInit:
-	waitingroom "[Deviling Team Recruiter]",5,"Poring#wop_door_d::OnStartArena",5,0,9,99;
+	waitingroom "[Deviling Team Recruiter]",5,"Poring#wop_door_d::OnStartArena",5,0,9;
 	enablewaitingroomevent;
 	end;
 

npc/quests/quests_13_1.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.8
+//= 2.0
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -35,7 +35,8 @@
 //= 1.6 Fixed check in cat hand agent.
 //= 1.7 Moved the close in Cat Hand Service Warps. (bugreport:4079) [L0ne_W0lf]
 //= 1.8 Added 13.2 Additions to Report from the New World NPCs
-//=     Upped success rates for Report from the New World drops.
+//= 1.9 Upped success rates for Report from the New World drops.
+//= 2.0 Added Mid Camp Warper, translated from the Official [Slim]
 //============================================================ 
 
 // Onward to the New World
@@ -18063,3 +18064,32 @@ que_dan02,102,42,3	script	Disfigured Corpse#moc2	457,{
 	close;
 }
 
+//Mid Camp Warper (gogoash), Translated from the Official [Slim]
+prontera,161,192,5	script	Ash Vacuum Warper	707,{
+	mes "[Warp Soldier]";
+	mes "For a limited period.";
+	mes "I can send you to Ash-Vacuum without any fee.";
+	next;
+	mes "[Warp Soldier]";
+	mes "Do you want to go to Ash-Vacuum right now?";
+	next;
+	switch(select("Yes, please","Not yet")) {
+
+		case 1:
+			mes "[Warp Soldier]";
+			mes "Ok. I hope you";
+			mes "enjoy your trip.";
+			close2;
+			set ep13_ryu,100;
+			warp "mid_camp",210,291;
+			break;
+		case 2:
+			mes "[Warp Soldier]";
+			mes "No problem. I understand.";
+			mes "Tell me when you change your mind.";
+			mes "See you.";
+			close;
+			break;
+	}
+	end;
+}

npc/scripts_athena.conf

@@ -299,6 +299,7 @@ npc: npc/other/auction.txt
 npc: npc/other/books.txt
 npc: npc/other/bulletin_boards.txt
 npc: npc/other/comodo_gambling.txt
+//npc: npc/other/card_trader.txt
 npc: npc/other/divorce.txt
 npc: npc/other/fortune.txt
 npc: npc/other/gympass.txt