diff options
| -rw-r--r-- | npc/custom/itembind.txt | 2 | ||||
| -rw-r--r-- | npc/other/arena/arena_room.txt | 14 | ||||
| -rw-r--r-- | npc/other/poring_war.txt | 22 | ||||
| -rw-r--r-- | npc/quests/okolnir.txt | 40 | ||||
| -rw-r--r-- | npc/re/instances/OldGlastHeim.txt | 22 | ||||
| -rw-r--r-- | npc/re/quests/quests_lighthalzen.txt | 16 |
6 files changed, 58 insertions, 58 deletions
diff --git a/npc/custom/itembind.txt b/npc/custom/itembind.txt index f30455123..916c57a46 100644 --- a/npc/custom/itembind.txt +++ b/npc/custom/itembind.txt @@ -11,7 +11,7 @@ //= Account, Character, or Guild //============================================================ -prontera,144,174,4 script Bound Items 429,{ +prontera,144,174,4 script Bound Items 4_M_JP_MID,{ mes "I can bind your items to your account, guild, or character"+((.bindprice)?" for a ^0000FF"+.bindprice+"^000000 zeny fee":"")+"."; next; diff --git a/npc/other/arena/arena_room.txt b/npc/other/arena/arena_room.txt index 3c4504d39..9330fcf6a 100644 --- a/npc/other/arena/arena_room.txt +++ b/npc/other/arena/arena_room.txt @@ -759,13 +759,13 @@ prt_are_in,1,1,5 duplicate(#arena_1039) #arena_6969 4_F_06 prt_are_in,94,26,5 duplicate(#arena_1039) #arena_ss_2 4_F_06 prt_are_in,100,28,3 duplicate(#arena_1039) #arena_ss_3 4_F_06 prt_are_in,102,26,3 duplicate(#arena_1039) #arena_ss_4 4_F_06 -prt_are_in,1,1,5 duplicate(#arena_1039) #arena_1272 1272 -prt_are_in,1,1,5 duplicate(#arena_1039) #arena_1046 1046 -prt_are_in,1,1,5 duplicate(#arena_1039) #arena_1115 1115 -prt_are_in,1,1,5 duplicate(#arena_1039) #arena_1389 1389 -prt_are_in,1,1,5 duplicate(#arena_1039) #arena_1492 1492 -prt_are_in,1,1,5 duplicate(#arena_1039) #arena_1251 1251 -prt_are_in,1,1,5 duplicate(#arena_1039) #arena_1159 1159 +prt_are_in,1,1,5 duplicate(#arena_1039) #arena_1272 DARK_LORD +prt_are_in,1,1,5 duplicate(#arena_1039) #arena_1046 DOPPELGANGER +prt_are_in,1,1,5 duplicate(#arena_1039) #arena_1115 EDDGA +prt_are_in,1,1,5 duplicate(#arena_1039) #arena_1389 DRACULA +prt_are_in,1,1,5 duplicate(#arena_1039) #arena_1492 INCANTATION_SAMURAI +prt_are_in,1,1,5 duplicate(#arena_1039) #arena_1251 KNIGHT_OF_WINDSTORM +prt_are_in,1,1,5 duplicate(#arena_1039) #arena_1159 PHREEONI prt_are_in,1,1,5 duplicate(#arena_1039) #arena_7777 4_F_VALKYRIE - script npctime#arena -1,{ diff --git a/npc/other/poring_war.txt b/npc/other/poring_war.txt index 507efe85d..3cd36dbfe 100644 --- a/npc/other/poring_war.txt +++ b/npc/other/poring_war.txt @@ -1652,17 +1652,17 @@ OnTouch: end; } -poring_w01,79,102,5 duplicate(Angeling Side Poring#wpa) Angeling Side Poring#wa1 1002 -poring_w01,80,107,5 duplicate(Angeling Side Poring#wpa) Angeling Side Poring#wa2 1002 -poring_w01,84,108,5 duplicate(Angeling Side Poring#wpa) Angeling Side Poring#wa3 1002 -poring_w01,84,112,5 duplicate(Angeling Side Poring#wpa) Angeling Side Poring#wa4 1002 -poring_w01,88,112,5 duplicate(Angeling Side Poring#wpa) Angeling Side Poring#wa5 1002 - -poring_w01,114,112,3 duplicate(Deviling Side Marin#wpd) Deviling Side Marin#wd1 1242 -poring_w01,117,111,3 duplicate(Deviling Side Marin#wpd) Deviling Side Marin#wd2 1242 -poring_w01,117,108,3 duplicate(Deviling Side Marin#wpd) Deviling Side Marin#wd3 1242 -poring_w01,122,108,3 duplicate(Deviling Side Marin#wpd) Deviling Side Marin#wd4 1242 -poring_w01,121,105,3 duplicate(Deviling Side Marin#wpd) Deviling Side Marin#wd5 1242 +poring_w01,79,102,5 duplicate(Angeling Side Poring#wpa) Angeling Side Poring#wa1 PORING +poring_w01,80,107,5 duplicate(Angeling Side Poring#wpa) Angeling Side Poring#wa2 PORING +poring_w01,84,108,5 duplicate(Angeling Side Poring#wpa) Angeling Side Poring#wa3 PORING +poring_w01,84,112,5 duplicate(Angeling Side Poring#wpa) Angeling Side Poring#wa4 PORING +poring_w01,88,112,5 duplicate(Angeling Side Poring#wpa) Angeling Side Poring#wa5 PORING + +poring_w01,114,112,3 duplicate(Deviling Side Marin#wpd) Deviling Side Marin#wd1 MARIN +poring_w01,117,111,3 duplicate(Deviling Side Marin#wpd) Deviling Side Marin#wd2 MARIN +poring_w01,117,108,3 duplicate(Deviling Side Marin#wpd) Deviling Side Marin#wd3 MARIN +poring_w01,122,108,3 duplicate(Deviling Side Marin#wpd) Deviling Side Marin#wd4 MARIN +poring_w01,121,105,3 duplicate(Deviling Side Marin#wpd) Deviling Side Marin#wd5 MARIN poring_w01,84,108,3 script #wop_ex_1 HIDDEN_WARP_NPC,3,3,{ end; diff --git a/npc/quests/okolnir.txt b/npc/quests/okolnir.txt index 78d4e6b0e..4dea1dc69 100644 --- a/npc/quests/okolnir.txt +++ b/npc/quests/okolnir.txt @@ -978,16 +978,16 @@ OnInit: end; } -que_qaru01,131,136,3 duplicate(Piamette#main) Piamette#aru01 1930 -que_qaru02,131,136,3 duplicate(Piamette#main) Piamette#aru02 1930 -que_qaru03,131,136,3 duplicate(Piamette#main) Piamette#aru03 1930 -que_qaru04,131,136,3 duplicate(Piamette#main) Piamette#aru04 1930 -que_qaru05,131,136,3 duplicate(Piamette#main) Piamette#aru05 1930 -que_qsch01,131,136,3 duplicate(Piamette#main) Piamette#sch01 1930 -que_qsch02,131,136,3 duplicate(Piamette#main) Piamette#sch02 1930 -que_qsch03,131,136,3 duplicate(Piamette#main) Piamette#sch03 1930 -que_qsch04,131,136,3 duplicate(Piamette#main) Piamette#sch04 1930 -que_qsch05,131,136,3 duplicate(Piamette#main) Piamette#sch05 1930 +que_qaru01,131,136,3 duplicate(Piamette#main) Piamette#aru01 PIAMETTE +que_qaru02,131,136,3 duplicate(Piamette#main) Piamette#aru02 PIAMETTE +que_qaru03,131,136,3 duplicate(Piamette#main) Piamette#aru03 PIAMETTE +que_qaru04,131,136,3 duplicate(Piamette#main) Piamette#aru04 PIAMETTE +que_qaru05,131,136,3 duplicate(Piamette#main) Piamette#aru05 PIAMETTE +que_qsch01,131,136,3 duplicate(Piamette#main) Piamette#sch01 PIAMETTE +que_qsch02,131,136,3 duplicate(Piamette#main) Piamette#sch02 PIAMETTE +que_qsch03,131,136,3 duplicate(Piamette#main) Piamette#sch03 PIAMETTE +que_qsch04,131,136,3 duplicate(Piamette#main) Piamette#sch04 PIAMETTE +que_qsch05,131,136,3 duplicate(Piamette#main) Piamette#sch05 PIAMETTE - script #event_start01_main -1,{ end; @@ -2128,16 +2128,16 @@ OnInit: hideonnpc "Wish Maiden#"+.@sub$+"_boss"; end; } -que_qaru01,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#aru01_boss 1931 -que_qaru02,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#aru02_boss 1931 -que_qaru03,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#aru03_boss 1931 -que_qaru04,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#aru04_boss 1931 -que_qaru05,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#aru05_boss 1931 -que_qsch01,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#sch01_boss 1931 -que_qsch02,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#sch02_boss 1931 -que_qsch03,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#sch03_boss 1931 -que_qsch04,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#sch04_boss 1931 -que_qsch05,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#sch05_boss 1931 +que_qaru01,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#aru01_boss WISH_MAIDEN +que_qaru02,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#aru02_boss WISH_MAIDEN +que_qaru03,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#aru03_boss WISH_MAIDEN +que_qaru04,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#aru04_boss WISH_MAIDEN +que_qaru05,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#aru05_boss WISH_MAIDEN +que_qsch01,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#sch01_boss WISH_MAIDEN +que_qsch02,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#sch02_boss WISH_MAIDEN +que_qsch03,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#sch03_boss WISH_MAIDEN +que_qsch04,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#sch04_boss WISH_MAIDEN +que_qsch05,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#sch05_boss WISH_MAIDEN - script Wish Maiden#main_gift -1,{ set .@sub$,callfunc("F_Okolnir"); diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt index 18fdfa4e3..33027e830 100644 --- a/npc/re/instances/OldGlastHeim.txt +++ b/npc/re/instances/OldGlastHeim.txt @@ -734,17 +734,17 @@ OnTalkK: } end; } -1@gl_k,154,54,3 duplicate(.#ghinstance1) .#ghinstance2 2471 -1@gl_k,145,64,6 duplicate(.#ghinstance1) .#ghinstance5 2471 -1@gl_k,154,64,3 duplicate(.#ghinstance1) .#ghinstance6 2471 -1@gl_k,145,74,6 duplicate(.#ghinstance1) .#ghinstance9 2471 -1@gl_k,154,74,3 duplicate(.#ghinstance1) .#ghinstance10 2471 -1@gl_k,145,84,6 duplicate(.#ghinstance1) .#ghinstance13 2471 -1@gl_k,154,84,3 duplicate(.#ghinstance1) .#ghinstance14 2471 -1@gl_k,145,94,6 duplicate(.#ghinstance1) .#ghinstance17 2471 -1@gl_k,154,94,3 duplicate(.#ghinstance1) .#ghinstance18 2471 -1@gl_k,145,104,6 duplicate(.#ghinstance1) .#ghinstance21 2471 -1@gl_k,154,104,3 duplicate(.#ghinstance1) .#ghinstance22 2471 +1@gl_k,154,54,3 duplicate(.#ghinstance1) .#ghinstance2 MG_KHALITZBURG +1@gl_k,145,64,6 duplicate(.#ghinstance1) .#ghinstance5 MG_KHALITZBURG +1@gl_k,154,64,3 duplicate(.#ghinstance1) .#ghinstance6 MG_KHALITZBURG +1@gl_k,145,74,6 duplicate(.#ghinstance1) .#ghinstance9 MG_KHALITZBURG +1@gl_k,154,74,3 duplicate(.#ghinstance1) .#ghinstance10 MG_KHALITZBURG +1@gl_k,145,84,6 duplicate(.#ghinstance1) .#ghinstance13 MG_KHALITZBURG +1@gl_k,154,84,3 duplicate(.#ghinstance1) .#ghinstance14 MG_KHALITZBURG +1@gl_k,145,94,6 duplicate(.#ghinstance1) .#ghinstance17 MG_KHALITZBURG +1@gl_k,154,94,3 duplicate(.#ghinstance1) .#ghinstance18 MG_KHALITZBURG +1@gl_k,145,104,6 duplicate(.#ghinstance1) .#ghinstance21 MG_KHALITZBURG +1@gl_k,154,104,3 duplicate(.#ghinstance1) .#ghinstance22 MG_KHALITZBURG 1@gl_k,145,59,6 script .#ghinstance3 HIDDEN_NPC,{ end; diff --git a/npc/re/quests/quests_lighthalzen.txt b/npc/re/quests/quests_lighthalzen.txt index 68148a1b4..19ca406d6 100644 --- a/npc/re/quests/quests_lighthalzen.txt +++ b/npc/re/quests/quests_lighthalzen.txt @@ -403,14 +403,14 @@ OnEffect3: specialeffect EF_FLASHER; end; } -que_lhz,148,231,0 duplicate(Awake Specimen#lhz) Awake Specimen#0 2244 -que_lhz,140,231,1 duplicate(Awake Specimen#lhz) Awake Specimen#1 2244 -que_lhz,140,224,2 duplicate(Awake Specimen#lhz) Awake Specimen#2 2244 -que_lhz,140,216,3 duplicate(Awake Specimen#lhz) Awake Specimen#3 2244 -que_lhz,147,216,4 duplicate(Awake Specimen#lhz) Awake Specimen#4 2244 -que_lhz,155,216,5 duplicate(Awake Specimen#lhz) Awake Specimen#5 2244 -que_lhz,155,224,6 duplicate(Awake Specimen#lhz) Awake Specimen#6 2244 -que_lhz,155,231,7 duplicate(Awake Specimen#lhz) Awake Specimen#7 2244 +que_lhz,148,231,0 duplicate(Awake Specimen#lhz) Awake Specimen#0 QUEST_CHEN +que_lhz,140,231,1 duplicate(Awake Specimen#lhz) Awake Specimen#1 QUEST_CHEN +que_lhz,140,224,2 duplicate(Awake Specimen#lhz) Awake Specimen#2 QUEST_CHEN +que_lhz,140,216,3 duplicate(Awake Specimen#lhz) Awake Specimen#3 QUEST_CHEN +que_lhz,147,216,4 duplicate(Awake Specimen#lhz) Awake Specimen#4 QUEST_CHEN +que_lhz,155,216,5 duplicate(Awake Specimen#lhz) Awake Specimen#5 QUEST_CHEN +que_lhz,155,224,6 duplicate(Awake Specimen#lhz) Awake Specimen#6 QUEST_CHEN +que_lhz,155,231,7 duplicate(Awake Specimen#lhz) Awake Specimen#7 QUEST_CHEN - script #controllhz4 -1,{ OnInit: |