diff options
Diffstat (limited to 'npc/pre-re')
143 files changed, 861 insertions, 1395 deletions
diff --git a/npc/pre-re/airports/izlude.txt b/npc/pre-re/airports/izlude.txt index b2c0ee2d5..b581c283e 100644 --- a/npc/pre-re/airports/izlude.txt +++ b/npc/pre-re/airports/izlude.txt @@ -1,11 +1,11 @@ //===== Hercules Script ====================================== //= Izlude Airport NPCs -//===== By: ================================================== +//===== By: ================================================== //= rAthena Dev Team -//===== Description: ========================================= +//===== Description: ========================================= //= Izlude Airport NPCs -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= Official NPCs. -//============================================================ +//============================================================ -izlude,206,55,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude 90 +izlude,206,55,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude 4_F_01 diff --git a/npc/pre-re/cities/alberta.txt b/npc/pre-re/cities/alberta.txt index 3643469de..4ba223b6e 100644 --- a/npc/pre-re/cities/alberta.txt +++ b/npc/pre-re/cities/alberta.txt @@ -1,40 +1,41 @@ //===== Hercules Script ====================================== //= Alberta Town Pre-Renewal -//===== By: ================================================== +//===== By: ================================================== //= Euphy -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.0 -//===== Description: ========================================= +//===== Description: ========================================= +//= [Official Conversion] //= Alberta town NPCs. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. //============================================================ // cities/amatsu.txt //============================================================ -alberta,245,93,3 duplicate(Sea_Captain_amatsu) Sea Captain#ama1 709 +alberta,245,93,3 duplicate(Sea_Captain_amatsu) Sea Captain#ama1 4_M_SEAMAN // cities/ayothaya.txt //============================================================ -alberta,247,42,3 duplicate(Aibakthing_ayothaya) Aibakthing#ayo 843 +alberta,247,42,3 duplicate(Aibakthing_ayothaya) Aibakthing#ayo 4_M_THAIONGBAK // cities/gonryun.txt //============================================================ -alberta,245,69,3 duplicate(Kunlun_Envoy_gonryun) Kunlun Envoy#gon 776 +alberta,245,69,3 duplicate(Kunlun_Envoy_gonryun) Kunlun Envoy#gon 4_M_TWMIDMAN // cities/louyang.txt //============================================================ -alberta,245,45,3 duplicate(Girl_louyang) Girl#0lou 815 +alberta,245,45,3 duplicate(Girl_louyang) Girl#0lou 4_F_CHNDRESS1 // cities/moscovia.txt //============================================================ -alberta,245,66,4 duplicate(PR_Officer_moscovia) Moscovia P.R. Officer#1 960 +alberta,245,66,4 duplicate(PR_Officer_moscovia) Moscovia P.R. Officer#1 4_F_RUSWOMAN2 // quests/quests_alberta.txt //============================================================ -alberta,247,122,4 duplicate(Sailor_alberta) Sailor#tur 709 -alberta,248,89,4 duplicate(Turtle_Scholar_alberta) Turtle Island Scholar 121 +alberta,247,122,4 duplicate(Sailor_alberta) Sailor#tur 4_M_SEAMAN +alberta,248,89,4 duplicate(Turtle_Scholar_alberta) Turtle Island Scholar 2_M_MOLGENSTEIN // quests/skills/merchant_skills.txt //============================================================ -alberta,232,106,6 duplicate(Gershaun_alberta) Gershaun 57 +alberta,232,106,6 duplicate(Gershaun_alberta) Gershaun 1_M_LIBRARYMASTER diff --git a/npc/pre-re/cities/izlude.txt b/npc/pre-re/cities/izlude.txt index 950f19abd..dfd4d3114 100644 --- a/npc/pre-re/cities/izlude.txt +++ b/npc/pre-re/cities/izlude.txt @@ -1,28 +1,22 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ======================================= //= Izlude Town Pre-Renewal -//===== By: ================================================== +//===== By: ================================================== //= Daegaladh -//===== Current Version: ===================================== -//= 1.2 -//===== Compatible With: ===================================== -//= Hercules GIT -//===== Description: ========================================= +//===== Current Version: ===================================== +//= 1.0 +//===== Description: ========================================= +//= [Official Conversion] //= Izlude town NPCs. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. -//= 1.1 Added bullet NPC duplicates. [Euphy] -//= 1.2 Added Dorian duplicate [Streusel] //============================================================ -izlude,201,181,2 duplicate(Sailor_izlude) Sailor#izlude 100 -izlude,55,74,2 duplicate(Bonne_izlude) Bonne#izlude 90 -izlude,135,78,2 duplicate(Charfri_izlude) Charfri#izlude 91 -izlude,119,121,2 duplicate(Cuskoal_izlude) Cuskoal#izlude 124 -izlude,150,118,2 duplicate(Dega_izlude) Dega#izlude 84 -izlude,150,143,2 duplicate(Kylick_izlude) Kylick#izlude 97 -izlude,56,126,2 duplicate(Red_izlude) Red#izlude 85 -izlude,58,126,2 duplicate(Cebalis_izlude) Cebalis#izlude 98 -izlude,124,178,2 duplicate(Soldier_izlude) Soldier#izlude 105 -izlude,171,133,3 duplicate(bdt) Bullet Dealer Tony#iz 86 -izlude,171,127,3 duplicate(mdk) Magazine Dealer Kenny 83 -izlude_in,110,64,3 duplicate(Dorian) Dorian#izlude 878,2,2,{
\ No newline at end of file +izlude,201,181,2 duplicate(Sailor_izlude) Sailor#izlude 4W_SAILOR +izlude,55,74,2 duplicate(Bonne_izlude) Bonne#izlude 4_F_01 +izlude,135,78,2 duplicate(Charfri_izlude) Charfri#izlude 4_F_02 +izlude,119,121,2 duplicate(Cuskoal_izlude) Cuskoal#izlude 4_F_TELEPORTER +izlude,150,118,2 duplicate(Dega_izlude) Dega#izlude 4_M_02 +izlude,150,143,2 duplicate(Kylick_izlude) Kylick#izlude 4W_M_01 +izlude,56,126,2 duplicate(Red_izlude) Red#izlude 4_M_03 +izlude,58,126,2 duplicate(Cebalis_izlude) Cebalis#izlude 4W_M_02 +izlude,124,178,2 duplicate(Soldier_izlude) Soldier#izlude 8W_SOLDIER diff --git a/npc/pre-re/cities/jawaii.txt b/npc/pre-re/cities/jawaii.txt index 1f2d0fb6a..52527e372 100644 --- a/npc/pre-re/cities/jawaii.txt +++ b/npc/pre-re/cities/jawaii.txt @@ -1,15 +1,14 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Jawaii Town Pre-Renewal -//===== By: ================================================== +//===== By: ================================================== //= Daegaladh -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN -//===== Description: ========================================= +//===== Description: ========================================= +//= [Official Conversion] //= Jawaii town NPCs. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. //============================================================ -izlude,171,185,3 duplicate(Honeymoon_Helper_Izlude) Honeymoon Helper#Izlude 71 +izlude,171,185,3 duplicate(Honeymoon_Helper_Izlude) Honeymoon Helper#Izlude 1_F_LIBRARYGIRL diff --git a/npc/pre-re/cities/yuno.txt b/npc/pre-re/cities/yuno.txt new file mode 100644 index 000000000..db9617882 --- /dev/null +++ b/npc/pre-re/cities/yuno.txt @@ -0,0 +1,20 @@ +//===== Hercules Script ====================================== +//= Juno City +//===== By: ================================================== +//= Euphy +//===== Current Version: ===================================== +//= 1.0 +//===== Description: ========================================= +//= [Official Conversion] +//= NPCs for the City of Juno +//===== Additional Comments: ================================= +//= 1.0 First version. +//============================================================ + +yuno,150,283,4 duplicate(JunoSoldier1) Juno Soldier#juno 8W_SOLDIER +yuno,165,283,4 duplicate(JunoSoldier2) Juno Soldier#2juno 8W_SOLDIER +yuno,227,292,4 duplicate(JunoSoldier3) Juno Soldier#3juno 8W_SOLDIER +yuno,165,228,4 duplicate(JunoSoldier4) Juno Soldier#4juno 8W_SOLDIER +yuno,150,228,4 duplicate(JunoSoldier5) Juno Soldier#5juno 8W_SOLDIER +yuno,334,182,4 duplicate(JunoSoldier6) Juno Soldier#6juno 8W_SOLDIER +yuno,263,320,4 duplicate(JunoSoldier7) Juno Soldier#7juno 8W_SOLDIER diff --git a/npc/pre-re/guides/guides_alberta.txt b/npc/pre-re/guides/guides_alberta.txt index c08894f52..f4a0d12ce 100644 --- a/npc/pre-re/guides/guides_alberta.txt +++ b/npc/pre-re/guides/guides_alberta.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Alberta Guides //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== //= 1.5a -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Guides for the city of Alberta @@ -21,7 +19,7 @@ // -Thanks to $ephiroth. //============================================================ -alberta,23,238,4 script Guide#alb::AlbGuide 105,{ +alberta,23,238,4 script Guide#alb::AlbGuide 8W_SOLDIER,{ cutin "prt_soldier",2; mes "[Alberta Guide]"; mes "Welcome to Alberta,"; @@ -156,4 +154,4 @@ alberta,23,238,4 script Guide#alb::AlbGuide 105,{ end; } -alberta,120,60,3 duplicate(AlbGuide) Guide#2alb 105
\ No newline at end of file +alberta,120,60,3 duplicate(AlbGuide) Guide#2alb 8W_SOLDIER diff --git a/npc/pre-re/guides/guides_aldebaran.txt b/npc/pre-re/guides/guides_aldebaran.txt index ba8fd1636..6abac6474 100644 --- a/npc/pre-re/guides/guides_aldebaran.txt +++ b/npc/pre-re/guides/guides_aldebaran.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Al De Baran Guides //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== //= 1.7 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official conversion] //= Guides for the City of Al De Baran @@ -21,7 +19,7 @@ //= 1.7 Fixed viewpoint coordinates [Playtester] //============================================================ -aldebaran,139,63,4 script Soldier#alde 105,{ +aldebaran,139,63,4 script Soldier#alde 8W_SOLDIER,{ cutin "prt_soldier",2; mes "[Al De Baran Guard]"; mes "I'm just an ordinary guard"; @@ -56,7 +54,7 @@ aldebaran,139,63,4 script Soldier#alde 105,{ end; } -aldebaran,133,108,4 script Soldier#2alde 105,{ +aldebaran,133,108,4 script Soldier#2alde 8W_SOLDIER,{ cutin "prt_soldier",2; mes "[Al De Baran Guard]"; mes "I'm just an"; diff --git a/npc/pre-re/guides/guides_amatsu.txt b/npc/pre-re/guides/guides_amatsu.txt index 100eb9c6a..85bd79047 100644 --- a/npc/pre-re/guides/guides_amatsu.txt +++ b/npc/pre-re/guides/guides_amatsu.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Amatsu Guides //===== By: ================================================== //= MasterOfMuppets; L0ne_W0lf //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Guides for the City of Amatsu @@ -15,7 +13,7 @@ //= 1.3 Rescripted to official 10.3 standards. [L0ne_W0lf] //============================================================ -amatsu,207,89,3 script Amatsu Guide#ama 758,{ +amatsu,207,89,3 script Amatsu Guide#ama 4_F_JPN,{ mes "[Amachang]"; mes "Welcome to Amatsu,"; mes "the town of kind towners"; @@ -69,7 +67,7 @@ amatsu,207,89,3 script Amatsu Guide#ama 758,{ } } -amatsu,251,283,4 script Guide Man#2ama 767,{ +amatsu,251,283,4 script Guide Man#2ama 8_M_JPNSOLDIER,{ mes "[Guide Man]"; mes "Welcome, tourist from Rune-Midgard."; mes "I'm the guide of"; diff --git a/npc/pre-re/guides/guides_ayothaya.txt b/npc/pre-re/guides/guides_ayothaya.txt index d153cf8d3..d13aa93e9 100644 --- a/npc/pre-re/guides/guides_ayothaya.txt +++ b/npc/pre-re/guides/guides_ayothaya.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Ayothaya Guides //===== By: ================================================== //= MasterOfMuppets //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Guides for the City of Ayotaya @@ -13,7 +11,7 @@ //= 1.0 First version [L0ne_W0lf] //============================================================ -ayothaya,203,169,3 script Noi#ayo 839,{ +ayothaya,203,169,3 script Noi#ayo 4_F_THAIGIRL,{ mes "[Noi]"; mes "Welcome to Ayotaya."; mes "Our beautiful village is built"; diff --git a/npc/pre-re/guides/guides_comodo.txt b/npc/pre-re/guides/guides_comodo.txt index 2cebf8740..de803a9c5 100644 --- a/npc/pre-re/guides/guides_comodo.txt +++ b/npc/pre-re/guides/guides_comodo.txt @@ -1,32 +1,31 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Comodo Guides //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Guides for the City of Comodo //===== Additional Comments: ================================= -//= Fully working v1.1 Now using duplicate command. +//= Fully working +//= 1.1 Now using duplicate command. //= 1.2 Optimized, updated common guide names [Lupus] //= 1.3 Updated the guide according to how it is on iRO, thanks -//= to Muad_Dib [MasterOfMuppets] -//= 1.4 Removed 3 guides, and converted to use functions. +//= to Muad_Dib [MasterOfMuppets] +//= 1.4 Removed 3 guides, and converted to use functions. //= 1.5 Rescripted to official 10.3 standards. [L0ne_W0lf] //============================================================ -comodo,322,178,4 script Comodo Guide#cmd::CmdGuide 700,{ +comodo,322,178,4 script Comodo Guide#cmd::CmdGuide 8_F_GIRL,{ callfunc "F_CmdGuide","Native Kokomo"; } -comodo,176,350,4 script Comodo Guide#2cmd 700,{ +comodo,176,350,4 script Comodo Guide#2cmd 8_F_GIRL,{ callfunc "F_CmdGuide","Native Nutcoco"; } -comodo,37,219,4 script Guide#2cmd 700,{ +comodo,37,219,4 script Guide#2cmd 8_F_GIRL,{ callfunc "F_CmdGuide","Native Papaya"; } diff --git a/npc/pre-re/guides/guides_einbroch.txt b/npc/pre-re/guides/guides_einbroch.txt index c73b37b74..9eefe2535 100644 --- a/npc/pre-re/guides/guides_einbroch.txt +++ b/npc/pre-re/guides/guides_einbroch.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Einbroch Guides //===== By: ================================================== //= Muad_dib; L0ne_W0lf //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Guides for the City of Einbroch @@ -18,7 +16,7 @@ //= 1.5 Rescripted to official 10.3 standards. [L0ne_W0lf] //============================================================ -einbroch,72,202,4 script Guide#ein::EinGuide 852,{ +einbroch,72,202,4 script Guide#ein::EinGuide 4_M_EIN_SOLDIER,{ cutin "ein_soldier",2; mes "[Einbroch Guide]"; mes "Welcome"; @@ -203,10 +201,10 @@ einbroch,72,202,4 script Guide#ein::EinGuide 852,{ end; } -einbroch,155,43,4 duplicate(EinGuide) Guide#2ein 852 -einbroch,162,317,4 duplicate(EinGuide) Guide#3ein 852 +einbroch,155,43,4 duplicate(EinGuide) Guide#2ein 4_M_EIN_SOLDIER +einbroch,162,317,4 duplicate(EinGuide) Guide#3ein 4_M_EIN_SOLDIER -einbech,67,37,4 script Guide#4ein::EinGuide2 852,{ +einbech,67,37,4 script Guide#4ein::EinGuide2 4_M_EIN_SOLDIER,{ cutin "ein_soldier",2; mes "[Einbech Guide]"; mes "Welcome to Einbech,"; @@ -348,4 +346,4 @@ einbech,67,37,4 script Guide#4ein::EinGuide2 852,{ end; } -einbech,48,214,4 duplicate(EinGuide2) Guide#5ein 852 +einbech,48,214,4 duplicate(EinGuide2) Guide#5ein 4_M_EIN_SOLDIER diff --git a/npc/pre-re/guides/guides_geffen.txt b/npc/pre-re/guides/guides_geffen.txt index 28e7232c4..46d7e9007 100644 --- a/npc/pre-re/guides/guides_geffen.txt +++ b/npc/pre-re/guides/guides_geffen.txt @@ -1,26 +1,24 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Geffen Guides //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== //= 1.4a -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official COnversion] //= Guides for the City of Geffen //===== Additional Comments: ================================= //= Fully working. Added a guide at every exit. -//= v1.1 Now using duplicate command. +//= 1.1 Now using duplicate command. //= 1.2 Optimized, updated common guide names [Lupus] //= 1.2a Small note that the BS guild moved to Einbroch [Poki#3] //= 1.3 Removed Duplicates [Silent] //= 1.4a Rescripted to official 10.3 standards. [L0ne_W0lf] //= 1.4 Fixed some errors with the loop[Samuray22] -// -Thanks to $ephiroth. +//= Thanks to $ephiroth. //============================================================ -geffen,203,116,0 script Guide#gef::GefGuide 705,{ +geffen,203,116,0 script Guide#gef::GefGuide 4_M_GEF_SOLDIER,{ cutin "gef_soldier",2; mes "[Geffen Guide]"; mes "Welcome to Geffen,"; @@ -171,4 +169,4 @@ geffen,203,116,0 script Guide#gef::GefGuide 705,{ end; } -geffen,118,62,0 duplicate(GefGuide) Guide#2gef 705 +geffen,118,62,0 duplicate(GefGuide) Guide#2gef 4_M_GEF_SOLDIER diff --git a/npc/pre-re/guides/guides_gonryun.txt b/npc/pre-re/guides/guides_gonryun.txt index 590bf7bd4..de9b2d599 100644 --- a/npc/pre-re/guides/guides_gonryun.txt +++ b/npc/pre-re/guides/guides_gonryun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Kunlun Guides //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official COnversion] //= Guides for the City of Kunlun @@ -13,7 +11,7 @@ //= 1.0 First version [L0ne_W0lf] //============================================================ -gonryun,163,60,4 script Kunlun Guide#gon 780,{ +gonryun,163,60,4 script Kunlun Guide#gon 8_M_TWSOLDIER,{ mes "[He Yuen Zhe]"; mes "Ni Hao!"; mes "Welcome to Kunlun~"; diff --git a/npc/pre-re/guides/guides_hugel.txt b/npc/pre-re/guides/guides_hugel.txt index 27336fcaa..b8a9711b1 100644 --- a/npc/pre-re/guides/guides_hugel.txt +++ b/npc/pre-re/guides/guides_hugel.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Hugel Guides //===== By: ================================================== //= erKURITA; L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official COnversion] //= Guides for the City of Hugel. @@ -15,7 +13,7 @@ //= 1.2 Rescripted to official 10.3 standards. [L0ne_W0lf] //============================================================ -hugel,98,56,3 script Hugel Guide Granny#huge 863,0,0,{ +hugel,98,56,3 script Hugel Guide Granny#huge 4_F_LGTGRAND,0,0,{ mes "[Hugel Guide Granny]"; mes "Oh, hello~ you are one energetic adventurer."; mes "Welcome to Hugel. I was honored to guide you to this beautiful village."; diff --git a/npc/pre-re/guides/guides_izlude.txt b/npc/pre-re/guides/guides_izlude.txt index df214fb67..ef84be488 100644 --- a/npc/pre-re/guides/guides_izlude.txt +++ b/npc/pre-re/guides/guides_izlude.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Izlude Guides //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== //= 1.5a -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Guides for the City of Izlude @@ -19,7 +17,7 @@ // -Thanks to $ephiroth. //============================================================ -izlude,121,87,6 script Guide#iz 105,{ +izlude,121,87,6 script Guide#iz 8W_SOLDIER,{ cutin "prt_soldier",2; mes "[Izlude Guide]"; mes "Welcome to Izlude,"; diff --git a/npc/pre-re/guides/guides_juno.txt b/npc/pre-re/guides/guides_juno.txt index d8c08b31e..c1a847717 100644 --- a/npc/pre-re/guides/guides_juno.txt +++ b/npc/pre-re/guides/guides_juno.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Yuno Guides //===== By: ================================================== //= KitsuneStarwind, usul, kobra_k88; L0ne_W0lf //===== Current Version: ===================================== //= 1.7 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Guides for the City of Juno @@ -21,7 +19,7 @@ //= 1.7 Rescripted to official 10.3 standards. [L0ne_W0lf] //============================================================ -yuno,153,47,4 script Juno Guide#yuno 700,{ +yuno,153,47,4 script Juno Guide#yuno 8_F_GIRL,{ mes "[Ms. Yoon]"; mes "A place that takes the vision of the future, and gives it form in the present. Welcome to"; mes "the city of Juno!"; diff --git a/npc/pre-re/guides/guides_lighthalzen.txt b/npc/pre-re/guides/guides_lighthalzen.txt index c9fb40b5b..b194c546c 100644 --- a/npc/pre-re/guides/guides_lighthalzen.txt +++ b/npc/pre-re/guides/guides_lighthalzen.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Lighthalzen Guides //===== By: ================================================== //= MasterOfMuppets; L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Guides for the City of Lighthalzen @@ -15,7 +13,7 @@ //= 1.2 Rescripted to official 10.3 standards. [L0ne_W0lf] //============================================================ -lighthalzen,207,310,5 script Guide#lhz::LhzGuide 852,{ +lighthalzen,207,310,5 script Guide#lhz::LhzGuide 4_M_EIN_SOLDIER,{ cutin "ein_soldier",2; mes "[Lighthalzen Guide]"; mes "Welcome to Lighthalzen,"; @@ -80,7 +78,7 @@ lighthalzen,207,310,5 script Guide#lhz::LhzGuide 852,{ mes "activity, or if you have any"; mes "problems whatsoever."; if (.@compass_check) - viewpoint 1,236,276,4,0x99FFFFF; + viewpoint 1,236,276,4,0x99FFFF; break; case 4: mes "[Lighthalzen Guide]"; @@ -220,8 +218,8 @@ lighthalzen,207,310,5 script Guide#lhz::LhzGuide 852,{ end; } -lighthalzen,220,311,3 duplicate(LhzGuide) Guide#2lhz 852 +lighthalzen,220,311,3 duplicate(LhzGuide) Guide#2lhz 4_M_EIN_SOLDIER -lighthalzen,154,100,5 duplicate(LhzGuide) Guide#3lhz 852 +lighthalzen,154,100,5 duplicate(LhzGuide) Guide#3lhz 4_M_EIN_SOLDIER -lighthalzen,307,224,3 duplicate(LhzGuide) Guide#4lhz 852 +lighthalzen,307,224,3 duplicate(LhzGuide) Guide#4lhz 4_M_EIN_SOLDIER diff --git a/npc/pre-re/guides/guides_louyang.txt b/npc/pre-re/guides/guides_louyang.txt index 52a87ee32..8b5b14c8b 100644 --- a/npc/pre-re/guides/guides_louyang.txt +++ b/npc/pre-re/guides/guides_louyang.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Louyang Guides //===== By: ================================================== //= jAthena/Tsuyuki; L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Guides for the City of Louyang //===== Additional Comments: ================================= @@ -15,7 +13,7 @@ //= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //============================================================ -louyang,213,213,3 script Soldier#BA::LouGuide 825,{ +louyang,213,213,3 script Soldier#BA::LouGuide 4_M_CHNSOLDIER,{ mes "[Soldier]"; mes "Welcome to Louyang,"; mes "a city with a long"; @@ -125,9 +123,9 @@ louyang,213,213,3 script Soldier#BA::LouGuide 825,{ close; } -louyang,160,175,3 duplicate(LouGuide) Soldier#BB 825 +louyang,160,175,3 duplicate(LouGuide) Soldier#BB 4_M_CHNSOLDIER -louyang,224,104,3 script Representative#lou 818,{ +louyang,224,104,3 script Representative#lou 4_F_CHNWOMAN,{ mes "[Representative]"; mes "Welcome to Louyang,"; mes "an ancient land with"; diff --git a/npc/pre-re/guides/guides_morroc.txt b/npc/pre-re/guides/guides_morroc.txt index f0b5b343b..d4b136094 100644 --- a/npc/pre-re/guides/guides_morroc.txt +++ b/npc/pre-re/guides/guides_morroc.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Morroc Guides //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== //= 1.4a -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Guides for the City of Morroc @@ -18,7 +16,7 @@ // -Thanks to $ephiroth. //============================================================ -morocc,153,286,6 script Guide#moc::MocGuide 707,{ +morocc,153,286,6 script Guide#moc::MocGuide 4_M_MOC_SOLDIER,{ cutin "moc_soldier",2; mes "[Morroc Guide]"; mes "Welcome to Morroc,"; @@ -161,4 +159,4 @@ morocc,153,286,6 script Guide#moc::MocGuide 707,{ end; } -morocc,54,97,0 duplicate(MocGuide) Guide#2moc 707 +morocc,54,97,0 duplicate(MocGuide) Guide#2moc 4_M_MOC_SOLDIER diff --git a/npc/pre-re/guides/guides_moscovia.txt b/npc/pre-re/guides/guides_moscovia.txt index 8986c7502..49975358f 100644 --- a/npc/pre-re/guides/guides_moscovia.txt +++ b/npc/pre-re/guides/guides_moscovia.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Moscovia Guides //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Guides for the town of Moscovia. @@ -13,7 +11,7 @@ //= 1.0 First Version. [Kisuka] //============================================================ -moscovia,161,76,4 script Moscovia Guide#mosk 959,{ +moscovia,161,76,4 script Moscovia Guide#mosk 4_F_RUSWOMAN1,{ mes "[Moscovia Guide]"; mes "Welcome to Moscovia"; mes "Here is the paradise spreading on"; @@ -89,4 +87,4 @@ moscovia,161,76,4 script Moscovia Guide#mosk 959,{ mes "Take care."; close; } -}
\ No newline at end of file +} diff --git a/npc/pre-re/guides/guides_niflheim.txt b/npc/pre-re/guides/guides_niflheim.txt index 9a68d10d6..4c7a9b586 100644 --- a/npc/pre-re/guides/guides_niflheim.txt +++ b/npc/pre-re/guides/guides_niflheim.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Niflheim Guide //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Guides for the City of Niflheim @@ -15,7 +13,7 @@ //= 1.3 Rescripted to official 10.3 standards. [L0ne_W0lf] //============================================================ -niflheim,107,156,6 script Roaming Man#nif 798,{ +niflheim,107,156,6 script Roaming Man#nif 4_M_NFMAN,{ mes "[Ricael]"; mes "You must be lost..."; mes "Why would anyone come"; @@ -68,7 +66,7 @@ niflheim,107,156,6 script Roaming Man#nif 798,{ mes "special once I realized no"; mes "Potion can ease the pain I feel."; mes "...I wish I was in prison."; - Emotion e_wah; + emotion e_wah; viewpoint 1,217,196,3,0xCE6300; break; case 3: @@ -84,7 +82,7 @@ niflheim,107,156,6 script Roaming Man#nif 798,{ mes "the monsters here will just"; mes "make them angrier. You may as"; mes "well let them eat you."; - Emotion e_wah; + emotion e_wah; viewpoint 1,216,171,4,0x55FF33; break; case 4: diff --git a/npc/pre-re/guides/guides_payon.txt b/npc/pre-re/guides/guides_payon.txt index 11e7cc57b..9f8e4a776 100644 --- a/npc/pre-re/guides/guides_payon.txt +++ b/npc/pre-re/guides/guides_payon.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Payon Guides //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== //= 1.6 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official COnversion] //= Guides for the City of Payon @@ -16,12 +14,12 @@ //= to Muad_Dib //= 1.3a Fixed some problems with duplicated text, thanks to muad_dib [MasterOfMuppets] //= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA] -//= 1.4a Tixed Archer Village Guide [Lupus] +//= 1.4a Tixed Archer Village Guide [Lupus] //= 1.5 Removed Duplicates [Silent] //= 1.6 Rescripted to official 10.3 standards. [L0ne_W0lf] //============================================================ -payon,162,67,4 script Guide#pay 708,{ +payon,162,67,4 script Guide#pay 4_M_PAY_SOLDIER,{ cutin "pay_soldier",2; mes "[Payon Guide]"; mes "Welcome to the"; @@ -190,7 +188,7 @@ payon,162,67,4 script Guide#pay 708,{ end; } -pay_arche,85,30,2 script Guide#2pay 708,{ +pay_arche,85,30,2 script Guide#2pay 4_M_PAY_SOLDIER,{ cutin "pay_soldier",2; mes "[Payon Guide]"; mes "Welcome to the"; @@ -246,7 +244,7 @@ pay_arche,85,30,2 script Guide#2pay 708,{ case 4: mes "[Payon Guide]"; mes "If you'd like to erase the marks on the mini-map, select menu, 'Wipe all indicators on the mini-map'."; - set @loop2,0; + set .@loop2,0; break; } } diff --git a/npc/pre-re/guides/guides_prontera.txt b/npc/pre-re/guides/guides_prontera.txt index 8a3f87f61..7a97a764c 100644 --- a/npc/pre-re/guides/guides_prontera.txt +++ b/npc/pre-re/guides/guides_prontera.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Prontera Guides //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== //= 1.6a -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Guides for the City of Prontera @@ -23,7 +21,7 @@ // -Thanks to Brainstorm. //============================================================ -prontera,154,187,4 script Guide#prt::PrtGuide 105,{ +prontera,154,187,4 script Guide#prt::PrtGuide 8W_SOLDIER,{ cutin "prt_soldier",2; mes "[Prontera Guide]"; mes "Welcome to Prontera,"; @@ -233,10 +231,10 @@ prontera,154,187,4 script Guide#prt::PrtGuide 105,{ end; } -prontera,282,208,2 duplicate(PrtGuide) East Gate-Guide 105 +prontera,282,208,2 duplicate(PrtGuide) East Gate-Guide 8W_SOLDIER -prontera,29,200,6 duplicate(PrtGuide) West Gate-Guide 105 +prontera,29,200,6 duplicate(PrtGuide) West Gate-Guide 8W_SOLDIER -prontera,160,29,0 duplicate(PrtGuide) South Gate-Guide 105 +prontera,160,29,0 duplicate(PrtGuide) South Gate-Guide 8W_SOLDIER -prontera,151,330,4 duplicate(PrtGuide) North Gate-Guide 105 +prontera,151,330,4 duplicate(PrtGuide) North Gate-Guide 8W_SOLDIER diff --git a/npc/pre-re/guides/guides_rachel.txt b/npc/pre-re/guides/guides_rachel.txt index d9fc74475..2380a465a 100644 --- a/npc/pre-re/guides/guides_rachel.txt +++ b/npc/pre-re/guides/guides_rachel.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Rachel Guide //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.2b -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Rachel City guide @@ -19,7 +17,7 @@ //= 1.2b Deleted a unnecessary "end". [Samuray22] //============================================================ -rachel,138,146,5 script Rachel Guide 934,{ +rachel,138,146,5 script Rachel Guide 4_M_RASWORD,{ mes "[Rachel Guide]"; mes "Welcome to the capital of"; mes "Arunafeltz, Rachel where a warm"; diff --git a/npc/pre-re/guides/guides_umbala.txt b/npc/pre-re/guides/guides_umbala.txt index aab2f362d..23ce98c29 100644 --- a/npc/pre-re/guides/guides_umbala.txt +++ b/npc/pre-re/guides/guides_umbala.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Umbala Guides //===== By: ================================================== //= Dizzy, Translated by Celest; L0ne_W0lf //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Guide for the City of Umbala @@ -17,7 +15,7 @@ //= 1.6 Corrected activating ontouch. [L0ne_W0lf] //============================================================ -umbala,128,94,4 script Adventurer#um 702,{ +umbala,128,94,4 script Adventurer#um 4_F_GON,{ mes "[Adventurer]"; mes "This is a very strange place..."; mes "It's underdeveloped, and there"; diff --git a/npc/pre-re/guides/guides_veins.txt b/npc/pre-re/guides/guides_veins.txt index 92c5d9558..99df4106e 100644 --- a/npc/pre-re/guides/guides_veins.txt +++ b/npc/pre-re/guides/guides_veins.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Veins Guide //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Veins City guide @@ -15,7 +13,7 @@ //= 1.2 Fixed a few small typos. [L0ne_W0lf] //============================================================ -veins,210,345,5 script Veins Guide#1::ve_guide 934,{ +veins,210,345,5 script Veins Guide#1::ve_guide 4_M_RASWORD,{ mes "[Veins Guide]"; mes "Desert City Veins welcomes adventurers seeking shelter from harsh sandstorms."; mes "If this is the first time for you to use the guide services, why don't you check the..."; @@ -126,4 +124,4 @@ veins,210,345,5 script Veins Guide#1::ve_guide 934,{ close; } -veins,189,101,5 duplicate(ve_guide) Veins Guide#2 934 +veins,189,101,5 duplicate(ve_guide) Veins Guide#2 4_M_RASWORD diff --git a/npc/pre-re/jobs/1-1/acolyte.txt b/npc/pre-re/jobs/1-1/acolyte.txt index 7b46a6029..2faef7c87 100644 --- a/npc/pre-re/jobs/1-1/acolyte.txt +++ b/npc/pre-re/jobs/1-1/acolyte.txt @@ -1,13 +1,13 @@ //===== Hercules Script ====================================== //= Acolyte Job Quest -//===== By: ================================================== +//===== By: ================================================== //= kobra_k88; L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 2.2 -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Job quest for Acolyte classes -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Fully working. //= 1.1 Added function calls for Priest Quest. //= 1.2 Fixed Marthilda, Yosuke bugs. [Lupus] @@ -17,8 +17,8 @@ //= 1.5 Now saves/restores all quest skills [Lupus] //= 1.6 Merged back JFunc [Lupus] //= 1.7 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] -//= No longer uses function "F_ToHigh" -//= Proper dialog for Priest job quest is unused (for now.) +//= No longer uses function "F_ToHigh" +//= Proper dialog for Priest job quest is unused (for now.) //= 1.7a Functions now make use of proper priest quest dialog [L0ne_W0lf] //= 1.8 Removed an Unnecessary "set job_acolyte_q,0;" [Samuray22] //= 1.8a More bug fixes care of Crashy. [L0ne_W0lf] @@ -26,9 +26,9 @@ //= 2.0 Fixed High Acolytesnot being given holy light. [L0ne_W0lf] //= 2.1 Added Quest Log commands. [L0ne_W0lf] //= 2.2 Fixed an issue with completequest by adding checkquest. [Kisuka] -//============================================================ +//============================================================ -prt_church,184,41,4 script Cleric#aco 60,{ +prt_church,184,41,4 script Cleric#aco 1_M_PASTOR,{ if (Upper == 1) { if (ADVJOB == Job_High_Priest || ADVJOB == Job_Champion) { if (Class == Job_Novice_High) { @@ -245,7 +245,7 @@ prt_church,184,41,4 script Cleric#aco 60,{ } } -prt_fild03,365,255,2 script Ascetic#aco 89,{ +prt_fild03,365,255,2 script Ascetic#aco 4_M_ORIENT02,{ mes "[Father Rubalkabara]"; if (BaseJob == Job_Novice) { if (job_acolyte_q == 6) { @@ -322,7 +322,7 @@ prt_fild03,365,255,2 script Ascetic#aco 89,{ } } -moc_fild07,41,355,4 script Ascetic#2aco 95,{ +moc_fild07,41,355,4 script Ascetic#2aco 4_F_SISTER,{ mes "[Mother Mathilda]"; if (BaseJob == Job_Novice) { if (job_acolyte_q == 7) { @@ -391,7 +391,7 @@ moc_fild07,41,355,4 script Ascetic#2aco 95,{ } } -prt_fild00,208,218,6 script Ascetic#3aco 98,{ +prt_fild00,208,218,6 script Ascetic#3aco 4W_M_02,{ mes "[Father Yosuke]"; if (BaseJob == Job_Novice) { if (job_acolyte_q == 8) { diff --git a/npc/pre-re/jobs/1-1/archer.txt b/npc/pre-re/jobs/1-1/archer.txt index 5018bc48f..710580054 100644 --- a/npc/pre-re/jobs/1-1/archer.txt +++ b/npc/pre-re/jobs/1-1/archer.txt @@ -1,13 +1,13 @@ //===== Hercules Script ====================================== //= Archer Job Quest -//===== By: ================================================== +//===== By: ================================================== //= kobra_k88; L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.9 -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Job quest for Archer classes -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Fully working. //= 1.1 Added instant job change for High Novice [Lupus] //= 1.3 Added Baby Class support [Lupus] @@ -15,14 +15,14 @@ //= 1.5 Now saves/restores all quest skills [Lupus] //= 1.6 Merged back JFunc [Lupus] //= 1.7 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] -//= Arrow reward is now equal to the type sof trunks brought. -//= No longer uses function "F_ToHigh" +//= Arrow reward is now equal to the type sof trunks brought. +//= No longer uses function "F_ToHigh" //= 1.7a Fixed minor dialogue bug at Grade==25 [Lupus] //= 1.8 Fixed mistake in condition check. [L0ne_W0lf] //= 1.9 Added Quest Log commands. [L0ne_W0lf] -//============================================================ +//============================================================ -payon_in02,64,71,4 script Archer Guildsman#archer 85,{ +payon_in02,64,71,4 script Archer Guildsman#archer 4_M_03,{ if (Upper == 1) { if (Class == Job_Novice_High && (ADVJOB == Job_Sniper || ADVJOB == Job_Clown || ADVJOB == Job_Gypsy)) { mes "[Archer Guildsman]"; @@ -50,7 +50,7 @@ payon_in02,64,71,4 script Archer Guildsman#archer 85,{ mes "I know you'll make a great Archer..."; next; skill 143,0,0; - jobchange Job_Archer_high; + jobchange Job_Archer_High; skill 147,1,0; skill 148,1,0; mes "[Archer Guildsman]"; diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt index 5652260f2..2e03ce410 100644 --- a/npc/pre-re/jobs/1-1/mage.txt +++ b/npc/pre-re/jobs/1-1/mage.txt @@ -1,15 +1,13 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Mage Job Quest -//===== By: ================================================== +//===== By: ================================================== //= kobra_k88; L0ne_W0lf -//===== Current Version: ===================================== -//= 1.9 -//===== Compatible With: ===================================== -//= rAthena SVN -//===== Description: ========================================= +//===== Current Version: ===================================== +//= 2.0 +//===== Description: ========================================= //= [Official Conversion] //= Job quest for Mage classes -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Fully working. //= 1.1 Fixed input ingridients bug [Lupus] //= 1.2 Added instant job change for High Novice [Lupus] @@ -18,13 +16,14 @@ //= 1.5 Now saves/restores all quest skills [Lupus] //= 1.6 Merged back JFunc, CHANGED NUMBERS TO CONSTANTS [Lupus] //= 1.7 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] -//= No longer uses function "F_ToHigh" +//= No longer uses function "F_ToHigh" //= 1.7a Fixed a "If" in the quest. (bugreport:489) [Samuray22] //= 1.8 Added Quest Log commands. [L0ne_W0lf] //= 1.9 Fixed an issue with completequest by adding checkquest. [Kisuka] -//============================================================ +//= 2.0 Moved "Dollshoi" and "Ponka-Hontas" NPCs. [Euphy] +//============================================================ -geffen_in,164,124,4 script Mage Guildsman 123,{ +geffen_in,164,124,4 script Mage Guildsman 2_F_MAGICMASTER,{ if (Upper == 1) { if (ADVJOB == Job_High_Wizard || ADVJOB == Job_Professor) { if (Class == Job_Novice_High) { @@ -86,7 +85,7 @@ geffen_in,164,124,4 script Mage Guildsman 123,{ } if (job_magician_q == 0) { mes "Wanna be a Mage, eh...?"; - if (sex) + if (Sex) mes "Hey, look at you! You're kinda cute~! Not my type though..."; else { mes "Oooh, you're such a hot babe~!"; @@ -208,7 +207,7 @@ geffen_in,164,124,4 script Mage Guildsman 123,{ next; callfunc "Job_Change",Job_Mage; callfunc "F_ClearJobVar"; - set Zeny,Zeny+50; + Zeny += 50; if(checkquest(1005) != -1) { completequest 1005; } @@ -231,7 +230,7 @@ geffen_in,164,124,4 script Mage Guildsman 123,{ case 2: mes "[Mage Guildsman]"; mes "Wanna be a Mage, eh?"; - if (sex) + if (Sex) mes "For a cutie like you, I'd be happy to explain the requirements!"; else mes "I'd be happy to explain the requirements for a pretty girl like you!"; @@ -286,7 +285,7 @@ geffen_in,164,124,4 script Mage Guildsman 123,{ } } -geffen_in,164,112,4 script Mixing Machine 111,{ +geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{ mes "[Mixing Machine]"; mes "This machine is the property of the Geffen Mage Guild and is used only for mixing solutions for magic purposes."; next; @@ -596,49 +595,14 @@ geffen_in,164,112,4 script Mixing Machine 111,{ close; } -pay_arche,122,100,0 script Dollshoi 88,{ - mes "[Mage Guildsman]"; - mes "You want a Solution? Hmm, give me 50 Zeny and at least 1 Empty Test Tube."; - next; - if (select("Alright, Deal.:Nah, forget it.") == 1) { - mes "[Mage Guildsman]"; - if (Zeny < 50) { - mes "Hey! You don't have enough money to cover my 50 Zeny charge."; - close; - } - if (countitem(1092) == 0) { - mes "You can't carry solutions without a bottle! Bring me an Empty Test Tube."; - close; - } - delitem 1092,1; //Empty_Cylinder - set zeny,zeny-50; - getitem 1089,1; //Payon_Potion - } - close; -} - -moc_ruins,91,150,0 script Ponka-Hontas 93,{ - mes "[Mage Guildsman]"; - mes "Would you like a Solution? Then please give me 50 Zeny and at least 1 Empty Testtube."; - next; - if (select("Alright, Deal.:Nah, forget it.") == 1) { - mes "[Mage Guildsman]"; - if (zeny < 50) { - mes "I'm sorry, but you don't have enough money to cover the 50 Zeny fee."; - close; - } - if (countitem(1092) == 0) { - mes "You can't carry liquids without using a bottle. Bring an Empty Test Tube the next time you see me."; - close; - } - delitem 1092,1; //Empty_Cylinder - set zeny,zeny-50; - getitem 1088,1; //Morocc_Potion - } - close; -} +// The Morroc Solution and Payon Solution traders +// are also used in the Sage skill quests, and have +// been moved to npc/quests/mage_solution.txt. +// +// pay_arche,122,100,0 script Dollshoi 4_M_ORIENT01,{} +// moc_ruins,91,150,0 script Ponka-Hontas 4_F_04,{} -geffen_in,177,112,4 script Bookshelf 111,{ +geffen_in,177,112,4 script Bookshelf HIDDEN_NPC,{ mes "[Guide Book]"; mes "This Guide Book is the property of the Geffen Mage Association. Please handle with care."; next; diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt index 93d502794..934dc0300 100644 --- a/npc/pre-re/jobs/1-1/merchant.txt +++ b/npc/pre-re/jobs/1-1/merchant.txt @@ -1,15 +1,13 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Merchant Job Quest -//===== By: ================================================== +//===== By: ================================================== //= kobra_k88; L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 2.3 -//===== Compatible With: ===================================== -//= rAthena SVN -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Job quest for Merchant classes -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Fully working. //= 1.1 Added instant job change for High Novice [Lupus] //= 1.3 Added Baby Class support [Lupus] @@ -20,7 +18,7 @@ //= 1.6 Merged back JFunc, CHANGED NUMBERS TO CONSTANTS [Lupus] //= 1.7 Updated to use Free Ticket for Kafra [Lupus] //= 1.8 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] -//= No longer uses function "F_ToHigh" +//= No longer uses function "F_ToHigh" //= 1.9 Bugfixes, thanks to Barron-Monster. [L0ne_W0lf] //= 1.9a Added a missing next; (Barron-Monster) [L0ne_W0lf] //= 1.9b Typo. "nextl" -> "next;" (Barron-Monster) [L0ne_W0lf] @@ -28,9 +26,9 @@ //= 2.1 Fixed mistake in condition check. [L0ne_W0lf] //= 2.2 Added Quest Log commands. [L0ne_W0lf] //= 2.3 Fixed an issue with completequest by adding checkquest. [Kisuka] -//============================================================ +//============================================================ -alberta_in,53,43,6 script Merchant#mer 86,{ +alberta_in,53,43,6 script Merchant#mer 4_M_04,{ if (Upper == 1) { if (Class == Job_Novice_High && (ADVJOB == Job_Whitesmith || ADVJOB == Job_Creator)) { mes "[Chief Mahnsoo]"; @@ -135,7 +133,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{ mes "Please return when you have earned the 500 zeny that you need to become a Merchant."; close; } - set zeny,zeny-500; + Zeny -= 500; mes "Ah yes...!"; mes "Now your"; mes "membership"; @@ -171,7 +169,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{ mes "[Chief Mahnsoo]"; mes "*Ahem* Aaaaand let me give you a little bit of money for delivering that message to Blossom for me."; mes "I hope you'll help me again next time~"; - set zeny,zeny+200; + Zeny += 200; set quest_alb_01,2; } else { @@ -343,7 +341,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{ mes "[Chief Mahnsoo]"; if (Zeny >= 1000) { set job_merchant_q,2; - set zeny,zeny-1000; + Zeny -= 1000; mes "Alright~"; mes "That's 1,000 zeny."; mes "Excellent, excellent."; @@ -357,7 +355,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{ mes "[Chief Mahnsoo]"; if (Zeny >= 500) { set job_merchant_q,1; - set zeny,zeny-500; + Zeny -= 500; mes "Let's see..."; mes "That's 500 Zeny. Although I don't think splitting payment is a good idea for any Merchant, it's alright since you're still learning."; } @@ -511,7 +509,7 @@ S_GiveSerial: return; } -alberta_in,28,29,2 script Merchant Guildsman#mer 83,{ +alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{ if (BaseJob == Job_Merchant) { mes "[Union Staff Kay]"; mes "Heya pal."; @@ -712,9 +710,9 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 83,{ mes "[Union Staff Kay]"; mes "Hey hey. That number's not valid! Enter a value from 1000000 to 5000000. got it?"; next; - } - else + } else { break; + } } mes "[Union Staff Kay]"; if (.@where_village == 1) @@ -788,7 +786,7 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 83,{ } } -morocc_in,140,102,4 script Student#mer 86,{ +morocc_in,140,102,4 script Student#mer 4_M_04,{ if ((job_merchant_q == 4) || (job_merchant_q == 3)) { mes "[Dyer's Student]"; mes "You're from"; @@ -873,7 +871,7 @@ morocc_in,140,102,4 script Student#mer 86,{ } } -geffen_in,155,122,4 script Guild Staff#mer 47,{ +geffen_in,155,122,4 script Guild Staff#mer 1_M_01,{ if (job_merchant_q == 4 || job_merchant_q == 3) { mes "[Guild Staff]"; mes "Ah, you must be with the Merchant Guild. Finally, my package has arrived! Alright...!"; @@ -954,7 +952,7 @@ geffen_in,155,122,4 script Guild Staff#mer 47,{ } } -prontera,248,42,0 script Kafra Employee#mer 116,{ +prontera,248,42,0 script Kafra Employee#mer 4_F_KAFRA2,{ cutin "kafra_02",2; if (job_merchant_q == 6 || job_merchant_q == 5) && (job_merchant_q2 == 2 || job_merchant_q2 == 1) { mes "[Kafra Employee]"; @@ -1060,7 +1058,7 @@ prontera,248,42,0 script Kafra Employee#mer 116,{ cutin "",255; end; } - set zeny,zeny-600; + Zeny -= 600; set RESRVPTS, RESRVPTS + 37; cutin "",255; warp "izlude",94,103; @@ -1072,7 +1070,7 @@ prontera,248,42,0 script Kafra Employee#mer 116,{ } } -//izlu2dun,106,58,4 script Kafra Employee#mer 116,{ +//izlu2dun,106,58,4 script Kafra Employee#mer 4_F_KAFRA2,{ function script F_MercKafra { if ((job_merchant_q == 6 || job_merchant_q == 5) && (job_merchant_q2 == 8 || job_merchant_q2 == 7)) { mes "[Kafra Employee]"; diff --git a/npc/pre-re/jobs/1-1/swordman.txt b/npc/pre-re/jobs/1-1/swordman.txt index 36ddc9d21..8b4a9f974 100644 --- a/npc/pre-re/jobs/1-1/swordman.txt +++ b/npc/pre-re/jobs/1-1/swordman.txt @@ -1,19 +1,17 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Swordsman Job Quest -//===== By: ================================================== +//===== By: ================================================== //= kobra_k88; L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 2.3 -//===== Compatible With: ===================================== -//= rAthena SVN -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Job quest for Swordman classes //= Uses Job_sword1 as opposed to sword_1-1 -> sword_3-1. //= EXPLOITABLE in a sense because while the sword_x-1 maps //= are marked as "inside" by the client, job_sword1 is not. //= giving players FREE camera rotation while doing the job quest. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Fully working. //= 1.1 Added instant job change for High Novice [Lupus] //= 1.3 Added Baby Class support [Lupus] @@ -27,17 +25,17 @@ //= 1.7 changed location from its clone to the original [Lupus] //= 1.7.1 Fixed warp on timeout [KarLaeda] //= 1.8 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] -//= Removed "green" traps, quest is no longer timed. -//= No longer uses function "F_ToHigh" +//= Removed "green" traps, quest is no longer timed. +//= No longer uses function "F_ToHigh" //= 1.9 Dialog is official, but the Script is now custom as far as maps go. [L0ne_W0lf] //= 1.9b Fixed usage of wrong jobchange func messing up baby classes [ultramage] //= 2.0 Corrected NPC names to fall within proper resctrictions. [L0ne_W0lf] //= 2.1 Fixed mistake in condition check. [L0ne_W0lf] //= 2.2 Warp portals dont end with ; [Yommy] //= 2.3 Added Quest Log commands. [L0ne_W0lf] -//============================================================ +//============================================================ -izlude_in,74,172,4 script Swordman#swd_1 119,{ +izlude_in,74,172,4 script Swordman#swd_1 2_M_SWORDMASTER,{ if (Upper == 1) { if (Class == Job_Novice_High && (ADVJOB == Job_Lord_Knight || ADVJOB == Job_Paladin)) { mes "[Swordman]"; @@ -203,7 +201,7 @@ izlude_in,74,172,4 script Swordman#swd_1 119,{ } } -izlude_in,62,170,6 script Swordman#swd_2 85,{ +izlude_in,62,170,6 script Swordman#swd_2 4_M_03,{ mes "[Swordman]"; if (BaseJob == Job_Swordman) { mes "Sorry guy, but I can only allow Novices to enter the Test Hall."; @@ -235,7 +233,7 @@ izlude_in,62,170,6 script Swordman#swd_2 85,{ } } -izlude_in,30,175,4 script Swordman#swd_3 92,{ +izlude_in,30,175,4 script Swordman#swd_3 4_F_03,{ mes "[Swordman]"; mes "I will tell you about the Test! Listen carefully, I won't repeat myself."; next; @@ -262,7 +260,7 @@ izlude_in,30,175,4 script Swordman#swd_3 92,{ close; } -izlude_in,30,163,0 script Test Hall Staff#swd_1 105,{ +izlude_in,30,163,0 script Test Hall Staff#swd_1 8W_SOLDIER,{ mes "[Test Hall Staff]"; if (BaseJob == Job_Swordman) { mes "Hm? How did you get inside? You're not supposed to be in here, so please leave now."; @@ -296,21 +294,21 @@ izlude_in,30,163,0 script Test Hall Staff#swd_1 105,{ } // Examination Courses NPCs -//============================================================ +//============================================================ // 1-1 -job_sword1,230,245,2 script Medic#swd_1 105,{ +job_sword1,230,245,2 script Medic#swd_1 8W_SOLDIER,{ callfunc "F_JobSwdMedic","1st"; } -job_sword1,230,242,2 script Test Hall Staff#swd_2 105,{ +job_sword1,230,242,2 script Test Hall Staff#swd_2 8W_SOLDIER,{ callfunc "F_JobSwdStaff",1; } -job_sword1,230,207,2 script Medic#2swd_2 105,{ +job_sword1,230,207,2 script Medic#2swd_2 8W_SOLDIER,{ callfunc "F_JobSwdMedic","2nd"; } -job_sword1,230,204,2 script Test Hall Staff#2swd_3 105,{ +job_sword1,230,204,2 script Test Hall Staff#2swd_3 8W_SOLDIER,{ callfunc "F_JobSwdStaff",1; } -job_sword1,223,167,2 script Mae#swd_1_success 92,{ +job_sword1,223,167,2 script Mae#swd_1_success 4_F_03,{ mapannounce "job_sword1","Applicant " + strcharinfo(0) + ". You successfully passed the test.",bc_map; set job_sword_q,4; mes "[Mae]"; @@ -322,7 +320,7 @@ job_sword1,223,167,2 script Mae#swd_1_success 92,{ } // Examination Course Functions -//============================================================ +//============================================================ function script F_JobSwdMedic { percentheal 100,0; mes "[Medic]"; @@ -366,37 +364,37 @@ OnTouch: } // Examination Course 1 -//============================================================ +//============================================================ job_sword1,223,243,0 warp checkp1-2#swd_1 1,1,job_sword1,11,206 job_sword1,223,205,0 warp checkp2-3#swd_1 1,1,job_sword1,11,168 -job_sword1,7,245,0 script Test Hall Staff#swd_4 45,1,3,{ +job_sword1,7,245,0 script Test Hall Staff#swd_4 WARPNPC,1,3,{ callfunc "F_JobSwdTestStaff",10,245; } -job_sword1,8,207,0 script Test Hall Staff#swd_5 45,1,6,{ +job_sword1,8,207,0 script Test Hall Staff#swd_5 WARPNPC,1,6,{ callfunc "F_JobSwdTestStaff",11,207; } -job_sword1,8,169,0 script Test Hall Staff#swd_6 45,1,6,{ +job_sword1,8,169,0 script Test Hall Staff#swd_6 WARPNPC,1,6,{ callfunc "F_JobSwdTestStaff",11,169; } -job_sword1,192,244,0 script Test Hall Staff#swd_7 45,1,3,{ +job_sword1,192,244,0 script Test Hall Staff#swd_7 WARPNPC,1,3,{ callfunc "F_JobSwdTestStaff2","1st",215,244; } -job_sword1,193,207,0 script Test Hall Staff#swd_8 45,1,3,{ +job_sword1,193,207,0 script Test Hall Staff#swd_8 WARPNPC,1,3,{ callfunc "F_JobSwdTestStaff2","2nd",215,205; warp "job_sword1",215,205; } -job_sword1,193,168,0 script Test Hall Staff#swd_9 45,1,3,{ +job_sword1,193,168,0 script Test Hall Staff#swd_9 WARPNPC,1,3,{ callfunc "F_JobSwdTestStaff2","3rd",215,167; } // Pitfalls (Set 1) -//============================================================ +//============================================================ job_sword1,65,117,0 warp pitfall01-01 1,1,job_sword1,10,245 job_sword1,98,27,0 warp pitfall02-01 1,1,job_sword1,11,207 job_sword1,161,27,0 warp pitfall02-02 1,1,job_sword1,11,207 @@ -463,7 +461,7 @@ job_sword1,181,239,0 duplicate(SwdTrap1) 1_blank_14_c -1,1,0 job_sword1,193,245,0 warp 1_rest 1,3,job_sword1,215,244 // Pitfalls (Set 2) -//============================================================ +//============================================================ job_sword1,56,212,0 script 2_blank_1_a::SwdTrap2 -1,40,0,{ OnTouch: switch(rand(1,5)) { @@ -508,7 +506,7 @@ job_sword1,155,201,0 duplicate(SwdTrap2) 2_blank_9_a -1,40,0 job_sword1,181,201,0 duplicate(SwdTrap2) 2_blank_9_b -1,2,0 // Pitfalls (Set 3) -//============================================================ +//============================================================ job_sword1,17,174,0 script 3_blank_1_a::SwdTrap3 -1,2,0,{ OnTouch: switch(rand(1,5)) { @@ -621,7 +619,7 @@ job_sword1,177,163,0 duplicate(SwdTrap3) 3_blank_30_b -1,0,2 job_sword1,181,163,0 duplicate(SwdTrap3) 3_blank_30_c -1,2,0 // Monsters (all three courses) -//============================================================ +//============================================================ job_sword1,0,0,0,0 monster Chonchon 1183,20,0,0,0 job_sword1,35,79,0,0 monster Fabre 1184,3,60000,30000,0 job_sword1,50,108,0,0 monster Fabre 1184,3,60000,30000,0 diff --git a/npc/pre-re/jobs/1-1/thief.txt b/npc/pre-re/jobs/1-1/thief.txt index aa5c6a108..356809cdc 100644 --- a/npc/pre-re/jobs/1-1/thief.txt +++ b/npc/pre-re/jobs/1-1/thief.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Thief Job Quest //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== //= 1.8 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Job quest for Thief classes @@ -14,15 +12,15 @@ //= 1.1 Added instant job change for High Novice [Lupus] //= 1.3 Added Baby Class support [Lupus] //= 1.4 Optimised and moved first checker to Jfunc1-1 [massdriller] -//= Fixed possible EXP abuse [Lupus] +//= Fixed possible EXP abuse [Lupus] //= 1.5 Now saves/restores all quest skills [Lupus] //= 1.6 Merged back JFunc [Lupus] 1.6a typos //= 1.7 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] -//= No longer uses function "F_ToHigh" +//= No longer uses function "F_ToHigh" //= 1.8 Added Quest Log commands. [L0ne_W0lf] //============================================================ -moc_prydb1,39,129,2 script Thief Guide 69,{ +moc_prydb1,39,129,2 script Thief Guide 1_F_04,{ if (Upper == 1) { if (ADVJOB == Job_Assassin_Cross || ADVJOB == Job_Stalker) { if (Class == Job_Novice_High) { @@ -52,7 +50,7 @@ moc_prydb1,39,129,2 script Thief Guide 69,{ } else { mes "[Thief Guide]"; - if (sex) + if (Sex) mes "Hey, dude."; else mes "Hey, baby~"; @@ -61,7 +59,7 @@ moc_prydb1,39,129,2 script Thief Guide 69,{ } else { mes "[Thief Guide]"; - if (sex) + if (Sex) mes "Hey, dude."; else mes "Hey, baby."; @@ -348,7 +346,7 @@ moc_prydb1,39,129,2 script Thief Guide 69,{ close; } -moc_prydb1,42,133,2 script Comrade 118,{ +moc_prydb1,42,133,2 script Comrade 2_M_THIEFMASTER,{ if (BaseJob == Job_Thief) { mes "[Brad]"; mes "We don't have any special events yet. Come some other time when there's news, alright?"; @@ -445,12 +443,12 @@ moc_prydb1,42,133,2 script Comrade 118,{ next; mes "[Brad]"; mes "Here is a small subsidy for a Newbie like you. Spend it whereever you want. Alright then, I'll see you around~"; - set zeny,zeny+.@money_thief; + Zeny += .@money_thief; close; } } -moc_ruins,141,125,3 script Mr. Irrelevant 83,{ +moc_ruins,141,125,3 script Mr. Irrelevant 4_M_01,{ if (BaseJob == Job_Thief) { mes "[Mr. Irrelevant]"; mes "Ah, I see that you are now a Thief. I always knew you'd join us."; diff --git a/npc/pre-re/jobs/novice/novice.txt b/npc/pre-re/jobs/novice/novice.txt index c88795463..a57bf5190 100644 --- a/npc/pre-re/jobs/novice/novice.txt +++ b/npc/pre-re/jobs/novice/novice.txt @@ -1,15 +1,13 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Ep 10+ Novice Training Grounds -//===== By: ================================================== +//===== By: ================================================== //= Dr.Evil & MasterOfMuppets -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 2.4 -//===== Compatible With: ===================================== -//= rAthena SVN 3422+(Requires jA Script System) -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Novice Training Grounds -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.7D Added confirm character name thing on receptionist. [Kisuka] //= 1.8 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] //= NPCs are not backwards compatable, and will remove @@ -23,24 +21,24 @@ //= 2.3 Added fix to Hanson from GM-windsor- and Saithis. [L0ne_W0lf] //= 2.3a Correct a wrong variable name. (bugreport:2293) [Samuray22] //= 2.4 Corrected an error in Hanson. (bugreport:2374) [L0ne_W0lf] -//============================================================ +//============================================================ // Bulletin Board -new_1-1,66,114,4 script Bulletin Board#nv 111,{ +new_1-1,66,114,4 script Bulletin Board#nv HIDDEN_NPC,{ mes "^FF0000=================================^000000"; mes "^FF0000 ^000000 ^E40CAA[Welcome]^CC0000 to ^FF9000Novice^7FFF00 Training ^00FF00Grounds ^E40CAA[Welcome]^FF0000^000000"; mes "^FF0000=================================^000000"; close; } -new_1-1,144,116,2 script Guard#nv1 105,{ +new_1-1,144,116,2 script Guard#nv1 8W_SOLDIER,{ mes "[Training Grounds Guard]"; mes "Welcome to the Training Grounds."; mes "You are now in the outer court yard. Please go inside the castle to begin your training."; close; } -new_1-1,144,107,2 script Guard#nv2 105,{ +new_1-1,144,107,2 script Guard#nv2 8W_SOLDIER,{ mes "[Training Grounds Guard]"; if(rand(2)) { mes "Come in!"; @@ -62,7 +60,7 @@ new_1-1,144,107,2 script Guard#nv2 105,{ } // Receptionist -new_1-2,100,29,4 script Receptionist#nv1 86,{ +new_1-2,100,29,4 script Receptionist#nv1 4_M_04,{ mes "[Training Grounds Receptionist]"; mes "Hello, you look to be new here."; mes "What is your name?"; @@ -177,9 +175,9 @@ new_1-2,100,29,4 script Receptionist#nv1 86,{ close; } } -} +} -new_1-1,53,114,4 script Shion#nv1 727,{ +new_1-1,53,114,4 script Shion#nv1 4_F_JOB_HUNTER,{ if (nov_get_item04 > 9 || nov_get_item05 > 9) { mes "[Shion]"; mes "Hm...?"; @@ -351,7 +349,7 @@ new_1-1,53,114,4 script Shion#nv1 727,{ } // Interfaces Tutor -new_1-2,99,105,3 script Interfaces Tutor#nv1 751,{ +new_1-2,99,105,3 script Interfaces Tutor#nv1 4_M_CRU,{ if (nov_get_item02 > 9 && nov_get_item03 > 9 && nov_get_item04 > 9) { mes "[Kris]"; mes "You've completed all the essential courses. Have you spoken to the assistant tutors already? The field combat training will be your next course. Would you like to proceed?"; @@ -628,7 +626,7 @@ new_1-2,99,105,3 script Interfaces Tutor#nv1 751,{ } } -new_1-2,83,111,3 script Skill Tutor#nv 753,{ +new_1-2,83,111,3 script Skill Tutor#nv 4_M_MONK,{ if (nov_get_item02 > 9 && nov_get_item03 > 9 && nov_get_item04 > 9) { mes "[Cecil]"; mes "Huh...?"; @@ -885,7 +883,7 @@ new_1-2,83,111,3 script Skill Tutor#nv 753,{ } } -new_1-2,115,111,3 script Item Tutor#nv 726,{ +new_1-2,115,111,3 script Item Tutor#nv 4_F_JOB_BLACKSMITH,{ if (nov_get_item02 > 9 && nov_get_item03 > 9 && nov_get_item04 > 9) { mes "[Alice]"; mes "Huh...?"; @@ -924,7 +922,6 @@ new_1-2,115,111,3 script Item Tutor#nv 726,{ } } else if (nov_get_item04 < 10) { - enable_items; mes "[Alice]"; mes "^666666*Yawn~*^000000"; mes "This is so boring."; @@ -1234,7 +1231,7 @@ new_1-2,115,111,3 script Item Tutor#nv 726,{ } } -new_1-2,118,108,3 script Kafra Employee#nv1 117,{ +new_1-2,118,108,3 script Kafra Employee#nv1 4_F_KAFRA1,{ mes "[Kafra Employee]"; mes "Welcome to"; mes "Kafra Corporation."; @@ -1533,7 +1530,7 @@ new_1-2,118,108,3 script Kafra Employee#nv1 117,{ } //Interface Assistant -new_1-2,161,182,5 script Instructor#nv 92,{ +new_1-2,161,182,5 script Instructor#nv 4_F_03,{ mes "[Edwin]"; mes "Welcome to my class."; mes "Choose the subject you"; @@ -1702,7 +1699,7 @@ new_1-2,161,182,5 script Instructor#nv 92,{ } } -new_1-2,182,182,3 script Somatology Instructor 754,{ +new_1-2,182,182,3 script Somatology Instructor 4_M_SAGE_A,{ mes "[Jare Riotte]"; mes "Welcome, new adventurer."; mes "I, Jare Riotte will help you to learn about the fundamental"; @@ -1893,7 +1890,7 @@ new_1-2,182,182,3 script Somatology Instructor 754,{ } } -new_1-2,184,172,1 script Understandings of Skills 47,{ +new_1-2,184,172,1 script Understandings of Skills 1_M_01,{ mes "[Leo Handerson]"; mes "Welcome~"; mes "Oh look at this"; @@ -2153,7 +2150,7 @@ new_1-2,184,172,1 script Understandings of Skills 47,{ } } -new_1-2,121,101,2 script Guide Soldier#nv1 105,{ +new_1-2,121,101,2 script Guide Soldier#nv1 8W_SOLDIER,{ mes "[Guide Soldier]"; mes "We Guide Soldiers provide location information at the entrance of every town. You can easily find us by our special uniforms."; next; @@ -2166,7 +2163,7 @@ new_1-2,121,101,2 script Guide Soldier#nv1 105,{ close; } -new_1-2,17,182,5 script Helper#nv 84,{ +new_1-2,17,182,5 script Helper#nv 4_M_02,{ if (nov_2nd_cos < 11) { mes "[Elmeen]"; mes "Congratulations!"; @@ -2452,7 +2449,7 @@ new_1-2,17,182,5 script Helper#nv 84,{ } } -new_1-2,38,182,3 script Entrance Guard#nv 92,{ +new_1-2,38,182,3 script Entrance Guard#nv 4_F_03,{ if (nov_2nd_cos == 0) { mes "[Muriel]"; mes "I'm sorry, but I can't let anybody who hasn't been instructed on fighting enter the Field Combat Training Grounds."; @@ -2620,7 +2617,7 @@ new_1-2,38,182,3 script Entrance Guard#nv 92,{ } //Teleport NPC -new_1-3,95,30,4 script Trainer#nv1::NovHoffman 84,{ +new_1-3,95,30,4 script Trainer#nv1::NovHoffman 4_M_02,{ mes "[Hoffman]"; mes "Hey there~"; mes "I'm here to provide"; @@ -2657,7 +2654,7 @@ new_1-3,95,30,4 script Trainer#nv1::NovHoffman 84,{ } else { warp "new_1-3",96,21; - } + } end; case 2: mes "[Hoffman]"; @@ -2693,12 +2690,12 @@ new_1-3,95,30,4 script Trainer#nv1::NovHoffman 84,{ } } -new_2-3,95,30,4 duplicate(NovHoffman) Trainer#nv2 84 -new_3-3,95,30,4 duplicate(NovHoffman) Trainer#nv3 84 -new_4-3,95,30,4 duplicate(NovHoffman) Trainer#nv4 84 -new_5-3,95,30,4 duplicate(NovHoffman) Trainer#nv5 84 +new_2-3,95,30,4 duplicate(NovHoffman) Trainer#nv2 4_M_02 +new_3-3,95,30,4 duplicate(NovHoffman) Trainer#nv3 4_M_02 +new_4-3,95,30,4 duplicate(NovHoffman) Trainer#nv4 4_M_02 +new_5-3,95,30,4 duplicate(NovHoffman) Trainer#nv5 4_M_02 -new_1-3,96,174,3 script Test Examiner#nv1::NovKeyman 85,{ +new_1-3,96,174,3 script Test Examiner#nv1::NovKeyman 4_M_03,{ mes "[Keyman]"; mes "Good!!"; mes "Now you know how to fight"; @@ -2724,15 +2721,15 @@ new_1-3,96,174,3 script Test Examiner#nv1::NovKeyman 85,{ } } -new_2-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv2 85 -new_3-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv3 85 -new_4-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv4 85 -new_5-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv5 85 +new_2-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv2 4_M_03 +new_3-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv3 4_M_03 +new_4-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv4 4_M_03 +new_5-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv5 4_M_03 //Potato Merchant -new_1-2,28,185,4 shop Potato Merchant 90,516:15 +new_1-2,28,185,4 shop Potato Merchant 4_F_01,516:15 -new_1-4,100,29,1 script Hanson#nv 46,{ +new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ if (checkweight(909,400) == 0) { mes "[Hanson]"; mes "All of the items you are carrying must be quite a burden. Where did you get so much things? Please lighten your weight by getting rid of things you don't need."; @@ -3862,7 +3859,7 @@ S_UserJobchoice: mes "[Hanson]"; mes "The Mage Academy is located in the NorthWest in town. Please remember this."; } - else if (@menu == 3) { + else if (@menu == 3) { mes "to become a Merchant."; mes "You will be sent to"; mes "the town of Alberta."; @@ -3964,7 +3961,7 @@ S_UserJobchoice: } //Novice Instructor -new_1-4,91,22,4 script Bruce#nv 57,{ +new_1-4,91,22,4 script Bruce#nv 1_M_LIBRARYMASTER,{ if (Class == Job_Novice) { if (nov_3_swordman == 20) { mes "[Bruce]"; @@ -4281,11 +4278,11 @@ new_3-3,0,0,0,0 monster Fabre 1184,5,0,0,0 new_4-3,0,0,0,0 monster Fabre 1184,5,0,0,0 new_5-3,0,0,0,0 monster Fabre 1184,5,0,0,0 -//============================================================ +//============================================================ // Old changelog -//============================================================ +//============================================================ //= 1.0 Added the New Novice Training Grounds, a big thanks [MasterOfMuppets] -//= to Dr.Evil who did 90% of the work =) +//= to Dr.Evil who did 90% of the work =) //= 1.0b Temp measure to stop exploits. [Vicious] //= 1.2 Removed Duplicates [Silent] //= 1.3 Removed Duplicates [Toms] @@ -4296,4 +4293,4 @@ new_5-3,0,0,0,0 monster Fabre 1184,5,0,0,0 //= 1.7a a bit of optimization [Lupus] //= 1.7b Corrected a little Typo Error. (bugreport:728) [Samuray22] //= 1.7C Corrected another Typo Error. (bugreport:740) [Samuray22] -//============================================================ +//============================================================ diff --git a/npc/pre-re/kafras/kafras.txt b/npc/pre-re/kafras/kafras.txt new file mode 100644 index 000000000..85d2ae49e --- /dev/null +++ b/npc/pre-re/kafras/kafras.txt @@ -0,0 +1,22 @@ +//===== Hercules Script ====================================== +//= Kafras (Cities/Dungeons/Fields) +//===== By: ================================================== +//= Daegaladh +//===== Current Version: ===================================== +//= 1.0 +//===== Description: ========================================= +//= Argument settings for callfunc "F_Kafra": +//= arg(0): 0 - Default Kafra message +//= 1 - Niflhiem Kafra message +//= 2 - Guild Kafra message +//= arg(1): 1 - Disable teleport menu +//= arg(2): 1 - Disable info menu +//= arg(3): Cost of Storage service +//= arg(4): Cost of Rent a Pushcart service +//===== Additional Comments: ================================= +//= 1.0 First version. +//============================================================ + +// Izlude +//============================================================ +izlude,134,87,3 duplicate(kaf_izlude) Kafra Employee#iz 4_F_KAFRA1 diff --git a/npc/pre-re/kafras/kafras_izl.txt b/npc/pre-re/kafras/kafras_izl.txt deleted file mode 100644 index ba2081fd6..000000000 --- a/npc/pre-re/kafras/kafras_izl.txt +++ /dev/null @@ -1,15 +0,0 @@ -//===== rAthena Script ======================================= -//= Izlude Kafras -//===== By: ================================================== -//= Daegaladh -//===== Current Version: ===================================== -//= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN -//===== Description: ========================================= -//= Izlude Kafras. -//===== Additional Comments: ================================= -//= 1.0 First version. -//============================================================ - -izlude,134,87,3 duplicate(kaf_izlude) Kafra Employee 117 diff --git a/npc/pre-re/merchants/ammo_boxes.txt b/npc/pre-re/merchants/ammo_boxes.txt new file mode 100644 index 000000000..a78adaca6 --- /dev/null +++ b/npc/pre-re/merchants/ammo_boxes.txt @@ -0,0 +1,13 @@ +//===== Hercules Script ====================================== +//= Magazine Dealers +//===== By: ================================================== +//= Euphy +//===== Current Version: ===================================== +//= 1.0 +//===== Description: ========================================= +//= Turns bullets into magazines/packs. +//===== Additional Comments: ================================= +//= 1.0 First version, Pre-Renewal duplicates. +//============================================================ + +izlude,171,127,3 duplicate(mdk) Magazine Dealer Kenny#iz 4_M_01 diff --git a/npc/pre-re/merchants/ammo_dealer.txt b/npc/pre-re/merchants/ammo_dealer.txt new file mode 100644 index 000000000..8cf77542b --- /dev/null +++ b/npc/pre-re/merchants/ammo_dealer.txt @@ -0,0 +1,13 @@ +//===== Hercules Script ====================================== +//= Bullet Dealers +//===== By =================================================== +//= Euphy +//===== Version ============================================== +//= 1.0 +//===== Description ========================================== +//= Bullet trader. +//===== Comments ============================================= +//= 1.0 First version, Pre-Renewal duplicates. +//============================================================ + +izlude,171,133,3 duplicate(bdt) Bullet Dealer Tony#iz 4_M_04 diff --git a/npc/pre-re/merchants/shops.txt b/npc/pre-re/merchants/shops.txt index 124ea0ef3..d303f35b4 100644 --- a/npc/pre-re/merchants/shops.txt +++ b/npc/pre-re/merchants/shops.txt @@ -1,24 +1,22 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ======================================= //= Shops -//===== By: ================================================== +//===== By: ================================================== //= Daegaladh -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Hercules GIT -//===== Description: ========================================= +//===== Description: ========================================= //= Pre-renewal-specific town shop NPCs. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. -//= 1.1 Added Tool Dealer & Trading Merchant [Streusel] -//============================================================ +//= 1.1 Moved Izlude shops to pre-re/re paths. [Streusel] +//============================================================ //======================================================= // Izlude //======================================================= -izlude,105,99,0 shop Butcher#iz 54,517:-1 -izlude,94,98,4 shop Fruit Gardener#iz 53,512:-1,513:-1,515:-1,516:-1 -izlude,105,92,7 shop Vendor from Milk Ranch#i 90,519:-1 -izlude,164,138,4 shop Pet Groomer#iz 124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1 -izlude_in,115,61,0 shop Tool Dealer#iz 47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1 -izlude_in,121,64,3 shop Trading Merchant#iz 900,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
\ No newline at end of file +izlude,105,99,0 shop Butcher#iz 1_M_JOBGUIDER,517:-1 +izlude,94,98,4 shop Fruit Gardener#iz 1_M_INNKEEPER,512:-1,513:-1,515:-1,516:-1 +izlude,105,92,7 shop Vendor from Milk Ranch#i 4_F_01,519:-1 +izlude,164,138,4 shop Pet Groomer#iz 4_F_TELEPORTER,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1 +izlude_in,115,61,0 shop Tool Dealer#iz 1_M_01,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1 +izlude_in,121,64,3 shop Trading Merchant#iz 4_M_HUMERCHANT,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1 diff --git a/npc/pre-re/mobs/citycleaners.txt b/npc/pre-re/mobs/citycleaners.txt new file mode 100644 index 000000000..7f7fd9105 --- /dev/null +++ b/npc/pre-re/mobs/citycleaners.txt @@ -0,0 +1,18 @@ +//===== Hercules Script ====================================== +//= City Cleaners Monster Spawn Script +//===== By: ================================================== +//= Euphy +//===== Current Version: ===================================== +//= 1.0 +//===== Description: ========================================= +//= Spawns monsters to clean up cities. +//===== Additional Comments: ================================= +//= 1.0 First version, Pre-Renewal spawns. +//============================================================ + +//================================================== +// Thief Bug City Spawns +//================================================== +payon_in02,23,68,5,5 monster Thief Bug 1051,7,1200000,600000,0 +jawaii_in,73,117,4,4 monster Thief Bug 1051,1,5400000,3000000,0 +jawaii_in,83,117,5,5 monster Thief Bug 1051,1,4800000,2400000,0 diff --git a/npc/pre-re/mobs/dungeons/ein_dun.txt b/npc/pre-re/mobs/dungeons/ein_dun.txt index 755e6d7ab..b7b902c9e 100644 --- a/npc/pre-re/mobs/dungeons/ein_dun.txt +++ b/npc/pre-re/mobs/dungeons/ein_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Einbech Mine Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.0 spawn N and spawn delays aren't yet correct, so I set //= respawn delays quite big for now [Lupus] diff --git a/npc/pre-re/mobs/dungeons/gef_dun.txt b/npc/pre-re/mobs/dungeons/gef_dun.txt index 70d0661e3..4fcc727e7 100644 --- a/npc/pre-re/mobs/dungeons/gef_dun.txt +++ b/npc/pre-re/mobs/dungeons/gef_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Geffen Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.2 Official kRO 10.1 spawns [Playtester] //= 1.3 More accurate spawns [Playtester] diff --git a/npc/pre-re/mobs/dungeons/glastheim.txt b/npc/pre-re/mobs/dungeons/glastheim.txt index 508de0239..68cc2d659 100644 --- a/npc/pre-re/mobs/dungeons/glastheim.txt +++ b/npc/pre-re/mobs/dungeons/glastheim.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Glast Heim Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 [Lupus] //= 1.2 Updated to ep 8.5 aegis spawns [MasterOfMuppets] diff --git a/npc/pre-re/mobs/dungeons/gld_dun.txt b/npc/pre-re/mobs/dungeons/gld_dun.txt index 048f43681..01636a206 100644 --- a/npc/pre-re/mobs/dungeons/gld_dun.txt +++ b/npc/pre-re/mobs/dungeons/gld_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Guild Dungeons Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.2 Official kRO 10.1 spawns [Playtester] //= 1.3 Corrected MVP spawn variance. [Gepard] diff --git a/npc/pre-re/mobs/dungeons/gld_dunSE.txt b/npc/pre-re/mobs/dungeons/gld_dunSE.txt index abff62d33..1408ad00e 100644 --- a/npc/pre-re/mobs/dungeons/gld_dunSE.txt +++ b/npc/pre-re/mobs/dungeons/gld_dunSE.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Guild Dungeons Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.0 First version //= 1.1 Updated spawns to official. [L0ne_W0lf] diff --git a/npc/pre-re/mobs/dungeons/gon_dun.txt b/npc/pre-re/mobs/dungeons/gon_dun.txt index 347ad6174..9b30ebd02 100644 --- a/npc/pre-re/mobs/dungeons/gon_dun.txt +++ b/npc/pre-re/mobs/dungeons/gon_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Gonryun Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 Official kRO 10.1 spawns [Playtester] //= 1.2 Corrected MVP spawn variance. [L0ne_W0lf] diff --git a/npc/pre-re/mobs/dungeons/ice_dun.txt b/npc/pre-re/mobs/dungeons/ice_dun.txt index 35a5090f8..c68972345 100644 --- a/npc/pre-re/mobs/dungeons/ice_dun.txt +++ b/npc/pre-re/mobs/dungeons/ice_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Ice Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.0 First version from jAthena [Playtester] //= 1.1 More accurate spawns [Playtester] diff --git a/npc/pre-re/mobs/dungeons/in_sphinx.txt b/npc/pre-re/mobs/dungeons/in_sphinx.txt index 1d3a4ad32..6b281d5a5 100644 --- a/npc/pre-re/mobs/dungeons/in_sphinx.txt +++ b/npc/pre-re/mobs/dungeons/in_sphinx.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Morocc Sphinx Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 Official kRO 10.1 spawns [Playtester] //= 1.2 Replaced Marduk with Anubis on F4 and F5 [Playtester] diff --git a/npc/pre-re/mobs/dungeons/iz_dun.txt b/npc/pre-re/mobs/dungeons/iz_dun.txt index fc1b282bb..60491b2c8 100644 --- a/npc/pre-re/mobs/dungeons/iz_dun.txt +++ b/npc/pre-re/mobs/dungeons/iz_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Byalan Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 Official kRO 10.1 spawns for 1-4 [Playtester] //= 1.2 More accurate spawns [Playtester] diff --git a/npc/pre-re/mobs/dungeons/kh_dun.txt b/npc/pre-re/mobs/dungeons/kh_dun.txt index 1960a958a..4b10f64ac 100644 --- a/npc/pre-re/mobs/dungeons/kh_dun.txt +++ b/npc/pre-re/mobs/dungeons/kh_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Kiel Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.0 First version [MasterOfMuppets] //= 1.1 Added official mob types [Playtester] diff --git a/npc/pre-re/mobs/dungeons/lhz_dun.txt b/npc/pre-re/mobs/dungeons/lhz_dun.txt index ee395123a..eb544e724 100644 --- a/npc/pre-re/mobs/dungeons/lhz_dun.txt +++ b/npc/pre-re/mobs/dungeons/lhz_dun.txt @@ -1,18 +1,18 @@ //===== Hercules Script ====================================== //= Lighthalzen Dungeon(Biolabs) Monster Spawn Script //===== By: ================================================== -// The Prometheus Project, rAthena Dev Team +//= The Prometheus Project, rAthena Dev Team //===== Current Version: ===================================== //= 1.8 //===== Additional Comments: ================================= //= 08/24/05 : Added 1st version. [Muad_Dib] -//= 1.1: Some corrections to level 1, 2 as pointed out by -//= MasterofMuppets. [Skotlex] -//= 1.3: Some fixes based on kRO's "RO Map" [Poki#3] -//= I also made the place more Moby ^^ -//= 1.4: Adjusted spawns according to own info from iRO [MasterOfMuppets] -//= 1.5: More accurate spawn numbers and iRO names thanks to Tharis [Playtester] -//= 1.6: Official X.3 spawns [Playtester] +//= 1.1 Some corrections to level 1, 2 as pointed out by +//= MasterofMuppets. [Skotlex] +//= 1.3 Some fixes based on kRO's "RO Map" [Poki#3] +//= I also made the place more Moby ^^ +//= 1.4 Adjusted spawns according to own info from iRO [MasterOfMuppets] +//= 1.5 More accurate spawn numbers and iRO names thanks to Tharis [Playtester] +//= 1.6 Official X.3 spawns [Playtester] //= 1.7 Corrected MVP spawn function to be standard to iRO. [L0ne_W0lf] //= - A random 99 will now be spawned when the MVP spawns. //= - Spare spawn and MVP spawn now spawn in official locations. @@ -21,11 +21,9 @@ //= 1.8 Corrected MVP spawn variance (Labs2 MVP). [L0ne_W0lf] //============================================================ - //======================================================================================== // lhz_dun01 - Bio-life Labs 1F //======================================================================================== - lhz_dun01,0,0,0,0 monster Metaling 1613,50,0,0,0 lhz_dun01,0,0,0,0 monster Anopheles 1627,70,0,0,0 lhz_dun01,0,0,0,0 monster Remover 1682,100,0,0,0 @@ -64,7 +62,6 @@ lhz_dun01,0,0,0,0 monster Gemini-S58 1681,1,7200000,5400000,0 //======================================================================================== // lhz_dun02 - Bio-life Labs 2F //======================================================================================== - lhz_dun02,0,0,0,0 monster Egnigem Cenia 1652,26,0,0,0 lhz_dun02,0,0,0,0 monster Wickebine Tres 1653,26,0,0,0 lhz_dun02,0,0,0,0 monster Armeyer Dinze 1654,26,0,0,0 @@ -97,7 +94,6 @@ lhz_dun02,0,0,0,0 boss_monster Egnigem Cenia 1658,1,7200000,600000,1 //======================================================================================== // lhz_dun03 - Bio-life Labs 3F //======================================================================================== - lhz_dun03,140,235,116,30 monster Seyren Windsor 1634,4,180000,120000,0 lhz_dun03,140,235,116,30 monster Eremes Guile 1635,4,180000,120000,0 lhz_dun03,140,235,116,30 monster Howard Alt-Eisen 1636,4,180000,120000,0 @@ -227,52 +223,52 @@ OnInit: OnTimer6000000: if (rand(1,6) == 1) { - donpcevent "summon_boss_lt::Onsummon"; + donpcevent "summon_boss_lt::OnSummon"; stopnpctimer; } end; OnTimer6300000: if (rand(1,6) == 2) { - donpcevent "summon_boss_lt::Onsummon"; + donpcevent "summon_boss_lt::OnSummon"; stopnpctimer; } end; OnTimer6600000: if (rand(1,6) == 3) { - donpcevent "summon_boss_lt::Onsummon"; + donpcevent "summon_boss_lt::OnSummon"; stopnpctimer; } end; OnTimer6900000: if (rand(1,6) == 4) { - donpcevent "summon_boss_lt::Onsummon"; + donpcevent "summon_boss_lt::OnSummon"; stopnpctimer; } end; OnTimer7200000: if (rand(1,6) == 5) { - donpcevent "summon_boss_lt::Onsummon"; + donpcevent "summon_boss_lt::OnSummon"; stopnpctimer; } end; OnTimer7500000: if (rand(1,6) == 6) { - donpcevent "summon_boss_lt::Onsummon"; + donpcevent "summon_boss_lt::OnSummon"; stopnpctimer; } end; OnTimer7800000: - donpcevent "summon_boss_lt::Onsummon"; + donpcevent "summon_boss_lt::OnSummon"; stopnpctimer; end; -Onsummon: +OnSummon: // Select Coordinates to summon a random MVP on switch(rand(1,6)) { case 1: set .@x,140; set .@y,232; break; @@ -283,7 +279,7 @@ Onsummon: case 6: set .@x,175; set .@y,137; break; } set .@mob,rand(1646,1651); - monster "lhz_dun03",.@x,.@y,strmobinfo(1,.@mob),.@mob,1,"summon_boss_lt::OnMyMvPDead"; + monster "lhz_dun03",.@x,.@y,strmobinfo(1,.@mob),.@mob,1,"summon_boss_lt::OnMyMVPDead"; // Select Coordinates to summon a random 99 on switch(rand(1,6)) { @@ -298,7 +294,7 @@ Onsummon: monster "lhz_dun03",.@x2,.@y2,strmobinfo(1,.@mob2),.@mob2,1,"summon_boss_lt::OnMVP"; end; -OnMyMvPDead: +OnMyMVPDead: killmonster "lhz_dun03","summon_boss_lt::OnMVP"; initnpctimer; end; diff --git a/npc/pre-re/mobs/dungeons/lou_dun.txt b/npc/pre-re/mobs/dungeons/lou_dun.txt index bc4a264dd..32dd9b117 100644 --- a/npc/pre-re/mobs/dungeons/lou_dun.txt +++ b/npc/pre-re/mobs/dungeons/lou_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Louyang Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 Updated by MasterOfMuppets //= 1.2 Added Bacsojin and Chung E [MasterOfMuppets] diff --git a/npc/pre-re/mobs/dungeons/mag_dun.txt b/npc/pre-re/mobs/dungeons/mag_dun.txt index e568a0f54..c59c7279f 100644 --- a/npc/pre-re/mobs/dungeons/mag_dun.txt +++ b/npc/pre-re/mobs/dungeons/mag_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Magma Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 fixed 2,3,4 tabs instead of 1... and wrong mob names [Lupus] //= 1.2 Official jRO 10.3 spawns [Playtester] diff --git a/npc/pre-re/mobs/dungeons/mjo_dun.txt b/npc/pre-re/mobs/dungeons/mjo_dun.txt index 12a0e9dee..18403fd8f 100644 --- a/npc/pre-re/mobs/dungeons/mjo_dun.txt +++ b/npc/pre-re/mobs/dungeons/mjo_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Coal Mine(Dead pit) Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 Official kRO 10.1 spawns [Playtester] //============================================================ diff --git a/npc/pre-re/mobs/dungeons/moc_pryd.txt b/npc/pre-re/mobs/dungeons/moc_pryd.txt index 4a8bf8e0b..bcbe05801 100644 --- a/npc/pre-re/mobs/dungeons/moc_pryd.txt +++ b/npc/pre-re/mobs/dungeons/moc_pryd.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= -//= Morocc Pryamid Dungeon Monster Spawn Script +//===== Hercules Script ====================================== +//= Morocc Pyramid Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 Official kRO 10.1 spawns [Playtester] //= 1.2 More accurate spawns [Playtester] diff --git a/npc/pre-re/mobs/dungeons/mosk_dun.txt b/npc/pre-re/mobs/dungeons/mosk_dun.txt index d3c416948..e7c9ec7f1 100644 --- a/npc/pre-re/mobs/dungeons/mosk_dun.txt +++ b/npc/pre-re/mobs/dungeons/mosk_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Moscovia Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.0 Added spawns [Playtester] //= 1.1 Swapped named according to mob db. [L0ne_W0lf] diff --git a/npc/pre-re/mobs/dungeons/nyd_dun.txt b/npc/pre-re/mobs/dungeons/nyd_dun.txt index 19a7e783e..7068a9a0b 100644 --- a/npc/pre-re/mobs/dungeons/nyd_dun.txt +++ b/npc/pre-re/mobs/dungeons/nyd_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Yggdrasil Root Dungeon //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.0 First version //============================================================ diff --git a/npc/pre-re/mobs/dungeons/odin.txt b/npc/pre-re/mobs/dungeons/odin.txt index 48f7f465f..8cf04f076 100644 --- a/npc/pre-re/mobs/dungeons/odin.txt +++ b/npc/pre-re/mobs/dungeons/odin.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Odin Temple Monster Spawn Script //===== By: ================================================== //= Poki#3 (0.1) //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.0 Updated by using Tharis' Homun AI, by Tharis [Vicious] //= 1.1 More accurate spawns [Playtester] diff --git a/npc/pre-re/mobs/dungeons/orcsdun.txt b/npc/pre-re/mobs/dungeons/orcsdun.txt index be6e7bfc1..706981ff8 100644 --- a/npc/pre-re/mobs/dungeons/orcsdun.txt +++ b/npc/pre-re/mobs/dungeons/orcsdun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Orc Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.2 Official kRO 10.1 spawns [Playtester] //============================================================ diff --git a/npc/pre-re/mobs/dungeons/pay_dun.txt b/npc/pre-re/mobs/dungeons/pay_dun.txt index 481edea80..fbd230ef8 100644 --- a/npc/pre-re/mobs/dungeons/pay_dun.txt +++ b/npc/pre-re/mobs/dungeons/pay_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Payon Cave Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 Official kRO 10.1 spawns [Playtester] //= 1.2 Small spawn update [Playtester] diff --git a/npc/pre-re/mobs/dungeons/prt_maze.txt b/npc/pre-re/mobs/dungeons/prt_maze.txt index 47d79efac..32ce16ef0 100644 --- a/npc/pre-re/mobs/dungeons/prt_maze.txt +++ b/npc/pre-re/mobs/dungeons/prt_maze.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Prontera Maze(Hidden Temple) Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.2 Official kRO 10.1 spawns [Playtester] //= 1.3 Some small fixes [Playtester] diff --git a/npc/pre-re/mobs/dungeons/prt_sew.txt b/npc/pre-re/mobs/dungeons/prt_sew.txt index f907feb38..d7ce90022 100644 --- a/npc/pre-re/mobs/dungeons/prt_sew.txt +++ b/npc/pre-re/mobs/dungeons/prt_sew.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Prontera Sewers(Culvert) Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 Official kRO 10.1 spawns [Playtester] //= 1.2 Corrected MVP spawn variance. [L0ne_W0lf] diff --git a/npc/pre-re/mobs/dungeons/ra_san.txt b/npc/pre-re/mobs/dungeons/ra_san.txt index ffb79459e..3bc8e19ac 100644 --- a/npc/pre-re/mobs/dungeons/ra_san.txt +++ b/npc/pre-re/mobs/dungeons/ra_san.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Rachel Sanctuary Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.0 First version with guessed amounts [Playtester] //= 1.1 More accurate spawns [Playtester] diff --git a/npc/pre-re/mobs/dungeons/tha_t.txt b/npc/pre-re/mobs/dungeons/tha_t.txt index c42f0e59b..d97be54c7 100644 --- a/npc/pre-re/mobs/dungeons/tha_t.txt +++ b/npc/pre-re/mobs/dungeons/tha_t.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Thanatos Tower Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.0 Real spawns by Poki#3 [Nexon] //= 1.1 More official spawns [Playtester] diff --git a/npc/pre-re/mobs/dungeons/thor_v.txt b/npc/pre-re/mobs/dungeons/thor_v.txt index f72abc90c..79d9c8176 100644 --- a/npc/pre-re/mobs/dungeons/thor_v.txt +++ b/npc/pre-re/mobs/dungeons/thor_v.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================== +//===== Hercules Script ====================================== //= Thor Volcano Monster Spawn Script //===== By: ================================================== //= Playtester //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Official monster spawn in Thor Volcano Dungeon. //===== Additional Comments: ================================= @@ -16,7 +14,7 @@ //= 1.4 Corrected MVP spawn variance. [L0ne_W0lf] //============================================================ -// ================= [Thor Volcano - 01] ===================== +// =================[Thor Volcano - 01] ===================== thor_v01,0,0,0,0 monster Magmaring 1836,10,0,0,0 thor_v01,0,0,0,0 monster Fire Imp 1837,5,0,0,0 thor_v01,0,0,0,0 monster Fire Imp 1837,12,1800000,0,0 @@ -34,7 +32,7 @@ thor_v01,0,0,0,0 monster Bow Master 1830,5,420000,0,0 thor_v01,0,0,0,0 monster Salamander 1831,5,3600000,0,0 thor_v01,0,0,0,0 monster Byorgue 1839,1,3600000,0,0 -// ================= [Thor Volcano - 02] ===================== +// =================[Thor Volcano - 02] ===================== thor_v02,0,0,0,0 monster Magmaring 1836,10,0,0,0 thor_v02,0,0,0,0 monster Fire Imp 1837,5,0,0,0 thor_v02,75,125,50,85 monster Fire Imp 1837,3,0,0,0 @@ -49,7 +47,7 @@ thor_v02,0,0,0,0 monster Salamander 1831,1,18000000,0,0 thor_v02,0,0,0,0 monster Sword Master 1829,1,7200000,0,0 thor_v02,0,0,0,0 monster Bow Master 1830,1,7200000,0,0 -// ================= [Thor Volcano - 03] ===================== +// =================[Thor Volcano - 03] ===================== thor_v03,0,0,0,0 monster Kasa 1833,16,0,0,0 thor_v03,95,220,64,55 monster Kasa 1833,6,0,0,0 thor_v03,223,224,65,60 monster Kasa 1833,6,0,0,0 diff --git a/npc/pre-re/mobs/dungeons/treasure.txt b/npc/pre-re/mobs/dungeons/treasure.txt index 7cc99c9a1..552b3f8be 100644 --- a/npc/pre-re/mobs/dungeons/treasure.txt +++ b/npc/pre-re/mobs/dungeons/treasure.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Sunken Ship Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 Official kRO 10.1 spawns [Playtester] //= 1.2 More accurate spawns [Playtester] diff --git a/npc/pre-re/mobs/dungeons/tur_dun.txt b/npc/pre-re/mobs/dungeons/tur_dun.txt index 3905c4616..a597e81e1 100644 --- a/npc/pre-re/mobs/dungeons/tur_dun.txt +++ b/npc/pre-re/mobs/dungeons/tur_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Turtle Island Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.2 Official kRO 10.1 spawns [Playtester] //============================================================ diff --git a/npc/pre-re/mobs/dungeons/um_dun.txt b/npc/pre-re/mobs/dungeons/um_dun.txt index e245c6d88..681a0dca0 100644 --- a/npc/pre-re/mobs/dungeons/um_dun.txt +++ b/npc/pre-re/mobs/dungeons/um_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Umbala Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.2 Official kRO 10.1 spawns [Playtester] //= 1.3 Some 11.1 spawn updates [Playtester] diff --git a/npc/pre-re/mobs/dungeons/xmas_dun.txt b/npc/pre-re/mobs/dungeons/xmas_dun.txt index 420efcdf9..4146c3fa8 100644 --- a/npc/pre-re/mobs/dungeons/xmas_dun.txt +++ b/npc/pre-re/mobs/dungeons/xmas_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Toy Factory Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 added Garm Baby according to May 10 patch //= 1.2 Official kRO 10.1 spawns [Playtester] diff --git a/npc/pre-re/mobs/dungeons/yggdrasil.txt b/npc/pre-re/mobs/dungeons/yggdrasil.txt index b3d401ac5..939933aeb 100644 --- a/npc/pre-re/mobs/dungeons/yggdrasil.txt +++ b/npc/pre-re/mobs/dungeons/yggdrasil.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Yggdrasil Tree Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.0 Splitted from Nifflheim fields [DracoRPG] //= 1.1 Official kRO 10.1 spawns [Playtester] diff --git a/npc/pre-re/mobs/fields/amatsu.txt b/npc/pre-re/mobs/fields/amatsu.txt index 1b886b073..fd38b2118 100644 --- a/npc/pre-re/mobs/fields/amatsu.txt +++ b/npc/pre-re/mobs/fields/amatsu.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Amatsu Fields Monster Spawn Script //===== By: ================================================== //= Athena (1.0) diff --git a/npc/pre-re/mobs/fields/comodo.txt b/npc/pre-re/mobs/fields/comodo.txt index e9d37da80..4e21f81e3 100644 --- a/npc/pre-re/mobs/fields/comodo.txt +++ b/npc/pre-re/mobs/fields/comodo.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Comodo Fields Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.2 Official kRO 10.1 spawns [Playtester] //= 1.3 More accurate spawns [Playtester] diff --git a/npc/pre-re/mobs/fields/einbroch.txt b/npc/pre-re/mobs/fields/einbroch.txt index bdaaf59da..1b8b48f24 100644 --- a/npc/pre-re/mobs/fields/einbroch.txt +++ b/npc/pre-re/mobs/fields/einbroch.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Einbroch Fields Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.6 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 correct spawn maps, but not yet exact amount of //= monsters [Lupus] @@ -14,9 +12,9 @@ //= again for providing the information [MasterOfMuppets] //= 1.2a Fixed missing tabs [Lupus] //= 1.3 Updated after Episode 10.4 - Hugel [Poki#3] -//= Mob quantity is custom. +//= Mob quantity is custom. //= 1.3b Changed the spawn numbers a bit. [Poki#3] -//= Thanks to Playtester and Emperium.org +//= Thanks to Playtester and Emperium.org //= 1.4 Updated by using Tharis' Homun AI, by Tharis [Vicious] //= 1.5 Adjusted some spawns according to official info [Playtester] //= 1.6 More accurate spawns [Playtester] diff --git a/npc/pre-re/mobs/fields/geffen.txt b/npc/pre-re/mobs/fields/geffen.txt index 813e745e7..cc6b1780d 100644 --- a/npc/pre-re/mobs/fields/geffen.txt +++ b/npc/pre-re/mobs/fields/geffen.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Geffen Fields Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.2 Map names typos fix [Lupus] //= 1.3 Official kRO 10.1 spawns + future changes [Playtester] diff --git a/npc/pre-re/mobs/fields/gonryun.txt b/npc/pre-re/mobs/fields/gonryun.txt index eab2227ef..0fb3fcafe 100644 --- a/npc/pre-re/mobs/fields/gonryun.txt +++ b/npc/pre-re/mobs/fields/gonryun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Gon Ryun Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 Official kRO 10.1 spawns [Playtester] //============================================================ diff --git a/npc/pre-re/mobs/fields/hugel.txt b/npc/pre-re/mobs/fields/hugel.txt index 0946379ce..633e9f428 100644 --- a/npc/pre-re/mobs/fields/hugel.txt +++ b/npc/pre-re/mobs/fields/hugel.txt @@ -1,18 +1,16 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Hugel Fields Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= Spawns for hu_fild05 and hu_fild04, numbers may not be correct [MasterOfMuppets] //= 0.2 Fixed Petit ID //= 0.3 Updated the spawns using kRO's website as info, [MasterOfMuppets] -//= thanks to battousai90 +//= thanks to battousai90 //= 0.4 Updated after Episode 10.4 - Hugel [Poki#3] -//= Mob quantity is custom. +//= Mob quantity is custom. //= 1.0 Updated by using Tharis' Homun AI, by Tharis [Vicious] //= 1.1 Official X.3 spawns [Playtester] //= 1.2 Some 11.1 spawn updates [Playtester] diff --git a/npc/pre-re/mobs/fields/jawaii.txt b/npc/pre-re/mobs/fields/jawaii.txt deleted file mode 100644 index 194a64b84..000000000 --- a/npc/pre-re/mobs/fields/jawaii.txt +++ /dev/null @@ -1,29 +0,0 @@ -//===== rAthena Script ======================================= -//= Jawaii the honeymoon Island Monster Spawn Script -//===== By: ================================================== -//= MasterOfMuppets (1.0) -//===== Current Version: ===================================== -//= 1.0 -//===== Compatible With: ===================================== -//= Any Athena Version -//===== Additional Comments: ================================= -//= 1.0 First version [MasterOfMuppets] -//============================================================ - -//================================================== -// jawaii - Jawaii, the Honeymoon Island -//================================================== -jawaii,207,290,10,10 monster Phen 1158,3,3600000,1800000,0 -jawaii,221,220,30,30 monster Aster 1266,2,3600000,2400000,0 -jawaii,276,163,20,20 monster Aster 1266,1,7200000,3600000,0 -jawaii,221,220,30,30 monster Shellfish 1074,1,4800000,3000000,0 -jawaii,276,163,20,30 monster Shellfish 1074,2,4200000,2400000,0 - -//================================================== -// jawaii_in - Inside Jawaii -//================================================== -jawaii_in,128,121,1,4 monster Red Mushroom 1085,1,3000000,1200000,0 -jawaii_in,124,76,1,1 monster Black Mushroom 1084,1,3600000,1200000,0 -jawaii_in,72,74,5,1 monster Black Mushroom 1084,2,3000000,1200000,0 -jawaii_in,73,117,4,4 monster Thief Bug 1051,1,5400000,3000000,0 -jawaii_in,83,117,5,5 monster Thief Bug 1051,1,4800000,2400000,0 diff --git a/npc/pre-re/mobs/fields/lighthalzen.txt b/npc/pre-re/mobs/fields/lighthalzen.txt index 46e660255..bb25b14fc 100644 --- a/npc/pre-re/mobs/fields/lighthalzen.txt +++ b/npc/pre-re/mobs/fields/lighthalzen.txt @@ -8,7 +8,7 @@ //= 1.0 by Muad_Dib (Prometheus Project) //= 1.1 Added Porcellio by MasterOfMuppets //= 1.2 Corrected monsters. Many thanks to vicious_pucca for -//= the information [MasterOfMuppets] +//= the information [MasterOfMuppets] //= 1.3 Updated acordingly to Episode 10.4 [Poki#3] //= 1.4 Fully updated X.4 spawns [Playtester] //= 1.5 More accurate spawns [Playtester] diff --git a/npc/pre-re/mobs/fields/louyang.txt b/npc/pre-re/mobs/fields/louyang.txt index e7254f8dd..f64a899de 100644 --- a/npc/pre-re/mobs/fields/louyang.txt +++ b/npc/pre-re/mobs/fields/louyang.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Louyang Fields Monster Spawn Script //===== By: ================================================== //= Evera/Lorri //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 updated by MasterOfMuppets //= 1.2 Official kRO 10.1 spawns [Playtester] diff --git a/npc/pre-re/mobs/fields/lutie.txt b/npc/pre-re/mobs/fields/lutie.txt index 7918ed45b..2eff79086 100644 --- a/npc/pre-re/mobs/fields/lutie.txt +++ b/npc/pre-re/mobs/fields/lutie.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Lutie Fields Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 added Garm Baby according to May 10 patch //= 1.2 Official kRO 10.1 spawns [Playtester] diff --git a/npc/pre-re/mobs/fields/manuk.txt b/npc/pre-re/mobs/fields/manuk.txt index 6bf0ba600..23970e19a 100644 --- a/npc/pre-re/mobs/fields/manuk.txt +++ b/npc/pre-re/mobs/fields/manuk.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Manuk Fields Monster Spawn Script //===== By: ================================================== //= alexx, MaC //===== Current Version: ===================================== //= 1.1a -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.0 Official spawn ammounts from Aegis script [alexx] //= 1.1 Added 13.2 mob spawn update [scriptor] diff --git a/npc/pre-re/mobs/fields/mjolnir.txt b/npc/pre-re/mobs/fields/mjolnir.txt index 2f6508b8e..377536fa6 100644 --- a/npc/pre-re/mobs/fields/mjolnir.txt +++ b/npc/pre-re/mobs/fields/mjolnir.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Mt. Mjolnir Fields Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.2 Official kRO 10.1 spawns [Playtester] //============================================================ diff --git a/npc/pre-re/mobs/fields/morocc.txt b/npc/pre-re/mobs/fields/morocc.txt index 8d3fef338..8fb354ce5 100644 --- a/npc/pre-re/mobs/fields/morocc.txt +++ b/npc/pre-re/mobs/fields/morocc.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Morocc Fields Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.7 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 Official kRO 10.1 spawns [Playtester] //= 1.2 More accurate spawns [Playtester] diff --git a/npc/pre-re/mobs/fields/moscovia.txt b/npc/pre-re/mobs/fields/moscovia.txt index d693e79d8..9a1afeb95 100644 --- a/npc/pre-re/mobs/fields/moscovia.txt +++ b/npc/pre-re/mobs/fields/moscovia.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Moscovia Fields Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.0 Added spawns [Playtester] diff --git a/npc/pre-re/mobs/fields/niflheim.txt b/npc/pre-re/mobs/fields/niflheim.txt index 737d6aa53..537157cda 100644 --- a/npc/pre-re/mobs/fields/niflheim.txt +++ b/npc/pre-re/mobs/fields/niflheim.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Niflheim Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.6 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.2 updated [shadow], //= 1.3 many changes and wrong LOD ID 5373 -> 1373 [Lupus] diff --git a/npc/pre-re/mobs/fields/payon.txt b/npc/pre-re/mobs/fields/payon.txt index ba6688047..95a5d3e9a 100644 --- a/npc/pre-re/mobs/fields/payon.txt +++ b/npc/pre-re/mobs/fields/payon.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Payon Fields Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 Official kRO 10.1 spawns [Playtester] //= 1.2 Some 11.1 spawn changes [Playtester] diff --git a/npc/pre-re/mobs/fields/prontera.txt b/npc/pre-re/mobs/fields/prontera.txt index f00556135..62758c125 100644 --- a/npc/pre-re/mobs/fields/prontera.txt +++ b/npc/pre-re/mobs/fields/prontera.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Prontera Fields Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.2 fixed some map name typos [Lupus] //= 1.3 Official kRO 10.1 spawns [Playtester] diff --git a/npc/pre-re/mobs/fields/rachel.txt b/npc/pre-re/mobs/fields/rachel.txt index 9272972cc..b9114802f 100644 --- a/npc/pre-re/mobs/fields/rachel.txt +++ b/npc/pre-re/mobs/fields/rachel.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Rachel Fields Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.0 Created this [Sepheus] //= 1.1 Updated [Playtester] diff --git a/npc/pre-re/mobs/fields/splendide.txt b/npc/pre-re/mobs/fields/splendide.txt index 9dfbbfa90..70f145e08 100644 --- a/npc/pre-re/mobs/fields/splendide.txt +++ b/npc/pre-re/mobs/fields/splendide.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Splendide Fields Monster Spawn Script //===== By: ================================================== //= alexx, MaC //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.0 Official spawn ammounts from Aegis script [alexx] //= 1.1 Added 13.2 mob spawn update [scriptor] @@ -29,4 +27,4 @@ spl_fild02,0,0,0,0 monster Luciola Vespa 1994,15,0,0,0 spl_fild03,0,0,0,0 monster Luciola Vespa 1994,35,0,0,0 spl_fild03,0,0,0,0 monster Cornus 1992,25,0,0,0 spl_fild03,0,0,0,0 monster Naga 1993,20,0,0,0 -spl_fild03,0,0,0,0 monster Tendril Lion 1991,1,3600000,0,0
\ No newline at end of file +spl_fild03,0,0,0,0 monster Tendril Lion 1991,1,3600000,0,0 diff --git a/npc/pre-re/mobs/fields/umbala.txt b/npc/pre-re/mobs/fields/umbala.txt index 5da651ff9..eb8ce1ce6 100644 --- a/npc/pre-re/mobs/fields/umbala.txt +++ b/npc/pre-re/mobs/fields/umbala.txt @@ -1,15 +1,13 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Umbala Fields Monster Spawn Script -//===== By: ================================================== +//===== By: ================================================== //= Darkchild (1.0) -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= Any rAthena Version; RO Ep6+ -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.3 Official kRO 10.1 spawns [Playtester] //= 1.4 More accurate spawns [Playtester] -//============================================================ +//============================================================ //================================================== // um_fild01 - Luluka Forest diff --git a/npc/pre-re/mobs/fields/veins.txt b/npc/pre-re/mobs/fields/veins.txt index 5a365ef55..5a9a221bc 100644 --- a/npc/pre-re/mobs/fields/veins.txt +++ b/npc/pre-re/mobs/fields/veins.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Veins Fields Monster Spawn Script //===== By: ================================================== //= $ephiroth //===== Current Version: ===================================== //= 1.7 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.0 Temp. monster spawn in Veins Field. [$ephiroth] //= 1.1 Updated monster spawn based on kRO website. [$ephiroth] @@ -72,7 +70,7 @@ ve_fild05,123,65,50,21 monster Sleeper 1386,5,120000,0,0 ve_fild05,152,139,15,17 monster White Plant 1082,5,1800000,0,0 ve_fild05,152,139,5,5 monster Shining Plant 1083,1,2400000,0,0 -//======== [Veins Field-06] =================================== +//======== [Veins Field-06] =================================== ve_fild06,0,0,0,0 monster Stapo 1784,2,300000,0,0 ve_fild06,0,0,0,0 monster Stapo 1784,1,1800000,0,0 ve_fild06,0,0,0,0 monster Shining Plant 1083,1,1020000,0,0 diff --git a/npc/pre-re/mobs/fields/yuno.txt b/npc/pre-re/mobs/fields/yuno.txt index 7a379d947..03ed9dd89 100644 --- a/npc/pre-re/mobs/fields/yuno.txt +++ b/npc/pre-re/mobs/fields/yuno.txt @@ -1,21 +1,19 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Yuno Fields Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.9 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.1 fixed tabs, names [Lupus] //= 1.2 New/Better Spawn [Muad_Dib] //= 1.3 Fix Up [Darkchild] //= 1.4 Updated monster spawns. Many thanks to vicious_pucca for -//= providing the information [MasterOfMuppets] +//= providing the information [MasterOfMuppets] //= 1.5 Updated after Episode 10.4 - Hugel [Poki#3] -//= Mob quantity is custom. +//= Mob quantity is custom. //= 1.5b Changed the spawn numbers a bit. [Poki#3] -//= Thanks to Playtester and Emperium.org +//= Thanks to Playtester and Emperium.org //= 1.6 Fixed Yuno Field 10. Mob amount sugested by Playtester [Poki#3] //= 1.7 Updated by using Tharis' Homun AI, by Tharis [Vicious] //= 1.8 Added kRO 10.1 spawns where they fit [Playtester] diff --git a/npc/pre-re/other/bulletin_boards.txt b/npc/pre-re/other/bulletin_boards.txt new file mode 100644 index 000000000..ed2b210c0 --- /dev/null +++ b/npc/pre-re/other/bulletin_boards.txt @@ -0,0 +1,27 @@ +//===== Hercules Script ====================================== +//= Bulletin Boards +//===== By: ================================================== +//= Euphy +//===== Current Version: ===================================== +//= 1.0 +//===== Description: ========================================= +//= Bulletin Boards for beginners. +//===== Additional Comments: ================================= +//= 1.0 Moved Izlude NPCs to Pre-RE/RE paths. +//============================================================ + +izlude,131,116,4 script Bulletin Board#5 2_BULLETIN_BOARD,{ + mes "[Izlude: The Satellite City]"; + mes "Welcome to Izlude, the satellite of Prontera. Izlude was built to support Prontera's defense and to accommodate its burgeoning population."; + next; + mes "[Izlude: The Satellite City]"; + mes "Points of interest include the Swordsman Association building which allows adventurers to change their job to Swordsman, and the Battle Area that is North of Izlude."; + next; + mes "[Izlude: The Satellite City]"; + mes "At the docks, you may take a ship and travel to ^123972Alberta^000000 or ^2F0400Byalan Island^000000."; + next; + mes "[Izlude: The Satellite City]"; + mes "From Izlude, ^6D6FE0Prontera^000000 is located to the Northwest, and ^1F3A11Payon^000000 is located to the South."; + mes "Enjoy your travels in the Rune-Midgarts Kingdom."; + close; +} diff --git a/npc/pre-re/other/mercenary_rent.txt b/npc/pre-re/other/mercenary_rent.txt index 26520994b..13428427e 100644 --- a/npc/pre-re/other/mercenary_rent.txt +++ b/npc/pre-re/other/mercenary_rent.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Mercenary related NPCs //===== By: ================================================== //= Daegaladh //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Sells Lancer, Sword, and Archer mercenaries, //= along with related mercenary items. @@ -13,5 +11,5 @@ //= 1.0 First version. [Daegaladh] //============================================================ -izlude,47,139,5 duplicate(Mercenary Manager#main) Mercenary Manager#Sword 734 -izlude,56,139,4 duplicate(MercMerchant) Mercenary Merchant#Sword 892 +izlude,47,139,5 duplicate(Mercenary Manager#main) Mercenary Manager#Sword 4_M_JOB_KNIGHT2 +izlude,56,139,4 duplicate(MercMerchant) Mercenary Merchant#Sword 4_F_HUWOMAN diff --git a/npc/pre-re/other/msg_boards.txt b/npc/pre-re/other/msg_boards.txt new file mode 100644 index 000000000..60c7133f0 --- /dev/null +++ b/npc/pre-re/other/msg_boards.txt @@ -0,0 +1,26 @@ +//===== Hercules Script ====================================== +//= Misc. Message Boards +//===== By: ================================================== +//= Euphy +//===== Current Version: ===================================== +//= 1.0 +//===== Description: ========================================= +//= Misc. Message Boards for: +//= - Izlude +//===== Additional Comments: ================================= +//= 1.0 Moved Izlude NPCs to Pre-RE path. +//============================================================ + +// Izlude +//============================================================ +izlude,54,139,1 script Sign#Iz1 HIDDEN_NPC,{ + mes "^993300- The Sign Reads -^000000"; + mes "Welcome to the Swordsman Academy."; + close; +} + +izlude,144,148,1 script Sign#Iz2 HIDDEN_NPC,{ + mes "^993300- The Sign Reads -^000000"; + mes "Welcome."; + close; +} diff --git a/npc/pre-re/other/pvp.txt b/npc/pre-re/other/pvp.txt new file mode 100644 index 000000000..55d6bae79 --- /dev/null +++ b/npc/pre-re/other/pvp.txt @@ -0,0 +1,32 @@ +//===== Hercules Script ====================================== +//= PvP NPCs +//===== By: ================================================== +//= Euphy +//===== Current Version: ===================================== +//= 1.0 +//===== Description: ========================================= +//= PvP NPCs that are found in the Inns in major cities. +//= Includes Yoyo Mode, Nightmare Mode, and Event Mode. +//===== Additional Comments: ================================= +//= 1.0 First version, Pre-Renewal. +//============================================================ + +// PVP Warpers +//============================================================ +pvp_y_room,86,85,4 script Fight Square Reception#8 8W_SOLDIER,{ + callfunc "F_PVP_FSRS"; + end; + +OnInit: + waitingroom "Free for all",0; + end; +} + +pvp_n_room,30,85,4 script Fight Square Reception#n 8W_SOLDIER,{ + callfunc "F_PVP_FSRS"; + end; + +OnInit: + waitingroom "Free for all",0; + end; +} diff --git a/npc/pre-re/other/resetskill.txt b/npc/pre-re/other/resetskill.txt new file mode 100644 index 000000000..4c8fb4054 --- /dev/null +++ b/npc/pre-re/other/resetskill.txt @@ -0,0 +1,142 @@ +//===== Hercules Script ====================================== +//= Hypnotist +//===== By: ================================================== +//= L0ne_W0lf +//===== Current Version: ===================================== +//= 1.0 +//===== Description: ========================================= +//= [Official Conversion] +//= Permenent first class, base level 40 and under skill resetter. +//= First Class characters and expanded classes only. +//= Baby Classes and First Class trans can't use this service. +//===== Additional Comments: ================================= +//= 1.0 First version. [L0ne_W0lf] +//============================================================ + +prontera,146,232,4 script Hypnotist#2 4_F_TELEPORTER,{ + mes "[Hypnotist]"; + mes "Greetings, adventurer."; + mes "I'm a member of the Hypnotist"; + mes "Academy sent here to Prontera"; + mes "to provide Skill Reset services"; + mes "to certain First Class characters for a really good price: free!"; + next; + mes "[Hypnotist]"; + mes "Although I offer unlimited"; + mes "skill resets for now, I have"; + mes "two conditions that must be"; + mes "fulfilled. First, you must be"; + mes "lower than ^FF0000Base Level 40^000000."; + next; + mes "[Hypnotist]"; + mes "Second, you must be a"; + mes "^FF0000Swordman, Acolyte, Mage,"; + mes "Thief, Archer, Merchant,"; + mes "Taekwon Boy, Taekwon Girl, Gunslinger and Ninja^000000"; + mes "Job character to qualify."; + mes "Now, do you have any questions?"; + next; + switch(select("Skill Reset?:I want a Skill Reset:Nothing")) { + + case 1: + mes "[Hypnotist]"; + mes "Skill Resets allow adventuers"; + mes "to redistribute their Skill"; + mes "Points if they are unhappy"; + mes "with their current skills."; + next; + mes "[Hypnotist]"; + mes "Before proceeding with"; + mes "a Skill Reset, you must"; + mes "reduce all of the weight"; + mes "of all carried items on your"; + mes "character to 0. You can put"; + mes "extra items in Kafra Storage."; + next; + mes "[Hypnotist]"; + mes "Ah, it's also important"; + mes "to remove your ^FF0000Pushcart^000000"; + mes "if you have one equipped."; + mes "Otherwise, hypnosis won't"; + mes "work, or will backfire..."; + close; + + case 2: + mes "[Hypnotist]"; + mes "Are you sure that you"; + mes "want to proceed with"; + mes "my ^FF0000Skill Reset^000000 service?"; + next; + if (select("Yes:Cancel") == 1) { + if (BaseLevel > 40) { + mes "[Hypnotist]"; + mes "I'm sorry, but characters"; + mes "with Base Levels higher"; + mes "than 40 are ineligible for the"; + mes "Skill Reset service I provide."; + close; + } + if ((Class > 0 && Class < 7 && Upper == 0) || (Class == Job_Gunslinger) || (Class == Job_Ninja) || (Class == Job_Taekwon)) { + if (checkcart()) { + mes "[Hypnotist]"; + mes "Oh! Please remove your"; + mes "Pushcart before proceeding"; + mes "with the Skill Reset service."; + mes "Thanks for cooperating~"; + close; + } + if (Weight) { + mes "[Hypnotist]"; + mes "If you're here for my Skill"; + mes "Reset service, please"; + mes "remember that you can't"; + mes "reset your skills until the"; + mes "^FF0000weight of your carried items in"; + mes "your Inventory is reduced to 0^000000."; + next; + mes "[Hypnotist]"; + mes "Why don't you place your"; + mes "things into the Kafra Storage"; + mes "for now? That way, you can"; + mes "safely keep all of your goods."; + close; + } + mes "[Hypnotist]"; + mes "Thank you for using"; + mes "my Skill Redistribution"; + mes "services. Oh, and best"; + mes "of luck to you on your"; + mes "travels, adventurer."; + resetskill; + close; + } + mes "[Hypnotist]"; + mes "I'm sorry, but your"; + mes "Job Class doesn't qualify"; + mes "for the Skill Reset service"; + mes "that I provide. I can only"; + mes "offer Skill Resets to the"; + mes "following Jobs..."; + next; + mes "[Hypnotist]"; + mes "^FF0000Swordman, Acolyte,"; + mes "Mage, Thief, Archer,"; + mes "Merchant, Taekwon"; + mes "Boy, Taekwon Girl, Gunslinger and Ninja^000000."; + close; + } + mes "[Hypnotist]"; + mes "Thank you, and good"; + mes "luck on your adventures."; + mes "Please travel in safety~"; + close; + + case 3: + mes "[Hypnotist]"; + mes "Thank you, and good"; + mes "luck on your adventures."; + mes "Please travel in safety~"; + close; + } + +} diff --git a/npc/pre-re/other/turbo_track.txt b/npc/pre-re/other/turbo_track.txt new file mode 100644 index 000000000..ec670fbad --- /dev/null +++ b/npc/pre-re/other/turbo_track.txt @@ -0,0 +1,14 @@ +//===== Hercules Script ====================================== +//= Turbo Track +//===== By: ================================================== +//= Euphy +//===== Current Version: ===================================== +//= 1.0 +//===== Description: ========================================= +//= [Official Conversion] +//= Pre-Renewal duplicates. +//===== Additional Comments: ================================= +//= 1.0 Split Peco Peco Manager NPC. +//============================================================ + +alde_gld,181,199,5 duplicate(MountManager_turbo) Peco Peco Manager 4_F_RACING diff --git a/npc/pre-re/quests/collection/quest_alligator.txt b/npc/pre-re/quests/collection/quest_alligator.txt index 263ea2658..79c121ba5 100644 --- a/npc/pre-re/quests/collection/quest_alligator.txt +++ b/npc/pre-re/quests/collection/quest_alligator.txt @@ -1,20 +1,18 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= iRO Repeatable EXP Quests. //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Added Monster Killing quests. //= Repeatable EXP Quest (Anolian Skins) //===== Additional Comments: ================================= //= 1.0 First version. //============================================================ -cmd_fild01,362,256,3 script Cuir#Gator_Hunt 106,{ +cmd_fild01,362,256,3 script Cuir#Gator_Hunt 1_M_MOC_LORD,{ if (checkquest(60119) != -1) { if (checkquest(60119,HUNTING) != 2 ) { mes "[Cuir]"; diff --git a/npc/pre-re/quests/collection/quest_caramel.txt b/npc/pre-re/quests/collection/quest_caramel.txt index 4cb379b71..6815c62e1 100644 --- a/npc/pre-re/quests/collection/quest_caramel.txt +++ b/npc/pre-re/quests/collection/quest_caramel.txt @@ -1,20 +1,18 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= iRO Repeatable EXP Quests. //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Added Monster Killing quests. //= Repeatable EXP Quest (Porcupine Quills) //===== Additional Comments: ================================= //= 1.0 First version. //============================================================ -mjolnir_01,296,29,6 script Yullo#Caramel_Hunt 95,{ +mjolnir_01,296,29,6 script Yullo#Caramel_Hunt 4_F_SISTER,{ if (checkquest(60116) != -1) { if (checkquest(60116,HUNTING) != 2 ) { mes "[Yullo]"; diff --git a/npc/pre-re/quests/collection/quest_coco.txt b/npc/pre-re/quests/collection/quest_coco.txt index 0915d3988..7ba4cab02 100644 --- a/npc/pre-re/quests/collection/quest_coco.txt +++ b/npc/pre-re/quests/collection/quest_coco.txt @@ -1,20 +1,18 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= iRO Repeatable EXP Quests. //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Added Monster Killing quests. //= Repeatable EXP Quest (Acorns) //===== Additional Comments: ================================= //= 1.0 First version. //============================================================ -mjolnir_01,293,20,3 script Nutters#Coco_Hunt 779,{ +mjolnir_01,293,20,3 script Nutters#Coco_Hunt 4_M_YOYOROGUE,{ if (checkquest(60113) != -1) { if (checkquest(60113,HUNTING) != 2 ) { mes "[Nutters]"; diff --git a/npc/pre-re/quests/collection/quest_creamy.txt b/npc/pre-re/quests/collection/quest_creamy.txt index 4a1844719..ecdb6b0fb 100644 --- a/npc/pre-re/quests/collection/quest_creamy.txt +++ b/npc/pre-re/quests/collection/quest_creamy.txt @@ -1,20 +1,18 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= iRO Repeatable EXP Quests. //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Added Monster Killing quests. (Dialog is semi-custom) //= Repeatable EXP Quest (Powder of Butterfly) //===== Additional Comments: ================================= //= 1.0 First version. //============================================================ -prt_fild04,356,148,3 script Laertes#Creamy_Hunt 798,{ +prt_fild04,356,148,3 script Laertes#Creamy_Hunt 4_M_NFMAN,{ if (checkquest(60122) != -1) { if (checkquest(60122,HUNTING) != 2 ) { mes "[Laertes]"; diff --git a/npc/pre-re/quests/collection/quest_demonpungus.txt b/npc/pre-re/quests/collection/quest_demonpungus.txt index 7e659e1ca..242e7bca2 100644 --- a/npc/pre-re/quests/collection/quest_demonpungus.txt +++ b/npc/pre-re/quests/collection/quest_demonpungus.txt @@ -1,20 +1,18 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= iRO Repeatable EXP Quests. //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Added Monster Killing quests. //= Repeatable EXP Quest (Bacillus) //===== Additional Comments: ================================= //= 1.0 First version. //============================================================ -ein_fild01,43,249,0 script Local Villager#hunt 898,{ +ein_fild01,43,249,0 script Local Villager#hunt 4_M_HUMAN_01,{ if (checkquest(60125) != -1) { if (checkquest(60125,HUNTING) != 2 ) { mes "[Local Villager]"; diff --git a/npc/pre-re/quests/collection/quest_disguiseloliruri.txt b/npc/pre-re/quests/collection/quest_disguiseloliruri.txt index 42ff4800c..35d48aef7 100644 --- a/npc/pre-re/quests/collection/quest_disguiseloliruri.txt +++ b/npc/pre-re/quests/collection/quest_disguiseloliruri.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= iRO Repeatable EXP Quests. //===== By: ================================================== //= Masao //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Custom Version. //= Repeatable EXP Quest : Kill 50 Disguise or Loli Ruri. @@ -13,7 +11,7 @@ //= 1.0 First version. //============================================================ -nif_fild02,332,327,4 script Deadman 795,{ +nif_fild02,332,327,4 script Deadman 4_M_NFDEADMAN,{ if (checkquest(60173) != -1) { if (checkquest(60173,HUNTING) != 2 ) { @@ -109,7 +107,7 @@ nif_fild02,332,327,4 script Deadman 795,{ next; switch(select("Disguise:Loli Ruri:Cancel")) { case 1: - if(BaseLevel > 90){ + if (BaseLevel > 90) { mes "[Deadman]"; mes "Thank you for your great help with the Disguise!"; mes "Currently the Situation is stable and i'm not in need of your help anymore to kill them."; @@ -120,7 +118,7 @@ nif_fild02,332,327,4 script Deadman 795,{ setquest 60173; close; case 2: - if(BaseLevel > 98){ + if (BaseLevel > 98) { mes "[Deadman]"; mes "Thank you for your great help with the Loli Ruri!"; mes "Currently the Situation is stable and i'm not in need of your help anymore to kill them."; diff --git a/npc/pre-re/quests/collection/quest_dokebi.txt b/npc/pre-re/quests/collection/quest_dokebi.txt index 3e6bcf637..62f0ed45d 100644 --- a/npc/pre-re/quests/collection/quest_dokebi.txt +++ b/npc/pre-re/quests/collection/quest_dokebi.txt @@ -1,20 +1,18 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= iRO Repeatable EXP Quests. //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Added Monster Killing quests. //= Repeatable EXP Quest (Dokebi Horns) //===== Additional Comments: ================================= //= 1.0 First version. //============================================================ -pay_fild10,108,357,5 script Li#Dokebi_Hunt 90,{ +pay_fild10,108,357,5 script Li#Dokebi_Hunt 4_F_01,{ if (checkquest(60128) != -1) { if (checkquest(60128,HUNTING) != 2 ) { mes "[Li]"; diff --git a/npc/pre-re/quests/collection/quest_dryad.txt b/npc/pre-re/quests/collection/quest_dryad.txt index 348dc75f9..552a1096f 100644 --- a/npc/pre-re/quests/collection/quest_dryad.txt +++ b/npc/pre-re/quests/collection/quest_dryad.txt @@ -1,20 +1,18 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= iRO Repeatable EXP Quests. //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Added Monster Killing quests. //= Repeatable EXP Quest (Sharp Leaves) //===== Additional Comments: ================================= //= 1.0 First version. //============================================================ -um_fild01,34,281,5 script Lilla#Dryad_Hunt 724,{ +um_fild01,34,281,5 script Lilla#Dryad_Hunt 4_F_07,{ if (checkquest(60131) != -1) { if (checkquest(60131,HUNTING) != 2 ) { mes "[Lilla]"; diff --git a/npc/pre-re/quests/collection/quest_fabre.txt b/npc/pre-re/quests/collection/quest_fabre.txt index 9c0c016a1..bd11cf8ae 100644 --- a/npc/pre-re/quests/collection/quest_fabre.txt +++ b/npc/pre-re/quests/collection/quest_fabre.txt @@ -1,20 +1,18 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= iRO Repeatable EXP Quests. //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Added Monster Killing quests. //= Repeatable EXP Quest (Fluffs) //===== Additional Comments: ================================= //= 1.0 First version. //============================================================ -gef_fild07,321,193,4 script Langry#Fabre_Hunt 754,{ +gef_fild07,321,193,4 script Langry#Fabre_Hunt 4_M_SAGE_A,{ if (checkquest(60107) != -1) { if (checkquest(60107,HUNTING) != 2 ) { mes "[Langry]"; diff --git a/npc/pre-re/quests/collection/quest_frilldora.txt b/npc/pre-re/quests/collection/quest_frilldora.txt index f0306d787..5c9321aa6 100644 --- a/npc/pre-re/quests/collection/quest_frilldora.txt +++ b/npc/pre-re/quests/collection/quest_frilldora.txt @@ -1,20 +1,18 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= iRO Repeatable EXP Quests. //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Added Monster Killing quests. //= Repeatable EXP Quest (Frills) //===== Additional Comments: ================================= //= 1.0 First version. //============================================================ -moc_fild17,66,273,5 script Lemly#Frilldora_Hunt 725,{ +moc_fild17,66,273,5 script Lemly#Frilldora_Hunt 4_F_JOB_ASSASSIN,{ if (checkquest(60134) != -1) { if (checkquest(60134,HUNTING) != 2 ) { mes "[Lemly]"; diff --git a/npc/pre-re/quests/collection/quest_goat.txt b/npc/pre-re/quests/collection/quest_goat.txt index 64d729386..292a38459 100644 --- a/npc/pre-re/quests/collection/quest_goat.txt +++ b/npc/pre-re/quests/collection/quest_goat.txt @@ -1,20 +1,18 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= iRO Repeatable EXP Quests. //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Added Monster Killing quests. //= Repeatable EXP Quest (Antelope Horns) //===== Additional Comments: ================================= //= 1.0 First version. //============================================================ -ein_fild06,82,171,0 script Vegetable Farmer#Goat 919,{ +ein_fild06,82,171,0 script Vegetable Farmer#Goat 4_F_SHABBY,{ if (checkquest(60137) != -1) { if (checkquest(60137,HUNTING) != 2 ) { mes "[Vegetable Farmer]"; diff --git a/npc/pre-re/quests/collection/quest_golem.txt b/npc/pre-re/quests/collection/quest_golem.txt index 882d878dd..2c927ea40 100644 --- a/npc/pre-re/quests/collection/quest_golem.txt +++ b/npc/pre-re/quests/collection/quest_golem.txt @@ -1,20 +1,18 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= iRO Repeatable EXP Quests. //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Added Monster Killing quests. //= Repeatable EXP Quest (Stone Hearts) //===== Additional Comments: ================================= //= 1.0 First version. //============================================================ -moc_fild11,57,138,0 script Private Jeremy#hunt 707,{ +moc_fild11,57,138,0 script Private Jeremy#hunt 4_M_MOC_SOLDIER,{ if (checkquest(60140) != -1) { if (checkquest(60140,HUNTING) != 2 ) { mes "[Private Jeremy]"; diff --git a/npc/pre-re/quests/collection/quest_hode.txt b/npc/pre-re/quests/collection/quest_hode.txt index 342ba5fc3..c534448d4 100644 --- a/npc/pre-re/quests/collection/quest_hode.txt +++ b/npc/pre-re/quests/collection/quest_hode.txt @@ -1,20 +1,18 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= iRO Repeatable EXP Quests. //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Added Monster Killing quests. //= Repeatable EXP Quest (Earthworm Peelings) //===== Additional Comments: ================================= //= 1.0 First version. //============================================================ -moc_fild17,208,346,5 script Shone#Hode_Hunt 707,{ +moc_fild17,208,346,5 script Shone#Hode_Hunt 4_M_MOC_SOLDIER,{ if (checkquest(60104) != -1) { if (checkquest(60104,HUNTING) != 2 ) { mes "[Shone]"; diff --git a/npc/pre-re/quests/collection/quest_leafcat.txt b/npc/pre-re/quests/collection/quest_leafcat.txt index 69f313f75..185ff2067 100644 --- a/npc/pre-re/quests/collection/quest_leafcat.txt +++ b/npc/pre-re/quests/collection/quest_leafcat.txt @@ -1,20 +1,18 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= iRO Repeatable EXP Quests. //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Added Monster Killing quests. //= Repeatable EXP Quest (Huge Leaves) //===== Additional Comments: ================================= //= 1.0 First version. //============================================================ -ayo_fild01,44,241,5 script Lella#LeafCat_Hunt 877,{ +ayo_fild01,44,241,5 script Lella#LeafCat_Hunt 4_F_YUNYANG,{ if (checkquest(60143) != -1) { if (checkquest(60143,HUNTING) != 2 ) { mes "[Lella]"; diff --git a/npc/pre-re/quests/collection/quest_mantis.txt b/npc/pre-re/quests/collection/quest_mantis.txt index 5e9249a1c..3eb18ca4f 100644 --- a/npc/pre-re/quests/collection/quest_mantis.txt +++ b/npc/pre-re/quests/collection/quest_mantis.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= iRO Repeatable EXP Quests. //===== By: ================================================== //= Masao //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Custom Version. //= Repeatable EXP Quest : Kill 50 Mantis. @@ -13,7 +11,7 @@ //= 1.0 First version. //============================================================ -lou_fild01,240,354,4 script Mantis Researcher 878,{ +lou_fild01,240,354,4 script Mantis Researcher 4_M_OILMAN,{ if (checkquest(60179) != -1) { if (checkquest(60179,HUNTING) != 2 ) { @@ -71,7 +69,7 @@ lou_fild01,240,354,4 script Mantis Researcher 878,{ next; switch(select("Sure:Cancel")) { case 1: - if(BaseLevel > 70){ + if (BaseLevel > 70) { mes "[Mantis Researcher]"; mes "Thank you for your great help with the Mantis!"; mes "Currently the Situation is stable and i'm not in need of your help anymore to kill them."; diff --git a/npc/pre-re/quests/collection/quest_pecopeco.txt b/npc/pre-re/quests/collection/quest_pecopeco.txt index 1850180e1..3460320ce 100644 --- a/npc/pre-re/quests/collection/quest_pecopeco.txt +++ b/npc/pre-re/quests/collection/quest_pecopeco.txt @@ -1,20 +1,18 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= iRO Repeatable EXP Quests. //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Added Monster Killing quests. //= Repeatable EXP Quest (Bill of Birds) //===== Additional Comments: ================================= //= 1.0 First version. //============================================================ -moc_fild02,74,329,3 script Gregor#PecoPeco_Hunt 97,{ +moc_fild02,74,329,3 script Gregor#PecoPeco_Hunt 4W_M_01,{ if (checkquest(60101) != -1) { if (checkquest(60101,HUNTING) != 2 ) { mes "[Gregor]"; diff --git a/npc/pre-re/quests/collection/quest_pupa.txt b/npc/pre-re/quests/collection/quest_pupa.txt index b6088a49f..64aafe42f 100644 --- a/npc/pre-re/quests/collection/quest_pupa.txt +++ b/npc/pre-re/quests/collection/quest_pupa.txt @@ -1,20 +1,18 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= iRO Repeatable EXP Quests. //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Added Monster Killing quests. //= Repeatable EXP Quest (Chrysalis) //===== Additional Comments: ================================= //= 1.0 First version. //============================================================ -gef_fild04,191,54,3 script Halgus#Pupa_Hunt 123,{ +gef_fild04,191,54,3 script Halgus#Pupa_Hunt 2_F_MAGICMASTER,{ if (checkquest(60110) != -1) { if (checkquest(60110,HUNTING) != 2 ) { mes "[Halgus]"; diff --git a/npc/pre-re/quests/collection/quest_zhupolong.txt b/npc/pre-re/quests/collection/quest_zhupolong.txt index bf3999683..a167ec3e5 100644 --- a/npc/pre-re/quests/collection/quest_zhupolong.txt +++ b/npc/pre-re/quests/collection/quest_zhupolong.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= iRO Repeatable EXP Quests. //===== By: ================================================== //= Masao //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Custom Version. //= Repeatable EXP Quest : Kill 50 Zhu Po Long. @@ -13,7 +11,7 @@ //= 1.0 First version. //============================================================ -lou_dun02,161,264,4 script Dragon Hunter 732,{ +lou_dun02,161,264,4 script Dragon Hunter 4_M_JOB_HUNTER,{ if (checkquest(60182) != -1) { if (checkquest(60182,HUNTING) != 2 ) { @@ -71,7 +69,7 @@ lou_dun02,161,264,4 script Dragon Hunter 732,{ next; switch(select("Sure:Cancel")) { case 1: - if(BaseLevel > 90){ + if (BaseLevel > 90) { mes "[Dragon Hunter]"; mes "Thank you for your great help with the Zhu Po Long!"; mes "Currently the Situation is stable and i'm not in need of your help anymore to kill them."; diff --git a/npc/pre-re/quests/doomed_swords.txt b/npc/pre-re/quests/doomed_swords.txt deleted file mode 100644 index 9d27d588b..000000000 --- a/npc/pre-re/quests/doomed_swords.txt +++ /dev/null @@ -1,64 +0,0 @@ -//===== Hercules Script ======================================= -//= Doomed Swords Quest -//===== By: ================================================== -//= kobra_k88; L0ne_W0lf -//===== Current Version: ===================================== -//= 1.0 -//===== Compatible With: ===================================== -//= Hercules GIT -//===== Description: ========================================= -//= [Aegis Conversion] -//= Doomed Swords Quest: -//= - Quest for Doomed Swords: Grimtooth, Mysteltain, Executioner. -//= Although this quest is enabled on iRO, the Mysteltainn -//= portion is NOT completable as the item "Young Twig" does -//= not drop. -//= - Variable in use: event_magum (max 6) -//= - Variable in use: dmdswrd_Q2 (bits 1 - 32) -//===== Additional Comments: ================================= -//= 1.0 Moved from main folder [Streusel] -//============================================================ - -izlude_in,173,88,2 script Nain#magum 102,{ - if (dmdswrd_Q2 == 4) { - mes "[Nain]"; - mes "It doesn't matter how"; - mes "powerful the Executioner"; - mes "is: if it were to end up in"; - mes "my hands, I would get rid"; - mes "of it right away. I'd never risk losing my mind to that curse..."; - close; - } - mes "[Nain]"; - mes "Long ago, one sword"; - mes "was used to behead all"; - mes "the criminals that had been"; - mes "sentenced to death. That"; - mes "accursed blade is known"; - mes "as the Executioner."; - next; - mes "[Nain]"; - mes "As the Executioner slayed"; - mes "more criminals, the rage and"; - mes "bloodlust of its victims began"; - mes "to accumulate upon the blade."; - mes "Although the sword gained great^FFFFFF ^000000 strength, it was tainted by evil."; - next; - mes "[Nain]"; - mes "The last person to wield"; - mes "the Executioner almost lost"; - mes "his mind to the sword. He saved^FFFFFF ^000000 himself by giving it to a talented"; - mes "blacksmith who would destroy^FFFFFF ^000000 it for him, thus saving his soul."; - next; - mes "[Nain]"; - mes "This mysterious blacksmith"; - mes "was never seen again in the"; - mes "city of Prontera, but rumor has"; - mes "it that if you can find him, he"; - mes "can forge that accursed"; - mes "Executioner anew..."; - if (event_magum == 1) - set event_magum,5; - set dmdswrd_Q2,dmdswrd_Q2 | 4; - close; -}
\ No newline at end of file diff --git a/npc/pre-re/quests/first_class/tu_archer.txt b/npc/pre-re/quests/first_class/tu_archer.txt new file mode 100644 index 000000000..5f53d0385 --- /dev/null +++ b/npc/pre-re/quests/first_class/tu_archer.txt @@ -0,0 +1,14 @@ +//===== Hercules Script ====================================== +//= Archer Class Tutorial and Job Specific Quest +//===== By: ================================================== +//= Euphy +//===== Current Version: ===================================== +//= 1.0 +//===== Description: ========================================= +//= [Official Conversion] +//= Archer training quest. +//===== Additional Comments: ================================= +//= 1.0 First version. [Euphy] +//============================================================ + +mjolnir_11,27,223,3 duplicate(Acolyte_Tu) Acolyte#tu 4_F_SISTER diff --git a/npc/pre-re/quests/monstertamers.txt b/npc/pre-re/quests/monstertamers.txt index 86f118f5a..6d998fdbf 100644 --- a/npc/pre-re/quests/monstertamers.txt +++ b/npc/pre-re/quests/monstertamers.txt @@ -1,15 +1,13 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Monster Tamers //===== By: ================================================== -//= Streusel +//= Euphy //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= Hercules //===== Description: ========================================= //= Cute pet quest items //===== Additional Comments: ================================= -//= 1.0 Duplicates for Monster Tamer [Streusel] +//= 1.0 Moved Izlude NPC to pre-re/re paths. //============================================================ -izlude_in,129,64,4 duplicate(Monster_Tamer#izu) Monster Tamer#izlude 125
\ No newline at end of file +izlude_in,129,64,4 duplicate(MonsterTamer_izlude) Monster Tamer#izu 4_M_TELEPORTER diff --git a/npc/pre-re/quests/mrsmile.txt b/npc/pre-re/quests/mrsmile.txt index b03afb770..525221af9 100644 --- a/npc/pre-re/quests/mrsmile.txt +++ b/npc/pre-re/quests/mrsmile.txt @@ -1,16 +1,14 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Mr. Smile Quest -//===== By: ================================================== +//===== By: ================================================== //= Daegaladh -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN -//===== Description: ========================================= -//= [Aegis Conversion] +//===== Description: ========================================= +//= [Official Conversion] //= Trade Clover, Fluff and Jellopy for a Mr. Smile mask. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. -//============================================================ +//============================================================ -izlude,129,118,4 duplicate(SmileHelper) Smile Assistance#iz 92 +izlude,129,118,4 duplicate(SmileHelper) Smile Assistance#iz 4_F_03 diff --git a/npc/pre-re/quests/quests_13_1.txt b/npc/pre-re/quests/quests_13_1.txt index b98aa2b95..ec291e16e 100644 --- a/npc/pre-re/quests/quests_13_1.txt +++ b/npc/pre-re/quests/quests_13_1.txt @@ -1,17 +1,13 @@ //===== Hercules Script ====================================== //= Quest NPCs related to Ash-Vacuum //===== By: ================================================== -//= Streusel +//= Euphy //===== Current Version: ===================================== //= 1.0 //===== Description: ========================================= -//= [Official Conversion] -//= Contains: -//= Promotional Staff Duplicate for pre-renewal +//= Contains duplicate NPCs from main script. //===== Additional Comments: ================================= -//= 1.0 First Version. [Streusel] +//= 1.0 Moved Izlude NPC to pre-re/re paths. [Euphy] //============================================================ -// Onward to the New World -//============================================================ -izlude,101,173,6 duplicate(Promotional Staff#iz) Promotional Staff#izlude 100
\ No newline at end of file +izlude,101,173,6 duplicate(PromotionalStaff_izlude) Promotional Staff#iz 4W_SAILOR diff --git a/npc/pre-re/quests/quests_izlude.txt b/npc/pre-re/quests/quests_izlude.txt index e742332eb..aac9f5467 100644 --- a/npc/pre-re/quests/quests_izlude.txt +++ b/npc/pre-re/quests/quests_izlude.txt @@ -1,15 +1,13 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Quest NPCs related to Izlude -//===== By: ================================================== +//===== By: ================================================== //= Daegaladh -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN -//===== Description: ========================================= +//===== Description: ========================================= //= Edgar's Offer -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. //============================================================ -izlude,182,186,2 duplicate(Edgar_izlude) Edgar#izlude 49 +izlude,182,186,2 duplicate(Edgar_izlude) Edgar#izlude 1_M_03 diff --git a/npc/pre-re/quests/quests_lighthalzen.txt b/npc/pre-re/quests/quests_lighthalzen.txt index aadb0296d..c9365857a 100644 --- a/npc/pre-re/quests/quests_lighthalzen.txt +++ b/npc/pre-re/quests/quests_lighthalzen.txt @@ -1,15 +1,13 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Quest NPCs located in Lighthalzen -//===== By: ================================================== +//===== By: ================================================== //= Daegaladh -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN -//===== Description: ========================================= +//===== Description: ========================================= //= Quests related to Lighthalzen City. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. -//============================================================ +//============================================================ -izlude,186,57,5 duplicate(Scamp) Scamp#2 853 +izlude,186,57,5 duplicate(Scamp) Scamp#iz 4_M_YURI diff --git a/npc/pre-re/quests/quests_nameless.txt b/npc/pre-re/quests/quests_nameless.txt index ab5d816dc..77654e084 100644 --- a/npc/pre-re/quests/quests_nameless.txt +++ b/npc/pre-re/quests/quests_nameless.txt @@ -1,391 +1,15 @@ //===== Hercules Script ====================================== //= Nameless Island Quests -//===== By: ================================================== -//= Streusel -//===== Current Version: ===================================== +//===== By: ================================================== +//= Euphy +//===== Current Version: ===================================== //= 1.0 -//===== Description: ========================================= +//===== Description: ========================================= +//= [Official Conversion] //= Contains: -//= Part of Muff's Loan: -//- - Help Muff clear his Debt and get his collateral back. -//= - prerequisite Quest to "Broken Diamond" -//= - Variable in use: diamond_edq (Max: 14) -//===== Additional Comments: ================================= -//= 1.0 First version. -//============================================================ +//= - Muff's Loan +//===== Additional Comments: ================================= +//= 1.0 Moved Dorian to pre-re/re paths. +//============================================================ -izlude_in,113,66,0 script Strange Machine 111,{ - if (checkweight(907,200) == 0) { - mes "[Dorian]"; - mes "Ugh, just like a member"; - mes "of the working class:"; - mes "hoarding all your items"; - mes "like a packrat? Have the"; - mes "decency to relocate your"; - mes "goods to Kafra Storage, please."; - close; - } - if (diamond_edq) == 10 { - set .@bolt_rand,rand(2,5); - mes "^3355FFThis must be Dorian's"; - mes "Mystic Dryer de Elegance."; - mes "What do you want to do?^000000"; - next; - while(1) { - set .@switch_sound,rand(1,4); - switch(select("Check the Machine:Replace the Engine:Tighten the Screw:Press a Switch")) { - case 1: - if (.@hit_status == 0) { - mes "^3355FFThere's no power"; - mes "in this behemoth"; - mes "of a machine.^000000"; - next; - } - break; - case 2: - if (.@engine == 0) { - mes "^3355FFYou replace the rough"; - mes "ruby in the ruby engine"; - mes "with a new rough ruby."; - mes "It clicks into place"; - mes "inside the engine core.^000000"; - next; - set .@engine,.@engine+1; - } - else if (engine > 0) { - mes "^3355FFThe ruby in the"; - mes "engine has already"; - mes "been replaced.^000000"; - next; - } - break; - case 3: - if (.@engine < 1) { - mes "^3355FFYou probably need"; - mes "to replace the ruby"; - mes "in the engine first.^000000"; - next; - } - else if ((.@engine == 1) && (.@bolt < .@bolt_rand)) { - mes "^3355FF*Krrrr-Krrrrr*^000000"; - mes "^3355FF*Krrrr-Krrrrr*^000000"; - next; - set .@bolt,.@bolt+1; - } - else if ((.@engine == 1) && (.@bolt == .@bolt_rand)) { - mes "^3355FF*Krrrr-Krrrrr*^000000"; - mes "^0000FF*Click*^000000"; - next; - set .@bolt,.@bolt+1; - set .@bolt_suc,.@bolt_suc+1; - } - else if ((.@engine == 1) && (.@bolt > .@bolt_rand)) { - mes "^3355FF*Krrrr-Krrrrr*^000000"; - mes "^3355FF*KrrICK-ICK-ICK-KOOM*^000000"; - next; - mes "^3355FFYou tightened the"; - mes "screw too tightly!"; - mes "The joint is broken..."; - mes "You should go back"; - mes "to Dorian for help.^000000"; - setquest 3106; - set diamond_edq,11; - close; - } - else { - mes "^3355FFSomething must have"; - mes "gone wrong. You'd be"; - mes "better off starting"; - mes "from the beginning...^000000"; - close; - } - break; - case 4: - if ((.@engine < 1) && (.@bolt_suc < 1)) { - mes "^3355FFYou need to replace"; - mes "the engine's ruby and"; - mes "tighten the main screw"; - mes "before you mess with"; - mes "these switches.^000000"; - next; - } - else if ((.@engine == 1) && (.@bolt_suc < 1)) { - mes "^3355FFYou need to tighten"; - mes "the scren before you can"; - mes "start the engine safely."; - next; - } - else if ((.@red >= 1) && (.@blue >= 1) && (.@yellow >= 1) && (.@green >= 1)) { - mes "^3355FFThe Mystic Dryer de"; - mes "Elegance started with"; - mes "a mighty buzz, and the"; - mes "sound lowers to a calm"; - mes "hum as it stabilizes."; - mes "It looks like you fixed it!^000000"; - next; - mes "^3355FFYou should tell Dorian"; - mes "first so that you can"; - mes "use this machine.^000000"; - setquest 3107; - set diamond_edq,12; - close; - } - else if ((.@engine == 1) && (.@bolt_suc == 1)) { - if (.@switch_sound == 1) { - mes "^3355FF*Buzz Buzz*^000000"; - mes "^3355FF*Buzz Buzz*^000000"; - mes "^3355FFThe machine is"; - mes "vibrating weakly."; - mes "Which switch do"; - mes "you want to press?^000000"; - next; - switch(select("Red Switch:Blue Switch:Yellow Switch:Green Switch")) { - default: - mes "^3355FF*Whiz Whiz*^000000"; - mes "^3355FF*Whiz Whiz*^000000"; - next; - mes "^3355FFThe machine made some"; - mes "violent, erratic sounds,"; - mes "and vibrated violently"; - mes "before coming to a sudden"; - mes "stop. That was the wrong"; - mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; - setquest 3106; - set diamond_edq,11; - close; - case 1: - if (.@red >= 0) { - mes "^3355FF*Buzzz Buzzz*^000000"; - mes "^3355FF*Clang...!*^000000"; - next; - mes "^3355FFThe machine's"; - mes "vibrations have"; - mes "grown stronger."; - mes "It looks like you"; - mes "chose the right switch.^000000"; - next; - set .@red,.@red+1; - } - else { - mes "^3355FF*Whiz Whiz*^000000"; - mes "^3355FF*Whiz Whiz*^000000"; - next; - mes "^3355FFThe machine made some"; - mes "violent, erratic sounds,"; - mes "and vibrated violently"; - mes "before coming to a sudden"; - mes "stop. That was the wrong"; - mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; - setquest 3106; - set diamond_edq,11; - close; - } - break; - } - } - else if (.@switch_sound == 2) { - mes "^3355FF*Purr Purr*^000000"; - mes "^3355FF*Purr Purr*^000000"; - mes "^3355FFThe machine is vibrating"; - mes "a little bit more strongly."; - mes "Which switch will"; - mes "you try now?^000000"; - next; - switch(select("Red Switch:Blue Switch:Yellow Switch:Green Switch")) { - default: - mes "^3355FF*Whiz Whiz*^000000"; - mes "^3355FF*Whiz Whiz*^000000"; - next; - mes "^3355FFThe machine made some"; - mes "violent, erratic sounds,"; - mes "and vibrated violently"; - mes "before coming to a sudden"; - mes "stop. That was the wrong"; - mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; - setquest 3106; - set diamond_edq,11; - close; - case 2: - if (.@blue >= 0) { - mes "^3355FF*Purrr Purr*^000000"; - mes "^3355FF*Clang...!*^000000"; - next; - mes "^3355FFThe machine's"; - mes "vibrations have"; - mes "grown stronger."; - mes "It looks like you"; - mes "chose the right switch.^000000"; - next; - set .@blue,.@blue+1; - } - else { - mes "^3355FF*Whiz Whiz*^000000"; - mes "^3355FF*Whiz Whiz*^000000"; - next; - mes "^3355FFThe machine made some"; - mes "violent, erratic sounds,"; - mes "and vibrated violently"; - mes "before coming to a sudden"; - mes "stop. That was the wrong"; - mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; - setquest 3106; - set diamond_edq,11; - close; - } - break; - } - } - else if (.@switch_sound == 3) { - mes "^3355FF*Bzzz Bzzz*"; - mes "*Bzzz Bzzz*"; - mes "The machine's vibrations"; - mes "are a bit more stable now."; - mes "Which switch will you try?^000000"; - next; - switch(select("Red Switch:Blue Switch:Yellow Switch:Green Switch")) { - default: - mes "^3355FF*Whiz Whiz*^000000"; - mes "^3355FF*Whiz Whiz*^000000"; - next; - mes "^3355FFThe machine made some"; - mes "violent, erratic sounds,"; - mes "and vibrated violently"; - mes "before coming to a sudden"; - mes "stop. That was the wrong"; - mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; - setquest 3106; - set diamond_edq,11; - close; - case 3: - if (.@yellow >= 0) { - mes "^3355FF*Bzzzz Bzzzz*^000000"; - mes "^3355FF*Clang...!*^000000"; - next; - mes "^3355FFThe machine's"; - mes "vibrations have"; - mes "grown stronger."; - mes "It looks like you"; - mes "chose the right switch.^000000"; - next; - set .@yellow,.@yellow+1; - } - else { - mes "^3355FF*Whiz Whiz*^000000"; - mes "^3355FF*Whiz Whiz*^000000"; - next; - mes "^3355FFThe machine made some"; - mes "violent, erratic sounds,"; - mes "and vibrated violently"; - mes "before coming to a sudden"; - mes "stop. That was the wrong"; - mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; - setquest 3106; - set diamond_edq,11; - close; - } - break; - } - } - else if (.@switch_sound == 4) { - next; - mes "^3355FF*Pzzzz Pzzz*"; - mes "*Pzzzz Pzzz*"; - mes "The machine is vibrating"; - mes "fairly strongly now. Which"; - mes "switch will you try?^000000"; - next; - switch(select("Red Switch:Blue Switch:Yellow Switch:Green Switch")) { - default: - mes "^3355FF*Whiz Whiz*^000000"; - mes "^3355FF*Whiz Whiz*^000000"; - next; - mes "^3355FFThe machine made some"; - mes "violent, erratic sounds,"; - mes "and vibrated violently"; - mes "before coming to a sudden"; - mes "stop. That was the wrong"; - mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; - setquest 3106; - set diamond_edq,11; - close; - case 4: - if (.@green >= 0) { - mes "^3355FFPzzzzz Pzzzz*^000000"; - mes "^3355FF*Clang...!*^000000"; - next; - mes "^3355FFThe machine's"; - mes "vibrations have"; - mes "grown stronger."; - mes "It looks like you"; - mes "chose the right switch.^000000"; - next; - set .@green,.@green+1; - } - else { - mes "^3355FF*Whiz Whiz*^000000"; - mes "^3355FF*Whiz Whiz*^000000"; - next; - mes "^3355FFThe machine made some"; - mes "violent, erratic sounds,"; - mes "and vibrated violently"; - mes "before coming to a sudden"; - mes "stop. That was the wrong"; - mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; - setquest 3106; - set diamond_edq,11; - close; - } - break; - } - } - } - } - } - } - if (diamond_edq == 12) { - mes "[Dorian]"; - mes "It sounds like you're"; - mes "done fixing my Mystic"; - mes "Dryer de Elegance."; - mes "Why don't you come"; - mes "back so I can explain"; - mes "how you can use it?"; - close; - } - if ((diamond_edq == 13) && (countitem(7722) < 1)) { - mes "^3355FFYou lift the main"; - mes "operational switch,"; - mes "turning on a light and"; - mes "opening a convenient"; - mes "slot. You insert the"; - mes "wet bond of debt.^000000"; - next; - mes "^3355FFThe engine's pistons"; - mes "and cylinders churn"; - mes "with a lively din, and"; - mes "when the heater stops,"; - mes "the slot reopens.^000000"; - next; - mes "[" + strcharinfo(0) + "]"; - mes "So this is the original"; - mes "bond of debt that Muff"; - mes "lost? It looks... Perfect!"; - changequest 3108,3109; - getitem 7722,1; //Debt_Note - close; - } - else if ((diamond_edq == 13) && (countitem(7722) > 0)) { - mes "You already used this"; - mes "machine to restore the"; - mes "bond of debt. There's no"; - mes "need to mess around"; - mes "with it any longer."; - close; - } - mes "[Dorian]"; - mes "Who are you?"; - mes "Don't you dare lay"; - mes "a hand on my precious"; - mes "masterpiece inventions! "; - close; -}
\ No newline at end of file +izlude_in,110,64,3 duplicate(Dorian_izlude) Dorian 4_M_OILMAN,2,2 diff --git a/npc/pre-re/quests/quests_veins.txt b/npc/pre-re/quests/quests_veins.txt new file mode 100644 index 000000000..23262d482 --- /dev/null +++ b/npc/pre-re/quests/quests_veins.txt @@ -0,0 +1,13 @@ +//===== Hercules Script ====================================== +//= Quest NPCs located in Veins +//===== By: ================================================== +//= Euphy +//===== Current Version: ===================================== +//= 1.0 +//===== Description: ========================================= +//= Quests related to Lighthalzen City. +//===== Additional Comments: ================================= +//= 1.0 First version. +//============================================================ + +ve_fild05,257,130,4 duplicate(WincingOldMan_veins) Wincing Old Man#ve 4_M_DST_GRAND diff --git a/npc/pre-re/quests/skills/swordman_skills.txt b/npc/pre-re/quests/skills/swordman_skills.txt deleted file mode 100644 index 7a4aa2ff3..000000000 --- a/npc/pre-re/quests/skills/swordman_skills.txt +++ /dev/null @@ -1,148 +0,0 @@ -//===== Hercules Script ======================================= -//= Swordsman Skills Quests -//===== By: ================================================== -//= kobra_k88 -//===== Current Version: ===================================== -//= 1.0 -//===== Compatible With: ===================================== -//= Hercules GIT -//===== Description: ========================================= -//= Quests for skills: Fatal Blow, Mobile HP Recovery, -// Auto-Berserk -//===== Additional Comments: ================================= -//= 1.0 Moved from main folder. [Streusel] -//============================================================ - -izlude_in,175,130,2 script Knight De Thomas 98,4,4,{ - if ((BaseClass == Job_Swordman) && (sm_movingrecovery_x < 1)) { - mes "[De Thomas]"; - mes "Oh, no! You must have been hurt! Are you ok?"; - mes "You must have fought hard to get such serious injuries.."; - mes "Being a swordsman must come with a lot of responsibility and sacrifice."; - next; - mes "[De Thomas]"; - if (Sex == 0) { - mes "For these swordsmen and knights, there is a wonderful skill."; - } - else { - mes "For these swordswomen and knights, there is a wonderful skill young lady."; - } - mes "I present to you - HP Recovery While Moving!"; - mes "Body moving is a splendid skill"; - mes "that allows you to regain strength(HP)"; - mes "while you are moving!"; - next; - mes "[De Thomas]"; - mes "It is currently under development"; - mes "so it may not recover that much,"; - mes "but it will help a little."; - mes "What do you think? Would you like to learn this skill?"; - next; - switch (select("What a nice skill! I want to learn it!:No, thank you.")) { - case 1: - mes "[De Thomas]"; - mes "Very well. I will tell you what you need to learn this skill."; - mes "First, your job level must be higher than ^00880035^000000."; - mes "You will also need ^008800200 empty bottles^000000."; - mes "Why? Because it is proof that you fought fiercely to have used that many potions."; - next; - mes "[De Thomas]"; - mes "Also, the armor you used in battle."; - mes "This is also proof of an experienced fighter."; - mes "For the armor... your armor is perfect!"; - mes "Bring your armor!"; - mes "Last but not least... bring me one ^008800Moth Wing^000000."; - next; - menu "Eh? You need that, too?",-; - mes "[De Thomas]"; - mes "Not really.. I don't really NEED it."; - mes "It's just that my niece has gotten a bug hunting as a holiday task during the summer vacation."; - mes "Of course! It would be much easier for me to get it myself."; - mes "but I must work here all the time so I don't exactly have the time to go out and get it."; - next; - mes "[De Thomas]"; - mes "Don't you think it is pitiful that I have to stay in once place everyday, not being able to go outside?"; - mes "Please, find me one...*sniffsniff*"; - mes "If you don't..."; - set sm_movingrecovery_x,1; - mes "You won't get anything! Muahahaha."; - close; - case 2: - mes "[De Thomas]"; - mes "..."; - close; - } - } - else if ((BaseClass == Job_Swordman) && (sm_movingrecovery_x > 1)) { - mes "[De Thomas]"; - mes "Oh, it's you?"; - mes "Long time no see!"; - mes "You seem healthier than before."; - mes "Hahahaha!"; - mes "Take care! See you again!"; - close; - } - else if ((BaseClass == Job_Swordman) && (sm_movingrecovery_x == 1)) { - mes "[De Thomas]"; - mes "Welcome back..."; - mes "are you ready to learn Body Movin'?"; - next; - switch (select("Yes.:No, I'm not ready yet.")) { - case 1: - if ((JobLevel > 34 || (BaseJob == Job_Knight || BaseJob == Job_Crusader)) && (countitem(713) > 199) && (countitem(1058) > 0)) { - mes "[De Thomas]"; - mes "Let's see....."; - next; - mes "[De Thomas]"; - mes "Ok! I shall now teach you..."; - mes "...The Body Movin' skill!"; - next; - delitem 713,200; //Empty_Bottle - delitem 1058,1; //Wing_Of_Moth - skill "SM_MOVINGRECOVERY",1,0; - set sm_movingrecovery_x,2; - mes "[De Thomas]"; - mes "There you go!"; - mes "Try it yourself."; - mes "But don't overdo it."; - next; - mes "[De Thomas]"; - mes "Oh yeah, I won't be needing your"; - mes "armor so you can keep it."; - mes "Good luck now!"; - close; - } - else if (JobLevel < 35 && (BaseJob != Job_Knight && BaseJob != Job_Crusader)) { - mes "[De Thomas]"; - mes "Wait a second, your Job level isn't above ^00880035^000000!"; - mes "Come back when it is."; - close; - } - else if ((countitem(713) < 200) || (countitem(1058) < 1)) { - mes "[De Thomas]"; - mes "You do not have all the items I asked for."; - next; - mes "[De Thomas]"; - mes "Remember I need, ^008800200 empty bottles^000000, your armor, and a ^008800Moth Wing^000000. Come back when you have it all."; - close; - } - mes "[De Thomas]"; - mes "You do not have all the items I asked for."; - next; - mes "[De Thomas]"; - mes "Remember I need, ^008800200 empty bottles^000000, your armor, and a ^008800Moth Wing^000000. Come back when you have it all."; - close; - case 2: - mes "[De Thomas]"; - mes "Is that so?"; - mes "Then come when you are prepared."; - close; - } - } - mes "[De Thomas]"; - mes "My name is De Thomas Carlos."; - mes "Knight of Prontera's 3rd Calvary."; - mes "I have a certain duty these days."; - mes "Ehem! Need I say more."; - close; -}
\ No newline at end of file diff --git a/npc/pre-re/scripts.conf b/npc/pre-re/scripts.conf index 6a69ede0e..1a6c0cd49 100644 --- a/npc/pre-re/scripts.conf +++ b/npc/pre-re/scripts.conf @@ -9,6 +9,7 @@ npc: npc/pre-re/airports/izlude.txt npc: npc/pre-re/cities/alberta.txt npc: npc/pre-re/cities/izlude.txt npc: npc/pre-re/cities/jawaii.txt +npc: npc/pre-re/cities/yuno.txt // --------------------------- Guides --------------------------- npc: npc/pre-re/guides/guides_alberta.txt @@ -34,14 +35,20 @@ npc: npc/pre-re/guides/guides_umbala.txt npc: npc/pre-re/guides/guides_veins.txt // ---------------- Kafras & Cool Event Corp. ------------------- -npc: npc/pre-re/kafras/kafras_izl.txt +npc: npc/pre-re/kafras/kafras.txt // -------------------------- Merchant -------------------------- +npc: npc/pre-re/merchants/ammo_boxes.txt +npc: npc/pre-re/merchants/ammo_dealer.txt npc: npc/pre-re/merchants/shops.txt // --------------------------- Others --------------------------- -// -------------------------------------------------------------- +npc: npc/pre-re/other/bulletin_boards.txt npc: npc/pre-re/other/mercenary_rent.txt +npc: npc/pre-re/other/pvp.txt +npc: npc/pre-re/other/msg_boards.txt +npc: npc/pre-re/other/resetskill.txt +npc: npc/pre-re/other/turbo_track.txt // --------------------------- Quests --------------------------- // - Repeatable EXP Quests (iRO) -------------------------------- @@ -67,10 +74,13 @@ npc: npc/pre-re/other/mercenary_rent.txt //npc: npc/pre-re/quests/collection/quest_pupa.txt //npc: npc/pre-re/quests/collection/quest_zhupolong.txt // -------------------------------------------------------------- +// - Quests-Tutorials for basic classes (1st class quests) ------ +npc: npc/pre-re/quests/first_class/tu_archer.txt +// -------------------------------------------------------------- +npc: npc/pre-re/quests/monstertamers.txt npc: npc/pre-re/quests/mrsmile.txt +npc: npc/pre-re/quests/quests_13_1.txt npc: npc/pre-re/quests/quests_izlude.txt npc: npc/pre-re/quests/quests_lighthalzen.txt -npc: npc/pre-re/quests/monstertamers.txt npc: npc/pre-re/quests/quests_nameless.txt -npc: npc/pre-re/quests/quests_13_1.txt -npc: npc/pre-re/quests/skills/swordman_skills.txt
\ No newline at end of file +npc: npc/pre-re/quests/quests_veins.txt diff --git a/npc/pre-re/scripts_main.conf b/npc/pre-re/scripts_main.conf index db7ed1411..8e75dd332 100644 --- a/npc/pre-re/scripts_main.conf +++ b/npc/pre-re/scripts_main.conf @@ -1,15 +1,15 @@ // -------------------------------------------------------------- -// - rAthena Pre-Renewal Primary Scripts File - +// - Hercules Pre-Renewal Primary Scripts File - // -------------------------------------------------------------- // The idea of this new system is to make scripts more organized // since the old system was rather messy with all the NPCs in one // file. Now scripts are organized in to files arraged by type. -// Custom scripts are now in scripts_custom.conf, all other +// Custom scripts are now in scripts_custom.conf, all other // scripts are deemed as 'official'. You should place your NPCs // in to scripts_custom.conf to follow the trend. // // Thanks, -// Ancyker and the rest of the rAthena Team +// Ancyker and the rest of the Hercules Team // // Note: "Comments" are all text on the right side of a double slash "//" // Whatever text is commented will not be parsed by the servers, and serves @@ -39,6 +39,9 @@ import: npc/pre-re/scripts_jobs.conf import: npc/pre-re/scripts_monsters.conf import: npc/pre-re/scripts_warps.conf +// ----------- Development / Testing Script Files --------------- +import: npc/scripts_dev.conf + // ------------------- Custom Script Files ---------------------- // - Your NPCs go in this file! import: npc/scripts_custom.conf diff --git a/npc/pre-re/scripts_monsters.conf b/npc/pre-re/scripts_monsters.conf index 8ae26c878..77baac554 100644 --- a/npc/pre-re/scripts_monsters.conf +++ b/npc/pre-re/scripts_monsters.conf @@ -2,6 +2,8 @@ // - Pre-Renewal Monster Scripts - // -------------------------------------------------------------- +npc: npc/pre-re/mobs/citycleaners.txt + // -------------------------- Dungeons -------------------------- npc: npc/pre-re/mobs/dungeons/abbey.txt npc: npc/pre-re/mobs/dungeons/abyss.txt @@ -52,7 +54,6 @@ npc: npc/pre-re/mobs/fields/einbroch.txt npc: npc/pre-re/mobs/fields/geffen.txt npc: npc/pre-re/mobs/fields/gonryun.txt npc: npc/pre-re/mobs/fields/hugel.txt -npc: npc/pre-re/mobs/fields/jawaii.txt npc: npc/pre-re/mobs/fields/lighthalzen.txt npc: npc/pre-re/mobs/fields/louyang.txt npc: npc/pre-re/mobs/fields/lutie.txt diff --git a/npc/pre-re/scripts_warps.conf b/npc/pre-re/scripts_warps.conf index d650676c6..50e87d0d9 100644 --- a/npc/pre-re/scripts_warps.conf +++ b/npc/pre-re/scripts_warps.conf @@ -19,4 +19,5 @@ npc: npc/pre-re/warps/fields/veins_fild.txt npc: npc/pre-re/warps/fields/yuno_fild.txt // --------------------------- Others --------------------------- -npc: npc/pre-re/warps/other/sign.txt
\ No newline at end of file +npc: npc/pre-re/warps/other/arena.txt +npc: npc/pre-re/warps/other/sign.txt diff --git a/npc/pre-re/warps/cities/izlude.txt b/npc/pre-re/warps/cities/izlude.txt index f2f1b6aaa..6aa6af7d2 100644 --- a/npc/pre-re/warps/cities/izlude.txt +++ b/npc/pre-re/warps/cities/izlude.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Izlude Warp Script //===== By: ================================================== //= Athena (1.0), Nana (1.1) //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Warp Points for Izlude //===== Additional Comments: ================================= diff --git a/npc/pre-re/warps/cities/rachel.txt b/npc/pre-re/warps/cities/rachel.txt index f5497f3ac..2f16964c3 100644 --- a/npc/pre-re/warps/cities/rachel.txt +++ b/npc/pre-re/warps/cities/rachel.txt @@ -1,22 +1,20 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Rachel Warp Script //===== By: ================================================== //= erKURITA & RockmanEXE //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Warp Points for Rachel City, shops & other locations //===== Additional Comments: ================================= -//= 1.0 Added the official warps and commented out the +//= 1.0 Added the official warps and commented out the //= "custom duplicates" for future checkout. Special thanks //= to RockmanEXE who provided all the info. [erKURITA] //= 1.1 Added warp to Veins Field [Playtester] //= 1.2 Fully official rachel warps [Playtester] //= 1.2a Added missing warp (Pope's office entryway -> temple) [L0ne_W0lf] //= 1.3 Updated Rachel -> Veins Field warp. [L0ne_W0lf] -//= 1.4 Disabled rachel33, moved to quest_rachel.txt [L0ne_W0lf] +//= 1.4 Disabled rachel33, moved to quest_rachel.txt [L0ne_W0lf] //============================================================ rachel,150,249,0 warp rachel01 1,1,ra_temple,120,30 diff --git a/npc/pre-re/warps/cities/yggdrasil.txt b/npc/pre-re/warps/cities/yggdrasil.txt index bd4a74996..89540aa36 100644 --- a/npc/pre-re/warps/cities/yggdrasil.txt +++ b/npc/pre-re/warps/cities/yggdrasil.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Yggdrasil Tree Warp Script //===== By: ================================================== //= PKGINGO (1.0) //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 6+ //===== Description: ========================================= //= Warp Points for Yggdrasil Tree //===== Additional Comments: ================================= diff --git a/npc/pre-re/warps/fields/com_fild.txt b/npc/pre-re/warps/fields/com_fild.txt index a28eace85..0e7c8643e 100644 --- a/npc/pre-re/warps/fields/com_fild.txt +++ b/npc/pre-re/warps/fields/com_fild.txt @@ -1,13 +1,11 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Comodo Field Warp Script //===== By: ================================================== //= Nana //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Warp Points for Comodo Fields //===== Additional Comments: ================================= //= 1.1 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf] diff --git a/npc/pre-re/warps/fields/geffen_fild.txt b/npc/pre-re/warps/fields/geffen_fild.txt index fd4350fe6..902fd8aa0 100644 --- a/npc/pre-re/warps/fields/geffen_fild.txt +++ b/npc/pre-re/warps/fields/geffen_fild.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Geffen Warp Script //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Warp Points for Geffen Field's //===== Additional Comments: ================================= diff --git a/npc/pre-re/warps/fields/hugel_fild.txt b/npc/pre-re/warps/fields/hugel_fild.txt index c86980a98..df85a3e01 100644 --- a/npc/pre-re/warps/fields/hugel_fild.txt +++ b/npc/pre-re/warps/fields/hugel_fild.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Hugel Field Warp Script //===== By: ================================================== //= Sara-chan (1.0) //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 10+ //===== Description: ========================================= //= Warp Points for Hugel Field //===== Additional Comments: ================================= diff --git a/npc/pre-re/warps/fields/morroc_fild.txt b/npc/pre-re/warps/fields/morroc_fild.txt index cce5d0b3d..c79538814 100644 --- a/npc/pre-re/warps/fields/morroc_fild.txt +++ b/npc/pre-re/warps/fields/morroc_fild.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Morroc Field Warp Script //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== //= 1.4b -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Warp Points for Morroc Fields //===== Additional Comments: ================================= @@ -43,7 +41,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 45,3,4,{ set @anthell,0; warp "anthell01",35,262; } +//moc_fild04,219,327,0 script mocf016 WARPNPC,3,4,{ set @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 @@ -96,7 +94,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 45,3,3,{ set @anthell,1; warp "anthell01",35,262; } +//moc_fild15,258,253,0 script mocf017 WARPNPC,3,3,{ set @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 diff --git a/npc/pre-re/warps/fields/payon_fild.txt b/npc/pre-re/warps/fields/payon_fild.txt index 07c7bcd4f..9eff9c645 100644 --- a/npc/pre-re/warps/fields/payon_fild.txt +++ b/npc/pre-re/warps/fields/payon_fild.txt @@ -1,17 +1,15 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Payon Field Warps -//===== By: ================================================== +//===== By: ================================================== //= Nana (1.0) -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any rAthena Mod -//===== Description: ========================================= +//===== Description: ========================================= //= Payon Field Warps -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.1 Refixed payon field08 -> payon warp //= 1.2 Changed trigger area of pay_fild08 -> payon warp. [L0ne_W0lf] -//============================================================ +//============================================================ //= Payon Field's ============================================ pay_fild01,13,152,0 warp payf001 2,7,moc_fild03,299,170 diff --git a/npc/pre-re/warps/fields/prontera_fild.txt b/npc/pre-re/warps/fields/prontera_fild.txt index 677da8c5f..bf16f51d1 100644 --- a/npc/pre-re/warps/fields/prontera_fild.txt +++ b/npc/pre-re/warps/fields/prontera_fild.txt @@ -4,8 +4,6 @@ //= Nana (1.0) //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Warp Points for Prontera Field //===== Additional Comments: ================================= diff --git a/npc/pre-re/warps/fields/rachel_fild.txt b/npc/pre-re/warps/fields/rachel_fild.txt index 78a24465e..5d272a61e 100644 --- a/npc/pre-re/warps/fields/rachel_fild.txt +++ b/npc/pre-re/warps/fields/rachel_fild.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Rachel Field Warp Script //===== By: ================================================== //= Playtester //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Warp Points for Rachel Field //===== Additional Comments: ================================= diff --git a/npc/pre-re/warps/fields/veins_fild.txt b/npc/pre-re/warps/fields/veins_fild.txt index 9664f1707..0bb03797b 100644 --- a/npc/pre-re/warps/fields/veins_fild.txt +++ b/npc/pre-re/warps/fields/veins_fild.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Veins Field Warp Script //===== By: ================================================== //= $ephiroth //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Warp Points for Veins Field //===== Additional Comments: ================================= @@ -30,7 +28,7 @@ ve_fild04,115,50,0 warp ve_fild4-3 1,1,ve_fild06,80,183 ve_fild05,200,330,0 warp ve_fild5-1 1,1,ve_fild03,222,48 ve_fild05,359,192,0 warp ve_fild5-2 1,1,ve_fild06,80,183 ve_fild06,153,220,0 warp ve_fild6-1 1,1,veins,218,355 -ve_fild06,81,177,0 script ve_fild6-2 45,1,1,{ +ve_fild06,81,177,0 script ve_fild6-2 WARPNPC,1,1,{ if (rand(2)) warp "ve_fild04",115,55; else @@ -39,9 +37,9 @@ ve_fild06,81,177,0 script ve_fild6-2 45,1,1,{ } ve_fild07,147,371,0 warp ve_fild7-1 1,1,veins,146,28 -//============================================================ +//============================================================ // Old changelog -//============================================================ +//============================================================ //= 1.0 Initial version [$ephiroth] //= 1.1 Updated more warps [$ephiroth] //= 1.2 Removed some unofficial warps [Playtester] diff --git a/npc/pre-re/warps/fields/yuno_fild.txt b/npc/pre-re/warps/fields/yuno_fild.txt index e78fbb3dc..7b5519eed 100644 --- a/npc/pre-re/warps/fields/yuno_fild.txt +++ b/npc/pre-re/warps/fields/yuno_fild.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Yuno Field Warp Script //===== By: ================================================== //= Nana (1.0), Sara //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 5+ //===== Description: ========================================= //= Warp Points for Yuno Field //===== Additional Comments: ================================= diff --git a/npc/pre-re/other/arena.txt b/npc/pre-re/warps/other/arena.txt index ff88f4c28..18c91a677 100644 --- a/npc/pre-re/other/arena.txt +++ b/npc/pre-re/warps/other/arena.txt @@ -1,15 +1,14 @@ //===== Hercules Script ====================================== //= Arena Warps //===== By: ================================================== -//= Streusel +//= Euphy //===== Current Version: ===================================== //= 1.0 //===== Description: ========================================= -//= Warp Points related to Izlude Arena && Control Panel +//= Warp Points related to Izlude Arena. //===== Additional Comments: ================================= -//= 1.0 First version. -//= Moved welcome_arena & bye_arena from main folder +//= 1.0 First version, Pre-Renewal warps. //============================================================ izlude,128,226,0 warp welcome_arena 1,1,arena_room,100,30 -arena_room,99,24,0 warp bye_arena 2,2,izlude,128,220
\ No newline at end of file +arena_room,99,24,0 warp bye_arena 2,2,izlude,128,220 diff --git a/npc/pre-re/warps/other/sign.txt b/npc/pre-re/warps/other/sign.txt index 5a18a99e8..a04044175 100644 --- a/npc/pre-re/warps/other/sign.txt +++ b/npc/pre-re/warps/other/sign.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Sign Quest Warps //===== By: ================================================== //= MasterOfMuppets //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 8+ //===== Description: ========================================= //= Warp Points related to the Sign Quest will be put here //===== Additional Comments: ================================= |