diff options
Diffstat (limited to 'npc/re')
278 files changed, 3466 insertions, 1984 deletions
diff --git a/npc/re/airports/izlude.txt b/npc/re/airports/izlude.txt index 1452b5814..880338c0b 100644 --- a/npc/re/airports/izlude.txt +++ b/npc/re/airports/izlude.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/battleground/bg_common.txt b/npc/re/battleground/bg_common.txt index 2c47f8ed1..61ffed531 100644 --- a/npc/re/battleground/bg_common.txt +++ b/npc/re/battleground/bg_common.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Frost +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Frost //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -33,4 +33,4 @@ //= 1.0 //========================================================================= -morocc,145,82,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit8 4_F_JOB_KNIGHT
\ No newline at end of file +morocc,145,82,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit8 4_F_JOB_KNIGHT diff --git a/npc/re/cities/alberta.txt b/npc/re/cities/alberta.txt index e8ac3e499..4b1e38791 100644 --- a/npc/re/cities/alberta.txt +++ b/npc/re/cities/alberta.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/cities/brasilis.txt b/npc/re/cities/brasilis.txt index eb30a3225..f9c141b39 100644 --- a/npc/re/cities/brasilis.txt +++ b/npc/re/cities/brasilis.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -94,7 +94,7 @@ brasilis,155,165,3 script Signpost#bra1 4_BULLETIN_BOARD2,{ close; } -brasilis,195,231,3 script Signpost#bra2 4_BULLETIN_BOARD2,{ +brasilis,191,239,3 script Signpost#bra2 4_BULLETIN_BOARD2,{ mes ":: Verass Monument ::"; close; } @@ -133,22 +133,22 @@ brasilis,137,77,5 script Ice-Cream Maker 4_M_03,{ mes "So how many d'ya want?"; next; while(1) { - input .@input; //,1,5; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes "[Ice Cream Maker]"; mes "None?"; mes "Fine get outta the way, I have customers to serve."; close; } - else if ((.@input < 0) || (.@input > 5)) { + if (.@input > 5) { mes "[Ice Cream Maker]"; mes "Wow."; mes "You ordered too much."; mes "If you eat over 5 you might need to fight with a monster in your stomach. Calm down buddy."; next; + continue; } - else - break; + break; } .@icecream_hap = .@input*100; if (Zeny < .@icecream_hap) { diff --git a/npc/re/cities/dewata.txt b/npc/re/cities/dewata.txt index d8bac5986..b512f81be 100644 --- a/npc/re/cities/dewata.txt +++ b/npc/re/cities/dewata.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Lemongrass -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) Muad_Dib -//= Copyright (C) Gennosuke Kouga +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Lemongrass +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) Muad_Dib +//= Copyright (C) Gennosuke Kouga //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -489,11 +489,12 @@ dewata,89,191,6 script Small Shrine#dew1 CLEAR_NPC,{ mes "^FF00001,000 ~ 100,000 Zeny^000000"; mes "How much do you want to donate?"; next; - input .@input,0,100000; + input(.@input, 0, 100000); if (.@input < 1000) { mes "- Cancelled. -"; close; - } else if (.@input <= 50000) + } + if (.@input <= 50000) .@good_luck = rand(1,10000); else .@good_luck = rand(1,5000); @@ -557,7 +558,7 @@ dewata,89,191,6 script Small Shrine#dew1 CLEAR_NPC,{ case 2: mes "What is your wish?"; next; - input .@wish$; + input(.@wish$); mes "You have made your wish for ^0000FF" + .@wish$ + "^000000 to the small shrine."; next; callsub L_Wish; diff --git a/npc/re/cities/dicastes.txt b/npc/re/cities/dicastes.txt index a00a549ac..af642d528 100644 --- a/npc/re/cities/dicastes.txt +++ b/npc/re/cities/dicastes.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) SkittleNugget -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) Muad_Dib -//= Copyright (C) Gennosuke Kouga +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) SkittleNugget +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) Muad_Dib +//= Copyright (C) Gennosuke Kouga //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/cities/eclage.txt b/npc/re/cities/eclage.txt index a347b9922..3f178161b 100644 --- a/npc/re/cities/eclage.txt +++ b/npc/re/cities/eclage.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Dastgir +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Dastgir //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/cities/izlude.txt b/npc/re/cities/izlude.txt index beb7cd6d9..0ffa3817b 100644 --- a/npc/re/cities/izlude.txt +++ b/npc/re/cities/izlude.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/cities/jawaii.txt b/npc/re/cities/jawaii.txt index 9b0858569..e668ffc6c 100644 --- a/npc/re/cities/jawaii.txt +++ b/npc/re/cities/jawaii.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Daegaladh +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Daegaladh //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/cities/malangdo.txt b/npc/re/cities/malangdo.txt index 5ccb1577e..c7735af6c 100644 --- a/npc/re/cities/malangdo.txt +++ b/npc/re/cities/malangdo.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/cities/malaya.txt b/npc/re/cities/malaya.txt index f18bbd0af..55870361c 100644 --- a/npc/re/cities/malaya.txt +++ b/npc/re/cities/malaya.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) DeadlySilence -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) DeadlySilence +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/cities/mora.txt b/npc/re/cities/mora.txt index a58ee4463..660629507 100644 --- a/npc/re/cities/mora.txt +++ b/npc/re/cities/mora.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Flaid -//= Copyright (C) SuperHulk -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Flaid +//= Copyright (C) SuperHulk +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -452,16 +452,18 @@ mora,140,186,3 script Raffle Philosopher 4_M_RAFLE_OLD,{ mes "You can pay me in the currencies listed below."; mes "Enter the sum you're willing to pay. Enter 0 if you don't want to pay anything."; next; - input .@input; + input(.@input); if (.@input == 0) { mes "[Raffle Philosopher]"; mes "So you don't want to hear a quote, eh?"; close; - } else if (.@input < 100 || .@input > 1000000) { + } + if (.@input < 100 || .@input > 1000000) { mes "[Raffle Philosopher]"; mes "You can pay between ^FF0000100 and 1000000^000000."; close; - } else if (Zeny < .@input) { + } + if (Zeny < .@input) { mes "[Raffle Philosopher]"; mes "So you think this is what my time is worth?"; close; @@ -908,7 +910,7 @@ mora,140,186,3 script Raffle Philosopher 4_M_RAFLE_OLD,{ mes "I wonder what you think"; mes "about what I've told you."; next; - input .@inputstr$; + input(.@inputstr$); mes "[Raffle Philosopher]"; mes "So you think that "+.@inputstr$+"."; next; @@ -1146,7 +1148,7 @@ mora,43,127,3 script Innkeeper#mora_inn 4_M_RAFLE_OR,{ close; } case 3: - input .@inputstr$; + input(.@inputstr$); mes "["+strcharinfo(PC_NAME)+"]"; mes "I come from a place called "+.@inputstr$+"."; next; diff --git a/npc/re/cities/yuno.txt b/npc/re/cities/yuno.txt index fe81450ee..44bb3efc1 100644 --- a/npc/re/cities/yuno.txt +++ b/npc/re/cities/yuno.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/events/christmas_2013.txt b/npc/re/events/christmas_2013.txt index 8ebf5879a..a3495d6b4 100644 --- a/npc/re/events/christmas_2013.txt +++ b/npc/re/events/christmas_2013.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2015-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/events/halloween_2013.txt b/npc/re/events/halloween_2013.txt index acfd60f9f..da3f67bc1 100644 --- a/npc/re/events/halloween_2013.txt +++ b/npc/re/events/halloween_2013.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team -//= Copyright (C) Dastgir -//= Copyright (C) Akkarin +//= Copyright (C) 2015-2020 Hercules Dev Team +//= Copyright (C) Dastgir +//= Copyright (C) Akkarin //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/events/halloween_2014.txt b/npc/re/events/halloween_2014.txt index fbfb417bb..696507844 100644 --- a/npc/re/events/halloween_2014.txt +++ b/npc/re/events/halloween_2014.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) erKURITA -//= Copyright (C) Kisuka +//= Copyright (C) 2014-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) erKURITA +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_alberta.txt b/npc/re/guides/guides_alberta.txt index b15c89ddd..7fa4eff38 100644 --- a/npc/re/guides/guides_alberta.txt +++ b/npc/re/guides/guides_alberta.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_aldebaran.txt b/npc/re/guides/guides_aldebaran.txt index 8532c5f1f..bfe0b11d2 100644 --- a/npc/re/guides/guides_aldebaran.txt +++ b/npc/re/guides/guides_aldebaran.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_amatsu.txt b/npc/re/guides/guides_amatsu.txt index 2038e5e9d..02f0c9ca6 100644 --- a/npc/re/guides/guides_amatsu.txt +++ b/npc/re/guides/guides_amatsu.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_ayothaya.txt b/npc/re/guides/guides_ayothaya.txt index 6a4ce5ad2..867aacdf7 100644 --- a/npc/re/guides/guides_ayothaya.txt +++ b/npc/re/guides/guides_ayothaya.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Joseph -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Joseph +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_brasilis.txt b/npc/re/guides/guides_brasilis.txt index 1bcf51d03..ecce529d3 100644 --- a/npc/re/guides/guides_brasilis.txt +++ b/npc/re/guides/guides_brasilis.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_comodo.txt b/npc/re/guides/guides_comodo.txt index 6941273b3..665a21bfd 100644 --- a/npc/re/guides/guides_comodo.txt +++ b/npc/re/guides/guides_comodo.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_dewata.txt b/npc/re/guides/guides_dewata.txt index 00df6bf24..58d4e62f7 100644 --- a/npc/re/guides/guides_dewata.txt +++ b/npc/re/guides/guides_dewata.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Lemongrass -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Lemongrass +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_dicastes.txt b/npc/re/guides/guides_dicastes.txt index 1aa4704ca..e39e6aeb9 100644 --- a/npc/re/guides/guides_dicastes.txt +++ b/npc/re/guides/guides_dicastes.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_eclage.txt b/npc/re/guides/guides_eclage.txt index 861e42dcd..535000253 100644 --- a/npc/re/guides/guides_eclage.txt +++ b/npc/re/guides/guides_eclage.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_einbroch.txt b/npc/re/guides/guides_einbroch.txt index a2806ac91..43676b5f5 100644 --- a/npc/re/guides/guides_einbroch.txt +++ b/npc/re/guides/guides_einbroch.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_geffen.txt b/npc/re/guides/guides_geffen.txt index 50da8778d..c1e627ddf 100644 --- a/npc/re/guides/guides_geffen.txt +++ b/npc/re/guides/guides_geffen.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_gonryun.txt b/npc/re/guides/guides_gonryun.txt index 2ee4af05f..5d7069154 100644 --- a/npc/re/guides/guides_gonryun.txt +++ b/npc/re/guides/guides_gonryun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_hugel.txt b/npc/re/guides/guides_hugel.txt index 4604e9f2d..16659f930 100644 --- a/npc/re/guides/guides_hugel.txt +++ b/npc/re/guides/guides_hugel.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_izlude.txt b/npc/re/guides/guides_izlude.txt index 1bdf5a472..aa56b9f97 100644 --- a/npc/re/guides/guides_izlude.txt +++ b/npc/re/guides/guides_izlude.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_juno.txt b/npc/re/guides/guides_juno.txt index 3b6bc6c9c..379abd79f 100644 --- a/npc/re/guides/guides_juno.txt +++ b/npc/re/guides/guides_juno.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_lighthalzen.txt b/npc/re/guides/guides_lighthalzen.txt index faff34736..b3263a6c0 100644 --- a/npc/re/guides/guides_lighthalzen.txt +++ b/npc/re/guides/guides_lighthalzen.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_louyang.txt b/npc/re/guides/guides_louyang.txt index 0b773b168..93718e91e 100644 --- a/npc/re/guides/guides_louyang.txt +++ b/npc/re/guides/guides_louyang.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_lutie.txt b/npc/re/guides/guides_lutie.txt index 374c36f46..1519853b4 100644 --- a/npc/re/guides/guides_lutie.txt +++ b/npc/re/guides/guides_lutie.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_malaya.txt b/npc/re/guides/guides_malaya.txt index 38f67778f..fe9fa585b 100644 --- a/npc/re/guides/guides_malaya.txt +++ b/npc/re/guides/guides_malaya.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_mora.txt b/npc/re/guides/guides_mora.txt index 66a0ba86d..6e16421f8 100644 --- a/npc/re/guides/guides_mora.txt +++ b/npc/re/guides/guides_mora.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_morroc.txt b/npc/re/guides/guides_morroc.txt index a818624c5..6eace56ff 100644 --- a/npc/re/guides/guides_morroc.txt +++ b/npc/re/guides/guides_morroc.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_moscovia.txt b/npc/re/guides/guides_moscovia.txt index 08b1c9bd7..3511898d8 100644 --- a/npc/re/guides/guides_moscovia.txt +++ b/npc/re/guides/guides_moscovia.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_niflheim.txt b/npc/re/guides/guides_niflheim.txt index 6a5f62d22..74487c960 100644 --- a/npc/re/guides/guides_niflheim.txt +++ b/npc/re/guides/guides_niflheim.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_payon.txt b/npc/re/guides/guides_payon.txt index dfbdd6403..10654223b 100644 --- a/npc/re/guides/guides_payon.txt +++ b/npc/re/guides/guides_payon.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_prontera.txt b/npc/re/guides/guides_prontera.txt index 5937809e7..9de83adc6 100644 --- a/npc/re/guides/guides_prontera.txt +++ b/npc/re/guides/guides_prontera.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_rachel.txt b/npc/re/guides/guides_rachel.txt index 0849a8259..7f6ed689e 100644 --- a/npc/re/guides/guides_rachel.txt +++ b/npc/re/guides/guides_rachel.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_umbala.txt b/npc/re/guides/guides_umbala.txt index e8bb6b257..d01047fb3 100644 --- a/npc/re/guides/guides_umbala.txt +++ b/npc/re/guides/guides_umbala.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/guides_veins.txt b/npc/re/guides/guides_veins.txt index 541db4a03..ebeefcf92 100644 --- a/npc/re/guides/guides_veins.txt +++ b/npc/re/guides/guides_veins.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/guides/navigation.txt b/npc/re/guides/navigation.txt index 0ea11dab2..30b53ba17 100644 --- a/npc/re/guides/navigation.txt +++ b/npc/re/guides/navigation.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/instances/BakonawaLake.txt b/npc/re/instances/BakonawaLake.txt index 5226db6cc..5243219c2 100644 --- a/npc/re/instances/BakonawaLake.txt +++ b/npc/re/instances/BakonawaLake.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/instances/BangungotHospital.txt b/npc/re/instances/BangungotHospital.txt index 4af583879..e997612b5 100644 --- a/npc/re/instances/BangungotHospital.txt +++ b/npc/re/instances/BangungotHospital.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/instances/BuwayaCave.txt b/npc/re/instances/BuwayaCave.txt index 1d3eddc6a..f8ebc0575 100644 --- a/npc/re/instances/BuwayaCave.txt +++ b/npc/re/instances/BuwayaCave.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/instances/EclageInterior.txt b/npc/re/instances/EclageInterior.txt index 2b2117b93..838722706 100644 --- a/npc/re/instances/EclageInterior.txt +++ b/npc/re/instances/EclageInterior.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team -//= Copyright (C) Dastgir +//= Copyright (C) 2015-2020 Hercules Dev Team +//= Copyright (C) Dastgir //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/instances/HazyForest.txt b/npc/re/instances/HazyForest.txt index 24e03b22e..f8c1129c1 100644 --- a/npc/re/instances/HazyForest.txt +++ b/npc/re/instances/HazyForest.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/instances/MalangdoCulvert.txt b/npc/re/instances/MalangdoCulvert.txt index d61509511..387aff58b 100644 --- a/npc/re/instances/MalangdoCulvert.txt +++ b/npc/re/instances/MalangdoCulvert.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt index 44b5f1e61..30d17ce43 100644 --- a/npc/re/instances/OldGlastHeim.txt +++ b/npc/re/instances/OldGlastHeim.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2018 Hercules Dev Team -//= Copyright (C) Ridley -//= Copyright (C) Exneval -//= Copyright (C) Euphy -//= Copyright (C) Heris -//= Copyright (C) Ziu +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Ridley +//= Copyright (C) Exneval +//= Copyright (C) Euphy +//= Copyright (C) Heris +//= Copyright (C) Ziu //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -2744,7 +2744,7 @@ glast_01,188,273,5 script White Knight#1a 4_WHITEKNIGHT,{ close(); } mes("I exchange you a White Knight Card for ^0000FF3000 Coagulated Spell^000000 or ^FF000070 Contaminated Magic^000000."); - mes("<ITEMLINK>White Knight Card<INFO>4608</INFO></ITEMLINK>"); + mes(F_MesItemInfo(White_Knightage_Card)); next(); setarray(.@item[0], Coagulated_Spell, Corrupted_Charm); setarray(.@cost[0], 3000, 70); @@ -2777,7 +2777,7 @@ glast_01,192,273,3 script Khalitzburg Knight#1a 4_F_KHALITZBURG,{ close(); } mes("I exchange you a Khalitzburg Knight Card for ^0000FF5000 Coagulated Spell^000000 or ^FF0000100 Contaminated Magic^000000."); - mes("<ITEMLINK>Khalitzburg Knight Card<INFO>4609</INFO></ITEMLINK>"); + mes(F_MesItemInfo(Khali_Knightage_Card)); next(); setarray(.@item[0], Coagulated_Spell, Corrupted_Charm); setarray(.@cost[0], 5000, 100); diff --git a/npc/re/instances/WolfchevLaboratory.txt b/npc/re/instances/WolfchevLaboratory.txt index 3bbb74ad1..48889400e 100644 --- a/npc/re/instances/WolfchevLaboratory.txt +++ b/npc/re/instances/WolfchevLaboratory.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2014-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Kisuka +//= Copyright (C) 2014-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/instances/ghost_palace.txt b/npc/re/instances/ghost_palace.txt index 3e708dc57..1449cca5b 100644 --- a/npc/re/instances/ghost_palace.txt +++ b/npc/re/instances/ghost_palace.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2016 Hercules Dev Team -//= Copyright (C) Asheraf -//= Copyright (C) pengc2010 +//= Copyright (C) 2016-2020 Hercules Dev Team +//= Copyright (C) Asheraf +//= Copyright (C) pengc2010 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -601,7 +601,7 @@ OnInstanceInit: OnStart: stopnpctimer instance_npcname("#gp3control"); disablenpc(instance_npcname("#gp3control")); - killmonster(instance_mapname("1@spa"), "All"); + killmonster(instance_mapname("1@spa"), "all"); disablenpc(instance_npcname("#gp3warp")); enablenpc(instance_npcname("Lurid Royal Guard#gp5")); enablenpc(instance_npcname("Tiara Princess#gp5")); diff --git a/npc/re/instances/octopus_cave.txt b/npc/re/instances/octopus_cave.txt index ffcf0a9fe..6b7ec4cf5 100644 --- a/npc/re/instances/octopus_cave.txt +++ b/npc/re/instances/octopus_cave.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2018 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Muad_Dib +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/instances/saras_memory.txt b/npc/re/instances/saras_memory.txt index 25c0e619b..ded506d3a 100644 --- a/npc/re/instances/saras_memory.txt +++ b/npc/re/instances/saras_memory.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2018 Hercules Dev Team -//= Copyright (C) Ridley -//= Copyright (C) Ziu +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Ridley +//= Copyright (C) Ziu //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/1-1/acolyte.txt b/npc/re/jobs/1-1/acolyte.txt index dae96908b..70de529d2 100644 --- a/npc/re/jobs/1-1/acolyte.txt +++ b/npc/re/jobs/1-1/acolyte.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Streusel -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Streusel +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/1-1/archer.txt b/npc/re/jobs/1-1/archer.txt index a7ef0ef10..19dc2bbf4 100644 --- a/npc/re/jobs/1-1/archer.txt +++ b/npc/re/jobs/1-1/archer.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Streusel -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Streusel +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/1-1/mage.txt b/npc/re/jobs/1-1/mage.txt index 29593163b..c0571635f 100644 --- a/npc/re/jobs/1-1/mage.txt +++ b/npc/re/jobs/1-1/mage.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Streusel -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Streusel +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/1-1/merchant.txt b/npc/re/jobs/1-1/merchant.txt index 2682e545d..b68a00c61 100644 --- a/npc/re/jobs/1-1/merchant.txt +++ b/npc/re/jobs/1-1/merchant.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Streusel -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Streusel +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/1-1/swordman.txt b/npc/re/jobs/1-1/swordman.txt index 8dbadbd9d..f0d62365c 100644 --- a/npc/re/jobs/1-1/swordman.txt +++ b/npc/re/jobs/1-1/swordman.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Streusel -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Streusel +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/1-1/thief.txt b/npc/re/jobs/1-1/thief.txt index 393b9a13c..bb68dd5f4 100644 --- a/npc/re/jobs/1-1/thief.txt +++ b/npc/re/jobs/1-1/thief.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Streusel -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Streusel +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/1-1e/taekwon.txt b/npc/re/jobs/1-1e/taekwon.txt index 1befa3b73..d07face21 100644 --- a/npc/re/jobs/1-1e/taekwon.txt +++ b/npc/re/jobs/1-1e/taekwon.txt @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team +//= Copyright (C) 2012-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/2e/kagerou_oboro.txt b/npc/re/jobs/2e/kagerou_oboro.txt index 5c54a0114..832876c61 100644 --- a/npc/re/jobs/2e/kagerou_oboro.txt +++ b/npc/re/jobs/2e/kagerou_oboro.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) Euphy -//= Copyright (C) M45T3R -//= Copyright (C) Dastgir +//= Copyright (C) 2015-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) Euphy +//= Copyright (C) M45T3R +//= Copyright (C) Dastgir //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -120,7 +120,7 @@ que_ng,21,76,0 script Wall with a Drawing#ko CLEAR_NPC,{ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ if (MaxWeight - Weight < 1000 || checkweight("Knife",1) == 0) { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "You don't need to carry so many things."; close; } @@ -128,8 +128,8 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ for (set .@i,5131; .@i<=5146; set .@i,.@i+1) if (questprogress(.@i)) erasequest .@i; set job_kagero,0; - mes "[Cougar]"; - mes "You are not in the Family of the Ninja."; + mes "[Kuuga Gai]"; + mes "You are not in the clan of the Ninja."; close2; warp "amatsu",147,136; end; @@ -156,28 +156,28 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ mes "^1A95E6He keeps talking and doesn't stop to answer your question.^1A95E6"; next; mes "[Old Man]"; - mes "There once was a quiet family living in ancient Amatsu times that is never mentioned in history books or stories."; + mes "There once was a quiet clan living in ancient Amatsu times that is never mentioned in history books or stories."; next; mes "[Old Man]"; mes "They lived beneath shadows but always yearned for the bright sun, like a sunflower."; next; mes "[Old Man]"; - mes "A family that was loyal to their lord who they served as their bright sun."; + mes "A clan that was loyal to their lord who they served as their bright sun."; next; mes "[Old Man]"; - mes "...a very trustworthy family..."; + mes "...a very trustworthy clan..."; next; mes "[Old Man]"; mes "....loyal to their core..."; next; mes "[Old Man]"; - mes "...a family of integrity..."; + mes "...a clan of integrity..."; next; select("What happened to them?"); mes "^1A95E6The old man looks at you with a melancholy face.^1A95E6"; next; mes "[Old Man]"; - mes "Why are you interested in a family that was abandoned by their lord and disappeared from history itself?"; + mes "Why are you interested in a clan that was abandoned by their lord and disappeared from history itself?"; next; if(select("I'm a Ninja.", "I'm bored.") == 2) { mes "[Old Man]"; @@ -188,13 +188,13 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ } cutin "job_ko02",2; mes "[Old Man]"; - mes "Ninja! There was a time when the family was called ninjas, too."; + mes "Ninja! There was a time when the clan was called ninjas, too."; next; erasequest 5131; setquest 5132; set job_kagero,2; mes "[Old Man]"; - mes "You'll have to lend me your ear for I have so much to tell you about the family story."; + mes "You'll have to lend me your ear for I have so much to tell you about the clan story."; close2; cutin "",255; end; @@ -206,13 +206,13 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ mes "This goes way back to ancient times and nobody in Amatsu remembers about it."; next; mes "[Old Man]"; - mes "The family worked behind the scenes and basically lived their lives for their lord."; + mes "The clan worked behind the scenes and basically lived their lives for their lord."; next; mes "[Old Man]"; mes "They were very loyal doing whatever deed their lord asked for."; next; mes "[Old Man]"; - mes "Ninja, the family was known as the dark family but that doesn't mean they wanted to be hidden in the darkness."; + mes "Ninja, the clan was known as the dark clan but that doesn't mean they wanted to be hidden in the darkness."; next; mes "[Old Man]"; mes "They were loyal enough to be satisfied as the lord's servants but their loyalty became the problem."; @@ -222,13 +222,13 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ mes "They are a secret organization that even the lord didn't know much about."; next; mes "[Old Man]"; - mes "The few that knew about the family's existence, tried to investigate them but nobody was able to reveal their true identity."; + mes "The few that knew about the clan's existence, tried to investigate them but nobody was able to reveal their true identity."; next; mes "[Old Man]"; - mes "That is why this family has grown from loyal servants to a group feared for its secrets."; + mes "That is why this clan has grown from loyal servants to a group feared for its secrets."; next; mes "[Old Man]"; - mes "The lord shunned the family and didn't call them for their service any more but they never betrayed him."; + mes "The lord shunned the clan and didn't call them for their service any more but they never betrayed him."; next; select("They were really loyal people."); cutin "job_ko03",2; @@ -245,20 +245,20 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ } else if (job_kagero == 3) { cutin "job_ko03",2; mes "[Old Man]"; - mes "The family has been living in hiding for so long since the old days. The current lord didn't even know of their existence."; + mes "The clan has been living in hiding for so long since the old days. The current lord didn't even know of their existence."; next; select("........."); cutin "job_ko01",2; mes "[Old Man]"; - mes "I'm Guide Gion, the last of the dark ninja family."; + mes "I'm Leader Gion, the last of the dark ninja clan."; next; if(select("I think your time has ended.", "I need your teaching.") == 1) { cutin "job_ko04",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Are you an assassin to end this old man's life?"; next; - mes "[Guide Gion]"; - mes "So that is why you've shown interest in my family. I won't give up easily."; + mes "[Leader Gion]"; + mes "So that is why you've shown interest in my clan. I won't give up easily."; next; percentheal -99,0; mes "Pow!!"; @@ -268,50 +268,50 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ end; } cutin "job_ko02",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Teaching..."; mes "Been a long time since I last heard that word."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I guess this little visit was not by coincidence but a start of a connection."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Sorry I am not a teacher. But!"; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I can help you on the path you've chosen, the ^33CC71"+ (Sex == SEX_MALE ? "Kagerou" : "Oboro") +"^000000 path."; next; - mes "^1A95E6You hear Guide Gion's voice faintly as you slip away.^1A95E6"; + mes "^1A95E6You hear Leader Gion's voice faintly as you slip away.^1A95E6"; next; erasequest 5133; setquest 5134; set job_kagero,4; - mes "[Guide Gion]"; - mes "If you are prepared to follow me, Guide Gion, on the "+ (Sex == SEX_MALE ? "Kagerou" : "Oboro") +" path, we will meet again."; + mes "[Leader Gion]"; + mes "If you are prepared to follow me, Leader Gion, on the "+ (Sex == SEX_MALE ? "Kagerou" : "Oboro") +" path, we will meet again."; close2; warp "amatsu",147,136; end; } else if (job_kagero == 4) { cutin "job_ko02",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I thought you were afraid of the ^33CC71path of the "+ (Sex == SEX_MALE ? "Kagerou" : "Oboro") +"^33CC71 and wouldn't come back."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "But from the look of your eyes, I guess I misjudged you."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You will have to train your mind and body to walk steadily in the unknown world and never fall into temptation to stay on the path."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Our ancestors had 4 tests to train our people."; next; select("4 tests?"); cutin "job_ko01",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Yes, there are 4 tests."; mes "My ancestors trained my people with 4 tests that involve ^087FF8knowledge^000000, ^087FF8survival^000000, ^087FF8weapons^000000, and ^087FF8battle^000000."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I know you are curious what these tests are. Let me explain one by one."; next; while(1) { @@ -319,75 +319,75 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ set .@test, .@test | (1<<(.@i-1)); switch (.@i) { case 1: - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "We need to be knowledgeable in order to assist the lord. This test is for this purpose."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You can pass the test if you successfully solve more than 9 out of 10 questions."; next; if (.@test != 15) { - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The test will be easy to pass if you've been steady in your studies. Now what other test are you curious about?"; next; } break; case 2: - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Missions aren't always easy and safe. That is why survival instincts are vital to us."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "My ancestors call this test the dice test. It is a test to advance forward depending on the dice results."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Think of it as the simple dice games people play."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "But never let your guard down during the test because it isn't called the survival test for nothing."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "There will be blocks that help you while there are blocks that will interrupt you."; next; if (.@test != 15) { - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "If you deal with various situations wisely, you will be able to pass the test. Now what other test are you curious about?"; next; } break; case 3: - mes "[Guide Gion]"; - mes "My family was famous for using unique weapons that we created."; + mes "[Leader Gion]"; + mes "My clan was famous for using unique weapons that we created."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You would be considered blessed if you created your own unique weapon."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Creating a weapon for yourself and refining it is the purpose of this test."; next; if (.@test != 15) { - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I hope you will be blessed and find the best weapon for yourself. Now what other test are you curious about?"; next; } break; case 4: - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Missions are not always done alone. You will often work in teams of 2 or 3 for a common goal."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The battle test is only for those that pass that knowledge, survival and weapon tests. So! It is the very last test."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Unlike the other three tests that are done alone, you will have to compete with others in this final test."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "There is only one target!!"; mes "And only the first to get to the target passes the test."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You'll be lucky if you have no competitors during your test."; next; if (.@test != 15) { - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "A challenge is better than explaining it a hundred times. It's the actual experience that makes you better."; next; } @@ -396,13 +396,13 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ if (.@test == 15) break; } cutin "job_ko02",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Seeing is believing, so go on and take the challenge."; next; erasequest 5134; setquest 5135; set job_kagero,5; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Let's start right away after you are done with preparations."; close2; cutin "",255; @@ -414,110 +414,110 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ set .@ko_test, .@ko_test_01 + .@ko_test_02 + .@ko_test_03; if (.@ko_test == 0) { cutin "job_ko03",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "It's been a while."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Since I felt happy like this. I feel young and energetic seeing young people like you challenge themselves with a new path."; next; - mes "[Guide Gion]"; - mes "We're done with explaining about the tests, now should I tell you my family story?"; + mes "[Leader Gion]"; + mes "We're done with explaining about the tests, now should I tell you my clan story?"; next; cutin "job_ko01",2; - mes "[Guide Gion]"; - mes "My family started from two warriors."; + mes "[Leader Gion]"; + mes "My clan started from two warriors."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Kagerou, a warrior like the dancing flames of the sun."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Oboro, a warrior like the misty moonlight."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The Sun and the Moon."; mes "The sunlight that lights up the world and the moonlight that lights up the night. Both were very similar but different warriors."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "There was a time there was an enmity between both warriors."; next; - mes "[Guide Gion]"; - mes "But it didn't take long for them to become one as a family."; + mes "[Leader Gion]"; + mes "But it didn't take long for them to become one as a clan."; next; select("How did it go afterwards?"); cutin "job_ko02",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Ha ha ha. It is never fun to listen to the whole story all at once, no? Come back after passing a test and I'll continue my story."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Which test will you select as your first test?"; next; callsub L_StartTest,select("Test of Knowledge", "Test of Survival", "Test of Weaponry"),1; end; } else if (.@ko_test == 2) { cutin "job_ko01",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; if (.@ko_test_01 == 2) { set .@menu$,":Test of Survival:Test of Weaponry"; mes "You've passed the Test of Knowledge."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "My friend doesn't approve of others that easily but I guess he liked you."; next; } else if (.@ko_test_02 == 2) { set .@menu$,"Test of Knowledge::Test of Weaponry"; mes "You've passed the Test of Survival."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Looks like you went through hell with this test."; next; } else if (.@ko_test_03 == 2) { set .@menu$,"Test of Knowledge:Test of Survival:"; mes "You've passed the Test of Weaponry."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I wonder if Joe is satisfied with your performance."; next; } - select("Please continue with the family story."); + select("Please continue with the clan story."); cutin "job_ko02",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Looks like you are pretty eager to hear more. Where did I leave off... Ah! I remember."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Kagerou, a warrior like the dancing flames of the sun."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Oboro, a warrior like the misty moonlight."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Both warriors weren't close at first, because personality and everything else was completely opposite of each other."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The first place they met was the battlefield. And you know how enemies greet each other on a battlefield."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "They ended up injuring each other badly."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "But what can you do? War is a war."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The friend you've laughed with yesterday is a foe that you have to fight with in a war today."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "So nobody can get along with anyone during a war."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I'll continue the story after you pass another test."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Which test will you choose for the second test?"; next; callsub L_StartTest,select(.@menu$),2; end; } else if (.@ko_test == 4) { cutin "job_ko04",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; if (.@ko_test_01 == 2 && .@ko_test_02 == 2) { set .@last_test,3; mes "You've passed the ^339CCCTests of Knowledge and Survival^000000!"; @@ -529,96 +529,96 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ mes "You've passed the ^339CCCTests of Survival and Weaponry^000000!"; } next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You are already done with two tests. Hope you've learned a lot from them."; next; cutin "job_ko01",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Shall we continue with the story?"; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Kagerou, a warrior like the dancing flames of the sun."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Oboro, a warrior like the misty moonlight."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I think I left off when the two warriors met at the battlefield as enemies."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The long war ended eventually but the wounds and pain of those that survived had just started."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "So these two warriors started to embrace and heal the war wounds together and became one."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "There is a backstory of a man appearing in front of them and winning the loyalty from both warriors."; next; select("Who is this man?"); - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "There isn't much known about this man. Only a short mentioning of the two warriors pledging their allegiance."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Maybe current generations like me are the ancestors of the current Amatsu lord? But this is only an assumption."; next; - mes "[Guide Gion]"; - mes "I'm almost at the end of my family story. Come back after you've passed the third test and I will tell you the rest."; + mes "[Leader Gion]"; + mes "I'm almost at the end of my clan story. Come back after you've passed the third test and I will tell you the rest."; next; callsub L_StartTest,.@last_test,3; end; } else if (.@ko_test == 6) { cutin "job_ko01",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You've gone through three tests leaving only one to pass."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "As I've told you before, the last test is different because you have to compete against others."; next; select("Will you continue the story?"); cutin "job_ko02",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Ha ha ha. I will finish the story."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Kagerou, a warrior like the dancing flames of the sun."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Oboro, a warrior like the misty moonlight."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "It is told that the man that earned the loyalty of the two warriors was a humorous person."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "He like the jokes and conversations better than quarrels and he liked women over men."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Hmm... I don't know why this part of the story was kept alive all these years but this man wanted to bring these two warriors together."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Both warriors did travel together after the war but kept an awkward distance from each other."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "They must have had their reasons but their lord would send them out to a difficult mission together, put them in a secret room together and all sorts of situations together."; next; select("Sounds like an odd person."); - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Yes, he was. And his efforts didn't go in vain since the two warriors eventually got acquainted and married."; next; - mes "[Guide Gion]"; - mes "This is how the family started."; + mes "[Leader Gion]"; + mes "This is how the clan started."; next; select("What happened after?"); - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Sadly, the next part of story was purposely discontinued."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I think it's because someone wanted us to let go of the past and move forward."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "That's that. Now shouldn't you be preparing for the last test?"; next; set job_kagero,6; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "But you must be tired from all the tests so far. Take a rest."; close2; cutin "",255; @@ -631,12 +631,12 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ set .@test_ko$, "Survival"; else if (.@ko_test_03 == 1) set .@test_ko$, "Weaponry"; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Weren't you taking the Test of " + .@test_ko$ + " just now?"; next; switch(select("I want to go back to test site.", "Ah... no.")) { case 1: - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The Test of " + .@test_ko$ + " site is over here."; close2; if (.@ko_test_01 == 1) @@ -647,7 +647,7 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ warp "job_ko",121,129; end; case 2: - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The village is over here."; close2; warp "amatsu",147,136; @@ -656,39 +656,39 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ } } else if (job_kagero == 6) { cutin "job_ko01",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You've come back already? You could have rested more. Is there a reason to hurry?"; next; - input .@inputstr$; + input(.@inputstr$); cutin "job_ko03",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Because of ^B24E59" + .@inputstr$ + "^000000?"; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I have to admit, I don't understand you now."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "But since you've gone through much, I'm sure you will do good with the final test."; next; cutin "job_ko01",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Now! No more small talk. I'll let you know what the target is for the Test of Battle."; next; - mes "[Guide Gion]"; - mes "The target is a monster called the ^FF0000Family Secret^000000."; + mes "[Leader Gion]"; + mes "The target is a monster called the ^FF0000Clan Secret^000000."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You will have to be careful because there are many similiar shaped and named monsters in test site."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "And if you are lucky, there will be others targeting the monster."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "May the blessings of '" + (Sex == SEX_MALE ? "Kagerou, dancing sun" : "Oboro, misty moonlight") + "' be with you."; next; setquest 5146; set job_kagero,7; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Then let's go to the battle test field."; close2; switch(rand(3)) { @@ -699,12 +699,12 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ end; } else if (job_kagero == 7 || job_kagero == 8) { cutin "job_ko03",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I see you are in the middle of the ^339CCCTest of Battle^000000. Will you go back to the test site?"; next; switch(select("Go back to the test site.", "Visit the village.")) { case 1: - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The test site is over here."; close2; switch(rand(3)) { @@ -714,7 +714,7 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ } end; case 2: - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The village is over here."; close2; cutin "",255; @@ -722,7 +722,7 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ } } else { cutin "job_ko03",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You should not be here. Leave!"; close2; warp "amatsu",147,136; @@ -737,14 +737,14 @@ L_StartTest: case 2: set .@str$,"You are taking the ^339CCCTest of %s^000000 as the second test? "; break; case 3: set .@str$,"Your third test is the ^339CCCTest of %s^000000! "; break; } - mes "[Guide Gion]"; + mes "[Leader Gion]"; switch (getarg(0)) { case 1: mes sprintf(.@str$ + "Then I will get to see a familiar face after so long...","Knowledge"); next; select("Familiar face?"); setquest 5136; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Ha ha ha. You'll know when we get there. The Test of Knowledge is taken over here."; close2; warp "job_ko",72,128; @@ -753,7 +753,7 @@ L_StartTest: mes sprintf(.@str$ + "It's a lonesome test that you have to face alone.","Survival"); next; setquest 5137; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "But I believe you can handle it. The Test of Survival is taken over here."; close2; warp "job_ko",62,16; @@ -766,7 +766,7 @@ L_StartTest: getitem "Phracon", 1; mes "You receive 5 Iron Ore and 1 Phracon."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You will find these useful. The Test of Weaponry is taken over here."; close2; warp "job_ko",121,129; @@ -775,74 +775,74 @@ L_StartTest: } //== Test of Knowledge ===================================== -job_ko,81,124,4 script Cougar#ko 4_M_JOB_ASSASSIN,{ +job_ko,81,124,4 script Kuuga Gai#ko 4_M_JOB_ASSASSIN,{ if (BaseJob != Job_Ninja) { for (set .@i,5131; .@i<=5146; set .@i,.@i+1) if (questprogress(.@i)) erasequest .@i; set job_kagero,0; - mes "[Cougar]"; - mes "Sorry, your family is not same as ours, is there something wrong?"; + mes "[Kuuga Gai]"; + mes "Sorry, your clan is not same as ours, is there something wrong?"; close2; warp "amatsu",147,136; end; } if (job_kagero == 5) { if (MaxWeight - Weight < 1000 || checkweight("Knife",1) == 0) { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "This is a test of knowledge, so why did you bring so many things?"; close; } set .@ko_test_01, questprogress(5136); set .@ko_test_01_1, questprogress(5139); if (.@ko_test_01 == 1 && .@ko_test_01_1 == 0) { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "It's been a while."; next; select("Aren't you..."); - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "I remember you from before looking for the way of the ninja."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "You've grown this strong already?"; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Ha ha ha-"; mes "A truly determined youth! I like that."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Good! The test you are about to take is the ^339CCCTest of Knowledge^000000."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "I hope you haven't been lazy with your studies while focusing on getting stronger?"; next; switch(select("Yes", "No")) { case 1: setquest 5139; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "That's a relief. Let me know when you are ready to start the test."; close; case 2: setquest 5139; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "So you were all talk? Well, let me know when you are ready then."; close; } } else if (.@ko_test_01 == 1 && .@ko_test_01_1 == 1) { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "I'm ready at my end. Are you ready for the test?"; next; if(select("Yes", "No") == 2) { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Well, what can I do but wait for you."; close; } - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "This isn't your first test, is it?"; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "You only need to choose the correct answer to my questions."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Let's start."; next; @@ -862,9 +862,9 @@ job_ko,81,124,4 script Cougar#ko 4_M_JOB_ASSASSIN,{ deletearray .@n[10],getarraysize(.@n) - .@questions; freeloop(0); - set @job_ko_cougar,0; + set @job_ko_kuuga,0; for (set .@i,1; .@i<=.@questions; set .@i,.@i+1) { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes (.@i < .@questions)?"Question number "+.@i+":":"Last question:"; switch (.@n[.@i-1]) { case 1: callsub L_Question,"What is the DEX + LUK total for a Job Master?",2,"8:10:12:14"; break; @@ -918,67 +918,67 @@ job_ko,81,124,4 script Cougar#ko 4_M_JOB_ASSASSIN,{ case 49: callsub L_Question,"Which of the following blacksmiths do not create ninja items?",2,"Khaibara:Aiku:Tetsu:Toshu"; break; case 50: callsub L_Question,"What is the name of the suspicious man you can meet during the Ninja job change quest?",3,"Red Leopard Jack:Black Leopard Jack:Red Leopard Joe:Black Leopard Joe"; break; default: - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "An unknown error has occurred."; mes "Please contact customer service."; close; } } - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "You're through all 10 questions. Wasn't so bad! The important part starts now."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "... ... ..."; next; - if (@job_ko_cougar < 90) { - mes "[Cougar]"; + if (@job_ko_kuuga < 90) { + mes "[Kuuga Gai]"; mes "You fool!!"; mes "You couldn't even solve these?"; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Can't believe someone who is taking a new path can be so pathetic."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "I'll give you another chance."; mes "You will take the test again with new questions. Better pass it this time."; } else { - mes "[Cougar]"; - mes "Hmm. " + (@job_ko_cougar) + "?"; + mes "[Kuuga Gai]"; + mes "Hmm. " + (@job_ko_kuuga) + "?"; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Well, looks like you weren't lazy with your studies."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "What? Proud of yourself for solving these questions?"; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "You still have a long way to go and this is only a small fraction of it."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Well... I'm curious how far your strong will can take you through other tests."; next; completequest 5136; erasequest 5139; - mes "[Cougar]"; - mes "I'll let you go now so go report back to Guide Gion with your results."; + mes "[Kuuga Gai]"; + mes "I'll let you go now so go report back to Leader Gion with your results."; close2; warp "job_ko",16,113; end; } - set @job_ko_cougar,0; + set @job_ko_kuuga,0; close; } else if (.@ko_test_01 == 2 && .@ko_test_01_1 == 0) { - mes "[Cougar]"; - mes "I'll let you go now so go report back to Guide Gion with your results."; + mes "[Kuuga Gai]"; + mes "I'll let you go now so go report back to Leader Gion with your results."; close2; warp "job_ko",16,113; end; } } - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "How did you get here?"; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "It's my duty to get rid of you."; mes "^000099(He's a short, silent man.)^000000"; mes "This will push you back!"; @@ -991,7 +991,7 @@ L_Question: mes getarg(0); next; if(select(getarg(2)) == getarg(1)) - set @job_ko_cougar, @job_ko_cougar + 10; + set @job_ko_kuuga, @job_ko_kuuga + 10; return; } @@ -1934,7 +1934,7 @@ job_ko,127,125,4 script Red Leopard Joe#ko 4_M_JOB_ASSASSIN,{ if (questprogress(.@i)) erasequest .@i; set job_kagero,0; mes "[Red Leopard Joe]"; - mes "Sorry, your family is not the same as ours, is there something wrong?"; + mes "Sorry, your clan is not the same as ours, is there something wrong?"; close2; warp "amatsu",147,136; end; @@ -1959,17 +1959,17 @@ job_ko,127,125,4 script Red Leopard Joe#ko 4_M_JOB_ASSASSIN,{ next; select("Long time indeed, Joe."); mes "[Red Leopard Joe]"; - mes "You aren't surprised I'm here. Did you meet ^0237FDCougar^000000 before coming here?"; + mes "You aren't surprised I'm here. Did you meet ^0237FDKuuga Gai^000000 before coming here?"; next; mes "[Red Leopard Joe]"; mes "Don't like it that I'm not the first one you visited but that is not important."; next; mes "[Red Leopard Joe]"; mes "Alright, " + strcharinfo(PC_NAME) + "!"; - mes "Welcome to the workshop where weapons are created for the family."; + mes "Welcome to the workshop where weapons are created for the clan."; next; mes "[Red Leopard Joe]"; - mes "Our family has been creating and using unique weapons to serve our secret missions since ancient times."; + mes "Our clan has been creating and using unique weapons to serve our secret missions since ancient times."; next; select("Really? At Einbroch?"); mes "[Red Leopard Joe]"; @@ -1979,7 +1979,7 @@ job_ko,127,125,4 script Red Leopard Joe#ko 4_M_JOB_ASSASSIN,{ mes "Yes. Einbroch is known as an industrial city, the city of great blacksmiths create new technology."; next; mes "[Red Leopard Joe]"; - mes "My mission is to analyze their technology and report back to the family."; + mes "My mission is to analyze their technology and report back to the clan."; next; mes "[Red Leopard Joe]"; mes "I spoke more than I intended to."; @@ -2503,44 +2503,44 @@ job_ko,127,121,0 duplicate(Refinement Tools#ko_01) Refinement Tools#ko_02 CLEAR_ //== Test of Battle ======================================== job_ko,148,46,4 script Guide Gion#ko2 4_M_KAGE_OLD,{ if (MaxWeight - Weight < 2000 || checkweight("Knife",1) == 0) { - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You don't need so many things now!"; close; } if (job_kagero == 7) { cutin "job_ko01",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Looks like you haven't taken care of the target yet."; next; - mes "[Guide Gion]"; - mes "I'll tell you once more. The target is the ^FF0000Family Secret^000000."; + mes "[Leader Gion]"; + mes "I'll tell you once more. The target is the ^FF0000Clan Secret^000000."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Of course the path will be difficult, so continue searching!"; close2; cutin "",255; end; } else if (job_kagero == 8) { cutin "job_ko02",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Looks like you've taken care of the target. Hmm."; next; if (checkmount()) { - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "But please get down from your frog. Otherwise I can't continue!"; close2; cutin "",255; end; } if (BaseLevel < 99 || JobLevel < 70) { - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "How did you get weaker? Come back once you've regained your previous levels."; close2; cutin "",255; end; } if (SkillPoint != 0) { - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Please come back after using all your Skill Points."; close2; cutin "",255; @@ -2548,38 +2548,38 @@ job_ko,148,46,4 script Guide Gion#ko2 4_M_KAGE_OLD,{ } mapannounce "job_ko","[Gion] Interrupting the Test of Battle.",bc_map; cutin "job_ko04",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The Test of Battle will be put off for a while. Don't worry because this does not have affect to other tests."; next; mapannounce "job_ko","[Gion] My Friend " + strcharinfo(PC_NAME) + " made it to " + (Sex == SEX_MALE ? "Kagerou" : "Oboro") + " Path. Congratulations!!",bc_map; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "My friend " + strcharinfo(PC_NAME) + " made it to " + (Sex == SEX_MALE ? "Kagerou" : "Oboro") + " Path. Congratulations!!"; next; cutin "job_ko02",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "It is pleasant to meet a youth that is walking through a new path."; next; mes "[Someone's Voice]"; mes "Wait for a while, Gion."; next; - donpcevent "Cougar#ko2::OnEnable"; + donpcevent "Kuuga Gai#ko2::OnEnable"; donpcevent "Red Leopard Joe#ko2::OnEnable"; cutin "job_ko04",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I'm sorry I almost forgot about you two. Do you have anything to share with " + strcharinfo(PC_NAME) + "?"; next; cutin "",255; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Hmm... Embarrassing... to speak so suddenly..."; next; - mes "[Cougar]"; - mes strcharinfo(PC_NAME) + ", you are now a proud member of our family. Always hold your head high and..."; + mes "[Kuuga Gai]"; + mes strcharinfo(PC_NAME) + ", you are now a proud member of our clan. Always hold your head high and..."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "^777777(Gai's voice fades out.)^000000."; mes "I'm sorry I strangled you when we first met."; next; - donpcevent "Cougar#ko2::OnDisable"; + donpcevent "Kuuga Gai#ko2::OnDisable"; mes "[Red Leopard Joe]"; mes "Puhahaha! Gai is all talk. I know I was know valuable to you than that Gai."; next; @@ -2600,17 +2600,17 @@ job_ko,148,46,4 script Guide Gion#ko2 4_M_KAGE_OLD,{ mes "I named your weapons on my own but I know you'll like the name."; next; mes "[Red Leopard Joe]"; - mes "Guide Gion, please continue."; + mes "Leader Gion, please continue."; next; cutin "job_ko01",2; donpcevent "Red Leopard Joe#ko2::OnDisable"; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I don't have much to add because Gai and Joe said it all."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I'm just sorry that the environment of all these tests could have been better for our later generation."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You only need to look forward and never turn back."; next; for (set .@i,5131; .@i<=5146; set .@i,.@i+1) @@ -2619,21 +2619,21 @@ job_ko,148,46,4 script Guide Gion#ko2 4_M_KAGE_OLD,{ getnameditem .@item,strcharinfo(PC_NAME); jobchange(Sex == SEX_MALE ? Job_Kagerou : Job_Oboro); donpcevent "Summon Target#ko::OnEnable"; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I hope the blessings of Kagerou, dancing sun and Oboro, misty moonlight will be with you on your journey ahead."; close2; warp "que_ng",21,71; end; } else if (job_kagero == 9) { cutin "job_ko01",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I hope the blessings of Kagerou, dancing sun and Oboro, misty moonlight will be with you on your journey ahead."; close2; warp "que_ng",21,71; end; } else { cutin "job_ko01",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You should not be here. Please leave!"; close2; warp "amatsu",147,136; @@ -2641,16 +2641,16 @@ job_ko,148,46,4 script Guide Gion#ko2 4_M_KAGE_OLD,{ } } -job_ko,151,47,4 script Cougar#ko2 4_M_JOB_ASSASSIN,{ - mes "[Cougar]"; +job_ko,151,47,4 script Kuuga Gai#ko2 4_M_JOB_ASSASSIN,{ + mes "[Kuuga Gai]"; mes "Congratulation for choosing the road of development!"; close; OnInit: OnDisable: - disablenpc "Cougar#ko2"; + disablenpc "Kuuga Gai#ko2"; end; OnEnable: - enablenpc "Cougar#ko2"; + enablenpc "Kuuga Gai#ko2"; end; } @@ -2684,7 +2684,7 @@ OnEnable: case 6: set .@mob,1049; break; case 7: set .@mob,1050; break; } - areamonster "job_ko",120,30,160,70,"Family Secret",.@mob,1,"Summon Target#ko::OnMyMobDead"; + areamonster "job_ko",120,30,160,70,"Clan Secret",.@mob,1,"Summon Target#ko::OnMyMobDead"; end; OnDisable: initnpctimer; @@ -2706,25 +2706,25 @@ OnInit: donpcevent "Summon Fake#ko::OnEnable"; end; OnEnable: - areamonster "job_ko",120,30,160,70,"Family's Legacy",1002,5,"Summon Fake#ko::OnMyMobDead"; + areamonster "job_ko",120,30,160,70,"Clan's Legacy",1002,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Kagerou's Memory",1002,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Oboro's Memory",1002,5,"Summon Fake#ko::OnMyMobDead"; - areamonster "job_ko",120,30,160,70,"Family's Mistake",1031,5,"Summon Fake#ko::OnMyMobDead"; + areamonster "job_ko",120,30,160,70,"Clan's Mistake",1031,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Oboro's Mistake",1031,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Kagerou's Mistake",1031,5,"Summon Fake#ko::OnMyMobDead"; - areamonster "job_ko",120,30,160,70,"Family's Memory",1113,5,"Summon Fake#ko::OnMyMobDead"; + areamonster "job_ko",120,30,160,70,"Clan's Memory",1113,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Oboro's Past",1113,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Kagerou's Past",1113,5,"Summon Fake#ko::OnMyMobDead"; - areamonster "job_ko",120,30,160,70,"Family's Legacy",1063,5,"Summon Fake#ko::OnMyMobDead"; + areamonster "job_ko",120,30,160,70,"Clan's Legacy",1063,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Oboro's Legacy",1063,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Kagerou's Legacy",1063,5,"Summon Fake#ko::OnMyMobDead"; - areamonster "job_ko",120,30,160,70,"Family's Mistake",1010,5,"Summon Fake#ko::OnMyMobDead"; + areamonster "job_ko",120,30,160,70,"Clan's Mistake",1010,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Oboro's Memory",1010,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Kagerou's Memory",1010,5,"Summon Fake#ko::OnMyMobDead"; - areamonster "job_ko",120,30,160,70,"Family's Past",1049,5,"Summon Fake#ko::OnMyMobDead"; + areamonster "job_ko",120,30,160,70,"Clan's Past",1049,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Oboro's Mistake",1049,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Kagerou's Mistake",1049,5,"Summon Fake#ko::OnMyMobDead"; - areamonster "job_ko",120,30,160,70,"Family's Memory",1050,5,"Summon Fake#ko::OnMyMobDead"; + areamonster "job_ko",120,30,160,70,"Clan's Memory",1050,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Oboro's Past",1050,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Kagerou's Past",1050,5,"Summon Fake#ko::OnMyMobDead"; end; diff --git a/npc/re/jobs/2e/rebellion.txt b/npc/re/jobs/2e/rebellion.txt new file mode 100644 index 000000000..53beb11f5 --- /dev/null +++ b/npc/re/jobs/2e/rebellion.txt @@ -0,0 +1,1035 @@ +//================= Hercules Script ======================================= +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2020 Hercules Dev Team +//= Copyright (C) Dastgir +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see <http://www.gnu.org/licenses/>. +//========================================================================= +//= Rebellion Job Quest +//================= Description =========================================== +//= Job change Quest from Gunslinger -> Rebellion +//================= Current Version ======================================= +//= 1.0 +//========================================================================= + +job_gun,1,1,1 script Administrator1 CLEAR_NPC,{ + callfunc("F_GM_NPC"); + mes("Please enter the password."); + .@success = callfunc("F_GM_NPC", 1854, 0); + if (.@sucess != 1) + close(); + + mes("[Time Administrator]"); + mes("What time would you like to return?"); + next(); + .@select = select("Cancel", "Test monster spawn", "Start from beginning", "Furnace Zone", "Shooting Zone", "Complete the test"); + if (.@select == 1) { + close(); + } else if (.@select == 2) { + donpcevent("#target::OnStart"); + donpcevent("#nontarget::OnStart"); + close(); + } else if (.@select == 4) { + .@questComplete = 12341; + } else if (.@select == 5) { + .@questComplete = 12342; + } else if (.@select == 6) { + .@questComplete = 12344; + } + for (.@i = 12340; .@i <= 12345; .@i++) { + erasequest(.@i); + if (.@i <= .@questComplete) { + setquest(.@i); + completequest(.@i); + } + } + close(); + +OnInit: + disablenpc(strnpcinfo(NPC_NAME)); + end; +} + +// Warps +job_gun,56,26,0 warp rebelroom#1 2,2,einbroch,49,97 +job_gun,18,10,0 warp rebelroom#2 2,2,job_gun,81,29 +job_gun,165,22,0 warp rebelroom#3 2,2,job_gun,196,35 +job_gun,197,49,0 warp rebelroom#4 2,2,job_gun,157,21 + +job_gun,88,144,0 warp shootingrange#1 3,3,job_gun,93,123 +job_gun,105,97,0 warp shootingrange#2 3,3,job_gun,125,98 +job_gun,156,115,0 warp shootingrange#3 3,3,job_gun,157,137 +job_gun,152,154,0 warp shootingrange#4 3,3,job_gun,135,154 +job_gun,130,146,0 warp shootingrange#5 3,3,job_gun,120,130 + +job_gun,165,18,1 script Furnace Controller#1 CLEAR_NPC,{ + if (Class != Job_Gunslinger) { + mes("Only authorized user can do the operation."); + close(); + } + if (getstatus(SC_MONSTER_TRANSFORM, 1) != G_L_SHECIL) { + mes("Not an authorized user. Abort the operation."); + close(); + } + if (questprogress(12342) != 1) { + mes("Not an authorized user. Abort the operation."); + close(); + } + mes("Do you want to dredge the mold up from the furnace?"); + next(); + if (select("Quit.", "Begin.") == 1) { + mes("Switch to the Standby mode."); + close(); + } + hideonnpc("Furnace Controller#1"); + donpcevent("Furnace Controller#2::OnStart"); + mes("Initializing Furnace Controller ZX-3100..."); + close(); + +OnInit: + hideoffnpc("Furnace Controller#1"); + end; +} + +job_gun,214,36,1 script Auto Anvil#1 CLEAR_NPC,{ + if (Class != Job_Gunslinger) { + mes("Only authorized user can do the operation."); + close(); + } + if (countitem(Tiny_Flame) > 0) { + mes("Unauthorized firearm creation has been detected. Report to Manager Elwin."); + close(); + } + if (checkweight(Tiny_Flame, 1) == 0) { + mes("You have too many items, please reduce them to continue."); + close(); + } + if (getstatus(SC_MONSTER_TRANSFORM, 1) != G_L_SHECIL || countitem(Steel_Article_) <= 4 || questprogress(12342) != 1) { + mes("Not an authorized user. Abort the operation."); + close(); + } + + mes("Do you want to use the auto anvil and shape the standard Steel Artifacts into a firearm?"); + next(); + if (select("Quit.", "Begin.") == 1) { + mes("For your safety, please step away from the auto anvil."); + close(); + } + if (rand(1, 10) > 6) { + specialeffect(EF_REPAIRWEAPON); + mes("You have successfully created a firearm using the auto anvil. ^ff0000Please report before your transformation expires^000000."); + delitem(Steel_Article_, 5); + getitem(Tiny_Flame, 1); + } else { + specialeffect(EF_SUI_EXPLOSION); + mes("Failed to create a firearm."); + delitem(Steel_Article_, 5); + } + close(); + +OnInit: + hideoffnpc("Auto Anvil#1"); + end; +} + +job_gun,165,18,1 script Furnace Controller#2 CLEAR_NPC,{ + mes("The system is busy dredging a completed mold from the furnace."); + close(); + +OnInit: + hideonnpc("Furnace Controller#2"); + end; + +OnStart: + hideoffnpc("Furnace Controller#2"); + sleep(3000); + mapannounce("job_gun", "Furnace Controller: Dredging a mold up from the furnace... Workers, stand by at the production line.", bc_map, "0x00ff44"); + sleep(500); + .@wh_start = 0; + while (true) { + if (.@wh_start >= 30) + break; + + .@eff_rnd = rand(1, 100); + if (.@eff_rnd < 33) { // 0 - 32 + donpcevent("Heating Furnace#3::OnStart"); + } else if (.@eff_rnd > 66) { // 67-100 + donpcevent("Heating Furnace#4::OnStart"); + } else { // 33-66 + donpcevent("Heating Furnace#5::OnStart"); + } + sleep(200); + makeitem(Steel_Article, 1, "job_gun", rand(127, 143), rand(26, 29)); + if (rand(1, 10) > 7) { + makeitem(Steel_Article_, 1, "job_gun", rand(127, 143), rand(26, 29)); + } + .@wh_start += 1; + sleep(500); + + } + sleep(2000); + mapannounce("job_gun", "Furnace Controller: Finishing the operation... Entering Standby mode in 15 seconds.", bc_map, "0x00ff44"); + sleep(15000); + hideonnpc("Furnace Controller#2"); + hideoffnpc("Furnace Controller#1"); + end; +} + +job_gun,130,31,1 script Heating Furnace#3 CLEAR_NPC,{ + end; + +OnStart: + specialeffect(EF_FIREPILLAR); + sleep(500); + specialeffect(EF_FIREPILLARBOMB); + end; +} + +job_gun,136,31,1 script Heating Furnace#4 CLEAR_NPC,{ + end; + +OnStart: + specialeffect(EF_FIREPILLAR); + sleep(500); + specialeffect(EF_FIREPILLARBOMB); + end; +} + +job_gun,141,31,1 script Heating Furnace#5 CLEAR_NPC,{ + end; + +OnStart: + specialeffect(EF_FIREPILLAR); + sleep(500); + specialeffect(EF_FIREPILLARBOMB); + end; +} + +function script F_summonTargetMonster { + .@monster_id = getarg(0); + .@max_mob_count = getarg(1); + .@monster_name$ = getarg(2); + .@event_name$ = getarg(3); + while(true) { + .@mob_dead_num = mobcount("job_gun", .@event_name$); + if (.@mob_dead_num >= .@max_mob_count) + break; + + switch(rand(1, 5)) { + case 1: + .@mobx = rand(88, 99); + .@moby = rand(143, 147); + break; + case 2: + .@mobx = rand(92, 96); + .@moby = rand(95, 122); + break; + case 3: + .@mobx = rand(143, 159); + .@moby = rand(99, 100); + break; + case 4: + .@mobx = rand(157, 158); + .@moby = rand(137, 160); + break; + case 5: + .@mobx = rand(119, 134); + .@moby = rand(156, 160); + break; + } + monster("job_gun", .@mobx, .@moby, .@monster_name$, .@monster_id, 1, .@event_name$); + } + return; +} + +job_gun,1,4,1 script #target CLEAR_NPC,{ + end; + +OnStart: + killmonster("job_gun", "#target::OnTargetDead"); + callfunc("F_summonTargetMonster", J_REB_SHECIL1, 16, _("Standard-issue Target"), "#target::OnTargetDead"); + end; + +OnInit: + hideonnpc("#target"); + callfunc("F_summonTargetMonster", J_REB_SHECIL1, 16, _("Standard-issue Target"), "#target::OnTargetDead"); + end; + +OnTargetDead: + hideonnpc("#target"); + callfunc("F_summonTargetMonster", J_REB_SHECIL1, 16, _("Standard-issue Target"), "#target::OnTargetDead"); + end; +} + +job_gun,1,5,1 script #nontarget CLEAR_NPC,{ + end; +OnStart: + killmonster("job_gun", "#nontarget::OnNonTargetDead"); + hideonnpc("#nontarget"); + callfunc("F_summonTargetMonster", J_REB_SHECIL2, 56, _("Defective Target"), "#nontarget::OnNonTargetDead"); + end; + +OnInit: + hideonnpc("#nontarget"); + callfunc("F_summonTargetMonster", J_REB_SHECIL2, 56, _("Defective Target"), "#nontarget::OnNonTargetDead"); + end; + +OnNonTargetDead: + hideonnpc("#nontarget"); + callfunc("F_summonTargetMonster", J_REB_SHECIL2, 56, _("Defective Target"), "#nontarget::OnNonTargetDead"); + end; +} + +moc_fild12,261,318,3 script Suspicious Man 4_M_MOCASS2,2,2,{ + end; +OnTouch: + if (Class != Job_Gunslinger || BaseLevel < 99 || JobLevel < 70) + end; + if (questprogress(12340) < 1) { + mes("[Suspicious Man]"); + mes("Finally I've found you, Vagabond Spike! Your neck is mine!"); + next(); + select("Say what?"); + + mes("[Suspicious Man]"); + mes("*Snort* Don't pretend like you don't know. Look at this poster! You're in it!"); + next(); + select("I see the resemblance, but that's not me."); + + mesf("[%s]", strcharinfo(PC_NAME)); + mes("Forget the resemblance. Where did you get that poster? I've never committed a crime."); + next(); + mes("[Suspicious Man]"); + mes("I knew you'd try to lie your way out."); + next(); + mes("[Suspicious Man]"); + mes("The ^0000ffEinbroch Private Pub^000000 has released that wanted poster. You have many bounty hunters like me on your heels."); + next(); + mes("[Suspicious Man]"); + mes("I don't care if you're the right one so long as you look it and I can take you dead or alive."); + next(); + } else { + mes("[Suspicious Man]"); + mes("It's you again! You've got guts to come back here!"); + next(); + } + switch (select("Make a run for it.", "Fight him.")) { + case 1: + mes("^0000ffI should run for now and think about this later.^000000"); + close2(); + break; + case 2: + mes("^0000ffHe's not the only bounty hunter after me, if he's telling the truth. I need time to strategize.^000000"); + close2(); + break; + } + setquest(12340); + warp("moc_fild12", 186, 83); + end; +} + +einbroch,54,97,3 script Bouncer 4_M_REBELLION,2,2,{ + if (Class != Job_Gunslinger) { + mes("[Bouncer]"); + mes("No loitering around the venue."); + close(); + } + if (questprogress(12340) < 1) { + mes("[Bouncer]"); + mes("Under construction, can't get in."); + close(); + } else if (questprogress(12340) == 1) { + mes("[Bouncer]"); + mes("*Gasp* You! I thought you were already captured. Ooh, doesn't matter now. You're my Get Out of Jail Free card!"); + next(); + select("I'm not the criminal you think I am!"); + mes("[Bouncer]"); + mes("You aren't?"); + next(); + mes("^0000ffThe bouncer examines your face.^000000"); + next(); + mes("[Bouncer]"); + mes("Hm, you bear a striking resemblance, though you don't look not as menacing as that criminal Spike"); + next(); + select("I want to talk to the poster publisher."); + mes("[Bouncer]"); + mes("Your problem is a bit out of my league. Get in. If I find out you're the real deal all along, I'll see that you'll never see the outside again."); + close2(); + warp("job_gun", 81, 29); + } else if (questprogress(12340) > 1) { + mes("[Bouncer]"); + mes("You're back. Why?"); + next(); + if (select("I want in.", "I was passing by.") == 2) { + mes("[Bouncer]"); + mes("You're silly."); + close(); + } + mes("[Bouncer]"); + mes("Go ahead. Stay out of trouble."); + close2(); + warp("job_gun", 70, 28); + } + end; +} + +job_gun,68,33,3 script Ruthless Rebellion 4_F_REBELLION,2,2,{ + mes("[Ruthless Rebellion]"); + mes("Do you know how to use a gun?"); + close(); +} + +job_gun,78,33,6 script Suspicious Gunslinger 4_M_JOB_BLACKSMITH,2,2,{ + mes("[Suspicious Gunslinger]"); + mes("... "); + next(); + mes("[Quiet Gunslinger]"); + mes("Don't say I look like a blacksmith you know."); + close(); +} + +job_gun,74,24,6 script Drunken Man 4_M_LIEMAN,2,2,{ + mes("[Drunken Man]"); + mes("*Hiccups* Oh, I'm the owner here."); + mes("Oh wait, am I in the pub or someplace else? Zzz..."); + close(); +} + +job_gun,64,33,6 script Anxious Man 4_M_ALCHE_A,2,2,{ + mes("[Anxious Man]"); + mes("Maybe I'm in the wrong place. This place doesn't look like a pub."); + close(); +} + +job_gun,86,29,3 script Kulbertinov 4_M_REBELLION,2,2,{ + if (Class != Job_Gunslinger) { + mes("[Kulbertinov]"); + mes("Are you looking for me?"); + close(); + } + if (questprogress(12340) < 1) { + mes("[Kulbertinov]"); + mes("Can I help you?"); + close(); + } else if (questprogress(12340) == 1) { + mes("[Kulbertinov]"); + mes("What do you want?"); + next(); + select("I'm mistaken for a criminal!"); + mes("[Kulbertinov]"); + mes("Wait a minute... Mwah hah hah!"); + next(); + mes("^0000ffHe scans your face, then guffaws.^000000"); + next(); + mes("[Kulbertinov]"); + mes("I'm sorry. For a moment, I thought Spike came back to life. He was found dead three days ago."); + next(); + select("He was captured already?"); + mes("[Kulbertinov]"); + mes("Yes, and the bounty hunter was already paid. The news hasn't spread, and you're the spitting image of him. Go figure."); + next(); + select("You have to do something!"); + mes("[Kulbertinov]"); + mes("I'm sorry, but I can't talk to every single bounty hunter for you. Of course, I'm willing to compensate for your inconvenience."); + next(); + mes("[Kulbertinov]"); + mes("Hey, how about you join our ranks? At the very last, you won't get shot."); + next(); + select("You want me become a bounty hunter?"); + mes("[Kulbertinov]"); + mes("No, bounty hunting is just a pastime. We're the experts of all the firearms in the world."); + next(); + mes("[Kulbertinov]"); + mes("Carefree spirits!"); + mes("Magical spitfires!"); + mes("We call ourselves the ^0000ffRebellion^000000."); + next(); + mes("[Kulbertinov]"); + mes("You look like you know how to use a gun. How'd you like to join our ranks? You won't have to worry about other bounty hunters anymore too."); + next(); + switch (select("Let me think it over.", "I don't think I have a choice.")) { + case 1: + mes("[Kulbertinov]"); + mes("You can think it over and over, but the answer won't change. Just take the offer."); + break; + case 2: + mes("[Kulbertinov]"); + mes("Good thinking. Might as well do it now and get it over with."); + break; + } + next(); + mes("[Kulbertinov]"); + mes("Talk to Enwin Conick. She guides drifting spirits like you to the way of the Rebellion. I'll send word to her. Ah, and don't point your gun at her."); + setquest(12341); + completequest(12340); + } else if (questprogress(12340) > 1) { + mes("[Kulbertinov]"); + mes("Do you have business with Elwin Conick?"); + next(); + if (select("No.", "Send me to Elwin Conick.") == 1) { + mes("[Kulbertinov]"); + mes("All right. Care for a shot of vodka?"); + close(); + } + mes("[Kulbertinov]"); + mes("Okay, I'll let her know."); + } + close2(); + warp("job_gun", 19, 15); + end; +} + +job_gun,19,24,3 script Elwin Conick#1 4_F_REBELLION,2,2,{ + if (Class != Job_Gunslinger) { + mes("[Elwin Conick]"); + mes("If you don't want to join Rebellions, just get out."); + close2(); + warp("job_gun", 81, 29); + end; + } + if (questprogress(12341) == 1) { + mes("[Elwin Conick]"); + mes("Do you to join us Rebellions?"); + next(); + mes("^0000ffThe short woman with keen eyes stares into your eyes.^000000"); + next(); + mes("[Elwin Conick]"); + mes("Sign here."); + next(); + mes("^0000ffThe undersigned party [_____] will not speak of the test even if he or she suffers injury, mutilation, or death in an unforeseen accident that may occur during the test.^000000"); + next(); + select("WHAT?!"); + mes("[Elwin Conick]"); + mes("Do you want join us or not?"); + next(); + if (select("I give up.", "...I'll sign.") == 1) { + mes("[Elwin Conick]"); + mes("Your choice."); + close2(); + warp("job_gun", 81, 29); + end; + } + mes("[Elwin Conick]"); + mes("Good. Now, follow me."); + close2(); + warp("job_gun", 117, 41); + end; + } + if (questprogress(12342) == 1) { + mes("[Elwin Conick]"); + mes("Do you want to try again?"); + next(); + if (select("I give up.", "Do it.") == 1) { + mes("[Elwin Conick]"); + mes("Your choice."); + close2(); + warp("job_gun", 81, 29); + end; + } + mes("[Elwin Conick]"); + mes("Follow me."); + close2(); + warp("job_gun", 117, 41); + end; + } + if (questprogress(12343) == 1) { + mes("[Elwin Conick]"); + mes("You still have Ivan's shooting test, do you want to try again?"); + next(); + if (select("I give up.", "Do it.") == 1) { + mes("[Elwin Conick]"); + mes("It's not worth to give up, now go out and relax."); + close2(); + warp("job_gun", 81, 29); + end; + } + mes("[Elwin Conick]"); + mes("Remember to give your best."); + close2(); + warp("job_gun", 120, 130); + end; + } + if (questprogress(12343) > 1) { + mes("[Elwin Conick]"); + mes("Ivan's shooting test have not finished yet, do you want to try again?"); + next(); + if (select("I give up.", "Do it.") == 1) { + mes("[Elwin Conick]"); + mes("It's not worth to give up, now go out and relax."); + close2(); + warp("job_gun", 81, 29); + end; + } + mes("[Elwin Conick]"); + mes("Remember to give your best."); + close2(); + warp("job_gun", 120, 130); + end; + } + if (questprogress(12345) == 1) { + mes("[Elwin Conick]"); + mes("Ivan is waiting for you, go find him."); + close2(); + warp("job_gun", 120, 130); + end; + } + mes("[Elwin Conick]"); + mes("You have no more test to take. Why don't you go out and have a drink?"); + close2(); + warp("job_gun", 81, 29); + end; +} + +job_gun,117,46,3 script Elwin Conick#2 4_F_REBELLION,2,2,{ + if (Class != Job_Gunslinger) { + mes("[Elwin Conick]"); + mes("If you don't want to join Rebellions, just get out."); + close2(); + warp("job_gun", 81, 29); + end; + } + if (getstatus(SC_MONSTER_TRANSFORM, 1) == G_L_SHECIL) { + mes("^0000ffYou are already in the test form. If you have finished all your tests, report to Elwin Conick in the Assembly Room^000000."); + close(); + } else if (getstatus(SC_MONSTER_TRANSFORM, 1) > 1) { + mes("[Elwin Conick]"); + mes("Look at yourself, do you really want to test?"); + next(); + mes("^0000ffElwin see you turn into another form and she is very angry. Wait for your current form ends, and then find her again.^000000"); + next(); + if (select("Wait.", "Go away.") == 1) { + mes("[Elwin Conick]"); + mes("It's not worth to give up, now go out and relax.."); + close(); + } + mes("[Elwin Conick]"); + mes("Come back when you aren't in any form."); + close2(); + warp("job_gun", 81, 29); + end; + } + if (questprogress(12341) == 1) { + .@st_job1 = countitem(Steel_Article); + .@st_job2 = countitem(Steel_Article_); + if (.@st_job1 > 0) { + delitem(Steel_Article, .@st_job1); + mes("[Elwin Conick]"); + mes("Any leftover Steel Artifacts must be returned after the test."); + close(); + } + if (.@st_job2 > 0) { + delitem(Steel_Article_, .@st_job2); + mes("[Elwin Conick]"); + mes("Any leftover Steel Artifacts must be returned after the test."); + close(); + } + if (countitem(Tiny_Flame) > 0) { + delitem(Tiny_Flame, 1); + mes("[Elwin Conick]"); + mes("Time over. You failed the test. Let me take all your leftover test materials."); + close(); + } + setquest(12342); + completequest(12341); + .@showDialog = true; + } else if (questprogress(12342) == 1) { + .@st_job1 = countitem(Steel_Article); + .@st_job2 = countitem(Steel_Article_); + if (.@st_job1 > 0) { + delitem(Steel_Article, .@st_job1); + mes("[Elwin Conick]"); + mes("Any leftover Steel Artifacts must be returned after the test."); + close(); + } + if (.@st_job2 > 0) { + delitem(Steel_Article_, .@st_job2); + mes("[Elwin Conick]"); + mes("Time over. You failed the test. Let me take all your leftover test materials."); + close(); + } + if (countitem(Tiny_Flame) > 0) { + delitem(Tiny_Flame, 1); + mes("[Elwin Conick]"); + mes("Time over. You failed the test. Let me take all your leftover test materials."); + close2(); + end; + } + .@showDialog = true; + } + if (.@showDialog) { + mes("[Elwin Conick]"); + mes("Listen up. I'm not going to great lengths trying to explain the test to you."); + next(); + select("Okay."); + mes("[Elwin Conick]"); + mes("This is where the firearm molds are cast. Everywhere you can see Steel Artifacts are being produced."); + next(); + mes("[Elwin Conick]"); + mes("You'll be asked to control switches on the machine and select 5 standard Steel Artifacts."); + next(); + mes("[Elwin Conick]"); + mes("You'll then take them to the next Assembly Room and assemble them into a complete firearm. You'll be given 3 minutes to finish all that. ^0000ffTo check the elapsed time, you'll be transformed into a different job^000000."); + next(); + mes("[Elwin Conick]"); + mes("I'll be in the next room, waiting for you to bring me a complete firearm. Remember, ^0000ffyou fail the test when your transformation expires after 3 minutes^000000."); + montransform(G_L_SHECIL, 180000); + close(); + } + mes("[Elwin Conick]"); + mes("Ah? Are you lost? You need to register first and then get back here."); + close2(); + warp("job_gun", 81, 29); + end; +} + +job_gun,198,39,3 script Elwin Conick#3 4_F_REBELLION,2,2,{ + if (Class != Job_Gunslinger) { + mes("[Elwin Conick]"); + mes("If you don't want to join Rebellions, just get out."); + close2(); + warp("job_gun", 81, 29); + end; + } + if (questprogress(12342) != 1) { + mes("[Elwin Conick]"); + mes("Ah? Are you lost? You need to register first and then get back here."); + close2(); + warp("job_gun", 81, 29); + end; + } + if (getstatus(SC_MONSTER_TRANSFORM, 1) == G_L_SHECIL) { + if (countitem(Tiny_Flame) == 0) { + mes("[Elwin Conick]"); + mes("Are you done? I don't see any completed firearm in your inventory."); + close(); + } + delitem(Tiny_Flame, 1); + mes("[Elwin Conick]"); + mes("It's shoddy but not bad, given the time. You passed."); + next(); + mes("[Elwin Conick]"); + mes("Let me take all your leftover test materials."); + .@st_job1 = countitem(Steel_Article); + .@st_job2 = countitem(Steel_Article_); + if (.@st_job1 > 0) { + delitem(Steel_Article, .@st_job1); + } + if (.@st_job2 > 0) { + delitem(Steel_Article_, .@st_job2); + } + next(); + mes("[Elwin Conick]"); + mes("Now you can move on to the next course. Ivan Sidorenko will oversee your test."); + completequest(12342); + close2(); + warp("job_gun", 120, 133); + end; + + } else if (getstatus(SC_MONSTER_TRANSFORM, 1) > 1) { + mes("[Elwin Conick]"); + mes("Look at yourself, do you really want to test?"); + next(); + mes("^0000ffElwin see you turn into another form and she is very angry. Wait for your current form ends, and then find her again.^000000"); + next(); + if (select("Wait.", "Go away.") == 1) { + mes("[Elwin Conick]"); + mes("It's not worth to give up, now go out and relax.."); + close(); + } + mes("[Elwin Conick]"); + mes("Come back when you aren't in any form."); + close2(); + warp("job_gun", 81, 29); + end; + } else { + mes("[Elwin Conick]"); + mes("Time over. You failed the test. Let me take all your leftover test materials."); + .@st_job1 = countitem(Steel_Article); + .@st_job2 = countitem(Steel_Article_); + if (.@st_job1 > 0) { + delitem(Steel_Article, .@st_job1); + } + if (.@st_job2 > 0) { + delitem(Steel_Article_, .@st_job2); + } + if (countitem(Tiny_Flame) > 0) { + delitem(Tiny_Flame, 1); + } + next(); + mes("[Elwin Conick]"); + mes("Let's start again."); + close2(); + warp("job_gun", 117, 41); + end; + } + end; +} + +job_gun,120,138,3 script Ivan Sidorenko#1 4_M_REBELLION,2,2,{ + if (Class != Job_Gunslinger) { + mes("[Ivan Sidorenko]"); + mes("This is shooting test area, you can't come here as you like."); + close2(); + warp("job_gun", 81, 29); + end; + } + if (questprogress(12342) < 2) { + mes("[Ivan Sidorenko]"); + mes("There seems to be a mistake, you can't stay here."); + close2(); + warp("job_gun", 81, 29); + end; + } + if (questprogress(12343) < 1) { + mes("[Ivan Sidorenko]"); + mes("Hey, stay focused--we're using live ammo here, and you can get shot anytime."); + next(); + mes("[Ivan Sidorenko]"); + mes("Let me make this quick. Basically you'll be running in this shooting range consisting of 5 sections."); + next(); + mes("[Ivan Sidorenko]"); + mes("The objective is to find enemies in the midst of a crowd quickly and without fail."); + next(); + mes("[Ivan Sidorenko]"); + mes("Among all the targets, you must shoot only the ^0000ffStandard-issue Targets^000000. If you make a mistake, you'll lose points."); + next(); + mes("[Ivan Sidorenko]"); + mes("Let's try. There aren't many ^0000ffStandard-issue Targets^000000, so keep your eyes peeled."); + next(); + mes("[Ivan Sidorenko]"); + mes("^0000ffYou have 3 minutes to finish this test. If you can't finish before your transformation expires^000000, you'll fail. If that happens, just follow the path back to me."); + next(); + mes("[Ivan Sidorenko]"); + mes("^0000ffYou'll fail if you miss a Standard-issue Target, or shoot 3 incorrect targets^000000. Let's get started."); + setquest(12343); + setquest(12344); + montransform(G_L_SHECIL, 180000); + close2(); + warp("job_gun", 102, 146); + end; + } else if (questprogress(12343) == 1) { + .@standard_target = 0; + .@failed_target = 0; + .@total_target = 0; + if (questprogress(12343, HUNTING) == 2) { + .@standard_target = 10; + } + if (questprogress(12344, HUNTING) == 2) { + .@failed_target = 2; + } + if (getstatus(SC_MONSTER_TRANSFORM, 1) != G_L_SHECIL) { + .@total_target = 5; + } + .@target_count = .@standard_target - (.@failed_target + .@total_target); // + if (.@target_count > 9) { // Killed 10 Standard, 0 Failed + completequest(12343); + completequest(12344); + setquest(12345); + mes("[Ivan Sidorenko]"); + mes("Good job. I didn't think you could pass so quickly."); + next(); + mes("[Ivan Sidorenko]"); + mes("You may leave and wait outside. I'll bring other instructors' evaluation reports to see you."); + close2(); + warp("job_gun", 210, 132); + end; + } else if (.@target_count == 8) { // Killed 10 Standard, 3 failed + erasequest(12343); + erasequest(12344); + mes("[Ivan Sidorenko]"); + mes("You're quick enough, but you shot too many incorrect targets. You failed."); + next(); + } else if (.@target_count == 5) { // Timeout + erasequest(12343); + erasequest(12344); + mes("[Ivan Sidorenko]"); + mes("You accurate enough, but you took too much time. Slow Rebellions don't survive long enough."); + next(); + } else if (.@target_count < 5) { // Timeout and failed targets + erasequest(12343); + erasequest(12344); + mes("[Ivan Sidorenko]"); + mes("You failed at both speed and accuracy. How did you survive this long?"); + next(); + } else { + erasequest(12343); + erasequest(12344); + mes("[Ivan Sidorenko]"); + mes("There's a problem, the statistic seems to be wrong. Well... This can happen sometimes."); + next(); + } + mes("[Ivan Sidorenko]"); + mes("Let's try again. Be more careful this time."); + setquest(12343); + setquest(12344); + montransform(G_L_SHECIL, 180000); + close2(); + warp("job_gun", 102, 146); + end; + } else { + mes("[Ivan Sidorenko]"); + mes("How did you not leave?"); + next(); + mes("[Ivan Sidorenko]"); + mes("You may leave and wait outside. I'll bring other instructors' evaluation reports to see you."); + close2(); + warp("job_gun", 210, 132); + end; + } + end; +} + +job_gun,220,132,3 script Ivan Sidorenko#2 4_M_REBELLION,2,2,{ + .@now_weight = MaxWeight - Weight; + if (checkweight(Knife, 1) == 0) { + mes("You have too many items, please reduce them to continue."); + close(); + } + if (.@now_weight < 1000) { + mes("The items in your inventory are weighing you down. Lighten your weight first."); + close(); + } + if (questprogress(12345) != 1) { + mes("[Ivan Sidorenko]"); + mes("There must have been a mistake. You aren't supposed to remain here."); + close2(); + warp("job_gun", 81, 29); + end; + } + if (Class == Job_Gunslinger) { + if (BaseLevel < 99 || JobLevel < 70) { + mes("[Ivan Sidorenko]"); + mes("Huh? You look so weak? I have nothing more to say."); + close(); + } + if (SkillPoint != 0) { + mes("[Ivan Sidorenko]"); + mes("Oh no~ You still have Skill Points."); + close(); + } + mes("[Ivan Sidorenko]"); + mes("Kulbertinov, Elwin, and I've evaluated your Rebellion test results."); + next(); + mes("[Ivan Sidorenko]"); + mes("And..."); + next(); + mes("[Ivan Sidorenko]"); + mes("You've met all our requirements including the attitude and the test performance."); + next(); + mes("[Ivan Sidorenko]"); + mes("That's right, you're now a member of the Rebellion. Get ready to be wowed."); + next(); + jobchange(Job_Rebellion); + completequest(12345); + mes("[Ivan Sidorenko]"); + mes("And Elwin wants you to have this. Take good care of it. He made it for you."); + getitem(Freedom_Flame, 1); + next(); + mes("[Ivan Sidorenko]"); + mes("See you later."); + close2(); + warp("job_gun", 81, 29); + end; + } else if (Class == Job_Rebellion) { + mes("[Ivan Sidorenko]"); + mes("This life should be fun, not boring."); + next(); + mes("[Ivan Sidorenko]"); + mes("And by becoming a Rebellion your life should be upgraded. So, go and create a great journey, make us proud!"); + close(); + } else { + mes("[Ivan Sidorenko]"); + mes("Do you have something to say to me, don't you?"); + close(); + } +} + +job_gun,220,138,4 trader Prop Vending Machine 2_VENDING_MACHINE1,{ + end; +OnInit: + sellitem(Slug_Bullet_1); + sellitem(Slug_Bullet_2); + sellitem(Slug_Bullet_3); + sellitem(Slug_Bullet_4); + sellitem(Slug_Bullet_5); + sellitem(Fullmetal_Jacket_Bullet); + sellitem(Mine_Projectile); + sellitem(Dragon_Tail_Missile); + end; +} + +job_gun,216,138,4 script Butler Karlex 1_M_01,{ + mes("[Butler Karlex]"); + mes("Use this temporary storage to keep your items safe while on the Advancement test."); + next(); + .@select = select("Cancel", "Open the storage."); + mes("[Butler Karlex]"); + mes("Thank you for using the service."); + close2(); + if (.@select == 2) { + openstorage(); + } + end; +} + +prontera,92,209,4 trader Rebellion Weapons 2_VENDING_MACHINE1,{ + end; +OnInit: + sellitem(H_FEATHER_H_FIRE); + sellitem(ALTAIR_ARES); + sellitem(COLORSCOPE); + sellitem(RAG203); + sellitem(DEATHFIRE); + sellitem(R_THUNDER); + sellitem(P_BREAKER); + sellitem(MINIMAY); + sellitem(TEMPEST); + sellitem(END_OF_HORIZON); + sellitem(Southern_Cross_R); + end; +} + +prontera,96,209,4 trader Rebellion Accessories 2_VENDING_MACHINE1,{ + end; +OnInit: + sellitem(Slug_Bullet); + sellitem(Fullmetal_Jacket_Bullet); + sellitem(Mine_Projectile); + sellitem(Dragon_Tail_Missile); + sellitem(Special_Alloy_Trap); + sellitem(Bullet); + sellitem(Silver_Bullet_); + sellitem(Shell_Of_Blood_); + sellitem(AP_Ammo); + sellitem(Blaze_Bullet); + sellitem(Freezing_Bullet); + sellitem(Electric_Shock_Bullet); + sellitem(Magical_Stone_Bullet); + sellitem(Sanctified_Bullet); + sellitem(Flare_Bullet); + sellitem(Lightning_Bullet); + sellitem(Poison_Bullet); + sellitem(Blind_Bullet); + sellitem(Ice_Bullet); + end; +} diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt index e59492ce5..c7e5b8a61 100644 --- a/npc/re/jobs/3-1/archbishop.txt +++ b/npc/re/jobs/3-1/archbishop.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Gepard -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Gepard +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -243,7 +243,7 @@ umbala,139,227,3 script Priest#arch 1_M_PASTOR,{ mes "[" + strcharinfo(PC_NAME) + "]"; mes "Hmm, I wanted to tell you..."; next; - input .@inputstr$; + input(.@inputstr$); mes "[" + strcharinfo(PC_NAME) + "]"; mes "" + .@inputstr$ + ""; next; @@ -483,7 +483,7 @@ OnTouch: next; mes "[" + strcharinfo(PC_NAME) + "]"; mes "Pain... What kind of faults have I had?"; - input .@inputstr$; + input(.@inputstr$); next; mes "[" + strcharinfo(PC_NAME) + "]"; mes "I confess my guilt to the Almighty God Odin."; @@ -779,7 +779,7 @@ job3_arch01,29,34,3 script Valkyrie#arch 4_F_VALKYRIE2,{ warp "odin_tem02",282,263; end; } - if (getmercinfo(1)) { + if (getmercinfo(MERCINFO_CLASS)) { mes "[Valkyrie]"; mes "If you want to talk with me, you have to ^3131FFcancel all contracts^000000 with any mercenaries you have."; close; @@ -1006,7 +1006,7 @@ OnTouch: if (countitem(ValkyrieA_Scroll)) { delitem ValkyrieA_Scroll,1; // fall through - } else if (getmercinfo(1) == 2037) { + } else if (getmercinfo(MERCINFO_CLASS) == VALKYRIE_A) { if (strnpcinfo(NPC_NAME) == "#arch_1_10") viewpoint 1,113,327,1,0xFF9900; .@randht = rand(1,10); @@ -1038,7 +1038,7 @@ OnTouch: if (countitem(ValkyrieA_Scroll)) { delitem ValkyrieA_Scroll,1; // fall through - } else if (getmercinfo(1) == 2037) { + } else if (getmercinfo(MERCINFO_CLASS) == VALKYRIE_A) { mapannounce "job3_arch02","Valkyrie's Nightmare: An incompetent illusion of Valkyrie came here with the assistance of humans. You wanna have that nightmare?",bc_map,"0xFF0000"; donpcevent "mob#arch_1::OnKill"; end; @@ -1113,7 +1113,7 @@ OnKill: } job3_arch02,113,327,5 script Valkyrie#arch_01 4_F_VALKYRIE2,{ - if (getmercinfo(1)) { + if (getmercinfo(MERCINFO_CLASS)) { mes "[Valkyrie]"; mes "If you want to talk with me, you have to ^3131FFcancel all contracts^000000 with any mercenaries you have."; close; @@ -1355,7 +1355,7 @@ OnTouch: if (countitem(ValkyrieB_Scroll)) { delitem ValkyrieB_Scroll,1; // fall through - } else if (getmercinfo(1) == 2038) { + } else if (getmercinfo(MERCINFO_CLASS) == VALKYRIE_B) { .@randht = rand(1,10); if (.@randht < 8) mapannounce "job3_arch02","Whispering of an impersonation: I can feel the devil's spirits. Can you hear? The sound of gathering in crowds.",bc_map,"0xFFCE00"; @@ -1400,7 +1400,7 @@ OnTouch: if (countitem(ValkyrieB_Scroll)) { delitem ValkyrieB_Scroll,1; // fall through - } else if (getmercinfo(1) == 2038) { + } else if (getmercinfo(MERCINFO_CLASS) == VALKYRIE_B) { mapannounce "job3_arch02","A shout of devil: You are so childish. I invite you a party of devil. I'll make you have a fun!",bc_map,"0xFF0000"; end; } diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt index 19f4ac7cf..a13afcbd9 100644 --- a/npc/re/jobs/3-1/guillotine_cross.txt +++ b/npc/re/jobs/3-1/guillotine_cross.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-1/mechanic.txt b/npc/re/jobs/3-1/mechanic.txt index 4dcc98448..b97c27c85 100644 --- a/npc/re/jobs/3-1/mechanic.txt +++ b/npc/re/jobs/3-1/mechanic.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) JayPee -//= Copyright (C) Masao -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) JayPee +//= Copyright (C) Masao +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt index 41e5b476f..d91a1b448 100644 --- a/npc/re/jobs/3-1/ranger.txt +++ b/npc/re/jobs/3-1/ranger.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Elias -//= Copyright (C) Masao -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Elias +//= Copyright (C) Masao +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -613,7 +613,7 @@ tur_dun01,91,169,3 script Test Instructor#jr02 4_M_JOB_HUNTER,{ mes "Don't hang around here doing nothing. This is my area!"; close; L_Start: - if (getmercinfo(1)) { + if (getmercinfo(MERCINFO_CLASS)) { mes "[Test Instructor, Teardrop]"; mes "Stop!"; next; @@ -1491,7 +1491,7 @@ job3_rang02,251,49,3 script Test Supervisor#jr_13 4_M_JOB_HUNTER,{ setquest 8261; close; } - if (getmercinfo(1) == 2034) { + if (getmercinfo(MERCINFO_CLASS) == M_DESERT_WOLF_B) { erasequest 8261; mes "Good! Then I'll start the test right now!"; next; diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt index ad8ab8f74..333c5c129 100644 --- a/npc/re/jobs/3-1/rune_knight.txt +++ b/npc/re/jobs/3-1/rune_knight.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Muad_Dib -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Muad_Dib +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -962,7 +962,7 @@ job3_rune01,58,51,1 script Rune Furnace CLEAR_NPC,{ next; mes .@str$[1]; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == .@str$[0]) { mes "[Rune Knight Renoa]"; mes "Wow! This is great. The image of the rune stone in my head and the modeled rune stone match perfectly. It's well made."; diff --git a/npc/re/jobs/3-1/warlock.txt b/npc/re/jobs/3-1/warlock.txt index 13f99013b..41921e74e 100644 --- a/npc/re/jobs/3-1/warlock.txt +++ b/npc/re/jobs/3-1/warlock.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Gepard -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Gepard +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-2/genetic.txt b/npc/re/jobs/3-2/genetic.txt index d9fb1bce6..14f065833 100644 --- a/npc/re/jobs/3-2/genetic.txt +++ b/npc/re/jobs/3-2/genetic.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Joseph -//= Copyright (C) JayPee -//= Copyright (C) Masao -//= Copyright (C) Aeomin -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Joseph +//= Copyright (C) JayPee +//= Copyright (C) Masao +//= Copyright (C) Aeomin +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-2/minstrel.txt b/npc/re/jobs/3-2/minstrel.txt index a9f30975c..a0312ab7c 100644 --- a/npc/re/jobs/3-2/minstrel.txt +++ b/npc/re/jobs/3-2/minstrel.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) JayPee -//= Copyright (C) Masao -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) JayPee +//= Copyright (C) Masao +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-2/royal_guard.txt b/npc/re/jobs/3-2/royal_guard.txt index 87cf554ad..16c8f78dd 100644 --- a/npc/re/jobs/3-2/royal_guard.txt +++ b/npc/re/jobs/3-2/royal_guard.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) brAthena -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) brAthena +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -521,7 +521,7 @@ sec_in02,12,43,3 script sorcereryal 1_M_LIBRARYMASTER,1,1,{ switch(select("Royal Guard", "Rune Knight", "Sorcerer")) { case 1: mes "1~5"; - input .@input; + input(.@input); next; if (.@input < 1 || .@input > 5) { mes "Set item to adjust the Royal Guard"; @@ -533,7 +533,7 @@ sec_in02,12,43,3 script sorcereryal 1_M_LIBRARYMASTER,1,1,{ close; case 2: mes "1~24"; - input .@input; + input(.@input); next; if (.@input < 1 || .@input > 24) { mes "Set item to adjust the Rune Knight"; @@ -545,7 +545,7 @@ sec_in02,12,43,3 script sorcereryal 1_M_LIBRARYMASTER,1,1,{ close; case 3: mes "1~5"; - input .@input; + input(.@input); next; if (.@input < 1 || .@input > 5) { mes "Set item to adjust the Sorcerer"; diff --git a/npc/re/jobs/3-2/shadow_chaser.txt b/npc/re/jobs/3-2/shadow_chaser.txt index 9cdd3f732..877752431 100644 --- a/npc/re/jobs/3-2/shadow_chaser.txt +++ b/npc/re/jobs/3-2/shadow_chaser.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) Oshinoke -//= Copyright (C) ultragunner -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) Oshinoke +//= Copyright (C) ultragunner +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -327,7 +327,7 @@ s_atelier,65,123,5 script Manager#sc04_prt 4_M_KHKYEL,{ mes "Wow, you deciphered it?"; mes "So, what's the right answer?"; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == "shadows atelier in prontera" || .@inputstr$ == "SHADOWS ATELIER IN PRONTERA") { mes "[Manager]"; mes "Good."; @@ -1118,7 +1118,7 @@ L_Code: mes "["+strcharinfo(PC_NAME)+"]"; mes "Paul said..."; next; - input .@inputstr$; + input(.@inputstr$); mes "["+strcharinfo(PC_NAME)+"]"; mes "Paul said..."; mes "'"+.@inputstr$+"' ."; @@ -1694,7 +1694,7 @@ tur_dun03,38,209,1 script Blue Flame#sc_f01 4_NFWISP,{ mes "A blue flame is roaring."; mes "The deciphered code means..."; next; - input .@inputstr$; + input(.@inputstr$); .@dap01$ = "blue fire in turtle island third floor"; .@dap02$ = "BLUE FIRE IN TURTLE ISLAND THIRD FLOOR"; if (.@inputstr$ != .@dap01$ && .@inputstr$ != .@dap02$) { @@ -1986,7 +1986,7 @@ job3_sha01,22,78,0 script ????#keybox01 CLEAR_NPC,{ mes " "; mes "And also letters. They are blinking as if waiting for a code to be input."; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == .@Codes2$[.@i] || .@inputstr$ == strtolower(.@Codes2$[.@i])) { mes "When you put the correct answer in there,"; mes "the box is opened."; @@ -2042,7 +2042,7 @@ job3_sha01,25,28,0 script ????#keybox02 CLEAR_NPC,{ next; switch(select("Input the answer.", "I can't get it.")) { case 1: - input .@input; + input(.@input); if (.@input == .@numbers[.@i]) { mes "You put 2 and "+(.@numbers[.@i]-20)+"."; mes "The box opens and you get one key."; @@ -2122,7 +2122,7 @@ job3_sha01,73,80,0 script ????#keybox03 CLEAR_NPC,{ mes "There's no code, so 1 should be A."; mes "And the answer is..."; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == "turn and shake" || .@inputstr$ == "TURN AND SHAKE") { mes "["+strcharinfo(PC_NAME)+"]"; mes "Turn... Turn... and"; diff --git a/npc/re/jobs/3-2/sorcerer.txt b/npc/re/jobs/3-2/sorcerer.txt index 0af118a0d..052771c33 100644 --- a/npc/re/jobs/3-2/sorcerer.txt +++ b/npc/re/jobs/3-2/sorcerer.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-2/sura.txt b/npc/re/jobs/3-2/sura.txt index 4e0108fd8..280e6ce28 100644 --- a/npc/re/jobs/3-2/sura.txt +++ b/npc/re/jobs/3-2/sura.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Joseph -//= Copyright (C) Masao -//= Copyright (C) Gepard -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Joseph +//= Copyright (C) Masao +//= Copyright (C) Gepard +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/3-2/wanderer.txt b/npc/re/jobs/3-2/wanderer.txt index 30449e2fa..0de90c3cf 100644 --- a/npc/re/jobs/3-2/wanderer.txt +++ b/npc/re/jobs/3-2/wanderer.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Joseph -//= Copyright (C) Masao -//= Copyright (C) Meyraw -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Joseph +//= Copyright (C) Masao +//= Copyright (C) Meyraw +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -252,7 +252,7 @@ xmas,132,143,5 script Performance Manager#wnd 4_M_06,{ next; mes "[" + strcharinfo(PC_NAME) + "]"; mes "It's because..."; - input .@inputstr$; + input(.@inputstr$); mes "^3131FF" + .@inputstr$ + "^000000"; mes "......"; next; diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt index 3b260d3db..f7cd335ce 100644 --- a/npc/re/jobs/novice/academy.txt +++ b/npc/re/jobs/novice/academy.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015-2016 Hercules Dev Team -//= Copyright (C) Ridley -//= Copyright (C) Kisuka +//= Copyright (C) 2015-2020 Hercules Dev Team +//= Copyright (C) Ridley +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -4513,7 +4513,7 @@ iz_ac01,68,49,3 script General Store Owner#ac 4_F_03,{ } next(); input(.@input); - if (!.@input) { + if (.@input <= 0) { mes("[Querrie]"); mes("Well, you don't need to buy it now."); mes("Use it next time."); @@ -4525,7 +4525,7 @@ iz_ac01,68,49,3 script General Store Owner#ac 4_F_03,{ mes("You can buy up to 99 at once."); close(); } - set .@cost, .@input * (BaseLevel <= 20 ? 30 : 500); + .@cost = .@input * (BaseLevel <= 20 ? 30 : 500); mes("[Querrie]"); mesf("%d combination kits will cost you %d.... zeny.", .@input, .@cost); if (Zeny < .@cost) { @@ -5945,199 +5945,199 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ mes("If you want to stop, say 0."); next(); input(.@style); - if (.@style > 19) { - mes("[Otter Samssoon]"); - mes("Oh my!!? Honey~ You can use a coupon for the hair style in here~"); - close(); - } else if (!.@style) { + if (.@style <= 0) { mes("[Otter Samssoon]"); mes("Did you decide? Which style??"); mes("I want to touch your hair with my hands~ Honey~"); close(); - } else { - callsub(L_cutin, .@style); + } + if (.@style > 19) { mes("[Otter Samssoon]"); - switch(.@style) { - case 1: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Play Dead' cut?"); - mes("This looks neat and relaxed.. So popular style."); - } else { - mes("Oh my!!? 'First Aid' cut?"); - mes("This is and adorable style."); - mes("I guess it looks good on you too!!"); - } - break; - case 2: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Two Handed Sword Mastery' cut?"); - mes("You... You know the famous D..? He has exactly the same style!"); - } else { - mes("Oh my!!? 'Bash' cut?"); - mes("This style gives strong curls on both side hair."); - } - break; - case 3: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Napalm Beat' cut?"); - mes("It has well arranges hair line that makes feel charisma."); - } else { - mes("Oh my!!? 'Frost Diver' cut?"); - mes("It is mysterious style that gives cold and warm feeling at the same time."); - } - break; - case 4: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Double Strafe' cut?"); - mes("Natural hair is shaking by wind.. Clean and good feeling."); - } else { - mes("Oh my!!? 'Arrow Shower' cut?"); - mes("Cool and nice shaggy cut makes good style."); - } - break; - case 5: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Angelus' cut?"); - mes("Calm and piety feeling.. Not boring style."); - } else { - mes("Oh my!!? 'Heal' cut?"); - mes("Feminine style give healing feeling."); - } - break; - case 6: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Push Cart' cut?"); - mes("Big Kar is motivated for this style with a romance of a man."); - } else { - mes("Oh my!!? 'Vending' cut?"); - mes("Royal ladies like this style. Make good money style."); - } - break; - case 7: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Envenom' cut?"); - mes("Tough style makes addicted."); - } else { - mes("Oh my!!? 'Double Attack' cut?"); - mes("Whoever will dash twice for this style."); - mes("Ponytail is important."); - } - break; - case 8: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Bowling Bash' cut?"); - mes("This style makes a nice guy to challenge."); - mes("Just a giving a glance can steal the heart."); - } else { - mes("Oh my!!? 'Gloria' cut?"); - mes("This style is ultimately gorgeous and graceful."); - } - break; - case 9: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Venom Dust' cut?"); - mes("This style has special ending line that looks fatal."); - } else { - mes("Oh my!!? 'SP Recovery' cut?"); - mes("This style has neat cutting that inspires."); - } - break; - case 10: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Turn Undead' cut?"); - mes("This style is like a cold city man who is strong enough to kill a monster."); - } else { - mes("Oh my!!? 'Prepare Potion' cut?"); - mes("This style has a liquid medicine motive so it makes feel cure."); - } - break; - case 11: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Dragonology' cut?"); - mes("This style is intelligent style of mysterious dragon."); - } else { - mes("Oh my!!? 'Grand Cross' cut?"); - mes("Well trimmed hair cut line gives trust."); - } - break; - case 12: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Mace Mastery' cut?"); - mes("Look fresh and look neat with wax treatment."); - } else { - mes("Oh my!!? 'Intimidate' cut?"); - mes("This style is very familiar."); - } - break; - case 13: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Thunder Storm' cut?"); - mes("This style has natural attractive perm which is like hitting by thunder storm."); - } else { - mes("Oh my!!? 'Spiritual Sphere"); - mes("Calm and a little bit looks like a boy cut draw attention."); - } - break; - case 14: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Encore' cut?"); - mes("Rocker's favorite style.. Even the name itself.."); - } else { - mes("Oh my!!? 'Gypsy's Kiss' cut?"); - mes("The hair.. Kind to everyone.. Neat and round hair line is very soft and charming."); - } - break; - case 15: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Grimtooth' cut?"); - mes("The style with edge."); - } else { - mes("Oh my!!? 'Counter Attack' cut?"); - mes("It is the style that looks cold and arrogant. Hard to talk to.."); - mes("But might be nice to boyfriend..?"); - } - break; - case 16: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Blitz Beat' cut?"); - mes("It is the style my senior invented after he broke up with his girlfriends 5 times."); - } else { - mes("Oh my!!? 'Anke Snare' cut?"); - mes("It is killing style.. No one can take eyes off!"); - } - break; - case 17: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Find Ore' cut?"); - mes("This style seems to bring encounter or find unexpected things while walking on the street."); - } else { - mes("Oh my!!? 'Hammer Fall' cut?"); - mes("Stunning hair with attraction."); - } - break; - case 18: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Fire Pillar' cut?"); - mes("Everyone used to have this hair style.. Which means that was a trend of an era."); - } else { - mes("Oh my!!? 'Jupitel Thunder'"); - mes("Fresh style by giving light waves on both side hairs."); - } - break; - case 19: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Guillotine Fist'"); - mes("It is like one-shot style.. Like a real man. Right?"); - } else { - mes("Oh my!!? 'Whirlwind' cut?"); - mes("It is cool style which flows with wind. Lah, lah, lah, lah ~"); - } - break; + mes("Oh my!!? Honey~ You can use a coupon for the hair style in here~"); + close(); + } + callsub(L_cutin, .@style); + mes("[Otter Samssoon]"); + switch(.@style) { + case 1: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Play Dead' cut?"); + mes("This looks neat and relaxed.. So popular style."); + } else { + mes("Oh my!!? 'First Aid' cut?"); + mes("This is and adorable style."); + mes("I guess it looks good on you too!!"); } - close2(); - cutin("", 255); - end; + break; + case 2: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Two Handed Sword Mastery' cut?"); + mes("You... You know the famous D..? He has exactly the same style!"); + } else { + mes("Oh my!!? 'Bash' cut?"); + mes("This style gives strong curls on both side hair."); + } + break; + case 3: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Napalm Beat' cut?"); + mes("It has well arranges hair line that makes feel charisma."); + } else { + mes("Oh my!!? 'Frost Diver' cut?"); + mes("It is mysterious style that gives cold and warm feeling at the same time."); + } + break; + case 4: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Double Strafe' cut?"); + mes("Natural hair is shaking by wind.. Clean and good feeling."); + } else { + mes("Oh my!!? 'Arrow Shower' cut?"); + mes("Cool and nice shaggy cut makes good style."); + } + break; + case 5: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Angelus' cut?"); + mes("Calm and piety feeling.. Not boring style."); + } else { + mes("Oh my!!? 'Heal' cut?"); + mes("Feminine style give healing feeling."); + } + break; + case 6: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Push Cart' cut?"); + mes("Big Kar is motivated for this style with a romance of a man."); + } else { + mes("Oh my!!? 'Vending' cut?"); + mes("Royal ladies like this style. Make good money style."); + } + break; + case 7: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Envenom' cut?"); + mes("Tough style makes addicted."); + } else { + mes("Oh my!!? 'Double Attack' cut?"); + mes("Whoever will dash twice for this style."); + mes("Ponytail is important."); + } + break; + case 8: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Bowling Bash' cut?"); + mes("This style makes a nice guy to challenge."); + mes("Just a giving a glance can steal the heart."); + } else { + mes("Oh my!!? 'Gloria' cut?"); + mes("This style is ultimately gorgeous and graceful."); + } + break; + case 9: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Venom Dust' cut?"); + mes("This style has special ending line that looks fatal."); + } else { + mes("Oh my!!? 'SP Recovery' cut?"); + mes("This style has neat cutting that inspires."); + } + break; + case 10: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Turn Undead' cut?"); + mes("This style is like a cold city man who is strong enough to kill a monster."); + } else { + mes("Oh my!!? 'Prepare Potion' cut?"); + mes("This style has a liquid medicine motive so it makes feel cure."); + } + break; + case 11: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Dragonology' cut?"); + mes("This style is intelligent style of mysterious dragon."); + } else { + mes("Oh my!!? 'Grand Cross' cut?"); + mes("Well trimmed hair cut line gives trust."); + } + break; + case 12: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Mace Mastery' cut?"); + mes("Look fresh and look neat with wax treatment."); + } else { + mes("Oh my!!? 'Intimidate' cut?"); + mes("This style is very familiar."); + } + break; + case 13: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Thunder Storm' cut?"); + mes("This style has natural attractive perm which is like hitting by thunder storm."); + } else { + mes("Oh my!!? 'Spiritual Sphere"); + mes("Calm and a little bit looks like a boy cut draw attention."); + } + break; + case 14: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Encore' cut?"); + mes("Rocker's favorite style.. Even the name itself.."); + } else { + mes("Oh my!!? 'Gypsy's Kiss' cut?"); + mes("The hair.. Kind to everyone.. Neat and round hair line is very soft and charming."); + } + break; + case 15: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Grimtooth' cut?"); + mes("The style with edge."); + } else { + mes("Oh my!!? 'Counter Attack' cut?"); + mes("It is the style that looks cold and arrogant. Hard to talk to.."); + mes("But might be nice to boyfriend..?"); + } + break; + case 16: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Blitz Beat' cut?"); + mes("It is the style my senior invented after he broke up with his girlfriends 5 times."); + } else { + mes("Oh my!!? 'Anke Snare' cut?"); + mes("It is killing style.. No one can take eyes off!"); + } + break; + case 17: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Find Ore' cut?"); + mes("This style seems to bring encounter or find unexpected things while walking on the street."); + } else { + mes("Oh my!!? 'Hammer Fall' cut?"); + mes("Stunning hair with attraction."); + } + break; + case 18: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Fire Pillar' cut?"); + mes("Everyone used to have this hair style.. Which means that was a trend of an era."); + } else { + mes("Oh my!!? 'Jupitel Thunder'"); + mes("Fresh style by giving light waves on both side hairs."); + } + break; + case 19: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Guillotine Fist'"); + mes("It is like one-shot style.. Like a real man. Right?"); + } else { + mes("Oh my!!? 'Whirlwind' cut?"); + mes("It is cool style which flows with wind. Lah, lah, lah, lah ~"); + } + break; } + close2(); + cutin("", 255); + end; close(); case 2: if (!countitem(Cryptura_Hair_Coupon)) { @@ -6152,15 +6152,17 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ mes("Pick the style from page 1 to 19."); next(); input(.@style); - if (.@style > 19) { + if (.@style <= 0) { mes("[Otter Samssoon]"); - mes("Come on.. Honey~ You can use a coupon for the hair style in here~"); + mes("Oh my!!? You do not want to?"); close(); - } else if (!.@style) { + } + if (.@style > 19) { mes("[Otter Samssoon]"); - mes("Oh my!!? You do not want to?"); + mes("Come on.. Honey~ You can use a coupon for the hair style in here~"); close(); - } else if (getlook(1) == .@style) { + } + if (getlook(1) == .@style) { mes("[Otter Samssoon]"); mes("Come on.. Honey~ That is the same style you have."); mes("Do you want to try something new?"); @@ -13114,18 +13116,19 @@ izlude,145,122,7 script Tadde#iz 4_M_04,{ mes("How many would you like? Enter '0' if you want to end."); next(); while(true) { - input(.@amount, 0, 501); - if (.@amount == 0) { + input(.@amount); + if (.@amount <= 0) { mes("[Tadde]"); mes("Trade ended."); close(); - } else if (.@amount > 500) { + } + if (.@amount > 500) { mes("[Tadde]"); mes("Please reduce your quantity to 500 or less."); next(); - } else { - break; + continue; } + break; } .@sell = .@amount * 200; .@item_weight = .@amount * 200; @@ -13150,18 +13153,19 @@ izlude,145,122,7 script Tadde#iz 4_M_04,{ mes("How many would you like? Enter '0' if you want to end."); next(); while(true) { - input(.@amount, 0, 501); - if (.@amount == 0) { + input(.@amount); + if (.@amount <= 0) { mes("[Tadde]"); mes("Trade ended."); close(); - } else if (.@amount > 500) { + } + if (.@amount > 500) { mes("[Tadde]"); mes("Please reduce your quantity to 500 or less."); next(); - } else { - break; + continue; } + break; } .@sell = .@amount * 1000; .@item_weight = .@amount * 200; diff --git a/npc/re/jobs/novice/novice.txt b/npc/re/jobs/novice/novice.txt index 18ba3fbe1..ed96a7524 100644 --- a/npc/re/jobs/novice/novice.txt +++ b/npc/re/jobs/novice/novice.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/novice/supernovice_ex.txt b/npc/re/jobs/novice/supernovice_ex.txt index 74328278f..5e362edfe 100644 --- a/npc/re/jobs/novice/supernovice_ex.txt +++ b/npc/re/jobs/novice/supernovice_ex.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/jobs/repair.txt b/npc/re/jobs/repair.txt index 7acd3b606..482d50d73 100644 --- a/npc/re/jobs/repair.txt +++ b/npc/re/jobs/repair.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/kafras/kafras.txt b/npc/re/kafras/kafras.txt index b9b2ff404..1d2ac3100 100644 --- a/npc/re/kafras/kafras.txt +++ b/npc/re/kafras/kafras.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Lemongrass -//= Copyright (C) Euphy -//= Copyright (C) Joseph -//= Copyright (C) Daegaladh -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Lemongrass +//= Copyright (C) Euphy +//= Copyright (C) Joseph +//= Copyright (C) Daegaladh +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mapflag/gvg.txt b/npc/re/mapflag/gvg.txt index 2e0e85f32..131a84f6c 100644 --- a/npc/re/mapflag/gvg.txt +++ b/npc/re/mapflag/gvg.txt @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2017 Hercules Dev Team +//= Copyright (C) 2017-2020 Hercules Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mapflag/zone.txt b/npc/re/mapflag/zone.txt index 24ffce665..224b73058 100644 --- a/npc/re/mapflag/zone.txt +++ b/npc/re/mapflag/zone.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Ind +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Ind //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/3rd_trader.txt b/npc/re/merchants/3rd_trader.txt index dcf66a19f..642245943 100644 --- a/npc/re/merchants/3rd_trader.txt +++ b/npc/re/merchants/3rd_trader.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Mercurial -//= Copyright (C) Masao +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Mercurial +//= Copyright (C) Masao //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -72,8 +72,8 @@ mes "You can only buy a maximum of '"+.@max+"' ea."; mes "Enter '0' if you want to cancel."; next; - input .@amount; - if (.@amount == 0) { + input(.@amount); + if (.@amount <= 0) { mes "[Poison Herb Merchant]"; mes "You've cancelled the trade."; close; @@ -133,8 +133,8 @@ lhz_in02,16,205,4 duplicate(phs) Poison Herb Merchant#lhz 4_F_YUNYANG mes "and remember, you can only"; mes "buy a maximum of '2000' ea."; next; - input .@amount; - if (.@amount == 0) { + input(.@amount); + if (.@amount <= 0) { mes "[Rune Merchant]"; mes "You're not buying? Please leave!"; close; @@ -199,8 +199,8 @@ job3_guil01,91,93,3 script Rare Herb Collector 1_M_03,{ mes "You can only buy a maximum of '2000' ea."; mes "Enter '0' if you want to cancel."; next; - input .@amount; - if (.@amount == 0) { + input(.@amount); + if (.@amount <= 0) { mes "[Rare Poison Herb Collector]"; mes "You've cancelled the trade."; close; @@ -254,9 +254,9 @@ job3_guil01,91,93,3 script Rare Herb Collector 1_M_03,{ mes "How many do you want?"; mes "If you want to cancel, enter 0."; next; - input .@amount; + input(.@amount); mes "[Point Merchant]"; - if (.@amount == 0) { + if (.@amount <= 0) { mes "You've cancelled the trade."; close; } diff --git a/npc/re/merchants/advanced_refiner.txt b/npc/re/merchants/advanced_refiner.txt index 5b3f69593..927ae7e68 100644 --- a/npc/re/merchants/advanced_refiner.txt +++ b/npc/re/merchants/advanced_refiner.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/alchemist.txt b/npc/re/merchants/alchemist.txt index 73344a75c..ddd2c435a 100644 --- a/npc/re/merchants/alchemist.txt +++ b/npc/re/merchants/alchemist.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -98,13 +98,13 @@ alde_alche,31,186,3 script Craft Book Merchant#alde 4_M_ALCHE_D,{ mes "100,000 zeny."; mes "How many would you like to purchase?"; next; - input .@amount; - if (.@amount == 0) { + input(.@amount); + if (.@amount <= 0) { mes "[Craft Book Merchant]"; mes "Would you like to see some different books?"; close; } - if (.@amount < 1 || .@amount > 99 ){ + if (.@amount > 99 ){ mes "[Craft Book Merchant]"; mes "You cannot purchase more than 100 at a time."; close; diff --git a/npc/re/merchants/ammo_boxes.txt b/npc/re/merchants/ammo_boxes.txt index a8a04d976..410fe68e0 100644 --- a/npc/re/merchants/ammo_boxes.txt +++ b/npc/re/merchants/ammo_boxes.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/ammo_dealer.txt b/npc/re/merchants/ammo_dealer.txt index 6b273371d..ef7e3c244 100644 --- a/npc/re/merchants/ammo_dealer.txt +++ b/npc/re/merchants/ammo_dealer.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/blessed_refiner.txt b/npc/re/merchants/blessed_refiner.txt index 6e548e25b..a9d985de3 100644 --- a/npc/re/merchants/blessed_refiner.txt +++ b/npc/re/merchants/blessed_refiner.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/card_separation.txt b/npc/re/merchants/card_separation.txt index b1f6754a5..8f8fd8695 100644 --- a/npc/re/merchants/card_separation.txt +++ b/npc/re/merchants/card_separation.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/catalog.txt b/npc/re/merchants/catalog.txt index f508014a1..452ac99b6 100644 --- a/npc/re/merchants/catalog.txt +++ b/npc/re/merchants/catalog.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Scriptor -//= Copyright (C) skyiing +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Scriptor +//= Copyright (C) skyiing //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -72,19 +72,21 @@ moc_para01,22,16,5 script Catalog Magician#catal01 4_M_BIBI,{ mes "Or how many do you need?"; next; while (1) { - input .@input; + input(.@input); mes "[Catalog Magician]"; - if (.@input == 0) { + if (.@input <= 0) { mes "The trade has been stopped!"; mes "I don't know what to do next..."; mes "What should I do?"; emotion e_swt2,1; close; - } else if (.@input < 1 || .@input > 50) { + } + if (.@input > 50) { mes "It should be less than 50 pieces."; next; - } else - break; + continue; + } + break; } .@sell = .@ticket_cost * .@input; mes "The total number of catalog(s) that you're trying to purchase is " + .@input + " pieces."; diff --git a/npc/re/merchants/coin_exchange.txt b/npc/re/merchants/coin_exchange.txt index f35c722f7..0a5de5cb9 100644 --- a/npc/re/merchants/coin_exchange.txt +++ b/npc/re/merchants/coin_exchange.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Dastgir -//= Copyright (C) rAthena Dev Team -//= Copyright (C) Lemongrass -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Dastgir +//= Copyright (C) rAthena Dev Team +//= Copyright (C) Lemongrass +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/diamond.txt b/npc/re/merchants/diamond.txt index 665af5e6a..91c4d0b3c 100644 --- a/npc/re/merchants/diamond.txt +++ b/npc/re/merchants/diamond.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Z3R0 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Z3R0 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -128,7 +128,7 @@ mes .@npc$; mes "Alright then, please sign here."; next; - input .@charname$; + input(.@charname$); if (.@charname$ == strcharinfo(PC_NAME)) { mes .@npc$; mes "Okay, good."; @@ -202,7 +202,7 @@ mes "The trade cannot be completed without your signature."; close; } - input .@charname$; + input(.@charname$); if (.@charname$ == strcharinfo(PC_NAME)) { mes .@npc$; mes "Your signature has been received."; @@ -218,12 +218,10 @@ Zeny += 499000000; close; } - else { - mes .@npc$; - mes "Is this really your signature?"; - mes "Will sign again to confirm?"; - next; - } + mes .@npc$; + mes "Is this really your signature?"; + mes "Will sign again to confirm?"; + next; } } } diff --git a/npc/re/merchants/enchan_ko.txt b/npc/re/merchants/enchan_ko.txt index 97b307ddd..b96fe103f 100644 --- a/npc/re/merchants/enchan_ko.txt +++ b/npc/re/merchants/enchan_ko.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/enchan_mal.txt b/npc/re/merchants/enchan_mal.txt index e921a7336..fed154dc8 100644 --- a/npc/re/merchants/enchan_mal.txt +++ b/npc/re/merchants/enchan_mal.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/enchan_mora.txt b/npc/re/merchants/enchan_mora.txt index 46979c82b..297d85c6f 100644 --- a/npc/re/merchants/enchan_mora.txt +++ b/npc/re/merchants/enchan_mora.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) DeadlySilence -//= Copyright (C) Lemongrass -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) DeadlySilence +//= Copyright (C) Lemongrass +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -580,16 +580,16 @@ mora,152,97,5 script Guardian of Power#pa082 4_F_DOGTRAVELER,{ next; switch(.@job) { case 0: // Rune Knight - setarray .@items[0],2475,2476,2574,2575; - .@i = select("Cancel", "Ur's Greaves (Shoes)", "Peuz's Greaves (Shoes)", "Ur's Manteau (Garment)", "Peuz's Manteau (Garment)")-2; + setarray .@items[0],2475,2574,2883,15036,2575,2476,2884,15037; + .@i = select("Cancel", "Ur's Greaves (Shoes)", "Ur's Manteau (Garment)", "Ur's Seal (Accessory)", "Ur's Plate (Armor)", "Peuz's Greaves (Shoes)", "Peuz's Manteau (Garment)", "Peuz's Seal (Accessory)", "Peuz's Plate (Armor)" )-2; break; case 1: // Guillotine Cross - setarray .@items[0],2477,2478,2577,2578; - .@i = select("Cancel", "Sapha Shoes (Shoes)", "Nab Shoes (Shoes)", "Sapha Hood (Garment)", "Nab Hood (Garment)")-2; + setarray .@items[0],2477,2577,2886,15038,2478,2578,2887,15039; + .@i = select("Cancel", "Sapha Shoes (Shoes)", "Sapha Hood (Garment)", "Sapha Ring (Accessory)", "Sapha's Cloth (Armor)", "Nab Shoes (Shoes)", "Nab Hood (Garment)", "Nab Ring (Accessory)", "Nab's Cloth (Armor)" )-2; break; case 2: // Ranger - setarray .@items[0],2479,2480,2580,2581; - .@i = select("Cancel", "White Wing Boots (Shoes)", "Black Wing Boots (Shoes)", "White Wing Manteau (Garment)", "Black Wing Manteau (Garment)")-2; + setarray .@items[0],2479,2580,2890,15042,2480,2581,2891,15043; + .@i = select("Cancel", "White Wing Boots (Shoes)", "White Wing Manteau (Garment)", "White Wing Brooch (Accessory)", "White Wing Suit (Armor)", "Black Wing Boots (Shoes)","Black Wing Manteau (Garment)", "Black Wing Brooch (Accessory)", "Black Wing Suit (Armor)" )-2; break; } if (.@i == -1) { diff --git a/npc/re/merchants/enchan_upg.txt b/npc/re/merchants/enchan_upg.txt index 3193fcf1b..6710a010d 100644 --- a/npc/re/merchants/enchan_upg.txt +++ b/npc/re/merchants/enchan_upg.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Skorm +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Skorm //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/flute.txt b/npc/re/merchants/flute.txt index 98fd3789c..47dd65c50 100644 --- a/npc/re/merchants/flute.txt +++ b/npc/re/merchants/flute.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Ziu -//= Copyright (C) Muad_Dib -//= Copyright (C) Masao +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Ziu +//= Copyright (C) Muad_Dib +//= Copyright (C) Masao //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/hd_refiner.txt b/npc/re/merchants/hd_refiner.txt index 17979642e..43cdc2c01 100644 --- a/npc/re/merchants/hd_refiner.txt +++ b/npc/re/merchants/hd_refiner.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -39,6 +39,17 @@ //== Blacksmith Mighty Hammer (+7~9) ======================= - script ::MightyHammer FAKE_NPC,{ + mes("[Blacksmith Mighty Hammer]"); + mes("I'm a blacksmith skilled in refining weapons and armors."); + mes("I can refine an item of your choice among the items you are equipped with."); + mes("Which item do you want to refine?"); + + if (getbattleflag("features/replace_refine_npcs") == 1) { + if (openrefineryui()) + close(); + } + next(); + disable_items; mes "[Blacksmith Mighty Hammer]"; mes "Unlike others, I am a blacksmith who refines a very limited number of items."; diff --git a/npc/re/merchants/inn.txt b/npc/re/merchants/inn.txt index d44ddd986..bd6883fbc 100644 --- a/npc/re/merchants/inn.txt +++ b/npc/re/merchants/inn.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) c +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) c //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/ninja_craftsman.txt b/npc/re/merchants/ninja_craftsman.txt index 4a3744269..4e212646c 100644 --- a/npc/re/merchants/ninja_craftsman.txt +++ b/npc/re/merchants/ninja_craftsman.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Dastgir +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Dastgir //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/quivers.txt b/npc/re/merchants/quivers.txt index ececa55a2..98297eb9c 100644 --- a/npc/re/merchants/quivers.txt +++ b/npc/re/merchants/quivers.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Muad_Dib (Prometheus Project) +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Muad_Dib (Prometheus Project) //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/refine.txt b/npc/re/merchants/refine.txt index 6356acfca..1a8c893b0 100644 --- a/npc/re/merchants/refine.txt +++ b/npc/re/merchants/refine.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -56,6 +56,17 @@ payon_in01,18,132,3 script Vestri#pay 4_M_DWARF,{ // On official servers, if an item is unsuccessfully refined it will break at a // 20% rate and downgrade at an 80% rate. function script refinenew { + mesf("[%s]", getarg(0)); + mes("I'm a blacksmith skilled in refining weapons and armors."); + mes("I can refine an item of your choice among the items you are equipped with."); + mes("Which item do you want to refine?"); + + if (getbattleflag("features/replace_refine_npcs") == 1) { + if (openrefineryui()) + close(); + } + next(); + disable_items; mes "["+ getarg(0) +"]"; mes "I am the best Armsmith ever!"; @@ -247,7 +258,7 @@ function script refinenew { mes "[" + getarg(0) + "]"; mes "How many times would you like me to refine your item?"; next; - input .@refinecnt; + input(.@refinecnt); .@refinecheck = .@refinecnt + getequiprefinerycnt(.@part); if (.@refinecnt < 1 || .@refinecheck > 20) { mes "[" + getarg(0) + "]"; diff --git a/npc/re/merchants/renters.txt b/npc/re/merchants/renters.txt index ab6b3f9ac..824a6b6fb 100644 --- a/npc/re/merchants/renters.txt +++ b/npc/re/merchants/renters.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Daegaladh -//= Copyright (C) eAthena Dev Team +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Daegaladh +//= Copyright (C) eAthena Dev Team //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -166,60 +166,125 @@ prontera,125,208,5 script Peco Peco Remover 8W_SOLDIER,{ close; } -//== Magic Gear Renter ===================================== +//== Mado Gear Renter :: madogear ===================================== - script ::mgm FAKE_NPC,{ - mes "[Magic Gear Master]"; + mes "[Mado Gear Armorer]"; if (Class == Job_Mechanic || Class == Job_Mechanic_T || Class == Job_Baby_Mechanic) { mes "Welcome, Mechanic."; mes "Would you like to rent a Pushcart or"; - mes "ride a Magic Gear?"; + mes "ride a Mado Gear?"; next; - switch(select("Rent a Pushcart", "Ride a Magic Gear", "Cancel")) { + switch(select("Rent a Pushcart", "Ride a Mado Gear", "Buy Emergency Mado Gear", "Upgrade Cooling Device", "Cancel")) { case 1: if (checkcart()) { - mes "[Magic Gear Master]"; + mes "[Mado Gear Armorer]"; mes "I'm sorry, but you already"; mes "have a Pushcart."; close; } setcart; - mes "[Magic Gear Master]"; + mes "[Mado Gear Armorer]"; mes "There you go!"; close; case 2: if (checkmount() == MOUNT_MADO) { - mes "[Magic Gear Master]"; + mes "[Mado Gear Armorer]"; mes "I'm sorry, but you're already"; - mes "riding a Magic Gear."; + mes "riding a Mado Gear."; close; } else if (!getskilllv(NC_MADOLICENCE)) { - mes "[Magic Gear Master]"; - mes "Please learn the skill to get the Magic Gear License first."; + mes "[Mado Gear Armorer]"; + mes "Please learn the skill to get the Mado Gear License first."; close; } else if(hascashmount()) { - mes "[Magic Gear Master]"; + mes "[Mado Gear Armorer]"; mes "Please remove your cash mount."; close; } setmount(MOUNT_MADO); - mes "[Magic Gear Master]"; + mes "[Mado Gear Armorer]"; mes "Have fun, and please come again!"; close; case 3: + mes "[Mado Gear Armorer]"; + mes "Emergency Mado Gear is really useful for emergency situations and it is sold at 1,000,000 Zeny."; + next; + if (select("Purchase", "Cancel") == 2) { + mes "[Mado Gear Armorer]"; + mes "I see. Please feel free to ask me"; + mes "if you change your mind."; + close; + } + if (countitem(Mado_Box) > 0) { + mes "[Mado Gear Armorer]"; + mes "I'm sorry, but you already have an Emergency Mado Gear."; + close; + } + if (Zeny < 1000000) { + mes "[Mado Gear Armorer]"; + mes "I'm sorry, but you don't have enough Zeny to purchase the Emergency Mado Gear."; + close; + } + Zeny -= 1000000; + getitem Mado_Box, 1; + mes "[Mado Gear Armorer]"; + mes "There you go!"; + close; + case 4: + mes "[Mado Gear Armorer]"; + mes "Which device do you want to upgrade?"; + next; + if (select("Cooling Device", "High Quality Cooler") == 1) { + mes "[Mado Gear Armorer]"; + mes "Upgrading Cooling Device to High Quality Cooler needs 1 Cooling Device and 2,000,000 Zeny."; + next; + .@itemid = Cooling_Device; + .@cost = 2000000; + } else { + mes "[Mado Gear Armorer]"; + mes "Upgrading High Quality Cooler to Special Cooler needs 1 High Quality Cooler and 4,000,000 Zeny."; + next; + .@itemid = High_Quality_Cooler; + .@cost = 4000000; + } + if (select("Upgrade", "Cancel") == 2) { + mes "[Mado Gear Armorer]"; + mes "I see. Please feel free to ask me"; + mes "if you change your mind."; + close; + } + if (!countitem(.@itemid)) { + mes "[Mado Gear Armorer]"; + mes "I'm sorry, but you don't have the " + getitemname(.@itemid) + "."; + close; + } + if (Zeny < .@cost) { + mes "[Mado Gear Armorer]"; + mes "I'm sorry, but you don't have enough Zeny to upgrade the device."; + close; + } + Zeny -= .@cost; + delitem .@itemid, 1; + getitem (.@itemid == Cooling_Device ? High_Quality_Cooler : Special_Cooler), 1; + mes "[Mado Gear Armorer]"; + mes "Here you are! Your very own " + getitemname(.@itemid) + "."; + close; + case 5: close; } } mes "How may I help you?"; - mes "Magic Gears are only available for Mechanics."; + mes "Mado Gears are only available for Mechanics."; close; } -prontera,163,178,3 duplicate(mgm) Magic Gear Master#prt 8W_SOLDIER -geffen,103,55,5 duplicate(mgm) Magic Gear Master#gef 8W_SOLDIER -payon,166,106,5 duplicate(mgm) Magic Gear Master#pay 8W_SOLDIER -aldebaran,133,112,5 duplicate(mgm) Magic Gear Master#alde 8W_SOLDIER -yuno,167,187,3 duplicate(mgm) Magic Gear Master#yuno 8W_SOLDIER -rachel,106,134,5 duplicate(mgm) Magic Gear Master#ra 8W_SOLDIER -dicastes01,187,207,3 duplicate(mgm) Magic Gear Master#dic 8W_SOLDIER -manuk,273,212,5 duplicate(mgm) Magic Gear Master#man 8W_SOLDIER -splendide,180,174,5 duplicate(mgm) Magic Gear Master#spl 8W_SOLDIER -mid_camp,242,243,3 duplicate(mgm) Magic Gear Master#mid 8W_SOLDIER + +prontera,163,178,3 duplicate(mgm) Mado Gear Armorer#prt 8W_SOLDIER +geffen,103,55,5 duplicate(mgm) Mado Gear Armorer#gef 8W_SOLDIER +payon,166,106,5 duplicate(mgm) Mado Gear Armorer#pay 8W_SOLDIER +aldebaran,133,112,5 duplicate(mgm) Mado Gear Armorer#alde 8W_SOLDIER +yuno,167,187,3 duplicate(mgm) Mado Gear Armorer#yuno 8W_SOLDIER +rachel,106,134,5 duplicate(mgm) Mado Gear Armorer#ra 8W_SOLDIER +dicastes01,187,207,3 duplicate(mgm) Mado Gear Armorer#dic 8W_SOLDIER +manuk,273,212,5 duplicate(mgm) Mado Gear Armorer#man 8W_SOLDIER +splendide,180,174,5 duplicate(mgm) Mado Gear Armorer#spl 8W_SOLDIER +mid_camp,242,243,3 duplicate(mgm) Mado Gear Armorer#mid 8W_SOLDIER diff --git a/npc/re/merchants/shadow_refiner.txt b/npc/re/merchants/shadow_refiner.txt index f03d348b2..cbf6338ba 100644 --- a/npc/re/merchants/shadow_refiner.txt +++ b/npc/re/merchants/shadow_refiner.txt @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2017 Hercules Dev Team +//= Copyright (C) 2017-2020 Hercules Dev Team //= Copyright (C) Dastgir //= Copyright (C) Smokexyz (v2.0) //= @@ -39,11 +39,17 @@ itemmall,31,76,3 script Shadow Blacksmith#nomal 4_F_JOB_BLACKSMITH,{ .@npc_name$ = "[Shadow Blacksmith]"; .@zeny_cost = 20000; // Amount of zeny to be charged for refining. - disable_items; mesf("%s", .@npc_name$); mes("Do you want to refine a Shadow item?"); mes("Please choose the part you want to refine."); - next; + + if (getbattleflag("features/replace_refine_npcs") == 1) { + if (openrefineryui()) + close(); + } + next(); + + disable_items; setarray(.@position$[0],"Armor","Weapon","Shield","Shoes","Earring","Pendant"); for (.@i=EQI_SHADOW_ARMOR; .@i <= EQI_SHADOW_ACC_L; .@i++){ .@menu$ = .@menu$ + (getequipisequiped(.@i) ? getequipname(.@i) : ("^8C8C8C" + .@position$[.@i-EQI_SHADOW_ARMOR] + " [Not Equipped]^000000" + ":")); diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt index 543d9cdc7..b1cbfe917 100644 --- a/npc/re/merchants/shops.txt +++ b/npc/re/merchants/shops.txt @@ -9,15 +9,15 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Frost -//= Copyright (C) rAthena Dev Team -//= Copyright (C) Lemongrass -//= Copyright (C) Streusel -//= Copyright (C) Euphy -//= Copyright (C) Joseph -//= Copyright (C) eAthena Dev Team -//= Copyright (C) Kenpachi +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Frost +//= Copyright (C) rAthena Dev Team +//= Copyright (C) Lemongrass +//= Copyright (C) Streusel +//= Copyright (C) Euphy +//= Copyright (C) Joseph +//= Copyright (C) eAthena Dev Team +//= Copyright (C) Kenpachi //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/merchants/ticket_refiner.txt b/npc/re/merchants/ticket_refiner.txt index 5b69fbc38..72c1b5851 100644 --- a/npc/re/merchants/ticket_refiner.txt +++ b/npc/re/merchants/ticket_refiner.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/champion.txt b/npc/re/mobs/champion.txt index 3ee712223..bc1b9fab2 100644 --- a/npc/re/mobs/champion.txt +++ b/npc/re/mobs/champion.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) nanakiwurtz +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) nanakiwurtz //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/citycleaners.txt b/npc/re/mobs/citycleaners.txt index 1acd7f8bd..0fd41c9be 100644 --- a/npc/re/mobs/citycleaners.txt +++ b/npc/re/mobs/citycleaners.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/abbey.txt b/npc/re/mobs/dungeons/abbey.txt index a7cbda8c9..83a0b0eb8 100644 --- a/npc/re/mobs/dungeons/abbey.txt +++ b/npc/re/mobs/dungeons/abbey.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) $ephiroth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) $ephiroth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/abyss.txt b/npc/re/mobs/dungeons/abyss.txt index 42e42cd55..f7bbde415 100644 --- a/npc/re/mobs/dungeons/abyss.txt +++ b/npc/re/mobs/dungeons/abyss.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Nexon -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Nexon +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/alde_dun.txt b/npc/re/mobs/dungeons/alde_dun.txt index b00efe8c1..80316a959 100644 --- a/npc/re/mobs/dungeons/alde_dun.txt +++ b/npc/re/mobs/dungeons/alde_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/ama_dun.txt b/npc/re/mobs/dungeons/ama_dun.txt index c4b025655..70de92c95 100644 --- a/npc/re/mobs/dungeons/ama_dun.txt +++ b/npc/re/mobs/dungeons/ama_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/anthell.txt b/npc/re/mobs/dungeons/anthell.txt index 81c4d4680..2e7a43be4 100644 --- a/npc/re/mobs/dungeons/anthell.txt +++ b/npc/re/mobs/dungeons/anthell.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/ayo_dun.txt b/npc/re/mobs/dungeons/ayo_dun.txt index 19bb1cef4..cbb3a9557 100644 --- a/npc/re/mobs/dungeons/ayo_dun.txt +++ b/npc/re/mobs/dungeons/ayo_dun.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Lupus -//= Copyright (C) Ishizu -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Lupus +//= Copyright (C) Ishizu +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/beach_dun.txt b/npc/re/mobs/dungeons/beach_dun.txt index d75c5a924..73396bd5e 100644 --- a/npc/re/mobs/dungeons/beach_dun.txt +++ b/npc/re/mobs/dungeons/beach_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/bra_dun.txt b/npc/re/mobs/dungeons/bra_dun.txt index 816440afa..4fa434b84 100644 --- a/npc/re/mobs/dungeons/bra_dun.txt +++ b/npc/re/mobs/dungeons/bra_dun.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/c_tower.txt b/npc/re/mobs/dungeons/c_tower.txt index 274266bc9..dee704c17 100644 --- a/npc/re/mobs/dungeons/c_tower.txt +++ b/npc/re/mobs/dungeons/c_tower.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/dew_dun.txt b/npc/re/mobs/dungeons/dew_dun.txt index 746e64a46..d86def00c 100644 --- a/npc/re/mobs/dungeons/dew_dun.txt +++ b/npc/re/mobs/dungeons/dew_dun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/dic_dun.txt b/npc/re/mobs/dungeons/dic_dun.txt index a5ee3b5bd..24a7094d5 100644 --- a/npc/re/mobs/dungeons/dic_dun.txt +++ b/npc/re/mobs/dungeons/dic_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Chilly -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Chilly +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/ecl_tdun.txt b/npc/re/mobs/dungeons/ecl_tdun.txt index 0e95c1377..a8425d303 100644 --- a/npc/re/mobs/dungeons/ecl_tdun.txt +++ b/npc/re/mobs/dungeons/ecl_tdun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Michieru -//= Copyright (C) Euphy -//= Copyright (C) refis +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Michieru +//= Copyright (C) Euphy +//= Copyright (C) refis //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/ein_dun.txt b/npc/re/mobs/dungeons/ein_dun.txt index 4f7111c95..aba31dd7e 100644 --- a/npc/re/mobs/dungeons/ein_dun.txt +++ b/npc/re/mobs/dungeons/ein_dun.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Lupus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Lupus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/gef_dun.txt b/npc/re/mobs/dungeons/gef_dun.txt index 70d9d3ca2..8b8da1a74 100644 --- a/npc/re/mobs/dungeons/gef_dun.txt +++ b/npc/re/mobs/dungeons/gef_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/gefenia.txt b/npc/re/mobs/dungeons/gefenia.txt index 3ba50be71..0b2dbb4a9 100644 --- a/npc/re/mobs/dungeons/gefenia.txt +++ b/npc/re/mobs/dungeons/gefenia.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/glastheim.txt b/npc/re/mobs/dungeons/glastheim.txt index 693aa4a3a..2f5c29753 100644 --- a/npc/re/mobs/dungeons/glastheim.txt +++ b/npc/re/mobs/dungeons/glastheim.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Lupus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Lupus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/gld_dunSE.txt b/npc/re/mobs/dungeons/gld_dunSE.txt index 8d6004cc6..0220ffac3 100644 --- a/npc/re/mobs/dungeons/gld_dunSE.txt +++ b/npc/re/mobs/dungeons/gld_dunSE.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/gld_re.txt b/npc/re/mobs/dungeons/gld_re.txt index 2fc5c5507..459349351 100644 --- a/npc/re/mobs/dungeons/gld_re.txt +++ b/npc/re/mobs/dungeons/gld_re.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/gon_dun.txt b/npc/re/mobs/dungeons/gon_dun.txt index 5e694fac8..1ebeb9512 100644 --- a/npc/re/mobs/dungeons/gon_dun.txt +++ b/npc/re/mobs/dungeons/gon_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/ice_dun.txt b/npc/re/mobs/dungeons/ice_dun.txt index 4e2b1b0e5..eb379ec28 100644 --- a/npc/re/mobs/dungeons/ice_dun.txt +++ b/npc/re/mobs/dungeons/ice_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/in_sphinx.txt b/npc/re/mobs/dungeons/in_sphinx.txt index 987762e22..f65612db0 100644 --- a/npc/re/mobs/dungeons/in_sphinx.txt +++ b/npc/re/mobs/dungeons/in_sphinx.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/iz_dun.txt b/npc/re/mobs/dungeons/iz_dun.txt index 01ecabc9e..f466b1a89 100644 --- a/npc/re/mobs/dungeons/iz_dun.txt +++ b/npc/re/mobs/dungeons/iz_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Chilly -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Chilly +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/juperos.txt b/npc/re/mobs/dungeons/juperos.txt index bfdce2b16..09c206a22 100644 --- a/npc/re/mobs/dungeons/juperos.txt +++ b/npc/re/mobs/dungeons/juperos.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) MasterOfMuppets -//= Copyright (C) The Prometheus Project -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) MasterOfMuppets +//= Copyright (C) The Prometheus Project +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/kh_dun.txt b/npc/re/mobs/dungeons/kh_dun.txt index b28fe528b..1f427392d 100644 --- a/npc/re/mobs/dungeons/kh_dun.txt +++ b/npc/re/mobs/dungeons/kh_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/lhz_dun.txt b/npc/re/mobs/dungeons/lhz_dun.txt index 3243a6e04..f0f0e520d 100644 --- a/npc/re/mobs/dungeons/lhz_dun.txt +++ b/npc/re/mobs/dungeons/lhz_dun.txt @@ -9,17 +9,17 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) Chilly -//= Copyright (C) eAthena Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Poki#3 -//= Copyright (C) Skotlex -//= Copyright (C) The Prometheus Project -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) Chilly +//= Copyright (C) eAthena Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Poki#3 +//= Copyright (C) Skotlex +//= Copyright (C) The Prometheus Project +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/lou_dun.txt b/npc/re/mobs/dungeons/lou_dun.txt index 0b437e723..0c1ab8ede 100644 --- a/npc/re/mobs/dungeons/lou_dun.txt +++ b/npc/re/mobs/dungeons/lou_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/ma_dun.txt b/npc/re/mobs/dungeons/ma_dun.txt index 687d14cf6..982200927 100644 --- a/npc/re/mobs/dungeons/ma_dun.txt +++ b/npc/re/mobs/dungeons/ma_dun.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/mag_dun.txt b/npc/re/mobs/dungeons/mag_dun.txt index 3c0d1c3d9..754680635 100644 --- a/npc/re/mobs/dungeons/mag_dun.txt +++ b/npc/re/mobs/dungeons/mag_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) Lupus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) Lupus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/mal_dun.txt b/npc/re/mobs/dungeons/mal_dun.txt index 0717975d2..1f18dbadc 100644 --- a/npc/re/mobs/dungeons/mal_dun.txt +++ b/npc/re/mobs/dungeons/mal_dun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/mjo_dun.txt b/npc/re/mobs/dungeons/mjo_dun.txt index 3deb10c97..16189a2ee 100644 --- a/npc/re/mobs/dungeons/mjo_dun.txt +++ b/npc/re/mobs/dungeons/mjo_dun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/moc_pryd.txt b/npc/re/mobs/dungeons/moc_pryd.txt index 5ba1e1955..02a4d76d8 100644 --- a/npc/re/mobs/dungeons/moc_pryd.txt +++ b/npc/re/mobs/dungeons/moc_pryd.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/mosk_dun.txt b/npc/re/mobs/dungeons/mosk_dun.txt index 50bff21bf..e605802cf 100644 --- a/npc/re/mobs/dungeons/mosk_dun.txt +++ b/npc/re/mobs/dungeons/mosk_dun.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/nyd_dun.txt b/npc/re/mobs/dungeons/nyd_dun.txt index 5b5aeff04..7b2b89fcc 100644 --- a/npc/re/mobs/dungeons/nyd_dun.txt +++ b/npc/re/mobs/dungeons/nyd_dun.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/odin.txt b/npc/re/mobs/dungeons/odin.txt index 4fb2eba22..159fed772 100644 --- a/npc/re/mobs/dungeons/odin.txt +++ b/npc/re/mobs/dungeons/odin.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Vicious -//= Copyright (C) Poki#3 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Vicious +//= Copyright (C) Poki#3 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/orcsdun.txt b/npc/re/mobs/dungeons/orcsdun.txt index b893fa6c2..e67d5ca1d 100644 --- a/npc/re/mobs/dungeons/orcsdun.txt +++ b/npc/re/mobs/dungeons/orcsdun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/pay_dun.txt b/npc/re/mobs/dungeons/pay_dun.txt index a343d6cce..6dc19c835 100644 --- a/npc/re/mobs/dungeons/pay_dun.txt +++ b/npc/re/mobs/dungeons/pay_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/prt_maze.txt b/npc/re/mobs/dungeons/prt_maze.txt index c5f783554..66f731ced 100644 --- a/npc/re/mobs/dungeons/prt_maze.txt +++ b/npc/re/mobs/dungeons/prt_maze.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/prt_sew.txt b/npc/re/mobs/dungeons/prt_sew.txt index 0c8a49537..68c7cc822 100644 --- a/npc/re/mobs/dungeons/prt_sew.txt +++ b/npc/re/mobs/dungeons/prt_sew.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/ra_san.txt b/npc/re/mobs/dungeons/ra_san.txt index ac01c0ef1..a388d9478 100644 --- a/npc/re/mobs/dungeons/ra_san.txt +++ b/npc/re/mobs/dungeons/ra_san.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/tha_t.txt b/npc/re/mobs/dungeons/tha_t.txt index df7391443..cc3919da6 100644 --- a/npc/re/mobs/dungeons/tha_t.txt +++ b/npc/re/mobs/dungeons/tha_t.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Vicious -//= Copyright (C) Playtester -//= Copyright (C) Nexon -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Vicious +//= Copyright (C) Playtester +//= Copyright (C) Nexon +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/thor_v.txt b/npc/re/mobs/dungeons/thor_v.txt index 246ab3d35..2d19661ba 100644 --- a/npc/re/mobs/dungeons/thor_v.txt +++ b/npc/re/mobs/dungeons/thor_v.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/treasure.txt b/npc/re/mobs/dungeons/treasure.txt index 3e42160ee..30673cfed 100644 --- a/npc/re/mobs/dungeons/treasure.txt +++ b/npc/re/mobs/dungeons/treasure.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/tur_dun.txt b/npc/re/mobs/dungeons/tur_dun.txt index 9824b1147..53bbe448e 100644 --- a/npc/re/mobs/dungeons/tur_dun.txt +++ b/npc/re/mobs/dungeons/tur_dun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/xmas_dun.txt b/npc/re/mobs/dungeons/xmas_dun.txt index 6fadd019e..d2154d343 100644 --- a/npc/re/mobs/dungeons/xmas_dun.txt +++ b/npc/re/mobs/dungeons/xmas_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/dungeons/yggdrasil.txt b/npc/re/mobs/dungeons/yggdrasil.txt index 898a11951..c50338551 100644 --- a/npc/re/mobs/dungeons/yggdrasil.txt +++ b/npc/re/mobs/dungeons/yggdrasil.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Playtester -//= Copyright (C) DracoRPG -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Playtester +//= Copyright (C) DracoRPG +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/amatsu.txt b/npc/re/mobs/fields/amatsu.txt index b2b90e7c0..55834e818 100644 --- a/npc/re/mobs/fields/amatsu.txt +++ b/npc/re/mobs/fields/amatsu.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) Playtester -//= Copyright (C) Lupus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) Playtester +//= Copyright (C) Lupus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/ayothaya.txt b/npc/re/mobs/fields/ayothaya.txt index 3ef2b5456..993e46830 100644 --- a/npc/re/mobs/fields/ayothaya.txt +++ b/npc/re/mobs/fields/ayothaya.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Streusel -//= Copyright (C) Kisuka -//= Copyright (C) Playtester -//= Copyright (C) VP -//= Copyright (C) Lupus -//= Copyright (C) Ishizu -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Streusel +//= Copyright (C) Kisuka +//= Copyright (C) Playtester +//= Copyright (C) VP +//= Copyright (C) Lupus +//= Copyright (C) Ishizu +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/bifrost.txt b/npc/re/mobs/fields/bifrost.txt index 11c186722..488c72f02 100644 --- a/npc/re/mobs/fields/bifrost.txt +++ b/npc/re/mobs/fields/bifrost.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/brasilis.txt b/npc/re/mobs/fields/brasilis.txt index 946f1eaaf..e5f9413af 100644 --- a/npc/re/mobs/fields/brasilis.txt +++ b/npc/re/mobs/fields/brasilis.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/comodo.txt b/npc/re/mobs/fields/comodo.txt index 230e7875d..6726077ae 100644 --- a/npc/re/mobs/fields/comodo.txt +++ b/npc/re/mobs/fields/comodo.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/dewata.txt b/npc/re/mobs/fields/dewata.txt index 45787ef73..53778e964 100644 --- a/npc/re/mobs/fields/dewata.txt +++ b/npc/re/mobs/fields/dewata.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/dicastes.txt b/npc/re/mobs/fields/dicastes.txt index 66dc01126..99a07b9c1 100644 --- a/npc/re/mobs/fields/dicastes.txt +++ b/npc/re/mobs/fields/dicastes.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/eclage.txt b/npc/re/mobs/fields/eclage.txt index 9bec80f20..691b8ebbf 100644 --- a/npc/re/mobs/fields/eclage.txt +++ b/npc/re/mobs/fields/eclage.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Michieru -//= Copyright (C) Euphy -//= Copyright (C) refis -//= Copyright (C) Auriga +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Michieru +//= Copyright (C) Euphy +//= Copyright (C) refis +//= Copyright (C) Auriga //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/einbroch.txt b/npc/re/mobs/fields/einbroch.txt index c2f6bcb04..9535b6853 100644 --- a/npc/re/mobs/fields/einbroch.txt +++ b/npc/re/mobs/fields/einbroch.txt @@ -9,15 +9,15 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Streusel -//= Copyright (C) Kisuka -//= Copyright (C) Playtester -//= Copyright (C) Vicious -//= Copyright (C) Poki#3 -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Lupus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Streusel +//= Copyright (C) Kisuka +//= Copyright (C) Playtester +//= Copyright (C) Vicious +//= Copyright (C) Poki#3 +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Lupus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/geffen.txt b/npc/re/mobs/fields/geffen.txt index 89f97afb3..9fc98fcac 100644 --- a/npc/re/mobs/fields/geffen.txt +++ b/npc/re/mobs/fields/geffen.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Lupus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Lupus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/gonryun.txt b/npc/re/mobs/fields/gonryun.txt index e388e9c14..2af78f32d 100644 --- a/npc/re/mobs/fields/gonryun.txt +++ b/npc/re/mobs/fields/gonryun.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Streusel -//= Copyright (C) Kisuka -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Streusel +//= Copyright (C) Kisuka +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/hugel.txt b/npc/re/mobs/fields/hugel.txt index 34a45319a..d8aba13c9 100644 --- a/npc/re/mobs/fields/hugel.txt +++ b/npc/re/mobs/fields/hugel.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Streusel -//= Copyright (C) Kisuka -//= Copyright (C) Playtester -//= Copyright (C) Vicious -//= Copyright (C) Poki#3 -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Streusel +//= Copyright (C) Kisuka +//= Copyright (C) Playtester +//= Copyright (C) Vicious +//= Copyright (C) Poki#3 +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/lighthalzen.txt b/npc/re/mobs/fields/lighthalzen.txt index a03cb54c3..95ba27b80 100644 --- a/npc/re/mobs/fields/lighthalzen.txt +++ b/npc/re/mobs/fields/lighthalzen.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) rAthena Dev Team -//= Copyright (C) eAthena Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) Playtester -//= Copyright (C) Poki#3 -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) rAthena Dev Team +//= Copyright (C) eAthena Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) Playtester +//= Copyright (C) Poki#3 +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/louyang.txt b/npc/re/mobs/fields/louyang.txt index 624ef34f6..4d8a5966c 100644 --- a/npc/re/mobs/fields/louyang.txt +++ b/npc/re/mobs/fields/louyang.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Streusel -//= Copyright (C) Kisuka -//= Copyright (C) Playtester -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Evera -//= Copyright (C) Lorri +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Streusel +//= Copyright (C) Kisuka +//= Copyright (C) Playtester +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Evera +//= Copyright (C) Lorri //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/lutie.txt b/npc/re/mobs/fields/lutie.txt index 260e3770e..51558c85e 100644 --- a/npc/re/mobs/fields/lutie.txt +++ b/npc/re/mobs/fields/lutie.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/malaya.txt b/npc/re/mobs/fields/malaya.txt index 584736414..3abc294ac 100644 --- a/npc/re/mobs/fields/malaya.txt +++ b/npc/re/mobs/fields/malaya.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/manuk.txt b/npc/re/mobs/fields/manuk.txt index 5c3af1de2..cd32e7dd8 100644 --- a/npc/re/mobs/fields/manuk.txt +++ b/npc/re/mobs/fields/manuk.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) scriptor -//= Copyright (C) alexx -//= Copyright (C) MaC +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) scriptor +//= Copyright (C) alexx +//= Copyright (C) MaC //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/mjolnir.txt b/npc/re/mobs/fields/mjolnir.txt index 103f16523..888e332f9 100644 --- a/npc/re/mobs/fields/mjolnir.txt +++ b/npc/re/mobs/fields/mjolnir.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/morocc.txt b/npc/re/mobs/fields/morocc.txt index 0c947afa3..3ab571b0f 100644 --- a/npc/re/mobs/fields/morocc.txt +++ b/npc/re/mobs/fields/morocc.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/moscovia.txt b/npc/re/mobs/fields/moscovia.txt index 12e528874..c31512854 100644 --- a/npc/re/mobs/fields/moscovia.txt +++ b/npc/re/mobs/fields/moscovia.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Streusel -//= Copyright (C) Kisuka -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Streusel +//= Copyright (C) Kisuka +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/niflheim.txt b/npc/re/mobs/fields/niflheim.txt index c42aba3d9..e305a413d 100644 --- a/npc/re/mobs/fields/niflheim.txt +++ b/npc/re/mobs/fields/niflheim.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) Playtester -//= Copyright (C) MasterOfMuppets -//= Copyright (C) DracoRPG -//= Copyright (C) Lupus -//= Copyright (C) shadow -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) Playtester +//= Copyright (C) MasterOfMuppets +//= Copyright (C) DracoRPG +//= Copyright (C) Lupus +//= Copyright (C) shadow +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/payon.txt b/npc/re/mobs/fields/payon.txt index db9759260..9b45a6869 100644 --- a/npc/re/mobs/fields/payon.txt +++ b/npc/re/mobs/fields/payon.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/prontera.txt b/npc/re/mobs/fields/prontera.txt index 2dca8a5c0..0e9a18c48 100644 --- a/npc/re/mobs/fields/prontera.txt +++ b/npc/re/mobs/fields/prontera.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Streusel -//= Copyright (C) Playtester -//= Copyright (C) Lupus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Streusel +//= Copyright (C) Playtester +//= Copyright (C) Lupus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/rachel.txt b/npc/re/mobs/fields/rachel.txt index e5e39de14..5e676bca9 100644 --- a/npc/re/mobs/fields/rachel.txt +++ b/npc/re/mobs/fields/rachel.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Streusel -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Sepheus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Streusel +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Sepheus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/splendide.txt b/npc/re/mobs/fields/splendide.txt index 230aa790e..767b670f5 100644 --- a/npc/re/mobs/fields/splendide.txt +++ b/npc/re/mobs/fields/splendide.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) scriptor -//= Copyright (C) alexx -//= Copyright (C) MaC +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) scriptor +//= Copyright (C) alexx +//= Copyright (C) MaC //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/umbala.txt b/npc/re/mobs/fields/umbala.txt index 7126a6e69..83803e665 100644 --- a/npc/re/mobs/fields/umbala.txt +++ b/npc/re/mobs/fields/umbala.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Darkchild +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Darkchild //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/veins.txt b/npc/re/mobs/fields/veins.txt index 09497517c..97f6c1b87 100644 --- a/npc/re/mobs/fields/veins.txt +++ b/npc/re/mobs/fields/veins.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Streusel -//= Copyright (C) Kisuka -//= Copyright (C) Gepard -//= Copyright (C) Playtester -//= Copyright (C) $ephiroth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Streusel +//= Copyright (C) Kisuka +//= Copyright (C) Gepard +//= Copyright (C) Playtester +//= Copyright (C) $ephiroth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/mobs/fields/yuno.txt b/npc/re/mobs/fields/yuno.txt index 4e9a82582..3614a98c6 100644 --- a/npc/re/mobs/fields/yuno.txt +++ b/npc/re/mobs/fields/yuno.txt @@ -9,17 +9,17 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Streusel -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Vicious -//= Copyright (C) Poki#3 -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Darkchild -//= Copyright (C) Muad_Dib -//= Copyright (C) Lupus -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Streusel +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Vicious +//= Copyright (C) Poki#3 +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Darkchild +//= Copyright (C) Muad_Dib +//= Copyright (C) Lupus +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -134,3 +134,17 @@ yuno_fild11,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1 //== yuno_fild12 - Border Checkpoint ======================= yuno_fild12,0,0,0,0 monster Geographer 1368,60,5000,0,0 yuno_fild12,0,0,0,0 monster Mantis 1139,30,5000,0,0 + +//== Transcendent Quest - Quest #5160 - Library Mistake ======================= +yuno_fild01,0,0,0,0 monster Runaway Book 2414,1,5000,0,"Metheus Sylphe#Library::OnKill" +yuno_fild02,0,0,0,0 monster Runaway Book 2414,1,5000,0,"Metheus Sylphe#Library::OnKill" +yuno_fild03,0,0,0,0 monster Runaway Book 2414,1,5000,0,"Metheus Sylphe#Library::OnKill" +yuno_fild04,0,0,0,0 monster Runaway Book 2414,1,5000,0,"Metheus Sylphe#Library::OnKill" +// yuno_fild05,0,0,0,0 monster Runaway Book 2414,1,5000,0,"Metheus Sylphe#Library::OnKill" +yuno_fild06,0,0,0,0 monster Runaway Book 2414,1,5000,0,"Metheus Sylphe#Library::OnKill" +yuno_fild07,0,0,0,0 monster Runaway Book 2414,1,5000,0,"Metheus Sylphe#Library::OnKill" +yuno_fild08,0,0,0,0 monster Runaway Book 2414,1,5000,0,"Metheus Sylphe#Library::OnKill" +yuno_fild09,0,0,0,0 monster Runaway Book 2414,1,5000,0,"Metheus Sylphe#Library::OnKill" +// yuno_fild10,0,0,0,0 monster Runaway Book 2414,1,5000,0,"Metheus Sylphe#Library::OnKill" +yuno_fild11,0,0,0,0 monster Runaway Book 2414,1,5000,0,"Metheus Sylphe#Library::OnKill" +yuno_fild12,0,0,0,0 monster Runaway Book 2414,1,5000,0,"Metheus Sylphe#Library::OnKill" diff --git a/npc/re/mobs/int_land.txt b/npc/re/mobs/int_land.txt index f204b1cb4..f917c2d51 100644 --- a/npc/re/mobs/int_land.txt +++ b/npc/re/mobs/int_land.txt @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2016 Hercules Dev Team +//= Copyright (C) 2016-2020 Hercules Dev Team //= Copyright (C) Ridley //= //= Hercules is free software: you can redistribute it and/or modify diff --git a/npc/re/mobs/towns.txt b/npc/re/mobs/towns.txt index 5d341fece..002ad9a87 100644 --- a/npc/re/mobs/towns.txt +++ b/npc/re/mobs/towns.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/other/achievement_treasures.txt b/npc/re/other/achievement_treasures.txt new file mode 100644 index 000000000..38fb69d77 --- /dev/null +++ b/npc/re/other/achievement_treasures.txt @@ -0,0 +1,342 @@ +//================= Hercules Script ======================================= +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2020 Hercules Dev Team +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see <http://www.gnu.org/licenses/>. +//========================================================================= +// Exploration Achievements +//========================================================================= + +- script achievement_tr FAKE_NPC,{ + sscanf(strnpcinfo(NPC_NAME_HIDDEN), "tr%d", .@id); + if (!achievement_iscompleted(.@id)) + achievement_progress(.@id, 1, 1, true); + end; +OnInit: + cloakonnpc(strnpcinfo(NPC_NAME)); + end; +} + +- script achievement_wp FAKE_NPC,{ +OnTouch: + sscanf(strnpcinfo(NPC_NAME_HIDDEN), "wp%d", .@id); + if (!achievement_iscompleted(.@id)) + cloakoffnpc(sprintf("#tr%d", .@id), playerattached()); + end; +} + +// Treasure Chests +prt_fild01,146,126,4 duplicate(achievement_tr) #tr120001 4_TREASURE_BOX +prt_fild02,142,221,4 duplicate(achievement_tr) #tr120002 4_TREASURE_BOX +prt_fild03,172,139,4 duplicate(achievement_tr) #tr120003 4_TREASURE_BOX +prt_fild04,118,57,4 duplicate(achievement_tr) #tr120004 4_TREASURE_BOX +prt_fild05,189,291,4 duplicate(achievement_tr) #tr120005 4_TREASURE_BOX +prt_fild06,298,304,4 duplicate(achievement_tr) #tr120006 4_TREASURE_BOX +prt_fild07,44,104,4 duplicate(achievement_tr) #tr120007 4_TREASURE_BOX +prt_fild08,203,222,4 duplicate(achievement_tr) #tr120008 4_TREASURE_BOX +prt_fild09,37,354,4 duplicate(achievement_tr) #tr120009 4_TREASURE_BOX +prt_fild10,177,206,4 duplicate(achievement_tr) #tr120010 4_TREASURE_BOX +gef_fild00,73,119,4 duplicate(achievement_tr) #tr120011 4_TREASURE_BOX +gef_fild01,222,224,4 duplicate(achievement_tr) #tr120012 4_TREASURE_BOX +gef_fild05,202,292,4 duplicate(achievement_tr) #tr120013 4_TREASURE_BOX +gef_fild06,279,105,4 duplicate(achievement_tr) #tr120014 4_TREASURE_BOX +gef_fild07,184,249,4 duplicate(achievement_tr) #tr120015 4_TREASURE_BOX +gef_fild09,170,73,4 duplicate(achievement_tr) #tr120016 4_TREASURE_BOX +gef_fild11,239,248,4 duplicate(achievement_tr) #tr120017 4_TREASURE_BOX +moc_fild11,188,218,4 duplicate(achievement_tr) #tr120018 4_TREASURE_BOX +moc_fild12,234,96,4 duplicate(achievement_tr) #tr120019 4_TREASURE_BOX +moc_fild13,290,207,4 duplicate(achievement_tr) #tr120020 4_TREASURE_BOX +moc_fild16,196,108,4 duplicate(achievement_tr) #tr120021 4_TREASURE_BOX +moc_fild17,269,105,4 duplicate(achievement_tr) #tr120022 4_TREASURE_BOX +moc_fild18,54,284,4 duplicate(achievement_tr) #tr120023 4_TREASURE_BOX +pay_fild01,167,243,4 duplicate(achievement_tr) #tr120024 4_TREASURE_BOX +pay_fild02,105,240,4 duplicate(achievement_tr) #tr120025 4_TREASURE_BOX +pay_fild03,144,97,4 duplicate(achievement_tr) #tr120026 4_TREASURE_BOX +pay_fild04,257,95,4 duplicate(achievement_tr) #tr120027 4_TREASURE_BOX +pay_fild07,365,37,4 duplicate(achievement_tr) #tr120028 4_TREASURE_BOX +pay_fild08,237,345,4 duplicate(achievement_tr) #tr120029 4_TREASURE_BOX +pay_fild09,251,42,4 duplicate(achievement_tr) #tr120030 4_TREASURE_BOX +pay_fild10,196,38,4 duplicate(achievement_tr) #tr120031 4_TREASURE_BOX +mjolnir_01,47,60,4 duplicate(achievement_tr) #tr120032 4_TREASURE_BOX +mjolnir_02,77,49,4 duplicate(achievement_tr) #tr120033 4_TREASURE_BOX +mjolnir_03,190,200,4 duplicate(achievement_tr) #tr120034 4_TREASURE_BOX +mjolnir_04,201,146,4 duplicate(achievement_tr) #tr120035 4_TREASURE_BOX +mjolnir_05,43,327,4 duplicate(achievement_tr) #tr120036 4_TREASURE_BOX +mjolnir_06,162,290,4 duplicate(achievement_tr) #tr120037 4_TREASURE_BOX +mjolnir_07,321,127,4 duplicate(achievement_tr) #tr120038 4_TREASURE_BOX +mjolnir_08,175,225,4 duplicate(achievement_tr) #tr120039 4_TREASURE_BOX +mjolnir_09,299,123,4 duplicate(achievement_tr) #tr120040 4_TREASURE_BOX +mjolnir_10,353,371,4 duplicate(achievement_tr) #tr120041 4_TREASURE_BOX +mjolnir_11,325,178,4 duplicate(achievement_tr) #tr120042 4_TREASURE_BOX +mjolnir_12,110,298,4 duplicate(achievement_tr) #tr120043 4_TREASURE_BOX +cmd_fild01,112,200,4 duplicate(achievement_tr) #tr120044 4_TREASURE_BOX +cmd_fild02,86,94,4 duplicate(achievement_tr) #tr120045 4_TREASURE_BOX +cmd_fild03,144,190,4 duplicate(achievement_tr) #tr120046 4_TREASURE_BOX +cmd_fild04,151,191,4 duplicate(achievement_tr) #tr120047 4_TREASURE_BOX +cmd_fild06,221,108,4 duplicate(achievement_tr) #tr120048 4_TREASURE_BOX +cmd_fild07,269,322,4 duplicate(achievement_tr) #tr120049 4_TREASURE_BOX +cmd_fild08,181,136,4 duplicate(achievement_tr) #tr120050 4_TREASURE_BOX +cmd_fild09,211,266,4 duplicate(achievement_tr) #tr120051 4_TREASURE_BOX +yuno_fild01,284,138,4 duplicate(achievement_tr) #tr120052 4_TREASURE_BOX +yuno_fild12,76,268,4 duplicate(achievement_tr) #tr120053 4_TREASURE_BOX +yuno_fild02,142,191,4 duplicate(achievement_tr) #tr120054 4_TREASURE_BOX +yuno_fild03,135,329,4 duplicate(achievement_tr) #tr120055 4_TREASURE_BOX +yuno_fild04,35,369,4 duplicate(achievement_tr) #tr120056 4_TREASURE_BOX +yuno_fild06,262,220,4 duplicate(achievement_tr) #tr120057 4_TREASURE_BOX +yuno_fild07,113,339,4 duplicate(achievement_tr) #tr120058 4_TREASURE_BOX +yuno_fild08,179,209,4 duplicate(achievement_tr) #tr120059 4_TREASURE_BOX +yuno_fild09,166,228,4 duplicate(achievement_tr) #tr120060 4_TREASURE_BOX +yuno_fild11,141,357,4 duplicate(achievement_tr) #tr120061 4_TREASURE_BOX +hu_fild01,347,312,4 duplicate(achievement_tr) #tr120062 4_TREASURE_BOX +hu_fild02,80,152,4 duplicate(achievement_tr) #tr120063 4_TREASURE_BOX +hu_fild04,322,313,4 duplicate(achievement_tr) #tr120064 4_TREASURE_BOX +hu_fild06,204,228,4 duplicate(achievement_tr) #tr120065 4_TREASURE_BOX +hu_fild05,197,210,4 duplicate(achievement_tr) #tr120066 4_TREASURE_BOX +ein_fild01,266,277,4 duplicate(achievement_tr) #tr120067 4_TREASURE_BOX +ein_fild03,99,332,4 duplicate(achievement_tr) #tr120068 4_TREASURE_BOX +ein_fild04,334,305,4 duplicate(achievement_tr) #tr120069 4_TREASURE_BOX +ein_fild05,337,233,4 duplicate(achievement_tr) #tr120070 4_TREASURE_BOX +ein_fild06,174,245,4 duplicate(achievement_tr) #tr120071 4_TREASURE_BOX +ein_fild07,188,50,4 duplicate(achievement_tr) #tr120072 4_TREASURE_BOX +ein_fild08,258,78,4 duplicate(achievement_tr) #tr120073 4_TREASURE_BOX +ein_fild09,330,76,4 duplicate(achievement_tr) #tr120074 4_TREASURE_BOX +lhz_fild01,118,73,4 duplicate(achievement_tr) #tr120075 4_TREASURE_BOX +lhz_fild02,239,243,4 duplicate(achievement_tr) #tr120076 4_TREASURE_BOX +lhz_fild03,313,132,4 duplicate(achievement_tr) #tr120077 4_TREASURE_BOX +ra_fild01,138,166,4 duplicate(achievement_tr) #tr120078 4_TREASURE_BOX +ra_fild03,224,275,4 duplicate(achievement_tr) #tr120079 4_TREASURE_BOX +ra_fild08,326,45,4 duplicate(achievement_tr) #tr120080 4_TREASURE_BOX +ra_fild12,352,165,4 duplicate(achievement_tr) #tr120081 4_TREASURE_BOX +ra_fild04,92,302,4 duplicate(achievement_tr) #tr120082 4_TREASURE_BOX +ra_fild05,59,59,4 duplicate(achievement_tr) #tr120083 4_TREASURE_BOX +ra_fild06,362,230,4 duplicate(achievement_tr) #tr120084 4_TREASURE_BOX +ve_fild01,180,234,4 duplicate(achievement_tr) #tr120085 4_TREASURE_BOX +ve_fild02,65,194,4 duplicate(achievement_tr) #tr120086 4_TREASURE_BOX +ve_fild03,197,242,4 duplicate(achievement_tr) #tr120087 4_TREASURE_BOX +ve_fild04,288,279,4 duplicate(achievement_tr) #tr120088 4_TREASURE_BOX +ve_fild07,33,113,4 duplicate(achievement_tr) #tr120089 4_TREASURE_BOX +ecl_fild01,234,217,4 duplicate(achievement_tr) #tr120090 4_TREASURE_BOX +bif_fild02,155,322,4 duplicate(achievement_tr) #tr120091 4_TREASURE_BOX +bif_fild01,147,64,4 duplicate(achievement_tr) #tr120092 4_TREASURE_BOX +spl_fild01,335,315,4 duplicate(achievement_tr) #tr120093 4_TREASURE_BOX +spl_fild02,153,358,4 duplicate(achievement_tr) #tr120094 4_TREASURE_BOX +spl_fild03,61,286,4 duplicate(achievement_tr) #tr120095 4_TREASURE_BOX +man_fild01,41,172,4 duplicate(achievement_tr) #tr120096 4_TREASURE_BOX +man_fild02,268,357,4 duplicate(achievement_tr) #tr120097 4_TREASURE_BOX +man_fild03,198,91,4 duplicate(achievement_tr) #tr120098 4_TREASURE_BOX +dic_fild01,227,82,4 duplicate(achievement_tr) #tr120099 4_TREASURE_BOX +dic_fild02,147,196,4 duplicate(achievement_tr) #tr120100 4_TREASURE_BOX +ama_fild01,187,337,4 duplicate(achievement_tr) #tr120101 4_TREASURE_BOX +gon_fild01,171,332,4 duplicate(achievement_tr) #tr120102 4_TREASURE_BOX +lou_fild01,104,232,4 duplicate(achievement_tr) #tr120103 4_TREASURE_BOX +ayo_fild01,289,70,4 duplicate(achievement_tr) #tr120104 4_TREASURE_BOX +mosk_fild02,176,77,4 duplicate(achievement_tr) #tr120105 4_TREASURE_BOX +bra_fild01,99,193,4 duplicate(achievement_tr) #tr120106 4_TREASURE_BOX +dew_fild01,175,287,4 duplicate(achievement_tr) #tr120107 4_TREASURE_BOX +ma_fild01,308,206,4 duplicate(achievement_tr) #tr120108 4_TREASURE_BOX +ma_fild02,246,323,4 duplicate(achievement_tr) #tr120109 4_TREASURE_BOX +abbey03,27,72,4 duplicate(achievement_tr) #tr120110 4_TREASURE_BOX +abyss_03,86,55,4 duplicate(achievement_tr) #tr120111 4_TREASURE_BOX +alde_dun04,90,107,4 duplicate(achievement_tr) #tr120112 4_TREASURE_BOX +ama_dun03,60,163,4 duplicate(achievement_tr) #tr120113 4_TREASURE_BOX +anthell02,253,41,4 duplicate(achievement_tr) #tr120114 4_TREASURE_BOX +ayo_dun02,150,256,4 duplicate(achievement_tr) #tr120115 4_TREASURE_BOX +beach_dun3,102,71,4 duplicate(achievement_tr) #tr120116 4_TREASURE_BOX +bra_dun02,171,121,4 duplicate(achievement_tr) #tr120117 4_TREASURE_BOX +c_tower4,37,158,4 duplicate(achievement_tr) #tr120118 4_TREASURE_BOX +dew_dun02,87,272,4 duplicate(achievement_tr) #tr120119 4_TREASURE_BOX +dic_dun03,216,211,4 duplicate(achievement_tr) #tr120120 4_TREASURE_BOX +ecl_tdun04,37,37,4 duplicate(achievement_tr) #tr120121 4_TREASURE_BOX +ein_dun02,31,255,4 duplicate(achievement_tr) #tr120122 4_TREASURE_BOX +gef_dun02,222,163,4 duplicate(achievement_tr) #tr120123 4_TREASURE_BOX +gl_sew04,288,6,4 duplicate(achievement_tr) #tr120124 4_TREASURE_BOX +gl_knt02,126,235,4 duplicate(achievement_tr) #tr120125 4_TREASURE_BOX +gl_cas02,53,151,4 duplicate(achievement_tr) #tr120126 4_TREASURE_BOX +gl_prison1,126,158,4 duplicate(achievement_tr) #tr120127 4_TREASURE_BOX +gon_dun03,166,231,4 duplicate(achievement_tr) #tr120128 4_TREASURE_BOX +ice_dun03,45,261,4 duplicate(achievement_tr) #tr120129 4_TREASURE_BOX +in_sphinx5,154,107,4 duplicate(achievement_tr) #tr120130 4_TREASURE_BOX +iz_dun05,64,223,4 duplicate(achievement_tr) #tr120131 4_TREASURE_BOX +kh_dun02,70,107,4 duplicate(achievement_tr) #tr120132 4_TREASURE_BOX +lhz_dun03,240,221,4 duplicate(achievement_tr) #tr120133 4_TREASURE_BOX +lou_dun03,29,228,4 duplicate(achievement_tr) #tr120134 4_TREASURE_BOX +mag_dun02,197,77,4 duplicate(achievement_tr) #tr120135 4_TREASURE_BOX +mjo_dun03,76,220,4 duplicate(achievement_tr) #tr120136 4_TREASURE_BOX +moc_pryd06,102,121,4 duplicate(achievement_tr) #tr120137 4_TREASURE_BOX +orcsdun02,31,72,4 duplicate(achievement_tr) #tr120138 4_TREASURE_BOX +pay_dun04,120,124,4 duplicate(achievement_tr) #tr120139 4_TREASURE_BOX +prt_maze03,11,14,4 duplicate(achievement_tr) #tr120140 4_TREASURE_BOX +prt_sewb4,19,183,4 duplicate(achievement_tr) #tr120141 4_TREASURE_BOX +tha_t06,150,176,4 duplicate(achievement_tr) #tr120142 4_TREASURE_BOX +thor_v03,220,221,4 duplicate(achievement_tr) #tr120143 4_TREASURE_BOX +treasure02,19,142,4 duplicate(achievement_tr) #tr120144 4_TREASURE_BOX +tur_dun04,134,130,4 duplicate(achievement_tr) #tr120145 4_TREASURE_BOX +xmas_dun02,120,224,4 duplicate(achievement_tr) #tr120146 4_TREASURE_BOX + +// Hidden Warps +prt_fild01,146,126,0 duplicate(achievement_wp) #wp120001 HIDDEN_WARP_NPC,5,5 +prt_fild02,142,221,0 duplicate(achievement_wp) #wp120002 HIDDEN_WARP_NPC,5,5 +prt_fild03,172,139,0 duplicate(achievement_wp) #wp120003 HIDDEN_WARP_NPC,5,5 +prt_fild04,118,57,0 duplicate(achievement_wp) #wp120004 HIDDEN_WARP_NPC,5,5 +prt_fild05,189,291,0 duplicate(achievement_wp) #wp120005 HIDDEN_WARP_NPC,5,5 +prt_fild06,298,304,0 duplicate(achievement_wp) #wp120006 HIDDEN_WARP_NPC,5,5 +prt_fild07,44,104,0 duplicate(achievement_wp) #wp120007 HIDDEN_WARP_NPC,5,5 +prt_fild08,203,222,0 duplicate(achievement_wp) #wp120008 HIDDEN_WARP_NPC,5,5 +prt_fild09,37,354,0 duplicate(achievement_wp) #wp120009 HIDDEN_WARP_NPC,5,5 +prt_fild10,177,206,0 duplicate(achievement_wp) #wp120010 HIDDEN_WARP_NPC,5,5 +gef_fild00,73,119,0 duplicate(achievement_wp) #wp120011 HIDDEN_WARP_NPC,5,5 +gef_fild01,222,224,0 duplicate(achievement_wp) #wp120012 HIDDEN_WARP_NPC,5,5 +gef_fild05,202,292,0 duplicate(achievement_wp) #wp120013 HIDDEN_WARP_NPC,5,5 +gef_fild06,279,105,0 duplicate(achievement_wp) #wp120014 HIDDEN_WARP_NPC,5,5 +gef_fild07,184,249,0 duplicate(achievement_wp) #wp120015 HIDDEN_WARP_NPC,5,5 +gef_fild09,170,73,0 duplicate(achievement_wp) #wp120016 HIDDEN_WARP_NPC,5,5 +gef_fild11,239,248,0 duplicate(achievement_wp) #wp120017 HIDDEN_WARP_NPC,5,5 +moc_fild11,188,218,0 duplicate(achievement_wp) #wp120018 HIDDEN_WARP_NPC,5,5 +moc_fild12,234,96,0 duplicate(achievement_wp) #wp120019 HIDDEN_WARP_NPC,5,5 +moc_fild13,290,207,0 duplicate(achievement_wp) #wp120020 HIDDEN_WARP_NPC,5,5 +moc_fild16,196,108,0 duplicate(achievement_wp) #wp120021 HIDDEN_WARP_NPC,5,5 +moc_fild17,269,105,0 duplicate(achievement_wp) #wp120022 HIDDEN_WARP_NPC,5,5 +moc_fild18,54,284,0 duplicate(achievement_wp) #wp120023 HIDDEN_WARP_NPC,5,5 +pay_fild01,167,243,0 duplicate(achievement_wp) #wp120024 HIDDEN_WARP_NPC,5,5 +pay_fild02,105,240,0 duplicate(achievement_wp) #wp120025 HIDDEN_WARP_NPC,5,5 +pay_fild03,144,97,0 duplicate(achievement_wp) #wp120026 HIDDEN_WARP_NPC,5,5 +pay_fild04,257,95,0 duplicate(achievement_wp) #wp120027 HIDDEN_WARP_NPC,5,5 +pay_fild07,365,37,0 duplicate(achievement_wp) #wp120028 HIDDEN_WARP_NPC,5,5 +pay_fild08,237,345,0 duplicate(achievement_wp) #wp120029 HIDDEN_WARP_NPC,5,5 +pay_fild09,251,42,0 duplicate(achievement_wp) #wp120030 HIDDEN_WARP_NPC,5,5 +pay_fild10,196,38,0 duplicate(achievement_wp) #wp120031 HIDDEN_WARP_NPC,5,5 +mjolnir_01,47,60,0 duplicate(achievement_wp) #wp120032 HIDDEN_WARP_NPC,5,5 +mjolnir_02,77,49,0 duplicate(achievement_wp) #wp120033 HIDDEN_WARP_NPC,5,5 +mjolnir_03,190,200,0 duplicate(achievement_wp) #wp120034 HIDDEN_WARP_NPC,5,5 +mjolnir_04,201,146,0 duplicate(achievement_wp) #wp120035 HIDDEN_WARP_NPC,5,5 +mjolnir_05,43,327,0 duplicate(achievement_wp) #wp120036 HIDDEN_WARP_NPC,5,5 +mjolnir_06,162,290,0 duplicate(achievement_wp) #wp120037 HIDDEN_WARP_NPC,5,5 +mjolnir_07,321,127,0 duplicate(achievement_wp) #wp120038 HIDDEN_WARP_NPC,5,5 +mjolnir_08,175,225,0 duplicate(achievement_wp) #wp120039 HIDDEN_WARP_NPC,5,5 +mjolnir_09,299,123,0 duplicate(achievement_wp) #wp120040 HIDDEN_WARP_NPC,5,5 +mjolnir_10,353,371,0 duplicate(achievement_wp) #wp120041 HIDDEN_WARP_NPC,5,5 +mjolnir_11,325,178,0 duplicate(achievement_wp) #wp120042 HIDDEN_WARP_NPC,5,5 +mjolnir_12,110,298,0 duplicate(achievement_wp) #wp120043 HIDDEN_WARP_NPC,5,5 +cmd_fild01,112,200,0 duplicate(achievement_wp) #wp120044 HIDDEN_WARP_NPC,5,5 +cmd_fild02,86,94,0 duplicate(achievement_wp) #wp120045 HIDDEN_WARP_NPC,5,5 +cmd_fild03,144,190,0 duplicate(achievement_wp) #wp120046 HIDDEN_WARP_NPC,5,5 +cmd_fild04,151,191,0 duplicate(achievement_wp) #wp120047 HIDDEN_WARP_NPC,5,5 +cmd_fild06,221,108,0 duplicate(achievement_wp) #wp120048 HIDDEN_WARP_NPC,5,5 +cmd_fild07,269,322,0 duplicate(achievement_wp) #wp120049 HIDDEN_WARP_NPC,5,5 +cmd_fild08,181,136,0 duplicate(achievement_wp) #wp120050 HIDDEN_WARP_NPC,5,5 +cmd_fild09,211,266,0 duplicate(achievement_wp) #wp120051 HIDDEN_WARP_NPC,5,5 +yuno_fild01,284,138,0 duplicate(achievement_wp) #wp120052 HIDDEN_WARP_NPC,5,5 +yuno_fild12,76,268,0 duplicate(achievement_wp) #wp120053 HIDDEN_WARP_NPC,5,5 +yuno_fild02,142,191,0 duplicate(achievement_wp) #wp120054 HIDDEN_WARP_NPC,5,5 +yuno_fild03,135,329,0 duplicate(achievement_wp) #wp120055 HIDDEN_WARP_NPC,5,5 +yuno_fild04,35,369,0 duplicate(achievement_wp) #wp120056 HIDDEN_WARP_NPC,5,5 +yuno_fild06,262,220,0 duplicate(achievement_wp) #wp120057 HIDDEN_WARP_NPC,5,5 +yuno_fild07,113,339,0 duplicate(achievement_wp) #wp120058 HIDDEN_WARP_NPC,5,5 +yuno_fild08,179,209,0 duplicate(achievement_wp) #wp120059 HIDDEN_WARP_NPC,5,5 +yuno_fild09,166,228,0 duplicate(achievement_wp) #wp120060 HIDDEN_WARP_NPC,5,5 +yuno_fild11,141,357,0 duplicate(achievement_wp) #wp120061 HIDDEN_WARP_NPC,5,5 +hu_fild01,347,312,0 duplicate(achievement_wp) #wp120062 HIDDEN_WARP_NPC,5,5 +hu_fild02,80,152,0 duplicate(achievement_wp) #wp120063 HIDDEN_WARP_NPC,5,5 +hu_fild04,322,313,0 duplicate(achievement_wp) #wp120064 HIDDEN_WARP_NPC,5,5 +hu_fild06,204,228,0 duplicate(achievement_wp) #wp120065 HIDDEN_WARP_NPC,5,5 +hu_fild05,197,210,0 duplicate(achievement_wp) #wp120066 HIDDEN_WARP_NPC,5,5 +ein_fild01,266,277,0 duplicate(achievement_wp) #wp120067 HIDDEN_WARP_NPC,5,5 +ein_fild03,99,332,0 duplicate(achievement_wp) #wp120068 HIDDEN_WARP_NPC,5,5 +ein_fild04,334,305,0 duplicate(achievement_wp) #wp120069 HIDDEN_WARP_NPC,5,5 +ein_fild05,337,233,0 duplicate(achievement_wp) #wp120070 HIDDEN_WARP_NPC,5,5 +ein_fild06,174,245,0 duplicate(achievement_wp) #wp120071 HIDDEN_WARP_NPC,5,5 +ein_fild07,188,50,0 duplicate(achievement_wp) #wp120072 HIDDEN_WARP_NPC,5,5 +ein_fild08,258,78,0 duplicate(achievement_wp) #wp120073 HIDDEN_WARP_NPC,5,5 +ein_fild09,330,76,0 duplicate(achievement_wp) #wp120074 HIDDEN_WARP_NPC,5,5 +lhz_fild01,118,73,0 duplicate(achievement_wp) #wp120075 HIDDEN_WARP_NPC,5,5 +lhz_fild02,239,243,0 duplicate(achievement_wp) #wp120076 HIDDEN_WARP_NPC,5,5 +lhz_fild03,313,132,0 duplicate(achievement_wp) #wp120077 HIDDEN_WARP_NPC,5,5 +ra_fild01,138,166,0 duplicate(achievement_wp) #wp120078 HIDDEN_WARP_NPC,5,5 +ra_fild03,224,275,0 duplicate(achievement_wp) #wp120079 HIDDEN_WARP_NPC,5,5 +ra_fild08,326,45,0 duplicate(achievement_wp) #wp120080 HIDDEN_WARP_NPC,5,5 +ra_fild12,352,165,0 duplicate(achievement_wp) #wp120081 HIDDEN_WARP_NPC,5,5 +ra_fild04,92,302,0 duplicate(achievement_wp) #wp120082 HIDDEN_WARP_NPC,5,5 +ra_fild05,59,59,0 duplicate(achievement_wp) #wp120083 HIDDEN_WARP_NPC,5,5 +ra_fild06,362,230,0 duplicate(achievement_wp) #wp120084 HIDDEN_WARP_NPC,5,5 +ve_fild01,180,234,0 duplicate(achievement_wp) #wp120085 HIDDEN_WARP_NPC,5,5 +ve_fild02,65,194,0 duplicate(achievement_wp) #wp120086 HIDDEN_WARP_NPC,5,5 +ve_fild03,197,242,0 duplicate(achievement_wp) #wp120087 HIDDEN_WARP_NPC,5,5 +ve_fild04,288,279,0 duplicate(achievement_wp) #wp120088 HIDDEN_WARP_NPC,5,5 +ve_fild07,33,113,0 duplicate(achievement_wp) #wp120089 HIDDEN_WARP_NPC,5,5 +ecl_fild01,234,217,0 duplicate(achievement_wp) #wp120090 HIDDEN_WARP_NPC,5,5 +bif_fild02,155,322,0 duplicate(achievement_wp) #wp120091 HIDDEN_WARP_NPC,5,5 +bif_fild01,147,64,0 duplicate(achievement_wp) #wp120092 HIDDEN_WARP_NPC,5,5 +spl_fild01,335,315,0 duplicate(achievement_wp) #wp120093 HIDDEN_WARP_NPC,5,5 +spl_fild02,153,358,0 duplicate(achievement_wp) #wp120094 HIDDEN_WARP_NPC,5,5 +spl_fild03,61,286,0 duplicate(achievement_wp) #wp120095 HIDDEN_WARP_NPC,5,5 +man_fild01,41,172,0 duplicate(achievement_wp) #wp120096 HIDDEN_WARP_NPC,5,5 +man_fild02,268,357,0 duplicate(achievement_wp) #wp120097 HIDDEN_WARP_NPC,5,5 +man_fild03,198,91,0 duplicate(achievement_wp) #wp120098 HIDDEN_WARP_NPC,5,5 +dic_fild01,227,82,0 duplicate(achievement_wp) #wp120099 HIDDEN_WARP_NPC,5,5 +dic_fild02,147,196,0 duplicate(achievement_wp) #wp120100 HIDDEN_WARP_NPC,5,5 +ama_fild01,187,337,0 duplicate(achievement_wp) #wp120101 HIDDEN_WARP_NPC,5,5 +gon_fild01,171,332,0 duplicate(achievement_wp) #wp120102 HIDDEN_WARP_NPC,5,5 +lou_fild01,104,232,0 duplicate(achievement_wp) #wp120103 HIDDEN_WARP_NPC,5,5 +ayo_fild01,289,70,0 duplicate(achievement_wp) #wp120104 HIDDEN_WARP_NPC,5,5 +mosk_fild02,176,77,0 duplicate(achievement_wp) #wp120105 HIDDEN_WARP_NPC,5,5 +bra_fild01,99,193,0 duplicate(achievement_wp) #wp120106 HIDDEN_WARP_NPC,5,5 +dew_fild01,175,287,0 duplicate(achievement_wp) #wp120107 HIDDEN_WARP_NPC,5,5 +ma_fild01,308,206,0 duplicate(achievement_wp) #wp120108 HIDDEN_WARP_NPC,5,5 +ma_fild02,246,323,0 duplicate(achievement_wp) #wp120109 HIDDEN_WARP_NPC,5,5 +abbey03,27,72,0 duplicate(achievement_wp) #wp120110 HIDDEN_WARP_NPC,5,5 +abyss_03,86,55,0 duplicate(achievement_wp) #wp120111 HIDDEN_WARP_NPC,5,5 +alde_dun04,90,107,0 duplicate(achievement_wp) #wp120112 HIDDEN_WARP_NPC,5,5 +ama_dun03,60,163,0 duplicate(achievement_wp) #wp120113 HIDDEN_WARP_NPC,5,5 +anthell02,253,41,0 duplicate(achievement_wp) #wp120114 HIDDEN_WARP_NPC,5,5 +ayo_dun02,150,256,0 duplicate(achievement_wp) #wp120115 HIDDEN_WARP_NPC,5,5 +beach_dun3,102,71,0 duplicate(achievement_wp) #wp120116 HIDDEN_WARP_NPC,5,5 +bra_dun02,171,121,0 duplicate(achievement_wp) #wp120117 HIDDEN_WARP_NPC,5,5 +c_tower4,37,158,0 duplicate(achievement_wp) #wp120118 HIDDEN_WARP_NPC,5,5 +dew_dun02,87,272,0 duplicate(achievement_wp) #wp120119 HIDDEN_WARP_NPC,5,5 +dic_dun03,216,211,0 duplicate(achievement_wp) #wp120120 HIDDEN_WARP_NPC,5,5 +ecl_tdun04,37,37,0 duplicate(achievement_wp) #wp120121 HIDDEN_WARP_NPC,5,5 +ein_dun02,31,255,0 duplicate(achievement_wp) #wp120122 HIDDEN_WARP_NPC,5,5 +gef_dun02,222,163,0 duplicate(achievement_wp) #wp120123 HIDDEN_WARP_NPC,5,5 +gl_sew04,288,6,0 duplicate(achievement_wp) #wp120124 HIDDEN_WARP_NPC,5,5 +gl_knt02,126,235,0 duplicate(achievement_wp) #wp120125 HIDDEN_WARP_NPC,5,5 +gl_cas02,53,151,0 duplicate(achievement_wp) #wp120126 HIDDEN_WARP_NPC,5,5 +gl_prison1,126,158,0 duplicate(achievement_wp) #wp120127 HIDDEN_WARP_NPC,5,5 +gon_dun03,166,231,0 duplicate(achievement_wp) #wp120128 HIDDEN_WARP_NPC,5,5 +ice_dun03,45,261,0 duplicate(achievement_wp) #wp120129 HIDDEN_WARP_NPC,5,5 +in_sphinx5,154,107,0 duplicate(achievement_wp) #wp120130 HIDDEN_WARP_NPC,5,5 +iz_dun05,64,223,0 duplicate(achievement_wp) #wp120131 HIDDEN_WARP_NPC,5,5 +kh_dun02,70,107,0 duplicate(achievement_wp) #wp120132 HIDDEN_WARP_NPC,5,5 +lhz_dun03,240,221,0 duplicate(achievement_wp) #wp120133 HIDDEN_WARP_NPC,5,5 +lou_dun03,29,228,0 duplicate(achievement_wp) #wp120134 HIDDEN_WARP_NPC,5,5 +mag_dun02,197,77,0 duplicate(achievement_wp) #wp120135 HIDDEN_WARP_NPC,5,5 +mjo_dun03,76,220,0 duplicate(achievement_wp) #wp120136 HIDDEN_WARP_NPC,5,5 +moc_pryd06,102,121,0 duplicate(achievement_wp) #wp120137 HIDDEN_WARP_NPC,5,5 +orcsdun02,31,72,0 duplicate(achievement_wp) #wp120138 HIDDEN_WARP_NPC,5,5 +pay_dun04,120,124,0 duplicate(achievement_wp) #wp120139 HIDDEN_WARP_NPC,5,5 +prt_maze03,11,14,0 duplicate(achievement_wp) #wp120140 HIDDEN_WARP_NPC,5,5 +prt_sewb4,19,183,0 duplicate(achievement_wp) #wp120141 HIDDEN_WARP_NPC,5,5 +tha_t06,150,176,0 duplicate(achievement_wp) #wp120142 HIDDEN_WARP_NPC,5,5 +thor_v03,220,221,0 duplicate(achievement_wp) #wp120143 HIDDEN_WARP_NPC,5,5 +treasure02,19,142,0 duplicate(achievement_wp) #wp120144 HIDDEN_WARP_NPC,5,5 +tur_dun04,134,130,0 duplicate(achievement_wp) #wp120145 HIDDEN_WARP_NPC,5,5 +xmas_dun02,120,224,0 duplicate(achievement_wp) #wp120146 HIDDEN_WARP_NPC,5,5 diff --git a/npc/re/other/bulletin_boards.txt b/npc/re/other/bulletin_boards.txt index 78f887e8f..51e91d473 100644 --- a/npc/re/other/bulletin_boards.txt +++ b/npc/re/other/bulletin_boards.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/other/clans.txt b/npc/re/other/clans.txt index f411b149d..59d183e2a 100644 --- a/npc/re/other/clans.txt +++ b/npc/re/other/clans.txt @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2017 Hercules Dev Team +//= Copyright (C) 2017-2020 Hercules Dev Team //= Copyright (C) Ridley //= //= Hercules is free software: you can redistribute it and/or modify diff --git a/npc/re/other/dimensional_gap.txt b/npc/re/other/dimensional_gap.txt index b303f14b7..edd9d7ba0 100644 --- a/npc/re/other/dimensional_gap.txt +++ b/npc/re/other/dimensional_gap.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2016 Hercules Dev Team -//= Copyright (C) 2016 Ridley -//= Copyright (C) 2016 Nova +//= Copyright (C) 2016-2020 Hercules Dev Team +//= Copyright (C) 2016 Ridley +//= Copyright (C) 2016 Nova //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/other/mail.txt b/npc/re/other/mail.txt index 34346b1d2..8826e436d 100644 --- a/npc/re/other/mail.txt +++ b/npc/re/other/mail.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/other/mercenary_rent.txt b/npc/re/other/mercenary_rent.txt index 8ae83f78a..336dc26db 100644 --- a/npc/re/other/mercenary_rent.txt +++ b/npc/re/other/mercenary_rent.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Daegaladh +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Daegaladh //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/other/pvp.txt b/npc/re/other/pvp.txt index 7f78b3e9b..6d2298744 100644 --- a/npc/re/other/pvp.txt +++ b/npc/re/other/pvp.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/other/resetskill.txt b/npc/re/other/resetskill.txt index 8bfb02651..6d82d3e89 100644 --- a/npc/re/other/resetskill.txt +++ b/npc/re/other/resetskill.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/other/stone_change.txt b/npc/re/other/stone_change.txt index 51cd65f71..336a7721a 100644 --- a/npc/re/other/stone_change.txt +++ b/npc/re/other/stone_change.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/other/turbo_track.txt b/npc/re/other/turbo_track.txt index 9a37ae0f0..6de9f4d20 100644 --- a/npc/re/other/turbo_track.txt +++ b/npc/re/other/turbo_track.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/cupet.txt b/npc/re/quests/cupet.txt index 72e1bd6c9..77d6cf6ee 100644 --- a/npc/re/quests/cupet.txt +++ b/npc/re/quests/cupet.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Z3RO +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Z3RO //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/100-110.txt b/npc/re/quests/eden/100-110.txt index 3cc47f6ef..aadca748b 100644 --- a/npc/re/quests/eden/100-110.txt +++ b/npc/re/quests/eden/100-110.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team -//= Copyright (C) Dastgir -//= Copyright (C) Capuche +//= Copyright (C) 2015-2020 Hercules Dev Team +//= Copyright (C) Dastgir +//= Copyright (C) Capuche //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/11-25.txt b/npc/re/quests/eden/11-25.txt index f65ad9090..900e62978 100644 --- a/npc/re/quests/eden/11-25.txt +++ b/npc/re/quests/eden/11-25.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/111-120.txt b/npc/re/quests/eden/111-120.txt index 4422c92c7..787950ad1 100644 --- a/npc/re/quests/eden/111-120.txt +++ b/npc/re/quests/eden/111-120.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team -//= Copyright (C) Dastgir -//= Copyright (C) Capuche +//= Copyright (C) 2015-2020 Hercules Dev Team +//= Copyright (C) Dastgir +//= Copyright (C) Capuche //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/121-130.txt b/npc/re/quests/eden/121-130.txt index d48c71702..4b808b1b8 100644 --- a/npc/re/quests/eden/121-130.txt +++ b/npc/re/quests/eden/121-130.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team -//= Copyright (C) Dastgir -//= Copyright (C) Capuche +//= Copyright (C) 2015-2020 Hercules Dev Team +//= Copyright (C) Dastgir +//= Copyright (C) Capuche //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/131-140.txt b/npc/re/quests/eden/131-140.txt index fa6061b42..607468142 100644 --- a/npc/re/quests/eden/131-140.txt +++ b/npc/re/quests/eden/131-140.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team -//= Copyright (C) Dastgir -//= Copyright (C) Capuche +//= Copyright (C) 2015-2020 Hercules Dev Team +//= Copyright (C) Dastgir +//= Copyright (C) Capuche //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/26-40.txt b/npc/re/quests/eden/26-40.txt index 029881068..de2e64732 100644 --- a/npc/re/quests/eden/26-40.txt +++ b/npc/re/quests/eden/26-40.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/41-55.txt b/npc/re/quests/eden/41-55.txt index ee32d4306..d4f70ba3f 100644 --- a/npc/re/quests/eden/41-55.txt +++ b/npc/re/quests/eden/41-55.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/56-70.txt b/npc/re/quests/eden/56-70.txt index c6aeb8c15..33ecf9bdc 100644 --- a/npc/re/quests/eden/56-70.txt +++ b/npc/re/quests/eden/56-70.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/71-85.txt b/npc/re/quests/eden/71-85.txt index cbb6c3e0c..5c81ef422 100644 --- a/npc/re/quests/eden/71-85.txt +++ b/npc/re/quests/eden/71-85.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/86-90.txt b/npc/re/quests/eden/86-90.txt index 394970944..c0409d626 100644 --- a/npc/re/quests/eden/86-90.txt +++ b/npc/re/quests/eden/86-90.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/91-99.txt b/npc/re/quests/eden/91-99.txt index 328cc4474..81f00eaea 100644 --- a/npc/re/quests/eden/91-99.txt +++ b/npc/re/quests/eden/91-99.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/eden_common.txt b/npc/re/quests/eden/eden_common.txt index 9085cad91..b4c45b15a 100644 --- a/npc/re/quests/eden/eden_common.txt +++ b/npc/re/quests/eden/eden_common.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Brian -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Brian +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -96,7 +96,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 4_F_EDEN_OFFICER,{ case 1: mes "[Lime Evenor]"; mes "Aright. Excellent! Please write down your name here."; - input .@input$; + input(.@input$); next; mes "[Lime Evenor]"; mes "Are you done?"; @@ -113,7 +113,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 4_F_EDEN_OFFICER,{ next; mes "[Lime Evenor]"; mes "Would you please write your name again? Please write it ^3131FFClearly^000000."; - input .@input$; + input(.@input$); next; mes "[Lime Evenor]"; mes "Ah~ ha. You are ^3131FF"+strcharinfo(PC_NAME)+"^000000."; @@ -148,7 +148,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 4_F_EDEN_OFFICER,{ if(select("Yes, I want to register.", "No, I don't.") == 1) { mes "[Lime Evenor]"; mes "Alrigh. Please write down your name on it."; - input .@input$; + input(.@input$); next; mes "[Lime Evenor]"; mes "^3131FF"+strcharinfo(PC_NAME)+"^000000.. Is that your name?"; @@ -157,7 +157,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 4_F_EDEN_OFFICER,{ mes "[Lime Evenor]"; mes "^3131FF"+strcharinfo(PC_NAME)+"^000000, tell me what you want to register. for"; mes "Which map should we go to?"; - input .@input$; + input(.@input$); next; mes "[Lime Evenor]"; mes "^3131FFMission Map: "+.@inputstr$+"^000000"; @@ -166,7 +166,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 4_F_EDEN_OFFICER,{ mes "[Lime Evenor]"; mes "Please let me know what kind of missions your are lookng for."; mes "It should be briefly like 'Hunt 10 Porings.'"; - input .@input$; + input(.@input$); next; mes "[Lime Evenor]"; mes "Are you done?"; diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt index aae9a5566..2012571b5 100644 --- a/npc/re/quests/eden/eden_iro.txt +++ b/npc/re/quests/eden/eden_iro.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Frost -//= Copyright (C) Euphy -//= Copyright (C) -SkittleNugget- +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Frost +//= Copyright (C) Euphy +//= Copyright (C) -SkittleNugget- //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -142,7 +142,7 @@ moc_para01,166,51,3 script Phelix#edco 4_M_03,{ mes "[Phelix]"; mes "How many do you want?"; mes "^ff0000You have enough for up to " + .@available + " Carrots.^000000"; - input .@input; + input(.@input); next; if (.@input < 1 || .@input > 10000) { mes "[Phelix]"; @@ -321,12 +321,13 @@ moc_para01,50,39,4 script Eve Natalia 4_F_SITDOWN,{ mes "So do you want to trade the 1st one in your inventory for ^00CC00"+.@amount+" Random Safe to 7 Certificates^000000?"; mes "Tell me '1' if you do, or '0' to cancel."; next; - input .@input; + input(.@input); if (.@input < 0 || .@input > 1) { mes "[Eve Natalia]"; mes "It is a 0 or 1, it can't be that difficult."; close; - } else if (.@input == 0) { + } + if (.@input == 0) { mes "[Eve Natalia]"; mes "It's best to be sure before trading, have a good day."; close; @@ -417,12 +418,13 @@ L_Exchange: mes "I can give you up to 60."; mes "Type 0 to cancel."; next; - input .@amount; - if (.@amount == 0) { + input(.@amount); + if (.@amount <= 0) { mes "[Trader Machine]"; mes "Cancelled."; close; - } else if (.@amount < 0 || .@amount > 60) { + } + if (.@amount > 60) { mes "[Trader Machine]"; mes "I said only 60 max."; close; diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt index a0f4fa922..926f4c7ab 100644 --- a/npc/re/quests/eden/eden_quests.txt +++ b/npc/re/quests/eden/eden_quests.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Capuche -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Capuche +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -4302,7 +4302,7 @@ sec_in02,25,33,4 script Assistant#para_suvquest 4_M_BABYCAT,{ .@var = select("para_suv01", "para_suv02"); mes "Enter the modified value"; next; - input .@input,0,9999; + input(.@input, 0, 9999); mes "Value of para_suv0"+.@var+" has been changed to "+.@input+"."; setd "para_suv0"+.@var,.@input; close; diff --git a/npc/re/quests/eden/eden_service.txt b/npc/re/quests/eden/eden_service.txt index ce6efaa67..1c9d02f64 100644 --- a/npc/re/quests/eden/eden_service.txt +++ b/npc/re/quests/eden/eden_service.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/eden/eden_tutorial.txt b/npc/re/quests/eden/eden_tutorial.txt index 902db7945..1f6b17574 100644 --- a/npc/re/quests/eden/eden_tutorial.txt +++ b/npc/re/quests/eden/eden_tutorial.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -228,7 +228,7 @@ moc_para01,34,178,3 script Tutorial Instructor 4_M_KHMAN,{ close; } } else if (questprogress(9167) == 1) { - if (!getmercinfo(1)) { + if (!getmercinfo(MERCINFO_CLASS)) { mes "[Tutorial Instructor]"; mes "You haven't gotten a mercenary yet."; next; @@ -319,7 +319,7 @@ moc_para01,34,178,3 script Tutorial Instructor 4_M_KHMAN,{ mes "if you really checked it?"; mes "Write down what material I asked you to get."; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == "10 Jellopy") { mes "[Tutorial Instructor]"; mes "Good, you know."; diff --git a/npc/re/quests/first_class/tu_archer.txt b/npc/re/quests/first_class/tu_archer.txt index 519b07bf2..5a6f4a28d 100644 --- a/npc/re/quests/first_class/tu_archer.txt +++ b/npc/re/quests/first_class/tu_archer.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/homun_s.txt b/npc/re/quests/homun_s.txt index c1ee52d52..95dea2bf6 100644 --- a/npc/re/quests/homun_s.txt +++ b/npc/re/quests/homun_s.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/magic_books.txt b/npc/re/quests/magic_books.txt index bcf94c4a0..8d23f77e0 100644 --- a/npc/re/quests/magic_books.txt +++ b/npc/re/quests/magic_books.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/monstertamers.txt b/npc/re/quests/monstertamers.txt index 6464ae6fc..6781d93bb 100644 --- a/npc/re/quests/monstertamers.txt +++ b/npc/re/quests/monstertamers.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/mrsmile.txt b/npc/re/quests/mrsmile.txt index a98ac8b0e..03ecfad61 100644 --- a/npc/re/quests/mrsmile.txt +++ b/npc/re/quests/mrsmile.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Daegaladh +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Daegaladh //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/newgears/2012_headgears.txt b/npc/re/quests/newgears/2012_headgears.txt index 80df8d650..d9e8bbd22 100644 --- a/npc/re/quests/newgears/2012_headgears.txt +++ b/npc/re/quests/newgears/2012_headgears.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2015 Hercules Dev Team -//= Copyright (C) -SkittleNugget- -//= Copyright (C) Euphy +//= Copyright (C) 2015-2020 Hercules Dev Team +//= Copyright (C) -SkittleNugget- +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/pile_bunker.txt b/npc/re/quests/pile_bunker.txt index 5362211ab..f32897fd7 100644 --- a/npc/re/quests/pile_bunker.txt +++ b/npc/re/quests/pile_bunker.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) JayPee Mateo +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) JayPee Mateo //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/quests_13_1.txt b/npc/re/quests/quests_13_1.txt index d29a167b1..977c28071 100644 --- a/npc/re/quests/quests_13_1.txt +++ b/npc/re/quests/quests_13_1.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/quests_aldebaran.txt b/npc/re/quests/quests_aldebaran.txt index 336ddb1c7..65460a598 100644 --- a/npc/re/quests/quests_aldebaran.txt +++ b/npc/re/quests/quests_aldebaran.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2016 Hercules Dev Team -//= Copyright (C) 2016 Ridley -//= Copyright (C) 2016 Aleos +//= Copyright (C) 2016-2020 Hercules Dev Team +//= Copyright (C) 2016 Ridley +//= Copyright (C) 2016 Aleos //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/quests_brasilis.txt b/npc/re/quests/quests_brasilis.txt index 4a60fd2bb..debaba2e5 100644 --- a/npc/re/quests/quests_brasilis.txt +++ b/npc/re/quests/quests_brasilis.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Panikon -//= Copyright (C) Michieru -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Panikon +//= Copyright (C) Michieru +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -2231,449 +2231,400 @@ brasilis,180,249,5 script Daniel#bra 4_M_KID1,{ } bra_in01,149,184,3 script Door#bra CLEAR_NPC,{ - if (brazil_ghost > 0) { - mes "- A key is inserted in the locked door.-"; + mes "- A key is inserted in the locked door.-"; + if (brazil_ghost == 0) { + close; + } + next; + switch(select("Turn the key.", "Ignore it.")) { + case 1: + mes "You start saying the first line of the magic words."; + input(.@input$); next; - switch(select("Turn the key.", "Ignore it.")) { + mes "["+strcharinfo(PC_NAME)+"]"; + mes .@input$; + next; + .@braspell$ = "Mother the door won't open!"; + .@chkspell = compare(.@braspell$,.@input$); + if (!.@chkspell) { + mes "Seems like you said something wrong."; + close; + } + if (brazil_ghost != 2) { + mes "Mother the door won't open!"; + close; + } + mes "[Sobbing Voice]"; + mes "'^FF0000Turn the key as many times as there are colors in the rainbow.^000000'"; + next; + switch(select("Open the door", "Knock on the door.", "Turn the key.", "Take the key out.")) { case 1: - mes "You start saying the first line of the magic words."; - input .@input$; + mes "The door is locked."; + mes "So nothing happens."; + close; + case 2: + mes "How many times should I try to knock?"; + input(.@input, 0, 999); next; - mes "["+strcharinfo(PC_NAME)+"]"; - mes .@input$; + mes "You knocked on the door "+.@input+" times."; next; - .@braspell$ = "Mother the door won't open!"; - .@chkspell = compare(.@braspell$,.@input$); - if (!.@chkspell) { - mes "Seems like you said something wrong."; + mes "But, nothing happens."; + close; + case 3: + mes "How many times should I turn the key?"; + input(.@input, 0, 999); + next; + mes "You turned over the key "+.@input+" times."; + next; + if (.@input != 7) { + mes "But nothing doesn't happened."; close; } - else { - if (brazil_ghost == 2) { - mes "[Sobbing Voice]"; - mes "'^FF0000Turn the key as many times as there are colors in the rainbow.^000000'"; - next; - switch(select("Open the door", "Knock on the door.", "Turn the key.", "Take the key out.")) { - case 1: - mes "The door is locked."; - mes "So nothing happens."; - close; - case 2: - mes "How many times should I try to knock?"; - input .@input,0,999; - next; - mes "You knocked on the door "+.@input+" times."; - next; - mes "But, nothing happens."; - close; - case 3: - mes "How many times should I turn the key?"; - input .@input,0,999; - next; - if (.@input == 7) { - mes "You turn the key 7 times."; - next; - mes "Click! Click! Click!"; - mes "Click! Click! Click!"; - mes "Click...!"; - next; - mes "[Distant Sound]"; - mes "^FF0000kkkkhee- hihihihi!!!^000000"; - mes "You hear water flushing."; - next; - specialeffect(EF_VENOMDUST, AREA, playerattached()); - mes "Faint laughing can be heard off in the direction of the toilet."; - brazil_ghost = 3; - changequest 2208,60351; - close; - } - else { - mes "You turned over the key "+.@input+" times."; - next; - mes "But nothing doesn't happened."; - close; - } - case 4: - mes "How many times should I insert the key into the door?"; - input .@input,0,999; - next; - mes "You inserted the key "+.@input+" times."; - next; - mes "But nothing happened."; - close; - } - } - else { - mes "Mother the door won't open!"; - close; - } - } - case 2: - mes "You do nothing."; + mes "Click! Click! Click!"; + mes "Click! Click! Click!"; + mes "Click...!"; + next; + mes "[Distant Sound]"; + mes "^FF0000kkkkhee- hihihihi!!!^000000"; + mes "You hear water flushing."; + next; + specialeffect(EF_VENOMDUST, AREA, playerattached()); + mes "Faint laughing can be heard off in the direction of the toilet."; + brazil_ghost = 3; + changequest 2208,60351; + close; + case 4: + mes "How many times should I insert the key into the door?"; + input(.@input, 0, 999); + next; + mes "You inserted the key "+.@input+" times."; + next; + mes "But nothing happened."; close; } - } - else { - mes "- A key is inserted in the locked door.-"; + case 2: + mes "You do nothing."; close; } } bra_in01,144,187,3 script Toilet#bra CLEAR_NPC,{ - if (brazil_ghost > 0) { - mes "- Looks like an ordinary toilet -"; + mes "- Looks like an ordinary toilet -"; + if (brazil_ghost == 0) { + close; + } + next; + if (brazil_ghost > 6) { + switch(select("Flush the toilet.", "Doing nothing.")) { + case 1: + mes "After flushing the toilet, you suddenly feel dizzy and are suddenly swept away somewhere."; + specialeffect(EF_WATERFALL_SMALL_T2_90, AREA, playerattached()); + close2; + warp "bra_in01",206,102; + end; + case 2: + mes "The water in the toilet looks gross."; + close; + } + } + switch(select("Use the toilet", "Ignore.")) { + case 1: + mes "- What was the second line to that spell now? -"; + input(.@input$); next; - if (brazil_ghost > 6) { - switch(select("Flush the toilet.", "Doing nothing.")) { - case 1: - mes "After flushing the toilet, you suddenly feel dizzy and are suddenly swept away somewhere."; - specialeffect(EF_WATERFALL_SMALL_T2_90, AREA, playerattached()); - close2; - warp "bra_in01",206,102; - end; - case 2: - mes "The water in the toilet looks gross."; - close; - } + mes "["+strcharinfo(PC_NAME)+"]"; + mes .@input$; + next; + .@braspell$ = "Mother the water is flooding!"; + .@chkspell = compare(.@braspell$,.@input$); + if (!.@chkspell) { + mes "Seems like you said something wrong."; + close; } - switch(select("Use the toilet", "Ignore.")) { + if (brazil_ghost != 3) { + mes "Nothing happens."; + close; + } + mes "[Sobbing Voice]"; + mes "^FF0000If the moon disappears 3 times... don't worry.....^000000"; + next; + switch(select("Flush the toilet.", "Close the lid.")) { case 1: - mes "- What was the second line to that spell now? -"; - input .@input$; + mes "How many times should I flush?"; + input(.@input, 0, 999); next; - mes "["+strcharinfo(PC_NAME)+"]"; - mes .@input$; + mes "You flush the toilet "+.@input+" times."; next; - .@braspell$ = "Mother the water is flooding!"; - .@chkspell = compare(.@braspell$,.@input$); - if (!.@chkspell) { - mes "Seems like you said something wrong."; + if (.@input != 3) { + mes "But nothing happens."; close; } - else { - if (brazil_ghost == 3) { - mes "[Sobbing Voice]"; - mes "^FF0000If the moon disappears 3 times... don't worry.....^000000"; - next; - switch(select("Flush the toilet.", "Close the lid.")) { - case 1: - mes "How many times should I flush?"; - input .@input,0,999; - next; - if (.@input == 3) { - mes "You flush the toilet 3 times."; - next; - mes "qwaaaaaaaaa!"; - mes "kwaaaaaaaaaa!"; - mes "kwaaaaaaaaaaaaaaaaaaa!"; - next; - mes "[Distant Sound]"; - mes "^FF0000kkkkhee- hihihihi!!!^000000"; - mes "Suddenly the sink sounds like water is flowing freely from it."; - next; - specialeffect(EF_VENOMDUST, AREA, playerattached()); - mes "Faint laughing can be heard off in the direction of the faucet."; - brazil_ghost = 4; - changequest 60351,60352; - close; - } - else { - mes "You flush the toilet "+.@input+" times."; - next; - mes "But nothing happens."; - close; - } - case 2: - mes "You close the lid of the toilet."; - mes "Nothing seems to be happening."; - close; - } - } - else { - mes "Nothing happens."; - close; - } - } + mes "qwaaaaaaaaa!"; + mes "kwaaaaaaaaaa!"; + mes "kwaaaaaaaaaaaaaaaaaaa!"; + next; + mes "[Distant Sound]"; + mes "^FF0000kkkkhee- hihihihi!!!^000000"; + mes "Suddenly the sink sounds like water is flowing freely from it."; + next; + specialeffect(EF_VENOMDUST, AREA, playerattached()); + mes "Faint laughing can be heard off in the direction of the faucet."; + brazil_ghost = 4; + changequest 60351,60352; + close; case 2: - mes "You do nothing."; + mes "You close the lid of the toilet."; + mes "Nothing seems to be happening."; close; } - } - else { - mes "- Looks like an ordinary toilet -"; + case 2: + mes "You do nothing."; close; } } bra_in01,134,189,3 script Faucet#bra CLEAR_NPC,{ - if (brazil_ghost > 0) { - mes "- It seems like an ordinary faucet -"; + mes "- It seems like an ordinary faucet -"; + if (brazil_ghost == 0) { + close; + } + next; + switch(select("Examine it.", "Ignore.")) { + case 1: + mes "- What was the next line to that spell now? -"; + input(.@input$); + next; + mes "["+strcharinfo(PC_NAME)+"]"; + mes .@input$; + next; + .@braspell$ = "Mother the drought has started!"; + .@chkspell = compare(.@braspell$,.@input$); + if (!.@chkspell) { + mes "Seems like you said something wrong."; + close; + } + if (brazil_ghost != 4) { + mes "Nothing happens."; + close; + } + mes "[Sobbing Voice]"; + mes "^FF0000Don't worry... the waterfall will help it....^000000"; next; - switch(select("Examine it.", "Ignore.")) { + switch(select("Tap on the faucet.", "Turn on the water.")) { case 1: - mes "- What was the next line to that spell now? -"; - input .@input$; + mes "How many times will you tap the faucet?"; + input(.@input, 0, 999); next; - mes "["+strcharinfo(PC_NAME)+"]"; - mes .@input$; + mes "You tap the faucet "+.@input+" times."; + next; + mes "But nothing happens."; + close; + case 2: + mes "How many times should I turn the water on?"; + input(.@input, 0, 999); next; - .@braspell$ = "Mother the drought has started!"; - .@chkspell = compare(.@braspell$,.@input$); - if (!.@chkspell) { - mes "Seems like you said something wrong."; + if (.@input != 1) { + mes "You turn the faucet on "+.@input+" times."; + next; + mes "But nothing happens."; close; } - else { - if (brazil_ghost == 4) { - mes "[Sobbing Voice]"; - mes "^FF0000Don't worry... the waterfall will help it....^000000"; - next; - switch(select("Tap on the faucet.", "Turn on the water.")) { - case 1: - mes "How many times will you tap the faucet?"; - input .@input,0,999; - next; - mes "You tap the faucet "+.@input+" times."; - next; - mes "But nothing happens."; - close; - case 2: - mes "How many times should I turn the water on?"; - input .@input,0,999; - next; - if (.@input == 1) { - mes "You turn the faucet on once."; - next; - mes "swwwaaaaaaa-"; - next; - mes "[Distant Sound]"; - mes "^FF0000kkkkhee- hihihihi!!!^000000"; - mes "You see the carpet move."; - next; - specialeffect(EF_VENOMDUST, AREA, playerattached()); - mes "Faint laughing can be heard off in the direction of the carpet."; - brazil_ghost = 5; - changequest 60352,60353; - close; - } - else { - mes "You turn the faucet on "+.@input+" times."; - next; - mes "But nothing happens."; - close; - } - } - } - else { - mes "Nothing happens."; - close; - } - } - case 2: - mes "You do nothing."; + mes "You turn the faucet on once."; + next; + mes "swwwaaaaaaa-"; + next; + mes "[Distant Sound]"; + mes "^FF0000kkkkhee- hihihihi!!!^000000"; + mes "You see the carpet move."; + next; + specialeffect(EF_VENOMDUST, AREA, playerattached()); + mes "Faint laughing can be heard off in the direction of the carpet."; + brazil_ghost = 5; + changequest 60352,60353; close; } - } - else { - mes "- It seems like an ordinary faucet -"; + case 2: + mes "You do nothing."; close; } } bra_in01,138,184,3 script Carpet#bra CLEAR_NPC,{ - if (brazil_ghost > 0) { - mes "- A carpet with an intricate pattern on it -"; + mes "- A carpet with an intricate pattern on it -"; + if (brazil_ghost == 0) { + close; + } + next; + switch(select("Examine it.", "Ignore.")) { + case 1: + mes "- What was the next line to that spell now? -"; + input(.@input$); next; - switch(select("Examine it.", "Ignore.")) { + mes "["+strcharinfo(PC_NAME)+"]"; + mes .@input$; + next; + .@braspell$ = "Mother where are my friends?"; + .@chkspell = compare(.@braspell$,.@input$); + if (!.@chkspell) { + mes "Seems like you said something wrong."; + close; + } + if (brazil_ghost != 5) { + mes "Nothing happens."; + close; + } + mes "[Sobbing Voice]"; + mes "^FF0000your 7 friends....are...sleeping... now it...'s time ....to wake them........^000000"; + next; + switch(select("Jump on the carpet.", "Lie on the carpet.", "Shake the carpet.")) { case 1: - mes "- What was the next line to that spell now? -"; - input .@input$; + mes "How many times should I jump?"; + input(.@input, 0, 999); next; - mes "["+strcharinfo(PC_NAME)+"]"; - mes .@input$; + mes "You jump on the carpet "+.@input+" times."; + next; + mes "But nothing happens."; + close; + case 2: + mes "How many times should I lie on the carpet?"; + input(.@input, 0, 999); + next; + mes "You lie on the carpet "+.@input+" times."; + next; + mes "But nothing happens."; + close; + case 3: + mes "How many times should I shake the carpet?"; + input(.@input, 0, 999); next; - .@braspell$ = "Mother where are my friends?"; - .@chkspell = compare(.@braspell$,.@input$); - if (!.@chkspell) { - mes "Seems like you said something wrong."; + mes "You shake the carpet "+.@input+" times."; + next; + if (.@input != 7) { + mes "But nothing happens."; close; } - else { - if (brazil_ghost == 5) { - mes "[Sobbing Voice]"; - mes "^FF0000your 7 friends....are...sleeping... now it...'s time ....to wake them........^000000"; - next; - switch(select("Jump on the carpet.", "Lie on the carpet.", "Shake the carpet.")) { - case 1: - mes "How many times should I jump?"; - input .@input,0,999; - next; - mes "You jump on the carpet "+.@input+" times."; - next; - mes "But nothing happens."; - close; - case 2: - mes "How many times should I lie on the carpet?"; - input .@input,0,999; - next; - mes "You lie on the carpet "+.@input+" times."; - next; - mes "But nothing happens."; - close; - case 3: - mes "How many times should I shake the carpet?"; - input .@input,0,999; - next; - if (.@input == 7) { - mes "You shake the carpet 7 times."; - next; - mes "- fly~ fly~ fly~ fly~ fly~ fly~ fly~ -"; - next; - mes "[Distant Sound]"; - mes "^FF0000kkkkhee- hihihihi!!!^000000"; - next; - specialeffect(EF_VENOMDUST, AREA, playerattached()); - mes "Faint laughing can be heard off in the direction of the mirror."; - brazil_ghost = 6; - changequest 60353,60354; - close; - } - else { - mes "You shake the carpet "+.@input+" times."; - next; - mes "But nothing happens."; - close; - } - } - } - else { - mes "Nothing happens."; - close; - } - } - case 2: - mes "You do nothing."; + mes "- fly~ fly~ fly~ fly~ fly~ fly~ fly~ -"; + next; + mes "[Distant Sound]"; + mes "^FF0000kkkkhee- hihihihi!!!^000000"; + next; + specialeffect(EF_VENOMDUST, AREA, playerattached()); + mes "Faint laughing can be heard off in the direction of the mirror."; + brazil_ghost = 6; + changequest 60353,60354; close; } - } - else { - mes "- A carpet with an intricate pattern on it -"; + case 2: + mes "You do nothing."; close; } } bra_in01,151,180,3 script Mirror#bra CLEAR_NPC,{ - if (brazil_ghost > 0) { - mes "- You can see a clean mirror without any marks or dust -"; + mes "- You can see a clean mirror without any marks or dust -"; + if (brazil_ghost == 0) { + close; + } + next; + switch(select("Examine it.", "Ignore.")) { + case 1: + mes "- What was the next line to that spell now? -"; + input(.@input$); + next; + mes "["+strcharinfo(PC_NAME)+"]"; + mes .@input$; + next; + .@braspell$ = "Where are you mom?"; + .@chkspell = compare(.@braspell$,.@input$); + if (!.@chkspell) { + mes "Seems like you said something wrong."; + close; + } + if (brazil_ghost != 6) { + mes "Nothing happens."; + close; + } + mes "[Distant Sound]"; + mes "^FF0000kihe! hit! hit! hit! hit!^000000"; + next; + mes "[Distant Sound]"; + mes "^FF0000kihe! hit! hit! hit! hit!^000000"; + mes "^FF0000kihe! hit! hit! hit! hit!^000000"; + next; + mes "[Distant Sound]"; + mes "Behind you..."; + enablenpc "Ghost#bra"; + next; + emotion e_omg,1; + mes "["+strcharinfo(PC_NAME)+"]"; + mes "The stories about the ghost are true~!"; + next; + mes "[Ghost]"; + mes "^FF0000my baby....^000000"; + next; + mes "[Ghost]"; + mes "^FF0000I can't see.... my eye....^000000"; + mes "^FF0000What's going on....?^000000"; next; - switch(select("Examine it.", "Ignore.")) { + mes "- You take a deep breath and then look at the Ghost and notice it has an eye patch -"; + next; + mes "[Ghost]"; + mes "^FF0000My eyes are so tight... can you take this off?^000000"; + next; + mes "You step carefully towards the ghost."; + next; + mes "His face was covered with dust making strange contortions with it's face."; + next; + mes "[Ghost]"; + mes "^FF0000Come on help mom.....^000000"; + next; + switch(select("Take the eye bandage off.", "Run away~.")) { case 1: - mes "- What was the next line to that spell now? -"; - input .@input$; - next; - mes "["+strcharinfo(PC_NAME)+"]"; - mes .@input$; - next; - .@braspell$ = "Where are you mom?"; - .@chkspell = compare(.@braspell$,.@input$); - if (!.@chkspell) { - mes "Seems like you said something wrong."; - close; + while(1) { + .@cpudice = rand(1,6); + .@pcdice = rand(1,6); + if (.@cpudice != .@pcdice) { + emotion (57+.@cpudice),0,"Ghost#bra"; + emotion (57+.@cpudice),1; + break; + } + } + if (.@cpudice > .@pcdice) { + specialeffect(EF_DEVIL, AREA, playerattached()); + mes "[Ghost]"; + mes "^FF0000Go away!^000000"; + brazil_ghost = 1; + changequest 60354,2208; + percentheal -50,-50; + close2; + disablenpc "Ghost#bra"; + warp "bra_in01",12,183; + end; } else { - if (brazil_ghost == 6) { - mes "[Distant Sound]"; - mes "^FF0000kihe! hit! hit! hit! hit!^000000"; - next; - mes "[Distant Sound]"; - mes "^FF0000kihe! hit! hit! hit! hit!^000000"; - mes "^FF0000kihe! hit! hit! hit! hit!^000000"; - next; - mes "[Distant Sound]"; - mes "Behind you..."; - enablenpc "Ghost#bra"; - next; - emotion e_omg,1; - mes "["+strcharinfo(PC_NAME)+"]"; - mes "The stories about the ghost are true~!"; - next; - mes "[Ghost]"; - mes "^FF0000my baby....^000000"; - next; - mes "[Ghost]"; - mes "^FF0000I can't see.... my eye....^000000"; - mes "^FF0000What's going on....?^000000"; - next; - mes "- You take a deep breath and then look at the Ghost and notice it has an eye patch -"; - next; - mes "[Ghost]"; - mes "^FF0000My eyes are so tight... can you take this off?^000000"; - next; - mes "You step carefully towards the ghost."; - next; - mes "His face was covered with dust making strange contortions with it's face."; - next; - mes "[Ghost]"; - mes "^FF0000Come on help mom.....^000000"; - next; - switch(select("Take the eye bandage off.", "Run away~.")) { - case 1: - while(1) { - .@cpudice = rand(1,6); - .@pcdice = rand(1,6); - if (.@cpudice != .@pcdice) { - emotion (57+.@cpudice),0,"Ghost#bra"; - emotion (57+.@cpudice),1; - break; - } - } - if (.@cpudice > .@pcdice) { - specialeffect(EF_DEVIL, AREA, playerattached()); - mes "[Ghost]"; - mes "^FF0000Go away!^000000"; - brazil_ghost = 1; - changequest 60354,2208; - percentheal -50,-50; - close2; - disablenpc "Ghost#bra"; - warp "bra_in01",12,183; - end; - } - else { - emotion e_bzz,1; - mes "[Ghost]"; - mes "^FF0000Ahh!^000000"; - mes "The Ghost disappeared into the toilet."; - brazil_ghost = 7; - changequest 60354,60355; - close2; - disablenpc "Ghost#bra"; - warp "bra_in01",206,100; - end; - } - case 2: - mes "You run away from the ghost."; - close2; - brazil_ghost = 1; - changequest 60354,2208; - warp "bra_in01",12,183; - disablenpc "Ghost#bra"; - end; - } - close; - } - else { - mes "Nothing happens."; - close; - } + emotion e_bzz,1; + mes "[Ghost]"; + mes "^FF0000Ahh!^000000"; + mes "The Ghost disappeared into the toilet."; + brazil_ghost = 7; + changequest 60354,60355; + close2; + disablenpc "Ghost#bra"; + warp "bra_in01",206,100; + end; } case 2: - mes "You do nothing."; - close; + mes "You run away from the ghost."; + close2; + brazil_ghost = 1; + changequest 60354,2208; + warp "bra_in01",12,183; + disablenpc "Ghost#bra"; + end; } - } - else { - mes "- You can see a clean mirror without any marks or dust -"; + close; + case 2: + mes "You do nothing."; close; } } diff --git a/npc/re/quests/quests_dewata.txt b/npc/re/quests/quests_dewata.txt index 1b57e4397..ac6e54622 100644 --- a/npc/re/quests/quests_dewata.txt +++ b/npc/re/quests/quests_dewata.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Lemongrass -//= Copyright (C) Euphy -//= Copyright (C) Muad_Dib -//= Copyright (C) Gennosuke Kouga +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Lemongrass +//= Copyright (C) Euphy +//= Copyright (C) Muad_Dib +//= Copyright (C) Gennosuke Kouga //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -1706,7 +1706,7 @@ dew_fild01,127,240,4 script Gatti#weapon 2_M_OLDBLSMITH,{ next; mes "- He seems to be asking for the Island name. -"; next; - input .@island_name$; + input(.@island_name$); next; mes "["+strcharinfo(PC_NAME)+"]"; mes "It's called "+ .@island_name$ +". What's wrong?"; diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt index 817b4780d..960d3a580 100644 --- a/npc/re/quests/quests_dicastes.txt +++ b/npc/re/quests/quests_dicastes.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Frost -//= Copyright (C) Dastgir -//= Copyright (C) Joseph -//= Copyright (C) Masao -//= Copyright (C) Euphy -//= Copyright (C) Muad_Dib -//= Copyright (C) Gennosuke Kouga +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Frost +//= Copyright (C) Dastgir +//= Copyright (C) Joseph +//= Copyright (C) Masao +//= Copyright (C) Euphy +//= Copyright (C) Muad_Dib +//= Copyright (C) Gennosuke Kouga //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -131,7 +131,7 @@ dic_dun01,266,113,5 script Curious Sapha#ep13_3_ 4_MAN_BENKUNI,{ mes "I'll give you a deal and sell it by 500 Zeny each. But, try not to carry it with you into Scaraba Hall."; mes "How many do you want? You can buy up to 100."; next; - input .@input; + input(.@input); .@deal = 500 * .@input; if (.@deal == 0) { mes "[Curious Sapha]"; @@ -164,7 +164,7 @@ dic_dun01,266,113,5 script Curious Sapha#ep13_3_ 4_MAN_BENKUNI,{ mes "[Curious Sapha]"; mes "Do you have any useful information?"; mes "Please let me know!"; - input .@str$; + input(.@str$); next; mes "[Curious Sapha]"; mes "It says ^0000FF"+.@str$+"^000000."; @@ -4588,7 +4588,7 @@ dic_fild01,231,174,5 script BK#ep133_18 4_M_MERCAT2,{ mes "- BK of the Cat Merchant group is being difficult."; mes "What did Shay tell you to do?-"; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == "Shay's special drink will be delivered" || .@inputstr$ == "Shay's special drink will be delivered.") { mes "[" + strcharinfo(PC_NAME) + "]"; mes "Hmm. If you don't cooperate,"; @@ -7517,7 +7517,7 @@ moc_para01,44,19,3 script Cat Hand Agent#gekk 4_M_MERCAT2,{ mes "If you really mean it, then sign here."; mes "I'm collecting signs to get on Gyareuk's good side... never mind. I will let them know you are my sponsor!"; next; - input .@inputstr$; + input(.@inputstr$); mes "[Agent Geck]"; mes "" + strcharinfo(PC_NAME) + "? Human names are strange to me."; next; diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt index ac6717529..9cd41566a 100644 --- a/npc/re/quests/quests_eclage.txt +++ b/npc/re/quests/quests_eclage.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Dastgir +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Dastgir //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -140,13 +140,13 @@ ecl_fild01,94,322,5 script Security Guard#ep14_2 4_M_FAIRYSOLDIER,{ mes "Please fill out your name, occupation, and level here."; next; mes "Write your name."; - input .@inputstr$; + input(.@inputstr$); next; mes "Write your occupation."; - input .@inputstr$; + input(.@inputstr$); next; mes "Write your level."; - input .@inputstr$; + input(.@inputstr$); next; mes "[Security Guard]"; mes "If you completed your forms, please submit them to the administrator over there."; @@ -624,7 +624,7 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{ next; mes "[Fairy Carpenter]"; mes "Please write the number of pieces necessary for each length. If no pieces for that length are necessary, please write 0."; - input .@inputstr$; + input(.@inputstr$); next; if (.@inputstr$ != "002") { mes "[Fairy Carpenter]"; @@ -1467,7 +1467,7 @@ eclage,191,200,4 script Yube#ep14_2 4_M_FAIRYKID5,{ emotion e_what; cutin "war_y3",2; next; - input .@inputnum; + input(.@inputnum); if (.@inputnum != 128) { mes "[Yube]"; mes "Hmm~ I don't think so."; @@ -1591,7 +1591,7 @@ eclage,191,200,4 script Yube#ep14_2 4_M_FAIRYKID5,{ mes "I can make as many as 128. How many do you need?"; cutin "war_y4",2; next; - input .@input; + input(.@input); if (.@input < 1 || .@input > 128) { mes "[Yube]"; mes "You aren't going to make them?"; @@ -10100,19 +10100,17 @@ ecl_in04,109,215,3 script Hiel#pa0829 4_M_FAIRYSCHOLAR,{ mes "[Hiel]"; mes "Oh~ Someone referred you to me? Who was it? You better make sense, or I'll be sure to kick you out."; next; - input .@inputstr$; - if (.@inputstr$ == "Clever"){ - mes "[" + strcharinfo(PC_NAME) + "]"; - mes .@inputstr$ + " referred me(" + strcharinfo(PC_NAME) + ") to you."; - next; - } - else { + input(.@inputstr$); + if (.@inputstr$ != "Clever") { mes "[Hiel]"; mes "I don't know that person! Aren't you suspicious!"; close2; warp "eclage",152,91; end; } + mes "[" + strcharinfo(PC_NAME) + "]"; + mes .@inputstr$ + " referred me(" + strcharinfo(PC_NAME) + ") to you."; + next; mes "[Hiel]"; mes "Oh really? Give me a minute. I'm going to wrap up what I am doing and come back."; ep14_2_etran = 11; @@ -10923,13 +10921,8 @@ ecl_in02,133,115,7 script Prison Guard#pa0829 4_M_FAIRYSOLDIER2,{ mes "[Prison Guard]"; mes "I see, I don't think I ever saw you on our visitor's list. Who are you visiting?"; next; - input .@inputstr$; - if (.@inputstr$ == "Clever") { - mes "[Prison Guard]"; - mes "^000099" + .@inputstr$ + "^000000? ... That means..."; - next; - } - else { + input(.@inputstr$); + if (.@inputstr$ != "Clever") { mes "[Prison Guard]"; mes "Hmm? You want to visit ^000099" + .@inputstr$ + "^000000? I don't see that visitation on the list. Are you sure you made a formal request?"; next; @@ -10939,6 +10932,9 @@ ecl_in02,133,115,7 script Prison Guard#pa0829 4_M_FAIRYSOLDIER2,{ } close; } + mes "[Prison Guard]"; + mes "^000099" + .@inputstr$ + "^000000? ... That means..."; + next; mes "[Clever]"; mes "Huh? I've got a visitor? Yahoo! It's a visit! Yay~"; next; @@ -11753,12 +11749,12 @@ ecl_in04,108,215,4 script Supreme Elec rope#pa0829 HIDDEN_NPC,{ } sec_in02,85,187,4 script #pa0829Reactor11 4_M_FAIRYKID,3,3,{ - input .@input; + input(.@input); if (.@input == 1854) { mes "[????]"; mes "Baby, you don't know why I'm upset, do you?"; mes "Present" + ep14_2_etran + "Dog"; - input .@input; + input(.@input, 0); ep14_2_etran = .@input; if (ep14_2_mylord < 7) { ep14_2_mylord = 7; @@ -13748,7 +13744,7 @@ sec_in02,16,11,5 script New Oz Image#1 4_M_MINSTREL1,1,1,{ //== Memory of Professor Worm ============================== sec_in02,10,17,4 script Professor Aide#worm 4_BULL,{ - input .@input; + input(.@input); if (.@input != 1917) { mes "EEK!"; close; @@ -19129,7 +19125,7 @@ que_avan01,18,38,0 script Desk#tl01 CLEAR_NPC,{ mes "In the middle, there is a small numerical panel. A 5-digit number can be inputted."; next; if (select("Input a number.", "Look at other parts of the desk.")==1) { - input .@input; + input(.@input); if (.@input == 31425) { mes "As soon as the number is inputted, a click is heard."; mes "The hinged device can be opened."; diff --git a/npc/re/quests/quests_glastheim.txt b/npc/re/quests/quests_glastheim.txt index cc6f2dc9d..c3ec8d06d 100644 --- a/npc/re/quests/quests_glastheim.txt +++ b/npc/re/quests/quests_glastheim.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2016 Hercules Dev Team -//= Copyright (C) 2016 Ridley +//= Copyright (C) 2016-2020 Hercules Dev Team +//= Copyright (C) 2016 Ridley //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/quests_izlude.txt b/npc/re/quests/quests_izlude.txt index 661fb735e..bd71f9fa2 100644 --- a/npc/re/quests/quests_izlude.txt +++ b/npc/re/quests/quests_izlude.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Daegaladh +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Daegaladh //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/quests_lighthalzen.txt b/npc/re/quests/quests_lighthalzen.txt index 070368a23..9369f298a 100644 --- a/npc/re/quests/quests_lighthalzen.txt +++ b/npc/re/quests/quests_lighthalzen.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) AtlantisRO +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) AtlantisRO //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt index 786aeccb1..0d22c9565 100644 --- a/npc/re/quests/quests_malangdo.txt +++ b/npc/re/quests/quests_malangdo.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -185,12 +185,13 @@ mal_in02,134,31,5 script Investment Cat Helper 4_WHITETIGER,{ mes "Isn't it lovely?"; mes "How many will you invest in? Enter 0 to cancel."; next; - input .@input; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes "[Investment Cat Helper]"; mes "Please invest next time~"; close; - } else if (.@input > 10) { + } + if (.@input > 10) { mes "[Investment Cat Helper]"; mes "You can get a maximum of 10 accounts~"; close; @@ -299,29 +300,29 @@ mal_in02,134,31,5 script Investment Cat Helper 4_WHITETIGER,{ mes "[Investment Cat Helper]"; mes "The can donation can range from a minimum of 20 to a maximum of 10,000."; next; - input .@input; + input(.@input); if (.@input < 20 || .@input > 10000) { mes "[Investment Cat Helper]"; mes "The can donation can range from a minimum of 20 to a maximum of 10,000."; close; - } else if (countitem(Malang_Sp_Can) < .@input) { // Malang_Sp_Can + } + if (countitem(Malang_Sp_Can) < .@input) { // Malang_Sp_Can mes "[Investment Cat Helper]"; mes "Hmm? You don't have enough cans."; close; - } else { - delitem Malang_Sp_Can,.@input; - mes "[Investment Cat Helper]"; - mes "Ohh! Thank you~"; - next; - mes "[Investment Cat Helper]"; - mes "Dear "+strcharinfo(PC_NAME)+" ~"; - mes "I have only Increase AGI"; - mes "and Blessing to give you."; - mes "Thank you."; - npcskill "AL_INCAGI",10,0,0; - npcskill "AL_BLESSING",10,0,0; - close; } + delitem Malang_Sp_Can,.@input; + mes "[Investment Cat Helper]"; + mes "Ohh! Thank you~"; + next; + mes "[Investment Cat Helper]"; + mes "Dear "+strcharinfo(PC_NAME)+" ~"; + mes "I have only Increase AGI"; + mes "and Blessing to give you."; + mes "Thank you."; + npcskill "AL_INCAGI",10,0,0; + npcskill "AL_BLESSING",10,0,0; + close; } } @@ -5556,7 +5557,7 @@ L_Viewpoint: break; } next; - input .@input; + input(.@input); if (.@input == .@nori_c) { mes "The card slides out with a sound after entering the number."; mes "^4d4dffYou have passed the "+strnpcinfo(NPC_NAME_VISIBLE)+"! Run to the next destination!^000000"; @@ -7755,7 +7756,7 @@ malangdo,161,197,4 script Eryu#gamer 4_CAT,{ next; mes "What do you want to say?"; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == "Come back") { erasequest 5083; setquest 5084; @@ -7984,7 +7985,7 @@ malangdo,230,197,4 script Stew#gamer 4_CAT_3COLOR,{ next; mes "What do you want to say?"; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == "Come back") { erasequest 5085; setquest 5086; @@ -8166,7 +8167,7 @@ malangdo,244,144,4 script Ketchup#gamer 4_CAT_SAILOR3,{ next; mes "What do you want to say?"; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == "Come back") { erasequest 5087; setquest 5088; @@ -8433,7 +8434,7 @@ malangdo,181,119,7 script Eff#gamer 4_CAT_ADV2,{ next; mes "What do you want to say?"; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == "Come back") { erasequest 5089; setquest 5090; diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt index 091d8527a..143fc07bc 100644 --- a/npc/re/quests/quests_malaya.txt +++ b/npc/re/quests/quests_malaya.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Michieru -//= Copyright (C) DeadlySilence -//= Copyright (C) Euphy -//= Copyright (C) Masao +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Michieru +//= Copyright (C) DeadlySilence +//= Copyright (C) Euphy +//= Copyright (C) Masao //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -2088,13 +2088,14 @@ malaya,119,217,3 script Blacksmith Pandoi 4_M_DEWBOY,{ mes "How many Silver Crosses do you need?"; mes "I can make up to 50 at a time."; next; - input .@amount; - if (.@amount == 0) { + input(.@amount); + if (.@amount <= 0) { mes "[Pandoi]"; mes "Don't need Silver Crosses?"; mes "Well, I can take a rest then. Ha ha ha ha~"; close; - } else if (.@amount > 50) { + } + if (.@amount > 50) { mes "[Pandoi]"; mes "A maximum of 50 at a time!"; close; @@ -8317,7 +8318,7 @@ ma_fild01,1,1,4 script Pintados Manager#pin 4_F_KHELLISIA,{ mes "295 - 343 -> Day 7"; mes "Global 1 = 1 hr."; next; - input .@input; + input(.@input); if (.@input < 0 || .@input > 344) close; $malaya_pintados_00 = .@input; @@ -8326,7 +8327,7 @@ ma_fild01,1,1,4 script Pintados Manager#pin 4_F_KHELLISIA,{ mes "Adjust the accumulated value for the Lesser Agimat."; mes "Values can be adjusted between 0 to 1000."; next; - input .@input; + input(.@input); if (.@input < 0 || .@input > 1000) close; $malaya_pintados_01 = .@input; @@ -8335,7 +8336,7 @@ ma_fild01,1,1,4 script Pintados Manager#pin 4_F_KHELLISIA,{ mes "Adjust the accumulated value of the Silver Cross."; mes "Values can be adjusted between 0 to 1000."; next; - input .@input; + input(.@input); if (.@input < 0 || .@input > 1000) close; $malaya_pintados_02 = .@input; @@ -8344,7 +8345,7 @@ ma_fild01,1,1,4 script Pintados Manager#pin 4_F_KHELLISIA,{ mes "Adjust the accumulated value for the Dyestuff."; mes "Values can be adjusted between 0 to 300."; next; - input .@input; + input(.@input); if (.@input < 0 || .@input > 300) close; $malaya_pintados_03 = .@input; @@ -8577,7 +8578,7 @@ ma_fild01,179,260,2 script Festival Helper Boy#pin 4_M_BARYO_BOY,{ mes "[Isco]"; mes "He he... I'm slow with numbers. I get lost when it's over 50. How many will you give me?"; next; - input .@amount; + input(.@amount); if (.@amount < 1 || .@amount > 50) { mes "[Isco]"; mes "Sigh~ I'm lost! I can't count if the numbers are weird."; @@ -8609,7 +8610,7 @@ ma_fild01,179,260,2 script Festival Helper Boy#pin 4_M_BARYO_BOY,{ mes "[Isco]"; mes "He he... I'm slow with numbers. I get lost when it's over 50. How many will you give me?"; next; - input .@amount; + input(.@amount); if (.@amount < 1 || .@amount > 50) { mes "[Isco]"; mes "Sigh~ I told you I'm not good with numbers."; diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt index 34293d200..1ba417904 100644 --- a/npc/re/quests/quests_mora.txt +++ b/npc/re/quests/quests_mora.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -3618,7 +3618,7 @@ mora,114,79,0 script Black Shadow#ep14_muk CLEAR_NPC,{ mes "You... I saw. Feeling. I saw. Feeling."; mes "You... Name?"; next; - input .@inputstr$; + input(.@inputstr$); mes "[Fishee]"; mes .@inputstr$+" do."; mes "No know. No remember.."; @@ -3756,7 +3756,7 @@ mora,114,79,0 script Black Shadow#ep14_muk CLEAR_NPC,{ } else if (questprogress(5017)) { mes "How will you bully the creature?"; next; - input .@inputstr$; + input(.@inputstr$); mes "You do ^0000FF"+.@inputstr$+"^000000 to bully the unidentified creature."; next; setquest 5029; @@ -4311,7 +4311,7 @@ mora,118,86,0 duplicate(???#mora) ???#ep14_muk05 CLEAR_NPC,2,2 next; mes "What was the name of the unidentified creature?"; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ != "Fishee") { mes "[???]"; mes "No Family. "+.@inputstr$+" No."; diff --git a/npc/re/quests/quests_morocc.txt b/npc/re/quests/quests_morocc.txt index f88692561..08bd16769 100644 --- a/npc/re/quests/quests_morocc.txt +++ b/npc/re/quests/quests_morocc.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/quests_nameless.txt b/npc/re/quests/quests_nameless.txt index 6d80c1c6a..440af3207 100644 --- a/npc/re/quests/quests_nameless.txt +++ b/npc/re/quests/quests_nameless.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/quests/quests_payon.txt b/npc/re/quests/quests_payon.txt new file mode 100644 index 000000000..6af5e647c --- /dev/null +++ b/npc/re/quests/quests_payon.txt @@ -0,0 +1,35 @@ +//================= Hercules Script ======================================= +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) JohnnyPlayy +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see <http://www.gnu.org/licenses/>. +//========================================================================= +//= Quest NPCs located in Payon +//================= Description =========================================== +//= Quests related to Payon City. +//================= Current Version ======================================= +//= 1.0 +//========================================================================= + +payon_in01,46,21,4 duplicate(Young man#12) Young man#1 4_M_ORIENT02 diff --git a/npc/re/quests/quests_veins.txt b/npc/re/quests/quests_veins.txt index 28509ef46..bcff20157 100644 --- a/npc/re/quests/quests_veins.txt +++ b/npc/re/quests/quests_veins.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/scripts.conf b/npc/re/scripts.conf index c26e907ad..5ecf6b741 100644 --- a/npc/re/scripts.conf +++ b/npc/re/scripts.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Athena Dev Teams +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena Dev Teams //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -136,6 +136,7 @@ "npc/re/other/turbo_track.txt", // - Clan System "npc/re/other/clans.txt", +"npc/re/other/achievement_treasures.txt", //================= Quests ================================================ // - Eden Group ------------------------------------------------- @@ -181,5 +182,6 @@ "npc/re/quests/quests_morocc.txt", "npc/re/quests/quests_nameless.txt", "npc/re/quests/quests_veins.txt", +"npc/re/quests/quests_payon.txt", // - New Gears -------------------------------------------------- "npc/re/quests/newgears/2012_headgears.txt", diff --git a/npc/re/scripts_jobs.conf b/npc/re/scripts_jobs.conf index 77d1532e1..6dd99e813 100644 --- a/npc/re/scripts_jobs.conf +++ b/npc/re/scripts_jobs.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Athena Dev Teams +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena Dev Teams //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -40,6 +40,7 @@ "npc/re/jobs/1-1e/taekwon.txt", // - 2e "npc/re/jobs/2e/kagerou_oboro.txt", +"npc/re/jobs/2e/rebellion.txt", // - 3-1 "npc/re/jobs/3-1/archbishop.txt", "npc/re/jobs/3-1/mechanic.txt", diff --git a/npc/re/scripts_main.conf b/npc/re/scripts_main.conf index 475e8d1be..1a98a9a01 100644 --- a/npc/re/scripts_main.conf +++ b/npc/re/scripts_main.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Athena Dev Teams +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena Dev Teams //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/scripts_mapflags.conf b/npc/re/scripts_mapflags.conf index 570294c47..3d448cf69 100644 --- a/npc/re/scripts_mapflags.conf +++ b/npc/re/scripts_mapflags.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Athena Dev Teams +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena Dev Teams //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/scripts_monsters.conf b/npc/re/scripts_monsters.conf index a143da36c..21ff25ce9 100644 --- a/npc/re/scripts_monsters.conf +++ b/npc/re/scripts_monsters.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Athena Dev Teams +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena Dev Teams //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/scripts_warps.conf b/npc/re/scripts_warps.conf index 683746d79..7b3f8be94 100644 --- a/npc/re/scripts_warps.conf +++ b/npc/re/scripts_warps.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Athena Dev Teams +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena Dev Teams //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/scripts_woe.conf b/npc/re/scripts_woe.conf index 957ac766d..b5b58ee62 100644 --- a/npc/re/scripts_woe.conf +++ b/npc/re/scripts_woe.conf @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Athena Dev Teams +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Athena Dev Teams //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/cities/brasilis.txt b/npc/re/warps/cities/brasilis.txt index 49e75cfe3..f54d13f29 100644 --- a/npc/re/warps/cities/brasilis.txt +++ b/npc/re/warps/cities/brasilis.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Deagaladh -//= Copyright (C) Jguy -//= Copyright (C) Protimus -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Deagaladh +//= Copyright (C) Jguy +//= Copyright (C) Protimus +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/cities/dewata.txt b/npc/re/warps/cities/dewata.txt index f28e81383..11f2732d6 100644 --- a/npc/re/warps/cities/dewata.txt +++ b/npc/re/warps/cities/dewata.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Lemongrass -//= Copyright (C) Euphy -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Lemongrass +//= Copyright (C) Euphy +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/cities/dicastes.txt b/npc/re/warps/cities/dicastes.txt index 862765d9a..fdae961a6 100644 --- a/npc/re/warps/cities/dicastes.txt +++ b/npc/re/warps/cities/dicastes.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Chilly -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Chilly +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/cities/eclage.txt b/npc/re/warps/cities/eclage.txt index 221c98f22..ee2090a2f 100644 --- a/npc/re/warps/cities/eclage.txt +++ b/npc/re/warps/cities/eclage.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Dastgir -//= Copyright (C) Euphy -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Dastgir +//= Copyright (C) Euphy +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/cities/izlude.txt b/npc/re/warps/cities/izlude.txt index 1e691e33b..7973b622f 100644 --- a/npc/re/warps/cities/izlude.txt +++ b/npc/re/warps/cities/izlude.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Ridley -//= Copyright (C) Euphy -//= Copyright (C) Streusel -//= Copyright (C) Masao -//= Copyright (C) Justin84 -//= Copyright (C) Nana -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Ridley +//= Copyright (C) Euphy +//= Copyright (C) Streusel +//= Copyright (C) Masao +//= Copyright (C) Justin84 +//= Copyright (C) Nana +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/cities/malangdo.txt b/npc/re/warps/cities/malangdo.txt index 499793c22..080724fb5 100644 --- a/npc/re/warps/cities/malangdo.txt +++ b/npc/re/warps/cities/malangdo.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/cities/malaya.txt b/npc/re/warps/cities/malaya.txt index 3c3e3073e..c2610665c 100644 --- a/npc/re/warps/cities/malaya.txt +++ b/npc/re/warps/cities/malaya.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Chilly +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/cities/rachel.txt b/npc/re/warps/cities/rachel.txt index 16bf226cc..33891f69c 100644 --- a/npc/re/warps/cities/rachel.txt +++ b/npc/re/warps/cities/rachel.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) erKURITA -//= Copyright (C) RockmanEXE +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) erKURITA +//= Copyright (C) RockmanEXE //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/cities/yggdrasil.txt b/npc/re/warps/cities/yggdrasil.txt index cdc096d10..f08802b57 100644 --- a/npc/re/warps/cities/yggdrasil.txt +++ b/npc/re/warps/cities/yggdrasil.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) PKGINGO +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) PKGINGO //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/dungeons/bra_dun.txt b/npc/re/warps/dungeons/bra_dun.txt index 7016f5549..d97fe82ba 100644 --- a/npc/re/warps/dungeons/bra_dun.txt +++ b/npc/re/warps/dungeons/bra_dun.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/dungeons/dic_dun.txt b/npc/re/warps/dungeons/dic_dun.txt index 02597e375..678d80216 100644 --- a/npc/re/warps/dungeons/dic_dun.txt +++ b/npc/re/warps/dungeons/dic_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Chilly -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Chilly +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/dungeons/ecl_dun.txt b/npc/re/warps/dungeons/ecl_dun.txt index 8a2aedae6..33c258d95 100644 --- a/npc/re/warps/dungeons/ecl_dun.txt +++ b/npc/re/warps/dungeons/ecl_dun.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Dastgir -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Dastgir +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/dungeons/iz_dun.txt b/npc/re/warps/dungeons/iz_dun.txt index 9746fc0dd..4ce79d67f 100644 --- a/npc/re/warps/dungeons/iz_dun.txt +++ b/npc/re/warps/dungeons/iz_dun.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Nana -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Nana +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/dungeons/moc_pryd.txt b/npc/re/warps/dungeons/moc_pryd.txt index 8daf245a8..e065f849f 100644 --- a/npc/re/warps/dungeons/moc_pryd.txt +++ b/npc/re/warps/dungeons/moc_pryd.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/fields/bif_fild.txt b/npc/re/warps/fields/bif_fild.txt index 68e3f4f7a..cdd7854b2 100644 --- a/npc/re/warps/fields/bif_fild.txt +++ b/npc/re/warps/fields/bif_fild.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/fields/bra_fild.txt b/npc/re/warps/fields/bra_fild.txt index 7b36f7247..0a38436bb 100644 --- a/npc/re/warps/fields/bra_fild.txt +++ b/npc/re/warps/fields/bra_fild.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Protimus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Protimus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/fields/com_fild.txt b/npc/re/warps/fields/com_fild.txt index bb17bdc5a..f213dc0b1 100644 --- a/npc/re/warps/fields/com_fild.txt +++ b/npc/re/warps/fields/com_fild.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/fields/dic_fild.txt b/npc/re/warps/fields/dic_fild.txt index 22d31fed9..f05227695 100644 --- a/npc/re/warps/fields/dic_fild.txt +++ b/npc/re/warps/fields/dic_fild.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Chilly -//= Copyright (C) Muad_Dib +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Chilly +//= Copyright (C) Muad_Dib //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/fields/geffen_fild.txt b/npc/re/warps/fields/geffen_fild.txt index a20d902cc..5e0e84db9 100644 --- a/npc/re/warps/fields/geffen_fild.txt +++ b/npc/re/warps/fields/geffen_fild.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/fields/hugel_fild.txt b/npc/re/warps/fields/hugel_fild.txt index d43aa092f..8f0621450 100644 --- a/npc/re/warps/fields/hugel_fild.txt +++ b/npc/re/warps/fields/hugel_fild.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) Sara-chan +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) Sara-chan //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/fields/morroc_fild.txt b/npc/re/warps/fields/morroc_fild.txt index 7ae6f5433..604eff6fa 100644 --- a/npc/re/warps/fields/morroc_fild.txt +++ b/npc/re/warps/fields/morroc_fild.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/fields/payon_fild.txt b/npc/re/warps/fields/payon_fild.txt index 296d4eed3..af0783ffc 100644 --- a/npc/re/warps/fields/payon_fild.txt +++ b/npc/re/warps/fields/payon_fild.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/fields/prontera_fild.txt b/npc/re/warps/fields/prontera_fild.txt index fae85a402..4a3563e83 100644 --- a/npc/re/warps/fields/prontera_fild.txt +++ b/npc/re/warps/fields/prontera_fild.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Lupus -//= Copyright (C) Nana +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Lupus +//= Copyright (C) Nana //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/fields/rachel_fild.txt b/npc/re/warps/fields/rachel_fild.txt index 4840ee582..36b2e8a94 100644 --- a/npc/re/warps/fields/rachel_fild.txt +++ b/npc/re/warps/fields/rachel_fild.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/fields/veins_fild.txt b/npc/re/warps/fields/veins_fild.txt index 04bbad754..df61c2cac 100644 --- a/npc/re/warps/fields/veins_fild.txt +++ b/npc/re/warps/fields/veins_fild.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Playtester -//= Copyright (C) $ephiroth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Playtester +//= Copyright (C) $ephiroth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/fields/yuno_fild.txt b/npc/re/warps/fields/yuno_fild.txt index c87d1c3f6..a19951092 100644 --- a/npc/re/warps/fields/yuno_fild.txt +++ b/npc/re/warps/fields/yuno_fild.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Nana -//= Copyright (C) Sara +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Nana +//= Copyright (C) Sara //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/guildcastles.txt b/npc/re/warps/guildcastles.txt index 444cc7ca5..8ee029a76 100644 --- a/npc/re/warps/guildcastles.txt +++ b/npc/re/warps/guildcastles.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/other/arena.txt b/npc/re/warps/other/arena.txt index fb0ad9a3e..b06fb68d1 100644 --- a/npc/re/warps/other/arena.txt +++ b/npc/re/warps/other/arena.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/other/dimensional_gap.txt b/npc/re/warps/other/dimensional_gap.txt index 890dc76f5..41ff9fa00 100644 --- a/npc/re/warps/other/dimensional_gap.txt +++ b/npc/re/warps/other/dimensional_gap.txt @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2016 Hercules Dev Team +//= Copyright (C) 2016-2020 Hercules Dev Team //= Copyright (C) Ridley //= Copyright (C) Nova //= diff --git a/npc/re/warps/other/jobquests.txt b/npc/re/warps/other/jobquests.txt index 4e12d4cff..e72c79b81 100644 --- a/npc/re/warps/other/jobquests.txt +++ b/npc/re/warps/other/jobquests.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Athena +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Athena //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/other/paradise.txt b/npc/re/warps/other/paradise.txt index ad3f3cf00..0536eb096 100644 --- a/npc/re/warps/other/paradise.txt +++ b/npc/re/warps/other/paradise.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/other/s_workshop.txt b/npc/re/warps/other/s_workshop.txt index 59cc2c19c..5eeb7eae5 100644 --- a/npc/re/warps/other/s_workshop.txt +++ b/npc/re/warps/other/s_workshop.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Chilly +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Chilly //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/warps/other/sign.txt b/npc/re/warps/other/sign.txt index 39face826..b650c41b3 100644 --- a/npc/re/warps/other/sign.txt +++ b/npc/re/warps/other/sign.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) MasterOfMuppets +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) MasterOfMuppets //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/re/woe-fe/invest_main.txt b/npc/re/woe-fe/invest_main.txt index 6a65a9c78..b40588502 100644 --- a/npc/re/woe-fe/invest_main.txt +++ b/npc/re/woe-fe/invest_main.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -151,18 +151,19 @@ function script F_Invest_Abyss { mes "Please choose between 1 to 200."; mes "Please enter 0 to cancel."; next; - input .@units; + input(.@units); if (.@units < 0 || .@units > 200) { mes getarg(1); mes "You've exceeded the amount per investment."; mes "Please try again."; close; - } else if (.@units == 0) { + } + if (.@units == 0) { mes getarg(1); mes "Canceled."; close; - } else - break; + } + break; case 5: mes getarg(1); mes "Canceled."; @@ -199,18 +200,19 @@ function script F_Invest_Abyss { mes "Please choose between 1 to 20."; mes "Please enter 0 to cancel."; next; - input .@tickets; + input(.@tickets); if (.@tickets < 0 || .@tickets > 20) { mes getarg(1); mes "You've exceeded the amount per investment."; mes "Please try again."; close; - } else if (.@tickets == 0) { + } + if (.@tickets == 0) { mes getarg(1); mes "Canceled."; close; - } else - break; + } + break; case 4: mes getarg(1); mes "Canceled."; @@ -906,7 +908,7 @@ OnAgitInvest: for(.@i = 1; .@i<=5; ++.@i) { .@castle_name$[.@i] = getcastlename(.@npc$+"g_cas0"+.@i); .@owner_id[.@i] = getcastledata(.@npc$+"g_cas0"+.@i,1); - .@owner_name$[.@i] = getguildname(.@owner_id[.@i]); + .@owner_name$[.@i] = getguildinfo(GUILDINFO_NAME, .@owner_id[.@i]); if (.@guild == .@owner_id[.@i]) { .@menu$ = .@menu$+.@castle_name$[.@i]+" ["+.@owner_name$[.@i]+"] Guild:"; .@castles_owned = .@castles_owned | (1<<.@i); @@ -1060,7 +1062,7 @@ OnAgitInvest: for(.@i = 1; .@i<=5; ++.@i) { .@map$ = .@npc$+"g_cas0"+.@i; .@fund[.@i] = getd("$@vfund_"+.@npc$+"0"+.@i); - mes getcastlename(.@map$)+" "+getguildname(getcastledata(.@map$,1))+" Guild: "+.@fund[.@i]; + mes getcastlename(.@map$)+" "+getguildinfo(GUILDINFO_NAME, getcastledata(.@map$,1))+" Guild: "+.@fund[.@i]; } .@fund[0] = getd("$@vfund_"+.@npc$+"_extra"); mes .@realm$+" normal: "+.@fund[0]; diff --git a/npc/re/woe-fe/invest_npc.txt b/npc/re/woe-fe/invest_npc.txt index 4b2d49f39..f996c345a 100644 --- a/npc/re/woe-fe/invest_npc.txt +++ b/npc/re/woe-fe/invest_npc.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by |