diff options
| author | shennetsind <ind@henn.et> | 2014-11-03 08:15:05 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2014-11-03 08:15:05 -0200 |
| commit | bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678 (patch) | |
| tree | 79f9aec5171e8aed2d701bf67167f260e05f41db /npc/re/warps/cities | |
| parent | 239d480487e24294975f35ed55f210837ad1088e (diff) | |
| parent | ce3f4bfbe016ea69c855146667ba9bd9e0e2e221 (diff) | |
| download | hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.gz hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.bz2 hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.xz hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.zip | |
Merge branch 'master' of github.com:HerculesWS/Hercules
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
src/map/battle.c
Diffstat (limited to 'npc/re/warps/cities')
| -rw-r--r-- | npc/re/warps/cities/dicastes.txt | 12 | ||||
| -rw-r--r-- | npc/re/warps/cities/malaya.txt | 2 |
2 files changed, 7 insertions, 7 deletions
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 |