diff options
| author | Emistry Haoyan <Equinox1991@gmail.com> | 2016-08-31 02:49:04 +0800 |
|---|---|---|
| committer | Emistry Haoyan <Equinox1991@gmail.com> | 2016-08-31 02:49:04 +0800 |
| commit | 99a36a426b7d2adb6a0f417e02e92366939e5d22 (patch) | |
| tree | 74a0fef908f373c3c6674821a150e866a2afb4c3 /npc/re/warps | |
| parent | ac6fd81810e6afb1ef60e7f2c7f8fc6e03408724 (diff) | |
| parent | 0f1d03f505fdc03533122db8ba19fa55f64f11b7 (diff) | |
| download | hercules-99a36a426b7d2adb6a0f417e02e92366939e5d22.tar.gz hercules-99a36a426b7d2adb6a0f417e02e92366939e5d22.tar.bz2 hercules-99a36a426b7d2adb6a0f417e02e92366939e5d22.tar.xz hercules-99a36a426b7d2adb6a0f417e02e92366939e5d22.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules into scriptcommand_makeitem2
Diffstat (limited to 'npc/re/warps')
| -rw-r--r-- | npc/re/warps/cities/dicastes.txt | 2 | ||||
| -rw-r--r-- | npc/re/warps/cities/izlude.txt | 2 | ||||
| -rw-r--r-- | npc/re/warps/fields/bif_fild.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/npc/re/warps/cities/dicastes.txt b/npc/re/warps/cities/dicastes.txt index e9b90614c..862765d9a 100644 --- a/npc/re/warps/cities/dicastes.txt +++ b/npc/re/warps/cities/dicastes.txt @@ -66,7 +66,7 @@ dic_in01,242,182,0 script #eldicastes0016 CLEAR_NPC,{ // Elevators - script Elevator#main FAKE_NPC,{ - .@n = atoi(strnpcinfo(2)); + .@n = atoi(strnpcinfo(NPC_NAME_HIDDEN)); .@eq = (isequipped(2782))?1:0; if (.@n <= 4) { .@m$ = (.@eq)?"Civil Services:Archive Room:Situation Room:Administrative Office":"¢³¡ð¡Ð:¡ñ¡ñ¡ò:¡ø¡ø¡ð:¡÷¡ú¡ð"; diff --git a/npc/re/warps/cities/izlude.txt b/npc/re/warps/cities/izlude.txt index a6229d25b..a8062d578 100644 --- a/npc/re/warps/cities/izlude.txt +++ b/npc/re/warps/cities/izlude.txt @@ -87,7 +87,7 @@ iz_int,96,73,0 script iz_int_iz WARPNPC,2,2,{ OnTouch: savepoint "izlude", 128, 98; - warp "izlude"+strnpcinfo(2)+"", 195, 209; + warp "izlude"+strnpcinfo(NPC_NAME_HIDDEN)+"", 195, 209; end; } diff --git a/npc/re/warps/fields/bif_fild.txt b/npc/re/warps/fields/bif_fild.txt index 2122ae15f..68e3f4f7a 100644 --- a/npc/re/warps/fields/bif_fild.txt +++ b/npc/re/warps/fields/bif_fild.txt @@ -47,7 +47,7 @@ mora,56,25,0 warp bifrost_field0005 1,1,bif_fild02,176,162 mes "When you knock on the door-like thing just for fun,"; mes "the door clicks open and you feel some mysterious force pulling you inside."; close2; - switch(atoi(charat(strnpcinfo(2),9))) { + switch(atoi(charat(strnpcinfo(NPC_NAME_HIDDEN),9))) { case 1: warp "mora",179,74; end; case 2: warp "mora",22,157; end; case 3: warp "mora",58,27; end; |