Fixed and cleaned Izlude Arena and some other scripts.

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

3 files changed, 15 insertions, 29 deletions

diff --git a/npc/other/hugel_bingo.txt b/npc/other/hugel_bingo.txt
index 483ba7f52..fd276ec33 100644
--- a/npc/other/hugel_bingo.txt
+++ b/npc/other/hugel_bingo.txt
@@ -57,12 +57,6 @@ OnInit:
 	end;
 
 OnTouch:
-    if ( zeny < 1000 ) {
-        mapannounce "que_bingo","Eukran: Oh it looks like "+strcharinfo(0)+" doesn't have enough money. I'm sorry but I must cancel the game~",1,0xFFAB54;
-        setnpctimer 201999,"start#bingo"; // manual reset
-        end;
-    }
-	set Zeny,Zeny -1000;
 	set @bingo_a1$,0;
 	set @bingo_a2$,0;
 	set @bingo_a3$,0;
@@ -171,6 +165,7 @@ OnTimer203000:
 	end;
 
 OnTimer204000:
+	areawarp "que_bingo",44,115,54,126,"que_bingo",40,121;
 	disablenpc "out3#bingo";
 	set $hu_bingoa,0;
 	set $hu_bingob,0;
@@ -422,11 +417,7 @@ OnTimer445000:
 OnTimer460000:
 	mapannounce "que_bingo","Eukran: I'm sorry, but this game has ended without a winner. Thanks for playing, everyone~",1,0xFFAB54;
 	donpcevent "1a#bingo::OnInit";
-	donpcevent "player1#bingo::OnOut";
-	donpcevent "player2#bingo::OnOut";
-	donpcevent "player3#bingo::OnOut";
-	donpcevent "player4#bingo::OnOut";
-	donpcevent "player5#bingo::OnOut";
+	areawarp "que_bingo",44,115,54,126,"que_bingo",40,121;
 	set $hu_bingoa,0;
 	donpcevent "Bingo Waiting Room::OnStart";
 	end;
@@ -875,9 +866,9 @@ OnTimer5000:
 	disablenpc "end1c#bingo";
 	disablenpc "end1d#bingo";
 	disablenpc "end1e#bingo";
+	areawarp "que_bingo",44,115,54,126,"que_bingo",40,121;
 	set $hu_bingoa,0;
 	donpcevent "Bingo Waiting Room::OnStart";
-	areawarp "que_bingo",69,108,30,135,"hugel",59,207;
 	end;
 }
 
diff --git a/npc/other/mail.txt b/npc/other/mail.txt
index 8d98f87e2..8b236fc76 100644
--- a/npc/other/mail.txt
+++ b/npc/other/mail.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.7
+//= 1.8
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -19,6 +19,7 @@
 //= 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. [Elias]
+//= 1.8 Optimized a bit. [Daegaladh]
 //============================================================
 
 // Floating mailbox npc that all NPCs duplicate from.
@@ -29,28 +30,22 @@
 	mes "to pay 130 zeny.";
 	mes "Would you like to use the service?";
 	next;
-	switch(select("Yes.","No.")) {
-	case 1:
+	mes "[Mailbox]";
+	if (select("Yes.:No.") == 1) {
 		if (Zeny < 130) {
-			mes "[Mailbox]";
 			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;
+			close;
 		}
-		
-	case 2:
-		mes "[Mailbox]";
 		mes "Thank you, please come again.";
-		break;
+		set Zeny,(Zeny - 130);
+		close2;
+		openmail;
+		end;
 	}
-close;
+	mes "Thank you, please come again.";
+	close;
 }
 
 // Prontera
diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt
index 6782c7473..cda9c2abe 100644
--- a/npc/other/pvp.txt
+++ b/npc/other/pvp.txt
@@ -428,7 +428,7 @@ OnTouch:
 	end;
 }
 
-pvp_2vs2,5,4,0	duplicate(PVPSpecWarp)	Combat Square Staff#1	45,1,1,{
+pvp_2vs2,5,4,0	duplicate(PVPSpecWarp)	Combat Square Staff#1	45,1,1
 pvp_2vs2,5,74,0	duplicate(PVPSpecWarp)	Combat Square Staff#2	45,1,1
 pvp_2vs2,74,74,0	duplicate(PVPSpecWarp)	Combat Square Staff#3	45,1,1
 pvp_2vs2,74,5,0	duplicate(PVPSpecWarp)	Combat Square Staff#4	45,1,1