diff options
Diffstat (limited to 'npc')
28 files changed, 96 insertions, 74 deletions
diff --git a/npc/cities/veins.txt b/npc/cities/veins.txt index d0b40a07d..c1815c828 100644 --- a/npc/cities/veins.txt +++ b/npc/cities/veins.txt @@ -551,7 +551,7 @@ ve_in,119,386,3 script Prisoner#ve1 4_M_DST_MASTER,{ close; } -ve_in,111,379,8 script Ward#ve1 4_M_DST_MASTER,{ +ve_in,111,379,0 script Ward#ve1 4_M_DST_MASTER,{ mes "[Ward]"; mes "This place ensures that"; mes "dangerous criminals aren't"; diff --git a/npc/dev/ci_test.txt b/npc/dev/ci_test.txt new file mode 100644 index 000000000..058d25ad5 --- /dev/null +++ b/npc/dev/ci_test.txt @@ -0,0 +1,22 @@ +//===== Hercules Script ====================================== +//= Script engine self-tests, CI integration +//===== By: ================================================== +//= Haru +//===== Current Version: ===================================== +//= 1.0 +//===== Description: ========================================= +//= This script depends on npc/dev/test.txt, and extends it so +// that it can be called in a CI environment and returns an +// appropriate value upon termination. +//= This script is part of the script_mapquit plugin +// distribution, and requires said plugin to be loaded. +//= Usage: ./map-server --load-plugin script_mapquit --load-script npc/dev/test.txt --load-script npc/dev/ci_test.txt + +- script HerculesSelfTestCI -1,{ + end; + +OnInit: + .@val = callfunc("HerculesSelfTestHelper"); + mapquit(.@val); + end; +} diff --git a/npc/kafras/kafras.txt b/npc/kafras/kafras.txt index 0df94899d..cfdaf183b 100644 --- a/npc/kafras/kafras.txt +++ b/npc/kafras/kafras.txt @@ -596,7 +596,7 @@ niflheim,202,180,3 script Kafra Employee::kaf_niflheim 4_F_NFDEADKAFRA,{ // Dungeons and Fields //============================================================ // - Byalan Island -izlu2dun,106,58,8 script Kafra Employee::kaf_izlu2dun 4_F_KAFRA3,{ +izlu2dun,106,58,0 script Kafra Employee::kaf_izlu2dun 4_F_KAFRA3,{ cutin "kafra_03",2; if (!RENEWAL && BaseJob == Job_Novice && job_merchant_q2 > 0) { // Merchant Job Change Quest diff --git a/npc/mobs/jail.txt b/npc/mobs/jail.txt index bf18438db..048136dcf 100644 --- a/npc/mobs/jail.txt +++ b/npc/mobs/jail.txt @@ -8,7 +8,7 @@ //= Spawns monsters in Jail. //============================================================ -sec_in02,139,80,20 monster Poring 1002,10,0,0,0 +sec_in02,139,80,20,20 monster Poring 1002,10,0,0,0 sec_in02,138,54,20,20 monster Marin 1242,5,0,0,0 sec_in02,161,46,15,15 monster Poporing 1031,5,0,0,0 sec_in02,114,47,10,10 monster Drops 1113,5,0,0,0 diff --git a/npc/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt index ca4b74388..717e69fd3 100644 --- a/npc/other/arena/arena_party.txt +++ b/npc/other/arena/arena_party.txt @@ -38,7 +38,7 @@ OnStart: end; } -prt_are_in,76,87,3 script Helper#party 67,4,4,{ +prt_are_in,76,87,3 script Helper#party 1_F_02,4,4,{ if($arn_partywait == 0) { $arn_partywait = 1; emotion e_gasp,0; diff --git a/npc/other/books.txt b/npc/other/books.txt index fed26bfeb..6ad8968b2 100644 --- a/npc/other/books.txt +++ b/npc/other/books.txt @@ -871,7 +871,7 @@ prt_in,159,56,4 script Monster Encyclopedia#2pr HIDDEN_NPC,{ } } -prt_in,161,50,4 script Monster Encyclopedia#3pr 111,{ +prt_in,161,50,4 script Monster Encyclopedia#3pr HIDDEN_NPC,{ mes "^FF0000[Monster Encyclopedia]^000000"; mes "This is a Monster Encyclopedia"; mes "containing information on Dark,"; diff --git a/npc/quests/gunslinger_quests.txt b/npc/quests/gunslinger_quests.txt index 34ac3dbd6..c88e0b741 100644 --- a/npc/quests/gunslinger_quests.txt +++ b/npc/quests/gunslinger_quests.txt @@ -380,7 +380,7 @@ SubGarrison_: } } -lighthalzen,322,247,6 script Ravey 86,{ +lighthalzen,322,247,6 script Ravey 4_M_04,{ if(gun_gs == 2) { diff --git a/npc/quests/lvl4_weapon_quest.txt b/npc/quests/lvl4_weapon_quest.txt index a2839d0cc..e55a57afc 100644 --- a/npc/quests/lvl4_weapon_quest.txt +++ b/npc/quests/lvl4_weapon_quest.txt @@ -2870,7 +2870,7 @@ niflheim,187,280,3 script Hein#lv4 4_M_NFDEADMAN,{ if (.@shobu > 1) { mes "[Hein]"; mes "Let's see..."; - mes "You won " + shobu + " times."; + mes "You won " + .@shobu + " times."; mes "You're really good at game!"; mes "Yes, your luck is at its highest!"; next; @@ -3333,7 +3333,7 @@ niflheim,331,72,3 script Waltboughst#lv4 4_M_NFDEADMAN,{ next; if (.@shobu > 1) { mes "[Waltboughst]"; - mes "Excellent. You won " + shobu + " times,"; + mes "Excellent. You won " + .@shobu + " times,"; mes "so your luck must be really high."; mes "That means we can begin~!"; next; diff --git a/npc/quests/newgears/2006_headgears.txt b/npc/quests/newgears/2006_headgears.txt index cc5c87752..4c41c657e 100644 --- a/npc/quests/newgears/2006_headgears.txt +++ b/npc/quests/newgears/2006_headgears.txt @@ -24,7 +24,7 @@ // Censor Bar //============================================================ -rachel,91,273,8 script ? 4_M_RACHMAN2,{ +rachel,91,273,0 script ? 4_M_RACHMAN2,{ if (countitem(983) > 0 && countitem(7111) > 99 && countitem(938) > 98 && Zeny > 99999) { mes "[?]"; mes "Giggle giggle...isn't it my partner, eh?"; diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt index ce389970a..9eb179c30 100644 --- a/npc/quests/quests_13_1.txt +++ b/npc/quests/quests_13_1.txt @@ -8317,7 +8317,7 @@ spl_fild02,321,169,0 duplicate(Fishinghole) School of Fish#2 CLEAR_NPC spl_fild02,326,171,0 duplicate(Fishinghole) School of Fish#3 CLEAR_NPC mid_camp,75,135,0 duplicate(Fishinghole) School of Fish#4 CLEAR_NPC -mid_camp,66,122,55 script Henry Clifford 4_M_05,{ +mid_camp,66,122,7 script Henry Clifford 4_M_05,{ if (countitem(6049) > 0) { mes "[Henry Clifford]"; mes "Congratulations, you've caught a precious Marlin."; @@ -8367,7 +8367,7 @@ mid_camp,66,122,55 script Henry Clifford 4_M_05,{ } } -mid_camp,88,100,55 script Cat Hand Mining Agent 4_CAT,{ +mid_camp,88,100,7 script Cat Hand Mining Agent 4_CAT,{ if (!questprogress(12062,PLAYTIME)) { if ((countitem(6048) > 2) && (ep13_yong1 > 9)) { mes "[Cat Hand Mining Agent]"; diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt index 78419758b..7e34a9729 100644 --- a/npc/quests/quests_lighthalzen.txt +++ b/npc/quests/quests_lighthalzen.txt @@ -11115,7 +11115,7 @@ lighthalzen,141,162,3 script Old Man#reken 4_M_03,{ close; } -einbroch,55,52,3 script Laboratory Guard#reken 852,{ +einbroch,55,52,3 script Laboratory Guard#reken 4_M_EIN_SOLDIER,{ if(lhz_rekenber == 3) { diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt index 381b39671..d6a5ee15c 100644 --- a/npc/quests/quests_veins.txt +++ b/npc/quests/quests_veins.txt @@ -4773,7 +4773,7 @@ veins,78,226,5 script Camel#camelcc1::VeinsCamel 4_DST_CAMEL,{ veins,72,227,3 duplicate(VeinsCamel) Camel#camelcc3 4_DST_CAMEL veins,81,222,1 duplicate(VeinsCamel) Camel#camelcc4 4_DST_CAMEL veins,77,219,5 duplicate(VeinsCamel) Camel#camelcc5 4_DST_CAMEL -veins,73,215,8 duplicate(VeinsCamel) Camel#camelcc6 4_DST_CAMEL +veins,73,215,0 duplicate(VeinsCamel) Camel#camelcc6 4_DST_CAMEL veins,68,215,5 duplicate(VeinsCamel) Camel#camelcc7 4_DST_CAMEL ve_fild07,235,42,3 script Silk Sand Camel 4_DST_CAMEL,{ diff --git a/npc/re/cities/dewata.txt b/npc/re/cities/dewata.txt index 022d3d715..fe6b661a3 100644 --- a/npc/re/cities/dewata.txt +++ b/npc/re/cities/dewata.txt @@ -418,7 +418,7 @@ dewata,99,203,4 script Tourist#dew4 4_M_SAGE_C,{ close; } -dewata,67,186,8 script Monk#dew1 4_M_BUDDHIST,{ +dewata,67,186,0 script Monk#dew1 4_M_BUDDHIST,{ mes "[Monk]"; mes "I am a monk, content to spend my days in religious study."; next; @@ -430,7 +430,7 @@ dewata,67,186,8 script Monk#dew1 4_M_BUDDHIST,{ close; } -dewata,65,188,8 script Monk#dew2 4_M_BUDDHIST,{ +dewata,65,188,0 script Monk#dew2 4_M_BUDDHIST,{ mes "[Monk]"; mes "Borobudur temple is one of few temples left for worshiping the Great Buddha."; next; @@ -439,7 +439,7 @@ dewata,65,188,8 script Monk#dew2 4_M_BUDDHIST,{ close; } -dewata,63,190,8 script Monk#dew3 4_M_BUDDHIST,{ +dewata,63,190,0 script Monk#dew3 4_M_BUDDHIST,{ mes "[Monk]"; mes "Are you a Tourist? You can make an offering and a wish to one of the shrines."; next; @@ -448,7 +448,7 @@ dewata,63,190,8 script Monk#dew3 4_M_BUDDHIST,{ close; } -dewata,62,192,8 script Monk#dew4 4_M_BUDDHIST,{ +dewata,62,192,0 script Monk#dew4 4_M_BUDDHIST,{ mes "[Monk]"; mes "Our great Buddha is the king of souls and the leader of all good Gods."; next; @@ -657,7 +657,7 @@ OnTouch: close; } -dewata,233,263,8 script Sweet Married Couple#1 4_M_ROGUE,2,3,{ +dewata,233,263,0 script Sweet Married Couple#1 4_M_ROGUE,2,3,{ OnTouch: mes "[Sweet Husband]"; mes "You are the most beautiful thing in the world baby~"; @@ -677,7 +677,7 @@ OnTouch: close; } -dewata,234,263,8 script Sweet Married Couple#2 4_F_JOB_HUNTER,2,3,{ +dewata,234,263,0 script Sweet Married Couple#2 4_F_JOB_HUNTER,2,3,{ OnTouch: mes "[Sweet Wife]"; mes "Baby~ You know what flower that is~?"; diff --git a/npc/re/jobs/2e/kagerou_oboro.txt b/npc/re/jobs/2e/kagerou_oboro.txt index 8c8e0bf3e..c9f639d67 100644 --- a/npc/re/jobs/2e/kagerou_oboro.txt +++ b/npc/re/jobs/2e/kagerou_oboro.txt @@ -1348,7 +1348,7 @@ OnTouch: job_ko,41,16,4 duplicate(Sight#ko_trap) Sight#ko_02 4_BULLETIN_BOARD2,1,1 -job_ko,33,16,4 script Sight#ko_03 858,1,1,{ +job_ko,33,16,4 script Sight#ko_03 4_BULLETIN_BOARD2,1,1,{ callfunc "F_KO_Survival_mes",3; end; OnTouch: @@ -2859,4 +2859,4 @@ job_ko,4,1,4 script Guide#ko_helper 4_M_KAGE_OLD,{ close; } end; -}
\ No newline at end of file +} diff --git a/npc/re/merchants/enchan_ko.txt b/npc/re/merchants/enchan_ko.txt index c162b4be6..98e309abb 100644 --- a/npc/re/merchants/enchan_ko.txt +++ b/npc/re/merchants/enchan_ko.txt @@ -13,7 +13,7 @@ // Main NPC :: job_ko //============================================================ -que_ng,75,20,3 script Artisan Tene#ko 762,{ +que_ng,75,20,3 script Artisan Tene#ko 4_M_JPN2,{ disable_items; mes "[Artisan Tene]"; mes "Hello? I'm Artisan Tene, the most respectful blacksmith of them all."; diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt index f9030964c..1d25e17d3 100644 --- a/npc/re/quests/eden/eden_quests.txt +++ b/npc/re/quests/eden/eden_quests.txt @@ -2150,7 +2150,7 @@ S_Select: close; } -moc_para01,179,44,3 script Chef 820,{ +moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{ mes "[Chef]"; mes "What's up?"; mes "Do you want a Meal? Or do you have other business?"; diff --git a/npc/re/quests/newgears/2012_headgears.txt b/npc/re/quests/newgears/2012_headgears.txt index c96c47ede..167817a10 100644 --- a/npc/re/quests/newgears/2012_headgears.txt +++ b/npc/re/quests/newgears/2012_headgears.txt @@ -14,7 +14,7 @@ // Main NPC :: 2012_hat_quest //============================================================ -moc_para01,41,169,3 script Reno#2012hat 64,{ +moc_para01,41,169,3 script Reno#2012hat 1_M_WIZARD,{ // iRO has (very) minor differences in dialogue from the original script. // To use iRO's version, uncomment the line below. //.@features_iRO = 1; diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt index 48e116884..10bb003e5 100644 --- a/npc/re/quests/quests_dicastes.txt +++ b/npc/re/quests/quests_dicastes.txt @@ -693,7 +693,7 @@ dic_in01,51,270,7 script Supply Dept. 1 Manager 4_MAN_BENKUNI,{ close; } -dic_in01,48,273,8 script Supply Dept. 2 Manager 4_MAN_BENKUNI,{ +dic_in01,48,273,1 script Supply Dept. 2 Manager 4_MAN_BENKUNI,{ if (!checkweight(1201,1)) { mes "You have too many kinds of items. Let's try again after you reduce the number of items."; close; diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt index 4f85b42c8..918a8edd3 100644 --- a/npc/re/quests/quests_eclage.txt +++ b/npc/re/quests/quests_eclage.txt @@ -87,7 +87,7 @@ dic_fild01,161,266,4 duplicate(Teleport Cat No.1#1) Teleport Cat No.6#6 4_M_BOSS // Eclage's Entrance //============================================================ -ecl_fild01,97,322,0 script #ep14_2Entrance 45,3,3,{ +ecl_fild01,97,322,0 script #ep14_2Entrance WARPNPC,3,3,{ end; OnTouch: @@ -464,7 +464,7 @@ ecl_fild01,88,315,5 script Tourist#ep14_2f12 4_WHITE_COW,{ // Oliver Wolf Hood(Dreaming Time) //============================================================ -eclage,101,29,0 script #ep14_2Bridge 139,3,3,{ +eclage,101,29,0 script #ep14_2Bridge HIDDEN_WARP_NPC,3,3,{ end; OnTouch: if (BaseLevel >= 120) { @@ -2310,7 +2310,7 @@ ecl_in01,70,88,4 script Sack Merchant#ep14_2 4_M_MERCAT1,{ close; } -eclage,292,265,0 script #ep14_2Yube Entrance 45,2,2,{ +eclage,292,265,0 script #ep14_2Yube Entrance WARPNPC,2,2,{ end; OnTouch: @@ -4136,7 +4136,7 @@ end; } -eclage,200,272,4 script Masione#eclbig 437,{ +eclage,200,272,4 script Masione#eclbig 4_F_FAIRYKID2,{ if (checkweight(Knife,1) == 0 || (MaxWeight - Weight)<2000) { mes "- Stop Here!! -"; mes "- You have too many items. -"; @@ -8829,7 +8829,7 @@ OnTouch: } } -ecl_in01,79,84,0 script #kusa 139,3,3,{ +ecl_in01,79,84,0 script #kusa HIDDEN_WARP_NPC,3,3,{ end; OnTouch: if (questprogress(4262) == 1) { @@ -8862,7 +8862,7 @@ OnTouch: } } -ecl_in01,1,1,0 script #call_ne 139,{ +ecl_in01,1,1,0 script #call_ne HIDDEN_WARP_NPC,{ end; OnInit: initnpctimer; @@ -8876,7 +8876,7 @@ OnCall: end; } -ecl_in01,2,2,0 script #call_kusa 139,{ +ecl_in01,2,2,0 script #call_kusa HIDDEN_WARP_NPC,{ end; OnInit: initnpctimer; @@ -9467,7 +9467,7 @@ ecl_in02,98,32,3 script Eclage Guard#tl1b 4_M_FAIRYSOLDIER2,{ close; } -ecl_in02,133,115,0 script #pa0829Prison Guard 139,3,3,{ +ecl_in02,133,115,0 script #pa0829Prison Guard HIDDEN_WARP_NPC,3,3,{ end; OnTouch: @@ -11311,7 +11311,7 @@ ecl_tdun01,60,56,4 script #pa0829EtranInterio HIDDEN_NPC,{ close; } -ecl_tdun01,60,56,0 script #pa0829EtranInterioTouch 139,4,4,{ +ecl_tdun01,60,56,0 script #pa0829EtranInterioTouch HIDDEN_WARP_NPC,4,4,{ end; OnTouch: disable_items; @@ -11338,7 +11338,7 @@ OnTouch: end; } -ecl_fild01,183,94,0 script #pa0829EtranExterioTouch 139,3,3,{ +ecl_fild01,183,94,0 script #pa0829EtranExterioTouch HIDDEN_WARP_NPC,3,3,{ end; OnTouch: disable_items; @@ -11465,7 +11465,7 @@ OnTouch: end; } -eclage,291,301,0 script #pa0829RobertExteriTouch 139,3,3,{ +eclage,291,301,0 script #pa0829RobertExteriTouch HIDDEN_WARP_NPC,3,3,{ end; OnTouch: disable_items; @@ -11507,7 +11507,7 @@ OnTouch: end; } -ecl_fild01,110,240,0 script #pa0829Reactor1 139,3,3,{ +ecl_fild01,110,240,0 script #pa0829Reactor1 HIDDEN_WARP_NPC,3,3,{ end; OnTouch: disable_items; @@ -11543,9 +11543,9 @@ OnTouch: } end; } -ecl_fild01,234,266,0 duplicate(#pa0829Reactor1) #pa0829Reactor6 139,3,3 +ecl_fild01,234,266,0 duplicate(#pa0829Reactor1) #pa0829Reactor6 HIDDEN_WARP_NPC,3,3 -ecl_fild01,110,198,0 script #pa0829Reactor2 139,3,3,{ +ecl_fild01,110,198,0 script #pa0829Reactor2 HIDDEN_WARP_NPC,3,3,{ end; OnTouch: disable_items; @@ -11594,9 +11594,9 @@ OnTouch: } end; } -ecl_fild01,179,125,0 duplicate(#pa0829Reactor2) #pa0829Reactor7 139,3,3 +ecl_fild01,179,125,0 duplicate(#pa0829Reactor2) #pa0829Reactor7 HIDDEN_WARP_NPC,3,3 -ecl_fild01,165,158,0 script #pa0829Reactor3 139,3,3,{ +ecl_fild01,165,158,0 script #pa0829Reactor3 HIDDEN_WARP_NPC,3,3,{ end; OnTouch: disable_items; @@ -11643,9 +11643,9 @@ OnTouch: } end; } -ecl_fild01,179,179,0 duplicate(#pa0829Reactor3) #pa0829Reactor8 139,3,3 +ecl_fild01,179,179,0 duplicate(#pa0829Reactor3) #pa0829Reactor8 HIDDEN_WARP_NPC,3,3 -ecl_fild01,237,166,0 script #pa0829Reactor4 139,3,3,{ +ecl_fild01,237,166,0 script #pa0829Reactor4 HIDDEN_WARP_NPC,3,3,{ end; OnTouch: disable_items; @@ -11687,9 +11687,9 @@ OnTouch: } end; } -ecl_fild01,187,243,0 duplicate(#pa0829Reactor4) #pa0829Reactor9 139,3,3 +ecl_fild01,187,243,0 duplicate(#pa0829Reactor4) #pa0829Reactor9 HIDDEN_WARP_NPC,3,3 -ecl_fild01,230,206,0 script #pa0829Reactor5 139,3,3,{ +ecl_fild01,230,206,0 script #pa0829Reactor5 HIDDEN_WARP_NPC,3,3,{ end; OnTouch: disable_items; @@ -11734,7 +11734,7 @@ OnTouch: } end; } -ecl_fild01,159,278,0 duplicate(#pa0829Reactor5) #pa0829Reactor10 139,3,3 +ecl_fild01,159,278,0 duplicate(#pa0829Reactor5) #pa0829Reactor10 HIDDEN_WARP_NPC,3,3 eclage,155,91,4 script #pa0829Hiel's Door10 2_BOARD2,3,3,{ mes "[Notice]"; @@ -14124,7 +14124,7 @@ ecl_tdun04,26,39,1 script Professor Worm#worm 4_M_PROFESSORWORM,{ } } -ecl_tdun04,21,41,0 script #pf 139,2,2,{ +ecl_tdun04,21,41,0 script #pf HIDDEN_WARP_NPC,2,2,{ end; OnTouch: @@ -14173,9 +14173,9 @@ if (ep14_2_profe == 1) { } } -ecl_tdun04,37,21,0 duplicate(#pf) #pf3 139,2,2 +ecl_tdun04,37,21,0 duplicate(#pf) #pf3 HIDDEN_WARP_NPC,2,2 -ecl_tdun04,39,27,0 script #prf1 139,2,2,{ +ecl_tdun04,39,27,0 script #prf1 HIDDEN_WARP_NPC,2,2,{ end; OnTouch: if (questprogress(1218) == 0 && ep14_2_profe==4) { @@ -14212,7 +14212,7 @@ OnTouch: } -ecl_tdun04,35,31,0 script #prf2 139,2,2,{ +ecl_tdun04,35,31,0 script #prf2 HIDDEN_WARP_NPC,2,2,{ end; OnTouch: if (questprogress(1219) == 0 && ep14_2_profe==4) { @@ -14254,7 +14254,7 @@ OnTouch: } -ecl_tdun04,28,43,0 script #prf3 139,2,2,{ +ecl_tdun04,28,43,0 script #prf3 HIDDEN_WARP_NPC,2,2,{ end; OnTouch: if (questprogress(1220) == 0 && ep14_2_profe==4) { @@ -14306,7 +14306,7 @@ OnTouch: } } -ecl_tdun04,39,31,0 script #prf4 139,2,2,{ +ecl_tdun04,39,31,0 script #prf4 HIDDEN_WARP_NPC,2,2,{ end; OnTouch: if (questprogress(1221) == 0 && ep14_2_profe==4) { @@ -14340,7 +14340,7 @@ OnTouch: } } -ecl_tdun04,24,31,0 script #prf5 139,2,2,{ +ecl_tdun04,24,31,0 script #prf5 HIDDEN_WARP_NPC,2,2,{ end; OnTouch: if (questprogress(1222) == 0 && ep14_2_profe == 4 ) { @@ -18225,7 +18225,7 @@ ecl_fild01,205,86,3 script Eclage Messenger Roy#tl 4_M_FAIRYSOLDIER2,{ mes "This is a little something for you."; mes "I'll be looking forward to seeing you!"; delitem Mail_Package,1; //Mail_Package - changequest 7430,4731; + changequest 7430,7431; getexp 200000,200000; getitem Splendide_Coin,1; //Splendide_Coin close; @@ -18931,7 +18931,7 @@ ecl_tdun04,32,35,3 script Hisie#tlord 4_M_FARIY_HISIE,{ end; } -eclage,280,290,0 script #Hisie01 139,0,3,{ +eclage,280,290,0 script #Hisie01 HIDDEN_WARP_NPC,0,3,{ end; OnTouch: if (ep14_2_mylord == 19) { @@ -19103,7 +19103,7 @@ OnTimer400000: end; } -que_avan01,26,26,0 script #tltimer 139,0,1,{ +que_avan01,26,26,0 script #tltimer HIDDEN_WARP_NPC,0,1,{ end; OnTouch: mes "It was definitely a small Yai when first entered, but upon regaining consciousness after being very dizzy, a huge space appeared."; diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt index 76e9a9536..e67a827e9 100644 --- a/npc/re/quests/quests_malaya.txt +++ b/npc/re/quests/quests_malaya.txt @@ -8932,7 +8932,7 @@ ma_fild01,173,223,0 duplicate(Ancient Grudge#01) Ancient Grudge#03 HIDDEN_WARP_N ma_fild01,172,222,0 duplicate(Ancient Grudge#01) Ancient Grudge#04 HIDDEN_WARP_NPC ma_fild01,171,223,0 duplicate(Ancient Grudge#01) Ancient Grudge#05 HIDDEN_WARP_NPC -ma_fild01,192,200,8 script Tourist#pin01 1_M_MERCHANT,{ +ma_fild01,192,200,0 script Tourist#pin01 1_M_MERCHANT,{ mes "[Tourist]"; mes "I came from afar and dropped everything to come and enjoy the 'Pintados Festival'."; next; diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt index fc076a6b3..55a60de98 100644 --- a/npc/re/quests/quests_mora.txt +++ b/npc/re/quests/quests_mora.txt @@ -4466,7 +4466,7 @@ mora,133,80,6 script Elephantine#pa0829 4_ELEPHANT,{ close; } -mora,115,98,8 script Hotcha#pa0829 4_ELEPHANT,{ +mora,115,98,0 script Hotcha#pa0829 4_ELEPHANT,{ if (checkweight(1201,1) == 0) { mes "You have too many kinds of things with you to do that. Throw out some of them and try again."; close; diff --git a/npc/warps/dungeons/lhz_dun.txt b/npc/warps/dungeons/lhz_dun.txt index 59277921d..b77b0d2ef 100644 --- a/npc/warps/dungeons/lhz_dun.txt +++ b/npc/warps/dungeons/lhz_dun.txt @@ -207,6 +207,6 @@ function script randomw { switch(rand(3)) { case 1: warp "lhz_cube",66,136; end; case 2: warp "lhz_cube",66,74; end; - default: warp "lhz_cube",67,193; end; + default: warp "lhz_cube",67,193; end; } } diff --git a/npc/warps/fields/jawaii.txt b/npc/warps/fields/jawaii.txt index d59563853..4d3b0879c 100644 --- a/npc/warps/fields/jawaii.txt +++ b/npc/warps/fields/jawaii.txt @@ -20,5 +20,5 @@ jawaii_in,133,107,0 warp jawaiiwarp003 1,1,jawaii,111,199 jawaii_in,88,117,0 warp jawaiiwarp004 1,1,jawaii,109,186 jawaii,192,215,0 warp jawaiiwarp005 1,1,jawaii_in,28,94 jawaii_in,27,91,4 script jawaiiwarp006 WARPNPC,1,1,{ -if (getpartnerid() > 0) warp "jawaii",192,218; else warp "jawaii_in",27,94; + if (getpartnerid() > 0) warp "jawaii",192,218; else warp "jawaii_in",27,94; } diff --git a/npc/woe-fe/agit_main.txt b/npc/woe-fe/agit_main.txt index 527bebce4..6f4130962 100644 --- a/npc/woe-fe/agit_main.txt +++ b/npc/woe-fe/agit_main.txt @@ -102,7 +102,7 @@ OnAgitBreak: // Show and log error if an unguilded player breaks the Emperium. (Should NEVER happen) if (.@GID <= 0) { .@notice$ = "Character "+strcharinfo(0)+" ("+getcharid(0)+") broke the Emperium in Castle: "+strnpcinfo(2)+" while guildless. No data will be saved and Emperium respawned."; - logmes .@notice$; debugmes .@notice$; + logmes .@notice$; debugmes .@notice$; donpcevent "Agit#"+strnpcinfo(2)+"::OnStartArena"; end; } diff --git a/npc/woe-fe/aldeg_cas01.txt b/npc/woe-fe/aldeg_cas01.txt index e72b121c5..401a0040a 100644 --- a/npc/woe-fe/aldeg_cas01.txt +++ b/npc/woe-fe/aldeg_cas01.txt @@ -66,8 +66,8 @@ OnRecvCastleA01: alde_gld,61,87,6 duplicate(OutsideFlagsA1) Neuschwanstein#1-2 GUILD_FLAG alde_gld,61,79,6 duplicate(OutsideFlagsA1) Neuschwanstein#2 GUILD_FLAG -alde_gld,45,87,8 duplicate(OutsideFlagsA1) Neuschwanstein#3 GUILD_FLAG -alde_gld,51,87,8 duplicate(OutsideFlagsA1) Neuschwanstein#4 GUILD_FLAG +alde_gld,45,87,0 duplicate(OutsideFlagsA1) Neuschwanstein#3 GUILD_FLAG +alde_gld,51,87,0 duplicate(OutsideFlagsA1) Neuschwanstein#4 GUILD_FLAG // Guild Flags (Inside Castle) //============================================================ diff --git a/npc/woe-fe/aldeg_cas03.txt b/npc/woe-fe/aldeg_cas03.txt index c595a8681..8d05d0a12 100644 --- a/npc/woe-fe/aldeg_cas03.txt +++ b/npc/woe-fe/aldeg_cas03.txt @@ -64,8 +64,8 @@ OnRecvCastleA03: end; } -alde_gld,146,82,8 duplicate(OutsideFlagsA3) Nuernberg#1-2 GUILD_FLAG -alde_gld,138,82,8 duplicate(OutsideFlagsA3) Nuernberg#2 GUILD_FLAG +alde_gld,146,82,0 duplicate(OutsideFlagsA3) Nuernberg#1-2 GUILD_FLAG +alde_gld,138,82,0 duplicate(OutsideFlagsA3) Nuernberg#2 GUILD_FLAG // Guild Flag (Inside Castle) //============================================================ diff --git a/npc/woe-fe/gefg_cas03.txt b/npc/woe-fe/gefg_cas03.txt index a206c8bac..69f629a71 100644 --- a/npc/woe-fe/gefg_cas03.txt +++ b/npc/woe-fe/gefg_cas03.txt @@ -92,7 +92,7 @@ gefg_cas03,34,208,1 duplicate(InsideFlagsG3) Yesnelph#14 GUILD_FLAG // Guild Flag (Town) //============================================================ -geffen,120,132,8 duplicate(InsideFlagsG3) Yesnelph#15 GUILD_FLAG +geffen,120,132,0 duplicate(InsideFlagsG3) Yesnelph#15 GUILD_FLAG // Kafra Employee //============================================================ diff --git a/npc/woe-fe/prtg_cas02.txt b/npc/woe-fe/prtg_cas02.txt index 315478ba1..3500cfbff 100644 --- a/npc/woe-fe/prtg_cas02.txt +++ b/npc/woe-fe/prtg_cas02.txt @@ -66,10 +66,10 @@ OnRecvCastlePt02: end; } -prt_gld,244,126,8 duplicate(OutsideFlagsPR2) Swanhild#1-2 GUILD_FLAG -prt_gld,244,128,8 duplicate(OutsideFlagsPR2) Swanhild#2 GUILD_FLAG -prt_gld,236,126,8 duplicate(OutsideFlagsPR2) Swanhild#3 GUILD_FLAG -prt_gld,236,128,8 duplicate(OutsideFlagsPR2) Swanhild#4 GUILD_FLAG +prt_gld,244,126,0 duplicate(OutsideFlagsPR2) Swanhild#1-2 GUILD_FLAG +prt_gld,244,128,0 duplicate(OutsideFlagsPR2) Swanhild#2 GUILD_FLAG +prt_gld,236,126,0 duplicate(OutsideFlagsPR2) Swanhild#3 GUILD_FLAG +prt_gld,236,128,0 duplicate(OutsideFlagsPR2) Swanhild#4 GUILD_FLAG // Guild Flags (Inside Castle) //============================================================ @@ -87,10 +87,10 @@ prtg_cas02,11,219,4 duplicate(InsideFlagsPR2) Swanhild#7 GUILD_FLAG prtg_cas02,11,214,4 duplicate(InsideFlagsPR2) Swanhild#8 GUILD_FLAG prtg_cas02,20,219,4 duplicate(InsideFlagsPR2) Swanhild#9 GUILD_FLAG prtg_cas02,20,214,4 duplicate(InsideFlagsPR2) Swanhild#10 GUILD_FLAG -prtg_cas02,79,227,8 duplicate(InsideFlagsPR2) Swanhild#11 GUILD_FLAG -prtg_cas02,70,227,8 duplicate(InsideFlagsPR2) Swanhild#12 GUILD_FLAG -prtg_cas02,38,189,8 duplicate(InsideFlagsPR2) Swanhild#13 GUILD_FLAG -prtg_cas02,34,189,8 duplicate(InsideFlagsPR2) Swanhild#14 GUILD_FLAG +prtg_cas02,79,227,0 duplicate(InsideFlagsPR2) Swanhild#11 GUILD_FLAG +prtg_cas02,70,227,0 duplicate(InsideFlagsPR2) Swanhild#12 GUILD_FLAG +prtg_cas02,38,189,0 duplicate(InsideFlagsPR2) Swanhild#13 GUILD_FLAG +prtg_cas02,34,189,0 duplicate(InsideFlagsPR2) Swanhild#14 GUILD_FLAG prtg_cas02,153,161,4 duplicate(InsideFlagsPR2) Swanhild#15 GUILD_FLAG prtg_cas02,162,161,4 duplicate(InsideFlagsPR2) Swanhild#16 GUILD_FLAG |