From 46fbbaabefa29df1378ae68b7f063dbc64846042 Mon Sep 17 00:00:00 2001 From: Haru Date: Sun, 26 Oct 2014 04:26:34 +0100 Subject: Replaced 'set' with direct assignment where applicable (re folder) Signed-off-by: Haru --- npc/re/warps/cities/dicastes.txt | 12 ++++++------ npc/re/warps/cities/malaya.txt | 2 +- npc/re/warps/fields/morroc_fild.txt | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'npc/re/warps') diff --git a/npc/re/warps/cities/dicastes.txt b/npc/re/warps/cities/dicastes.txt index 9af35d123..1d1476830 100644 --- a/npc/re/warps/cities/dicastes.txt +++ b/npc/re/warps/cities/dicastes.txt @@ -41,21 +41,21 @@ dic_in01,242,182,0 script #eldicastes0016 CLEAR_NPC,{ // Elevators - script Elevator#main -1,{ - set .@n, atoi(strnpcinfo(2)); - set .@eq, (isequipped(2782))?1:0; + .@n = atoi(strnpcinfo(2)); + .@eq = (isequipped(2782))?1:0; if (.@n <= 4) { - set .@m$, (.@eq)?"Civil Services:Archive Room:Situation Room:Administrative Office":"¢³¡ð¡Ð:¡ñ¡ñ¡ò:¡ø¡ø¡ð:¡÷¡ú¡ð"; + .@m$ = (.@eq)?"Civil Services:Archive Room:Situation Room:Administrative Office":"¢³¡ð¡Ð:¡ñ¡ñ¡ò:¡ø¡ø¡ð:¡÷¡ú¡ð"; setarray .@xy, 45,286,36,212,122,282,121,201; } else if (.@n <= 11) { - set .@m$, (.@eq)?"Residential Zone 1:Residential Zone 2:Residential Zone 3:Pub Burman Flone":"¡ô¡õ¡ñ ¡þ :¢³¡ü¡Ð ¡ú :¡ï¢³¢¤ ¢² :¢±¡Ð¡ñ"; + .@m$ = (.@eq)?"Residential Zone 1:Residential Zone 2:Residential Zone 3:Pub Burman Flone":"¡ô¡õ¡ñ ¡þ :¢³¡ü¡Ð ¡ú :¡ï¢³¢¤ ¢² :¢±¡Ð¡ñ"; setarray .@xy, 42,115,110,108,178,108,260,115; } else if (.@n <= 13) { - set .@m$, (.@eq)?"Battle Station:Galten Quarters":"¡ø¡ô¡ï ¡ò :¡ü¡÷¡ó ¡÷ "; + .@m$ = (.@eq)?"Battle Station:Galten Quarters":"¡ø¡ô¡ï ¡ò :¡ü¡÷¡ó ¡÷ "; setarray .@xy, 385,272,385,208; } - set .@m, select(.@m$) - 1; + .@m = select(.@m$) - 1; warp "dic_in01",.@xy[.@m*2],.@xy[.@m*2+1]; end; } diff --git a/npc/re/warps/cities/malaya.txt b/npc/re/warps/cities/malaya.txt index 190f1831a..d6102dc48 100644 --- a/npc/re/warps/cities/malaya.txt +++ b/npc/re/warps/cities/malaya.txt @@ -92,7 +92,7 @@ OnTouch: function script F_Malaya_Warp { mes "Where would you like to go?"; next; - set .@i$, getarg(select("Back outside",getarg(1)+" Jeepney",getarg(2)+" Jeepney") - 1); + .@i$ = getarg(select("Back outside",getarg(1)+" Jeepney",getarg(2)+" Jeepney") - 1); close2; switch(getarg(3)) { case 1: // 12 passenger diff --git a/npc/re/warps/fields/morroc_fild.txt b/npc/re/warps/fields/morroc_fild.txt index 3b40d2443..3e4084640 100644 --- a/npc/re/warps/fields/morroc_fild.txt +++ b/npc/re/warps/fields/morroc_fild.txt @@ -42,7 +42,7 @@ moc_fild03,70,341,0 warp mocf04-1 5,2,moc_fild02,332,23 //moc_fild04,14,98,0 warp mocf07 1,11,moc_fild05,378,119 //moc_fild04,175,18,0 warp mocf08 3,2,moc_fild08,170,380 //moc_fild04,19,206,0 warp mocf09 3,15,moc_fild05,373,208 -//moc_fild04,219,327,0 script mocf016 WARPNPC,3,4,{ set @anthell,0; warp "anthell01",35,262; } +//moc_fild04,219,327,0 script mocf016 WARPNPC,3,4,{ @anthell = 0; warp "anthell01",35,262; } //moc_fild04,292,381,0 warp mocf01-2 10,1,moc_fild01,76,25 //moc_fild04,314,381,0 warp mocf01-3 10,1,moc_fild01,76,25 //moc_fild04,336,381,0 warp mocf01-4 10,1,moc_fild01,76,25 @@ -95,7 +95,7 @@ moc_fild13,308,49,0 warp mocf06-1 2,4,moc_fild03,20,37 //moc_fild14,196,382,0 warp mocf16-1 4,2,moc_fild08,204,19 //moc_fild15,104,16,0 warp mocf26 9,2,moc_fild16,125,380 //moc_fild15,158,363,0 warp mocf18-1 6,2,moc_fild09,126,23 -//moc_fild15,258,253,0 script mocf017 WARPNPC,3,3,{ set @anthell,1; warp "anthell01",35,262; } +//moc_fild15,258,253,0 script mocf017 WARPNPC,3,3,{ @anthell = 1; warp "anthell01",35,262; } //moc_fild15,348,18,0 warp mocf27 5,2,moc_fild16,334,379 //moc_fild15,367,276,0 warp mocf25-1 2,4,moc_fild14,19,278 //moc_fild15,38,105,0 warp mocf23-1 2,4,moc_fild11,376,197 -- cgit v1.2.3-70-g09d2