optimized warps scripts

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

3 files changed, 43 insertions, 50 deletions

diff --git a/npc/warps/dungeons/alde_ct.txt b/npc/warps/dungeons/alde_ct.txt
index 69d2a6df7..2ec503dc2 100644
--- a/npc/warps/dungeons/alde_ct.txt
+++ b/npc/warps/dungeons/alde_ct.txt
@@ -3,14 +3,14 @@
 //===== By: ==================================================

 //= Nana (1.0)

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

-//= 1.2

+//= 1.3

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

 //= Any Athena Version; RO Episode 2+

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

 //= Warp Points for Clock Tower

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

-//= Split off Aldebaran.txt

-//= 1.1 fixed clt007 warp

+//= Split off Aldebaran.txt 1.1 fixed clt007 warp

+//= 1.3 Optimized [Lupus]

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

 

 //= Al De Baran Clock Tower

@@ -27,10 +27,9 @@ c_tower2.gat,273,26,0	warp	clt005	1,1,c_tower1.gat,235,223
 //= Random 2-1 ===============================================

 c_tower2.gat,13,288,4	script	clt006r	45,1,1,{

 	set @r,rand(3);

-	if(@r==0) goto w1;

 	if(@r==1) goto w2;

 	if(@r==2) goto w3;

-	w1:	warp "c_tower2.gat",13,282; end;

+		warp "c_tower2.gat",13,282; end;

 	w2:	warp "alde_dun03.gat",175,131; end;

 	w3:	warp "c_tower3.gat",235,7; end;

 }

@@ -38,10 +37,9 @@ c_tower2.gat,13,288,4	script	clt006r	45,1,1,{
 //= Random 2-2 ===============================================

 c_tower2.gat,223,267,4	script	clt007r	45,1,1,{

 	set @r,rand(3);

-	if(@r==0) goto w1;

 	if(@r==1) goto w2;

 	if(@r==2) goto w3;

-	w1:	warp "c_tower2.gat",288,267; end;

+		warp "c_tower2.gat",288,267; end;

 	w2:	warp "alde_dun03.gat",130,130; end;

 	w3:	warp "c_tower3.gat",252,29; end;

 }

@@ -55,20 +53,20 @@ c_tower3.gat,146,8,0	warp	clt013	1,1,c_tower1.gat,235,223
 //============================================================

 //= Random 3-1 ===============================================

 c_tower3.gat,163,252,4	script	clt014r	45,1,1,{

-	set @r,rand(2);

-	if(@r==0) goto w1;

-	if(@r==1) goto w2;

-	w1:	warp "c_tower3.gat",168,252; end;

-	w2:	warp "alde_dun02.gat",262,41; end;

+	if(rand(2)) {

+		warp "c_tower3.gat",168,252;

+	} else {

+		warp "alde_dun02.gat",262,41;

+	}

+	end;

 }

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

 //= Random 3-2 ===============================================

 c_tower3.gat,240,7,4	script	clt015r	45,1,1,{

 	set @r,rand(3);

-	if(@r==0) goto w1;

 	if(@r==1) goto w2;

 	if(@r==2) goto w3;

-	w1:	warp "c_tower2.gat",13,282; end;

+		warp "c_tower2.gat",13,282; end;

 	w2:	warp "alde_dun03.gat",175,131; end;

 	w3:	warp "c_tower3.gat",235,7; end;

 }

@@ -76,10 +74,9 @@ c_tower3.gat,240,7,4	script	clt015r	45,1,1,{
 //= Random 3-3 ===============================================

 c_tower3.gat,252,24,4	script	clt016r	45,1,1,{

 	set @r,rand(3);

-	if(@r==0) goto w1;

 	if(@r==1) goto w2;

 	if(@r==2) goto w3;

-	w1:	warp "c_tower2.gat",228,267; end;

+		warp "c_tower2.gat",228,267; end;

 	w2:	warp "alde_dun03.gat",130,130; end;

 	w3:	warp "c_tower3.gat",252,29; end;

 }

@@ -99,11 +96,10 @@ c_tower4.gat,204,57,0	warp	clt026	1,1,c_tower4.gat,65,77
 //= Random 4-1 ===============================================

 c_tower4.gat,75,156,4	script	clt027r	45,0,0,{

 	set @r,rand(4);

-	if(@r==0) goto w1;

 	if(@r==1) goto w2;

 	if(@r==2) goto w3;

 	if(@r==3) goto w4;

-	w1:	warp "c_tower3.gat",168,252; end;

+		warp "c_tower3.gat",168,252; end;

 	w2:	warp "alde_dun02.gat",262,41; end;

 	w3:	warp "c_tower4.gat",73,154; end;

 	w4:	warp "c_tower4.gat",140,149; end;

@@ -112,11 +108,10 @@ c_tower4.gat,75,156,4	script	clt027r	45,0,0,{
 //= Random 4-2 ===============================================

 c_tower4.gat,68,79,4	script	clt028r	45,0,0,{

 	set @r,rand(4);

-	if(@r==0) goto w1;

 	if(@r==1) goto w2;

 	if(@r==2) goto w3;

 	if(@r==3) goto w4;

-	w1:	warp "c_tower2.gat",13,282; end;

+		warp "c_tower2.gat",13,282; end;

 	w2:	warp "alde_dun03.gat",175,131; end;

 	w3:	warp "c_tower3.gat",235,7; end;

 	w4:	warp "c_tower4.gat",65,77; end;

@@ -125,11 +120,10 @@ c_tower4.gat,68,79,4	script	clt028r	45,0,0,{
 //= Random 4-3 ===============================================

 c_tower4.gat,142,151,4	script	clt029r	45,0,0,{

 	set @r,rand(4);

-	if(@r==0) goto w1;

 	if(@r==1) goto w2;

 	if(@r==2) goto w3;

 	if(@r==3) goto w4;

-	w1:	warp "c_tower3.gat",168,252; end;

+		warp "c_tower3.gat",168,252; end;

 	w2:	warp "alde_dun02.gat",262,41; end;

 	w3:	warp "c_tower4.gat",73,154; end;

 	w4: warp "c_tower4.gat",140,149; end;

@@ -138,11 +132,10 @@ c_tower4.gat,142,151,4	script	clt029r	45,0,0,{
 //= Random 4-4 ===============================================

 c_tower4.gat,151,96,4	script	clt030r	45,0,0,{

 	set @r,rand(4);

-	if(@r==0) goto w1;

 	if(@r==1) goto w2;

 	if(@r==2) goto w3;

 	if(@r==3) goto w4;

-	w1:	warp "c_tower2.gat",228,267; end;

+		warp "c_tower2.gat",228,267; end;

 	w2:	warp "alde_dun03.gat",130,130; end;

 	w3:	warp "c_tower3.gat",252,29; end;

 	w4:	warp "c_tower4.gat",152,95; end;

@@ -151,11 +144,10 @@ c_tower4.gat,151,96,4	script	clt030r	45,0,0,{
 //= Random 4-5 ===============================================

 c_tower4.gat,189,40,4	script	clt031r	45,2,2,{

 	set @r,rand(4);

-	if(@r==0) goto w1;

 	if(@r==1) goto w2;

 	if(@r==2) goto w3;

 	if(@r==3) goto w4;

-	w1:	warp "c_tower2.gat",228,267; end;

+		warp "c_tower2.gat",228,267; end;

 	w2:	warp "alde_dun03.gat",130,130; end;

 	w3:	warp "c_tower3.gat",252,29; end;

 	w4:	warp "c_tower4.gat",152,95; end;

@@ -172,11 +164,12 @@ alde_dun02.gat,187,234,0	warp	ald007	2,2,c_tower3.gat,65,147
 //============================================================

 //= Random B2 ================================================

 alde_dun02.gat,267,41,4	script	clt008r	45,1,1,{

-	set @r,rand(2);

-	if(@r==0) goto w1;

-	if(@r==1) goto w2;

-	w1:	warp "c_tower3.gat",168,252; end;

-	w2:	warp "alde_dun02.gat",262,141; end;

+	if(rand(2)) {

+		warp "c_tower3.gat",168,252;

+	} else {

+		warp "alde_dun02.gat",262,141;

+	}

+	end;

 }

 alde_dun03.gat,12,267,0	warp	aldd09	2,2,alde_dun02.gat,273,250

 alde_dun03.gat,277,183,0	warp	ald010	2,2,c_tower2.gat,27,27

@@ -187,10 +180,9 @@ alde_dun03.gat,276,48,0	warp	ald012	2,2,c_tower1.gat,235,223
 //= Random B3-1 ================================================

 alde_dun03.gat,130,125,4	script	clt014r	45,1,1,{

 	set @r,rand(3);

-	if(@r==0) goto w1;

 	if(@r==1) goto w2;

 	if(@r==2) goto w3;

-	w1:	warp "c_tower2.gat",228,267; end;

+		warp "c_tower2.gat",228,267; end;

 	w2:	warp "alde_dun03.gat",130,130; end;

 	w3:	warp "c_tower3.gat",252,29; end;

 }

@@ -198,10 +190,9 @@ alde_dun03.gat,130,125,4	script	clt014r	45,1,1,{
 //= Random 3-2 ===============================================

 alde_dun03.gat,171,127,4	script	clt015r	45,1,1,{

 	set @r,rand(4);

-	if(@r==0) goto w1;

 	if(@r==1) goto w2;

 	if(@r==2) goto w3;

-	w1:	warp "c_tower2.gat",13,282; end;

+		warp "c_tower2.gat",13,282; end;

 	w2:	warp "alde_dun03.gat",175,131; end;

 	w3:	warp "c_tower3.gat",235,7; end;

 }

@@ -213,14 +204,12 @@ alde_dun04.gat,208,58,0	warp	aldd20	2,2,alde_dun04.gat,268,74
 alde_dun04.gat,272,74,0	warp	aldd021	2,2,alde_dun04.gat,204,62

 alde_dun04.gat,80,34,4	script	clt022r	45,1,1,{

 	set @r,rand(4);

-	if(@r==0) goto w1;

 	if(@r==1) goto w2;

 	if(@r==2) goto w3;

 	if(@r==3) goto w4;

-	w1:	warp "c_tower2.gat",13,282; end;

+		warp "c_tower2.gat",13,282; end;

 	w2:	warp "alde_dun03.gat",175,131; end;

 	w3:	warp "c_tower3.gat",235,7; end;

 	w4:	warp "alde_dun04.gat",84,36; end;

 }

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

-//============================================================

diff --git a/npc/warps/dungeons/ant_hell.txt b/npc/warps/dungeons/ant_hell.txt
index 808f5c4b2..94d12ea1c 100644
--- a/npc/warps/dungeons/ant_hell.txt
+++ b/npc/warps/dungeons/ant_hell.txt
@@ -3,25 +3,31 @@
 //===== By: ==================================================

 //= Nana (1.0)

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

-//= 1.2

+//= 1.3

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

 //= Any Athena Version

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

 //= Warp Points for Ant Hell

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

-//= No Comment!

+//= 1.3 Changed var anthell to @anthell. Optimized [Lupus]

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

 

 //= Ant Hell =================================================

 anthell01.gat,35,267,0	script	ant001	45,1,1,{

-	if( anthell==1) goto moc15;

-	warp "moc_fild04.gat",213,327; end;

-moc15:	warp "moc_fild15.gat",251,248; end;

+	if(@anthell) {

+		warp "moc_fild15.gat",251,248;

+	} else {

+		warp "moc_fild04.gat",213,327;

+	}

+	end;

 }

 anthell02.gat,171,169,0	script	ant001	45,1,2,{

-	if(anthell==0) goto moc15;

-	warp "moc_fild04.gat",213,327; end;

-moc15:	warp "moc_fild15.gat",251,248; end;

+	if(@anthell) {

+		warp "moc_fild04.gat",213,327;

+	} else {

+		warp "moc_fild15.gat",251,248;

+	}

+	end;

 }

 anthell01.gat,253,32,0	warp	ant01	2,1,anthell02.gat,34,263

 anthell02.gat,32,267,0	warp	ant01-1	2,2,anthell01.gat,253,35

diff --git a/npc/warps/dungeons/payon_dun.txt b/npc/warps/dungeons/payon_dun.txt
index b337a0aed..1857a3c86 100644
--- a/npc/warps/dungeons/payon_dun.txt
+++ b/npc/warps/dungeons/payon_dun.txt
@@ -3,13 +3,12 @@
 //===== By: ================================================== 

 //= Nana (1.0)

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

-//= 1.1a

+//= 1.2

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

 //= Any eAthena Mod

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

 //= Payon Dungeon Warps

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

-//= No Comment

 //= 1.1a Fixed 'payd04r' warping players to a non-existant tile [MasterOfMuppets]

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

 

@@ -23,11 +22,10 @@ pay_dun02.gat,16,63,0	warp	payd02-1	2,7,pay_dun01.gat,283,28
 pay_dun03.gat,155,161,0	warp	payd03-1	2,1,pay_dun02.gat,137,126	

 pay_dun03.gat,127,62,4	script	payd04r	45,2,2,{

 	set @r,rand(4);

-	if(@r==0) goto w1;

 	if(@r==1) goto w2;

 	if(@r==2) goto w3;

 	if(@r==3) goto w4;

-	w1:	warp "pay_dun04.gat",201,204; end;

+		warp "pay_dun04.gat",201,204; end;

 	w2:	warp "pay_dun04.gat",189,43; end;

 	w3:	warp "pay_dun04.gat",43,40; end;

 	w4:	warp "pay_dun04.gat",34,202; end;