From 7e10f1611d51f1d0c6d9efce6efe3e046cdd3aca Mon Sep 17 00:00:00 2001 From: Mysteries Date: Tue, 29 Jan 2013 20:02:52 -0500 Subject: Updated placeholders. --- npc/guild/agit_controller.txt | 4 +--- npc/guild/agit_main.txt | 4 +--- npc/guild/aldeg_cas01.txt | 4 +--- npc/guild/aldeg_cas02.txt | 4 +--- npc/guild/aldeg_cas03.txt | 4 +--- npc/guild/aldeg_cas04.txt | 4 +--- npc/guild/aldeg_cas05.txt | 4 +--- 7 files changed, 7 insertions(+), 21 deletions(-) (limited to 'npc/guild') diff --git a/npc/guild/agit_controller.txt b/npc/guild/agit_controller.txt index 27376df86..36ebdf941 100644 --- a/npc/guild/agit_controller.txt +++ b/npc/guild/agit_controller.txt @@ -1,12 +1,10 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= War of Emperium - WoE Auto-Start //===== By: ================================================== //= kalen (1.0) //= 1.1 by Akaru and ho|yAnge| //===== Current Version: ===================================== //= 2.0 -//===== Compatible With: ===================================== -//= rAthena SVN; RO Episode 4+ //===== Description: ========================================= //= Auto Start for War of Emperium //============================================= diff --git a/npc/guild/agit_main.txt b/npc/guild/agit_main.txt index 1175d5a5a..8f4253299 100644 --- a/npc/guild/agit_main.txt +++ b/npc/guild/agit_main.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= War of Emperium Guild Template File //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.9 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [ Aegis Conversion] //= ---------------------------------------------------------- diff --git a/npc/guild/aldeg_cas01.txt b/npc/guild/aldeg_cas01.txt index e194e9433..06d523e09 100644 --- a/npc/guild/aldeg_cas01.txt +++ b/npc/guild/aldeg_cas01.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= War of Emperium (Al De Baran) //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= NPCs that relate to Al De Baran Guild Castle 1 //===== Additional Comments: ================================= diff --git a/npc/guild/aldeg_cas02.txt b/npc/guild/aldeg_cas02.txt index 3aae1b699..e5c931239 100644 --- a/npc/guild/aldeg_cas02.txt +++ b/npc/guild/aldeg_cas02.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= War of Emperium (Al De Baran) //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= NPCs that relate to Al De Baran Guild Castle 2 //===== Additional Comments: ================================= diff --git a/npc/guild/aldeg_cas03.txt b/npc/guild/aldeg_cas03.txt index 751e404ac..9666bdaf0 100644 --- a/npc/guild/aldeg_cas03.txt +++ b/npc/guild/aldeg_cas03.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= War of Emperium (Al De Baran) //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= NPCs that relate to Al De Baran Guild Castle 3 //===== Additional Comments: ================================= diff --git a/npc/guild/aldeg_cas04.txt b/npc/guild/aldeg_cas04.txt index 0afba08bd..cc91a0207 100644 --- a/npc/guild/aldeg_cas04.txt +++ b/npc/guild/aldeg_cas04.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= War of Emperium (Al De Baran) //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= NPCs that relate to Al De Baran Guild Castle 4 //===== Additional Comments: ================================= diff --git a/npc/guild/aldeg_cas05.txt b/npc/guild/aldeg_cas05.txt index 2f43685b5..229c5ea36 100644 --- a/npc/guild/aldeg_cas05.txt +++ b/npc/guild/aldeg_cas05.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= War of Emperium (Al De Baran) //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= NPCs that relate to Al De Baran Guild Castle 5 //===== Additional Comments: ================================= -- cgit v1.2.3-70-g09d2 From a8240276644fe5e80ad41c53143bdc87cf953c31 Mon Sep 17 00:00:00 2001 From: Mysteries Date: Sun, 3 Feb 2013 14:34:42 -0500 Subject: Updated more placeholders and fixed some spacing issues. --- npc/airports/airships.txt | 2 +- npc/airports/einbroch.txt | 4 +- npc/airports/hugel.txt | 4 +- npc/airports/izlude.txt | 4 +- npc/airports/lighthalzen.txt | 4 +- npc/airports/rachel.txt | 4 +- npc/airports/yuno.txt | 4 +- npc/battleground/bg_common.txt | 2 +- npc/battleground/flavius/flavius01.txt | 4 +- npc/battleground/flavius/flavius02.txt | 4 +- npc/battleground/flavius/flavius_enter.txt | 4 +- npc/battleground/kvm/kvm01.txt | 4 +- npc/battleground/kvm/kvm02.txt | 4 +- npc/battleground/kvm/kvm03.txt | 4 +- npc/battleground/kvm/kvm_enter.txt | 4 +- npc/battleground/kvm/kvm_item_pay.txt | 4 +- npc/battleground/tierra/tierra01.txt | 4 +- npc/battleground/tierra/tierra02.txt | 4 +- npc/battleground/tierra/tierra_enter.txt | 4 +- npc/cities/alberta.txt | 2 +- npc/cities/aldebaran.txt | 4 +- npc/cities/amatsu.txt | 2 +- npc/cities/ayothaya.txt | 2 +- npc/cities/comodo.txt | 4 +- npc/cities/einbech.txt | 4 +- npc/cities/einbroch.txt | 4 +- npc/cities/geffen.txt | 4 +- npc/cities/gonryun.txt | 4 +- npc/cities/hugel.txt | 4 +- npc/cities/izlude.txt | 4 +- npc/cities/jawaii.txt | 4 +- npc/cities/lighthalzen.txt | 68 +++++++++++++++--------------- npc/cities/louyang.txt | 4 +- npc/cities/lutie.txt | 6 +-- npc/cities/manuk.txt | 4 +- npc/cities/morocc.txt | 4 +- npc/cities/moscovia.txt | 4 +- npc/cities/niflheim.txt | 5 +-- npc/cities/payon.txt | 4 +- npc/cities/prontera.txt | 4 +- npc/cities/rachel.txt | 4 +- npc/cities/splendide.txt | 4 +- npc/cities/umbala.txt | 4 +- npc/cities/veins.txt | 4 +- npc/cities/yuno.txt | 4 +- npc/custom/breeder.txt | 2 +- npc/custom/card_remover.txt | 2 +- npc/custom/etc/airplane.txt | 2 +- npc/custom/etc/bank.txt | 2 +- npc/custom/etc/bank_kafra.txt | 2 +- npc/custom/etc/blackjack.txt | 2 +- npc/custom/quests/bandit_beard.txt | 2 +- npc/custom/quests/berzebub.txt | 2 +- npc/custom/resetnpc.txt | 4 +- npc/events/MemorialDay_2008.txt | 4 +- npc/events/StPatrick_2008.txt | 4 +- npc/events/bossnia.txt | 2 +- npc/events/children_week.txt | 4 +- npc/events/christmas_2005.txt | 4 +- npc/events/christmas_2008.txt | 4 +- npc/events/dumplingfestival.txt | 4 +- npc/events/easter_2008.txt | 4 +- npc/events/event_skill_reset.txt | 4 +- npc/events/gdevent_aru.txt | 4 +- npc/events/gdevent_sch.txt | 4 +- npc/events/god_se_festival.txt | 4 +- npc/events/halloween_2006.txt | 4 +- npc/events/halloween_2008.txt | 4 +- npc/events/halloween_2009.txt | 4 +- npc/events/idul_fitri.txt | 4 +- npc/events/lunar_2008.txt | 4 +- npc/events/nguild/nguild_dunsw.txt | 4 +- npc/events/nguild/nguild_ev_agit.txt | 4 +- npc/events/nguild/nguild_flags.txt | 4 +- npc/events/nguild/nguild_guardians.txt | 4 +- npc/events/nguild/nguild_kafras.txt | 4 +- npc/events/nguild/nguild_managers.txt | 4 +- npc/events/nguild/nguild_treas.txt | 4 +- npc/events/nguild/nguild_warper.txt | 4 +- npc/events/twintowers.txt | 4 +- npc/events/valentinesday.txt | 4 +- npc/events/valentinesday_2009.txt | 4 +- npc/events/valentinesday_2012.txt | 4 +- npc/events/whiteday.txt | 4 +- npc/events/xmas.txt | 4 +- npc/guild/agit_controller.txt | 2 +- npc/guild/agit_main.txt | 2 +- npc/guild/aldeg_cas01.txt | 2 +- npc/guild/aldeg_cas02.txt | 2 +- npc/guild/aldeg_cas03.txt | 2 +- npc/guild/aldeg_cas04.txt | 2 +- npc/guild/aldeg_cas05.txt | 2 +- npc/guild/gefg_cas01.txt | 4 +- npc/guild/gefg_cas02.txt | 4 +- npc/guild/gefg_cas03.txt | 4 +- npc/guild/gefg_cas04.txt | 4 +- npc/guild/gefg_cas05.txt | 4 +- npc/guild/payg_cas01.txt | 4 +- npc/guild/payg_cas02.txt | 4 +- npc/guild/payg_cas03.txt | 4 +- npc/guild/payg_cas04.txt | 4 +- npc/guild/payg_cas05.txt | 4 +- npc/guild/prtg_cas01.txt | 4 +- npc/guild/prtg_cas02.txt | 4 +- npc/guild/prtg_cas03.txt | 4 +- npc/guild/prtg_cas04.txt | 4 +- npc/guild/prtg_cas05.txt | 4 +- npc/guild/trs_rp.txt | 4 +- npc/guild2/agit_main_se.txt | 2 +- npc/guild2/agit_start_se.txt | 2 +- npc/guild2/arug_cas01.txt | 2 +- npc/guild2/arug_cas02.txt | 2 +- npc/guild2/arug_cas03.txt | 2 +- npc/guild2/arug_cas04.txt | 2 +- npc/guild2/arug_cas05.txt | 2 +- npc/guild2/guild_flags.txt | 4 +- npc/guild2/schg_cas01.txt | 4 +- npc/guild2/schg_cas02.txt | 4 +- npc/guild2/schg_cas03.txt | 4 +- npc/guild2/schg_cas04.txt | 4 +- npc/guild2/schg_cas05.txt | 4 +- npc/instances/EndlessTower.txt | 4 +- npc/instances/NydhoggsNest.txt | 4 +- npc/instances/OrcsMemory.txt | 4 +- npc/instances/SealedShrine.txt | 4 +- npc/jobs/2-1/assassin.txt | 2 +- npc/jobs/2-1/priest.txt | 4 +- npc/jobs/2-1a/AssassinCross.txt | 2 +- npc/jobs/2-2/alchemist.txt | 2 +- npc/jobs/2-2/bard.txt | 2 +- npc/jobs/2-2/sage.txt | 4 +- npc/jobs/2-2a/Champion.txt | 2 +- npc/kafras/cool_event_corp.txt | 4 +- npc/kafras/dts_warper.txt | 4 +- npc/kafras/functions_kafras.txt | 4 +- npc/kafras/kafras.txt | 4 +- npc/merchants/advanced_refiner.txt | 4 +- npc/merchants/alchemist.txt | 2 +- npc/merchants/ammo_boxes.txt | 4 +- npc/merchants/buying_shops.txt | 2 +- npc/merchants/cash_hair.txt | 2 +- npc/merchants/cash_trader.txt | 2 +- npc/merchants/cashheadgear_dye.txt | 2 +- npc/merchants/clothes_dyer.txt | 4 +- npc/merchants/coin_exchange.txt | 4 +- npc/merchants/dye_maker.txt | 4 +- npc/merchants/elemental_trader.txt | 6 +-- npc/merchants/enchan_arm.txt | 4 +- npc/merchants/gemstone.txt | 4 +- npc/merchants/hair_dyer.txt | 4 +- npc/merchants/hair_style.txt | 4 +- npc/merchants/icecream.txt | 4 +- npc/merchants/inn.txt | 6 +-- npc/merchants/kunai_maker.txt | 6 +-- npc/merchants/milk_trader.txt | 4 +- npc/merchants/novice_exchange.txt | 6 +-- npc/merchants/old_pharmacist.txt | 4 +- npc/merchants/quivers.txt | 4 +- npc/merchants/refine.txt | 4 +- npc/merchants/renters.txt | 4 +- npc/merchants/shops.txt | 4 +- npc/merchants/socket_enchant.txt | 4 +- npc/merchants/socket_enchant2.txt | 4 +- npc/merchants/wander_pet_food.txt | 6 +-- npc/mobs/bossnia.txt | 2 +- npc/mobs/citycleaners.txt | 4 +- npc/mobs/jail.txt | 4 +- npc/mobs/pvp.txt | 4 +- npc/other/CashShop_Functions.txt | 2 +- npc/other/Global_Functions.txt | 4 +- npc/other/auction.txt | 2 +- npc/other/books.txt | 2 +- npc/other/bulletin_boards.txt | 2 +- npc/other/card_trader.txt | 2 +- npc/other/comodo_gambling.txt | 4 +- npc/other/divorce.txt | 4 +- npc/other/fortune.txt | 4 +- npc/other/guildpvp.txt | 4 +- npc/other/gympass.txt | 4 +- npc/other/hugel_bingo.txt | 4 +- npc/other/mail.txt | 4 +- npc/other/marriage.txt | 4 +- npc/other/mercenary_rent.txt | 4 +- npc/other/monster_museum.txt | 4 +- npc/other/monster_race.txt | 4 +- npc/other/msg_boards.txt | 5 +-- npc/other/poring_war.txt | 4 +- npc/other/powernpc.txt | 4 +- npc/other/pvp.txt | 4 +- npc/other/resetskill.txt | 4 +- npc/other/sealstatus.txt | 4 +- npc/other/turbo_track.txt | 4 +- npc/pre-re/airports/izlude.txt | 4 +- npc/pre-re/cities/alberta.txt | 2 +- npc/pre-re/jobs/1-1/acolyte.txt | 2 +- npc/pre-re/jobs/1-1/archer.txt | 2 +- npc/pre-re/mobs/dungeons/abbey.txt | 2 +- npc/pre-re/mobs/dungeons/abyss.txt | 2 +- npc/pre-re/mobs/dungeons/alde_dun.txt | 2 +- npc/pre-re/mobs/dungeons/ayo_dun.txt | 2 +- npc/pre-re/mobs/dungeons/beach_dun.txt | 2 +- npc/pre-re/mobs/dungeons/c_tower.txt | 2 +- npc/pre-re/mobs/dungeons/gefenia.txt | 6 +-- npc/pre-re/mobs/dungeons/juperos.txt | 6 +-- npc/pre-re/mobs/dungeons/lhz_dun.txt | 6 +-- npc/pre-re/mobs/fields/ayothaya.txt | 2 +- npc/pre-re/mobs/fields/lighthalzen.txt | 6 +-- npc/pre-re/other/arena/arena_aco.txt | 2 +- npc/pre-re/other/arena/arena_lvl50.txt | 2 +- npc/pre-re/other/arena/arena_lvl60.txt | 2 +- npc/pre-re/other/arena/arena_lvl70.txt | 2 +- npc/pre-re/other/arena/arena_lvl80.txt | 2 +- npc/pre-re/other/arena/arena_party.txt | 2 +- npc/pre-re/other/arena/arena_point.txt | 2 +- npc/pre-re/other/arena/arena_room.txt | 2 +- npc/pre-re/warps/other/arena.txt | 2 +- npc/quests/bard_quest.txt | 2 +- npc/quests/bunnyband.txt | 2 +- npc/quests/dandelion_request.txt | 4 +- npc/quests/eye_of_hellion.txt | 4 +- npc/quests/guildrelay.txt | 4 +- npc/quests/newgears/2004_headgears.txt | 2 +- npc/quests/newgears/2005_headgears.txt | 2 +- npc/quests/newgears/2006_headgears.txt | 2 +- npc/quests/newgears/2008_headgears.txt | 2 +- npc/quests/okolnir.txt | 4 +- npc/quests/quests_13_1.txt | 4 +- npc/quests/quests_alberta.txt | 4 +- npc/quests/quests_aldebaran.txt | 8 ++-- npc/quests/quests_amatsu.txt | 4 +- npc/quests/quests_ein.txt | 4 +- npc/quests/quests_hugel.txt | 4 +- npc/quests/quests_izlude.txt | 4 +- npc/quests/quests_juperos.txt | 4 +- npc/quests/quests_lighthalzen.txt | 4 +- npc/quests/quests_louyang.txt | 4 +- npc/quests/quests_morocc.txt | 4 +- npc/quests/quests_nameless.txt | 4 +- npc/quests/quests_niflheim.txt | 4 +- npc/quests/quests_veins.txt | 4 +- npc/quests/quests_yuno.txt | 4 +- npc/quests/seals/brisingamen_seal.txt | 2 +- npc/quests/seals/megingard_seal.txt | 4 +- npc/quests/skills/acolyte_skills.txt | 2 +- npc/quests/skills/alchemist_skills.txt | 2 +- npc/quests/skills/archer_skills.txt | 4 +- npc/quests/skills/assassin_skills.txt | 2 +- npc/quests/skills/bard_skills.txt | 2 +- npc/quests/skills/blacksmith_skills.txt | 2 +- npc/re/airports/izlude.txt | 4 +- npc/re/cities/alberta.txt | 2 +- npc/re/cities/brasilis.txt | 2 +- npc/re/jobs/1-1/acolyte.txt | 2 +- npc/re/jobs/1-1/archer.txt | 2 +- npc/re/jobs/3-1/rune_knight.txt | 4 +- npc/re/merchants/3rd_trader.txt | 2 +- npc/re/merchants/refine.txt | 4 +- npc/re/merchants/renters.txt | 4 +- npc/re/merchants/shops.txt | 4 +- npc/re/mobs/dungeons/abbey.txt | 2 +- npc/re/mobs/dungeons/abyss.txt | 2 +- npc/re/mobs/dungeons/alde_dun.txt | 2 +- npc/re/mobs/dungeons/ama_dun.txt | 2 +- npc/re/mobs/dungeons/ayo_dun.txt | 2 +- npc/re/mobs/dungeons/beach_dun.txt | 2 +- npc/re/mobs/dungeons/bra_dun.txt | 2 +- npc/re/mobs/dungeons/c_tower.txt | 2 +- npc/re/mobs/dungeons/gefenia.txt | 6 +-- npc/re/mobs/dungeons/juperos.txt | 6 +-- npc/re/mobs/dungeons/lhz_dun.txt | 6 +-- npc/re/mobs/fields/ayothaya.txt | 2 +- npc/re/mobs/fields/bifrost.txt | 2 +- npc/re/mobs/fields/brasilis.txt | 2 +- npc/re/mobs/fields/lighthalzen.txt | 6 +-- npc/re/mobs/towns/brasilis.txt | 2 +- npc/re/quests/eden/11-25.txt | 2 +- npc/re/quests/eden/26-40.txt | 2 +- npc/re/quests/eden/41-55.txt | 2 +- npc/re/quests/eden/56-70.txt | 2 +- npc/re/quests/eden/71-85.txt | 2 +- npc/re/quests/eden/86-90.txt | 2 +- npc/re/quests/eden/91-99.txt | 2 +- npc/re/warps/cities/brasilis.txt | 2 +- npc/re/warps/dungeons/bra_dun.txt | 2 +- npc/re/warps/fields/bif_fild.txt | 2 +- npc/re/warps/fields/bra_fild.txt | 2 +- npc/warps/cities/alberta.txt | 2 +- npc/warps/cities/aldebaran.txt | 2 +- npc/warps/cities/ayothaya.txt | 2 +- npc/warps/cities/comodo.txt | 6 +-- npc/warps/dungeons/abbey.txt | 2 +- npc/warps/dungeons/abyss.txt | 2 +- npc/warps/dungeons/alde_dun.txt | 2 +- npc/warps/dungeons/ama_dun.txt | 2 +- npc/warps/dungeons/ayo_dun.txt | 2 +- npc/warps/dungeons/beach_dun.txt | 2 +- npc/warps/dungeons/c_tower.txt | 2 +- npc/warps/fields/abyss_warper.txt | 2 +- npc/warps/other/airplane.txt | 2 +- npc/warps/other/bossnia.txt | 2 +- 300 files changed, 354 insertions(+), 714 deletions(-) (limited to 'npc/guild') diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt index 0deca7d29..eb621c9bf 100644 --- a/npc/airports/airships.txt +++ b/npc/airports/airships.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= The Airship System Script //===== By: ================================================== //= rAthena Dev Team diff --git a/npc/airports/einbroch.txt b/npc/airports/einbroch.txt index 25418daf7..8143c68bf 100644 --- a/npc/airports/einbroch.txt +++ b/npc/airports/einbroch.txt @@ -1,9 +1,7 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Einbroch Airport Staff //===== By: ================================================== //= L0ne_W0lf, Muad_Dib -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Einbroch Airport Staff //===== Additional Comments: ================================= diff --git a/npc/airports/hugel.txt b/npc/airports/hugel.txt index ea591eccc..d5f3155ed 100644 --- a/npc/airports/hugel.txt +++ b/npc/airports/hugel.txt @@ -1,9 +1,7 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Hugel Airport NPCs //===== By: ================================================== //= rAthena Dev Team -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Hugel Airport NPCs //===== Additional Comments: ================================= diff --git a/npc/airports/izlude.txt b/npc/airports/izlude.txt index 40d0bd437..48ccbde79 100644 --- a/npc/airports/izlude.txt +++ b/npc/airports/izlude.txt @@ -1,9 +1,7 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Izlude Airport NPCs //===== By: ================================================== //= rAthena Dev Team -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Izlude Airport NPCs //===== Additional Comments: ================================= diff --git a/npc/airports/lighthalzen.txt b/npc/airports/lighthalzen.txt index 5509b80c1..817e4b2c3 100644 --- a/npc/airports/lighthalzen.txt +++ b/npc/airports/lighthalzen.txt @@ -1,9 +1,7 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Lighthalzen Airport Staff //===== By: ================================================== //= L0ne_W0lf, Muad_Dib -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Lighthalzen Airport Staff //===== Additional Comments: ================================= diff --git a/npc/airports/rachel.txt b/npc/airports/rachel.txt index 78280fdbf..87749961c 100644 --- a/npc/airports/rachel.txt +++ b/npc/airports/rachel.txt @@ -1,9 +1,7 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Rachel Airport NPCs //===== By: ================================================== //= rAthena Dev Team -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Rachel Airport NPCs //===== Additional Comments: ================================= diff --git a/npc/airports/yuno.txt b/npc/airports/yuno.txt index ca2556fed..ffcade3cc 100644 --- a/npc/airports/yuno.txt +++ b/npc/airports/yuno.txt @@ -1,9 +1,7 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Yuno Airport Staff //===== By: ================================================== //= L0ne_W0lf, Muad_Dib -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Yuno Airport Staff //===== Additional Comments: ================================= diff --git a/npc/battleground/bg_common.txt b/npc/battleground/bg_common.txt index 178b526f3..9a7d0fb51 100644 --- a/npc/battleground/bg_common.txt +++ b/npc/battleground/bg_common.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== // BattleGround System - Common NPCs //===== By: ================================================== //= ????, L0ne_W0lf diff --git a/npc/battleground/flavius/flavius01.txt b/npc/battleground/flavius/flavius01.txt index fedea3680..42c230ff3 100644 --- a/npc/battleground/flavius/flavius01.txt +++ b/npc/battleground/flavius/flavius01.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== // BattleGround System - Flavius //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena 1.0 //===== Description: ========================================= //= [AEGIS Conversion] //= Flavius Battleground. diff --git a/npc/battleground/flavius/flavius02.txt b/npc/battleground/flavius/flavius02.txt index bc9645029..67519bdc6 100644 --- a/npc/battleground/flavius/flavius02.txt +++ b/npc/battleground/flavius/flavius02.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== // BattleGround System - Flavius Second //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= rAthena 1.0 //===== Description: ========================================= //= [AEGIS Conversion] //= Flavius Battleground. diff --git a/npc/battleground/flavius/flavius_enter.txt b/npc/battleground/flavius/flavius_enter.txt index 468a7fef8..18176f4d2 100644 --- a/npc/battleground/flavius/flavius_enter.txt +++ b/npc/battleground/flavius/flavius_enter.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== // BattleGround System - Flavius Entrance NPCs //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena 1.0 //===== Description: ========================================= //= [AEGIS Conversion] //= Flavius Battleground Entrance NPCs diff --git a/npc/battleground/kvm/kvm01.txt b/npc/battleground/kvm/kvm01.txt index b69649944..f89a8f66a 100644 --- a/npc/battleground/kvm/kvm01.txt +++ b/npc/battleground/kvm/kvm01.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== // BattleGround System - KvM 80-99 //===== By: ================================================== //= ???, L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena 1.0 //===== Description: ========================================= //= [AEGIS Conversion] //= Kreiger Von Midgard Battleground for levels 80 to 99 diff --git a/npc/battleground/kvm/kvm02.txt b/npc/battleground/kvm/kvm02.txt index d99741834..e01225fbb 100644 --- a/npc/battleground/kvm/kvm02.txt +++ b/npc/battleground/kvm/kvm02.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== // BattleGround System - KvM 1-59 //===== By: ================================================== //= ???, L0ne_W0lf //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena 1.0 //===== Description: ========================================= //= [AEGIS Conversion] //= Kreiger Von Midgard Battleground for levels 1 to 59 diff --git a/npc/battleground/kvm/kvm03.txt b/npc/battleground/kvm/kvm03.txt index 8cc26dc93..05cf76dc0 100644 --- a/npc/battleground/kvm/kvm03.txt +++ b/npc/battleground/kvm/kvm03.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== // BattleGround System - KvM 60-80 //===== By: ================================================== //= ???, L0ne_W0lf //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena 1.0 //===== Description: ========================================= //= [AEGIS Conversion] //= Kreiger Von Midgard Battleground for levels 60 to 80 diff --git a/npc/battleground/kvm/kvm_enter.txt b/npc/battleground/kvm/kvm_enter.txt index d54792bb5..512e12dbd 100644 --- a/npc/battleground/kvm/kvm_enter.txt +++ b/npc/battleground/kvm/kvm_enter.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== // BattleGround System - KvM Entrance NPCs //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena 1.0 //===== Description: ========================================= //= [AEGIS Conversion] //= Kreiger Von Midgard Battleground Entrance NPCs diff --git a/npc/battleground/kvm/kvm_item_pay.txt b/npc/battleground/kvm/kvm_item_pay.txt index 3af0c5a1b..9257e92b3 100644 --- a/npc/battleground/kvm/kvm_item_pay.txt +++ b/npc/battleground/kvm/kvm_item_pay.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== // BattleGround System - KvM Item Dealer //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena 1.0 //===== Description: ========================================= //= [AEGIS Conversion] //= Kreiger Von Midgard Battleground Point redemption NPC diff --git a/npc/battleground/tierra/tierra01.txt b/npc/battleground/tierra/tierra01.txt index b6b3e4354..4dec175c2 100644 --- a/npc/battleground/tierra/tierra01.txt +++ b/npc/battleground/tierra/tierra01.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== // BattleGround System - Tierra Gorge //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena 1.0 //===== Description: ========================================= //= [AEGIS Conversion] //= Tierra Gorge Battleground. diff --git a/npc/battleground/tierra/tierra02.txt b/npc/battleground/tierra/tierra02.txt index 867946181..aa5f09215 100644 --- a/npc/battleground/tierra/tierra02.txt +++ b/npc/battleground/tierra/tierra02.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== // BattleGround System - Tierra Gorge 2 //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena 1.0 //===== Description: ========================================= //= [AEGIS Conversion] //= Second Tierra Gorge Battleground. diff --git a/npc/battleground/tierra/tierra_enter.txt b/npc/battleground/tierra/tierra_enter.txt index 4ee74ceca..df2568125 100644 --- a/npc/battleground/tierra/tierra_enter.txt +++ b/npc/battleground/tierra/tierra_enter.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== // BattleGround System - Tierra Gorge Entrance NPCs //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena 1.0 //===== Description: ========================================= //= [AEGIS Conversion] //= Tierra Gorge Battleground Entrance NPCs diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt index c0787516a..ccfced388 100644 --- a/npc/cities/alberta.txt +++ b/npc/cities/alberta.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Alberta Town //===== By: ================================================== //= DZeroX diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt index 19c675cf3..d49a4f8f0 100644 --- a/npc/cities/aldebaran.txt +++ b/npc/cities/aldebaran.txt @@ -1,7 +1,7 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Al De Baran Town //===== By: ================================================== -//= rAthena dev team; L0ne_W0lf +//= L0ne_W0lf, rAthena Dev Team //===== Current Version: ===================================== //= 2.3 //===== Description: ========================================= diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt index de44a5a82..de68aff7b 100644 --- a/npc/cities/amatsu.txt +++ b/npc/cities/amatsu.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Amatsu Town //===== By: ================================================== //= rAthena Dev Team diff --git a/npc/cities/ayothaya.txt b/npc/cities/ayothaya.txt index 5f4e4ab54..e05cf8e40 100644 --- a/npc/cities/ayothaya.txt +++ b/npc/cities/ayothaya.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Ayotaya Town //===== By: ================================================== //= MasterOfMuppets diff --git a/npc/cities/comodo.txt b/npc/cities/comodo.txt index 38d7731ba..31d108710 100644 --- a/npc/cities/comodo.txt +++ b/npc/cities/comodo.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Comodo Town //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== //= 2.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Comodo Town NPCs diff --git a/npc/cities/einbech.txt b/npc/cities/einbech.txt index 3e39655e3..a4c969910 100644 --- a/npc/cities/einbech.txt +++ b/npc/cities/einbech.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Einbech Town //===== By: ================================================== //= Muad_Dib //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= rAthena Revision 3000+ //===== Description: ========================================= //= //===== Additional Comments: ================================= diff --git a/npc/cities/einbroch.txt b/npc/cities/einbroch.txt index 710c57740..27f561007 100644 --- a/npc/cities/einbroch.txt +++ b/npc/cities/einbroch.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Einbroch Town //===== By: ================================================== //= Everybody mentioned in the comments //===== Current Version: ===================================== //= 1.7 -//===== Compatible With: ===================================== -//= rAthena Revision 3000+ //===== Description: ========================================= //= //===== Additional Comments: ================================= diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt index f5cff90d3..bc337bf3c 100644 --- a/npc/cities/geffen.txt +++ b/npc/cities/geffen.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Geffen Town //===== By: ================================================== //= Everybody mentioned in the comments //===== Current Version: ===================================== //= 1.9 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Geffen Town NPCs diff --git a/npc/cities/gonryun.txt b/npc/cities/gonryun.txt index b3e6b7dda..4d2141e00 100644 --- a/npc/cities/gonryun.txt +++ b/npc/cities/gonryun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Kunlun Town //===== By: ================================================== //= x[tsk], KarLaeda //===== Current Version: ===================================== //= 1.6 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Kunlun Town Script diff --git a/npc/cities/hugel.txt b/npc/cities/hugel.txt index aba6f3997..845b81015 100644 --- a/npc/cities/hugel.txt +++ b/npc/cities/hugel.txt @@ -1,12 +1,10 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Hugel City //===== By: ================================================== //= vicious_pucca, Poki#3, erKURITA, Munin, and everybody in the //= comments //===== Current Version: ===================================== //= 1.7 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= NPC's for the City of Hugel. //===== Additional Comments: ================================= diff --git a/npc/cities/izlude.txt b/npc/cities/izlude.txt index 156e6b207..da7b650d7 100644 --- a/npc/cities/izlude.txt +++ b/npc/cities/izlude.txt @@ -1,12 +1,10 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Izlude Town //===== By: ================================================== //= kobra_k88 //= L0ne_W0lf //===== Current Version: ===================================== //= 1.8a -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Izlude town NPCs diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt index e6706df4a..a54e2a487 100644 --- a/npc/cities/jawaii.txt +++ b/npc/cities/jawaii.txt @@ -1,4 +1,4 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Jawaii (The Lovers' Paradise) Town //===== By: ================================================== //= jAthena (1.0) @@ -6,8 +6,6 @@ //= L0ne_w0lf //===== Current Version: ===================================== //= 3.7 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Jawaii Town NPCs diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt index 9ba02bca3..35af28b2d 100644 --- a/npc/cities/lighthalzen.txt +++ b/npc/cities/lighthalzen.txt @@ -1,44 +1,12 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Lighthalzen City //===== By: ================================================== //= erKURITA, Au{R}oN (Translated by Alan), $ephiroth //===== Current Version: ===================================== //= 2.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Lighthalzen NPCs (Temporal names for now) [erKURITA] //===== Additional Comments: ================================== -//= 0.1 Placed temporal names, why there weren't on the SVN before? [erKURITA] -//= 0.2 Implemented some crap NPCs [MasterOfMuppets] -//= 0.3 Another load of NPCs. Scripted by Kargha [MasterOfMuppets] -//= 0.4 More Town NPCs. [Musashiden] -//= 0.5 Added a BIG load of Lighthalzen NPCs. [musashiden] -//= 0.6 Fixed some typos+Coordinates. [Musashiden] -//= 0.7 Implemented some more crap NPCs and the second entrance to biolabs [MasterOfMuppets] -//= 0.8 Removed Duplicates [Silent] -//= 0.9 Removed Duplicates [Toms] -//= 1.0 Added a missing feature to the donation NPC [MasterOfMuppets] -//= 1.0a added constants to emotions, minor optimization [Lupus] -//= 1.0b npcid fix [KarLaeda] -//= 1.1 Added new NPC by $ephiroth and merged other NPCs -//= from npc\other\lighthalzen_???.txt [Lupus] -//= 1.2 Moved some NPCs to Lighthalzen quests. [SinSloth] -//= 1.3 Moved some other NPCs for quests purposes. [SinSloth] -//= 1.4 Corrected NPC names to fall within proper resctrictions. [L0ne_W0lf] -//= 1.5 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf] -//= 1.6 Massive NPC clean up, includes corrected dialogs and [L0ne_W0lf] -//= added missing dialogs, fixed indentation, corrected some NPC -//= facing positions, NPC names are more unique now. Removed -//= whitespace (empty lines after header and before end curly) -//= reduced usage of the command "goto", grammatical corrections. -//= Added additional missing NPCs. -//= 1.7 Removed Auciton Staff as the offical auction file has been added. [L0ne_W0lf] -//= Corrected Lucius so he checks the donation variable. (bugreport:1103) [L0ne_W0lf] -//= 1.7a Another fix to Lucius. (bugreport:1118) [L0ne_W0lf] -//= 1.7b Another fix to Lucius (trivial). (bugreport:1125) -//= 1.8 Replaced effect numerics with constants. [L0ne_W0lf] -//= 1.9 Added Cool Corp. Event Staff, who oringialy resided in the DTS_warper script file. [L0ne_W0lf] //= 2.0 Added missing Lab Staff#amano08 NPC. (bugreport:4319) [Gepard] //= 2.1 Commented out Duplicate NPCs. (bugreport:4555) //= 2.2 Added missing NPC found in AEGIS files. [L0ne_W0lf] @@ -3213,3 +3181,37 @@ lhz_in01,221,131,7 script Scientist#li_01 865,{ // Lighthalzen Mushroom. // Don't really understand why it's there, but it's funny regardless. lhz_in01,157,54,0,0 monster Red Mushroom 1085,1,120000,100000,0 + +//========================= +// Older Comments +//========================= +//= 0.1 Placed temporal names, why there weren't on the SVN before? [erKURITA] +//= 0.2 Implemented some crap NPCs [MasterOfMuppets] +//= 0.3 Another load of NPCs. Scripted by Kargha [MasterOfMuppets] +//= 0.4 More Town NPCs. [Musashiden] +//= 0.5 Added a BIG load of Lighthalzen NPCs. [musashiden] +//= 0.6 Fixed some typos+Coordinates. [Musashiden] +//= 0.7 Implemented some more crap NPCs and the second entrance to biolabs [MasterOfMuppets] +//= 0.8 Removed Duplicates [Silent] +//= 0.9 Removed Duplicates [Toms] +//= 1.0 Added a missing feature to the donation NPC [MasterOfMuppets] +//= 1.0a added constants to emotions, minor optimization [Lupus] +//= 1.0b npcid fix [KarLaeda] +//= 1.1 Added new NPC by $ephiroth and merged other NPCs +//= from npc\other\lighthalzen_???.txt [Lupus] +//= 1.2 Moved some NPCs to Lighthalzen quests. [SinSloth] +//= 1.3 Moved some other NPCs for quests purposes. [SinSloth] +//= 1.4 Corrected NPC names to fall within proper resctrictions. [L0ne_W0lf] +//= 1.5 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf] +//= 1.6 Massive NPC clean up, includes corrected dialogs and [L0ne_W0lf] +//= added missing dialogs, fixed indentation, corrected some NPC +//= facing positions, NPC names are more unique now. Removed +//= whitespace (empty lines after header and before end curly) +//= reduced usage of the command "goto", grammatical corrections. +//= Added additional missing NPCs. +//= 1.7 Removed Auciton Staff as the offical auction file has been added. [L0ne_W0lf] +//= Corrected Lucius so he checks the donation variable. (bugreport:1103) [L0ne_W0lf] +//= 1.7a Another fix to Lucius. (bugreport:1118) [L0ne_W0lf] +//= 1.7b Another fix to Lucius (trivial). (bugreport:1125) +//= 1.8 Replaced effect numerics with constants. [L0ne_W0lf] +//= 1.9 Added Cool Corp. Event Staff, who oringialy resided in the DTS_warper script file. [L0ne_W0lf] diff --git a/npc/cities/louyang.txt b/npc/cities/louyang.txt index 0fc53b045..9f4b41f80 100644 --- a/npc/cities/louyang.txt +++ b/npc/cities/louyang.txt @@ -1,4 +1,4 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Louyang City NPC's //===== By: ================================================== //= Vidar (1.0) @@ -9,8 +9,6 @@ //= rAthena Dev Team //===== Current Version: ===================================== //= 3.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Louyang Town Script diff --git a/npc/cities/lutie.txt b/npc/cities/lutie.txt index 2596e0a4f..95fce1beb 100644 --- a/npc/cities/lutie.txt +++ b/npc/cities/lutie.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Lutie Town //===== By: ================================================== -//= rAthena dev team +//= rAthena Dev Team //===== Current Version: ===================================== //= 1.7 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Lutie - City NPCs //===== Additional Comments: ================================= diff --git a/npc/cities/manuk.txt b/npc/cities/manuk.txt index 07bf61ccf..cd4181552 100644 --- a/npc/cities/manuk.txt +++ b/npc/cities/manuk.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Manuk Town //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Town-specific NPCs for Manuk. diff --git a/npc/cities/morocc.txt b/npc/cities/morocc.txt index a533b0fd6..83065d2c6 100644 --- a/npc/cities/morocc.txt +++ b/npc/cities/morocc.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Morroc Town //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== //= 2.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Morroc Town NPCs diff --git a/npc/cities/moscovia.txt b/npc/cities/moscovia.txt index e05a4a755..50e5d0e69 100644 --- a/npc/cities/moscovia.txt +++ b/npc/cities/moscovia.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Moscovia Town //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Moscovia Town Script //===== Additional Comments: ================================= diff --git a/npc/cities/niflheim.txt b/npc/cities/niflheim.txt index 581dffaf4..d9a6cb19a 100644 --- a/npc/cities/niflheim.txt +++ b/npc/cities/niflheim.txt @@ -1,13 +1,10 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Niflheim Script //===== By: ================================================== //= Fyrien, Dizzy, PKGINGO //= Official NPCs translated and re-edited by Celest //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= [Aegis Conversion] -//= rAthena SVN; Niflheim Required //===== Description: ========================================= //= Official NPC's for Niflheim //= 1.01 Splitted file(guides, shops). Fixed rand() bugs, diff --git a/npc/cities/payon.txt b/npc/cities/payon.txt index 4d85c3a9c..feea5ed88 100644 --- a/npc/cities/payon.txt +++ b/npc/cities/payon.txt @@ -1,12 +1,10 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Payon City //===== By: ================================================== //= Muad Dib (1.0) Darkchild (1.1) Muad Dib (1.2) //= Darkchild (1.3) DracoRPG (1.5) L0ne_W0lf (2.1) //===== Current Version: ===================================== //= 2.1b -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Payon City Npcs //===== Additional Comments: ================================= diff --git a/npc/cities/prontera.txt b/npc/cities/prontera.txt index 8dac3d078..5c81cadce 100644 --- a/npc/cities/prontera.txt +++ b/npc/cities/prontera.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Prontera Town //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== //= 2.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= NPCs in Prontera diff --git a/npc/cities/rachel.txt b/npc/cities/rachel.txt index cf6c0ed64..db3c6816e 100644 --- a/npc/cities/rachel.txt +++ b/npc/cities/rachel.txt @@ -1,12 +1,10 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Rachel City NPCs //===== By: ================================================== //= First Version: Tsuyuki and Harp //= iRO Version: L0ne_W0lf //===== Current Version: ===================================== //= 0.9 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Partial Aegis Conversion] //= Arunafeltz NPCs diff --git a/npc/cities/splendide.txt b/npc/cities/splendide.txt index 87bf41a81..2a961040d 100644 --- a/npc/cities/splendide.txt +++ b/npc/cities/splendide.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Splendide Town //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Town-specific NPCs for Splendide. diff --git a/npc/cities/umbala.txt b/npc/cities/umbala.txt index 74fc5b6ea..cb8a1e0c0 100644 --- a/npc/cities/umbala.txt +++ b/npc/cities/umbala.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Umbala Town script //===== By: ================================================== //= jAthena (1.0) Fusion Dev Team (1.1) Muad Dib (1.2) Darkchild (1.3) //===== Current Version: ===================================== //= 2.1 -//===== Compatible With: ===================================== -//= rAthena SVN; RO Episode XX //===== Description: ========================================= //- [Aegis Conversion] //= Umbala Town Npcs diff --git a/npc/cities/veins.txt b/npc/cities/veins.txt index 2f066f10d..f07955587 100644 --- a/npc/cities/veins.txt +++ b/npc/cities/veins.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Veins Town script //===== By: ================================================== //= Muad_Dib //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Veins Town Npcs diff --git a/npc/cities/yuno.txt b/npc/cities/yuno.txt index 31c57bdc2..f681aa4e4 100644 --- a/npc/cities/yuno.txt +++ b/npc/cities/yuno.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Juno City //===== By: ================================================== //= KitsuneStarwind, kobra_k88, L0ne_W0lf //===== Current Version: ===================================== //= 1.4a -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= NPCs for the City of Juno diff --git a/npc/custom/breeder.txt b/npc/custom/breeder.txt index f18c18a54..a4452db68 100644 --- a/npc/custom/breeder.txt +++ b/npc/custom/breeder.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Universal Rental NPC //===== By: ================================================== //= Euphy diff --git a/npc/custom/card_remover.txt b/npc/custom/card_remover.txt index e1a4f90f6..1e0a1c8f7 100644 --- a/npc/custom/card_remover.txt +++ b/npc/custom/card_remover.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Card Removal NPC //===== By: ================================================== //= TyrNemesis^ diff --git a/npc/custom/etc/airplane.txt b/npc/custom/etc/airplane.txt index ac784b599..637d38e61 100644 --- a/npc/custom/etc/airplane.txt +++ b/npc/custom/etc/airplane.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= elRO Airship //===== By: ================================================== //= Draike, Bluto, Hephaestus diff --git a/npc/custom/etc/bank.txt b/npc/custom/etc/bank.txt index b7a62d228..00ebc66c8 100644 --- a/npc/custom/etc/bank.txt +++ b/npc/custom/etc/bank.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Banker Script //===== By: ================================================== //= Syrus22 (1.0) diff --git a/npc/custom/etc/bank_kafra.txt b/npc/custom/etc/bank_kafra.txt index 5ac35fe85..12f35aff5 100644 --- a/npc/custom/etc/bank_kafra.txt +++ b/npc/custom/etc/bank_kafra.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= The 2nd Bank of Prontera (with daily 0.01% income!) //===== By: ================================================== //= Lupus (1.0) diff --git a/npc/custom/etc/blackjack.txt b/npc/custom/etc/blackjack.txt index 405409236..15e74865c 100644 --- a/npc/custom/etc/blackjack.txt +++ b/npc/custom/etc/blackjack.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Black Jack //===== By: ================================================== //= kobra_k88 diff --git a/npc/custom/quests/bandit_beard.txt b/npc/custom/quests/bandit_beard.txt index bc0f2e061..175471f56 100644 --- a/npc/custom/quests/bandit_beard.txt +++ b/npc/custom/quests/bandit_beard.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Bandit Beard Quest //===== By: ================================================== //= Mega Man Expert & Lupus diff --git a/npc/custom/quests/berzebub.txt b/npc/custom/quests/berzebub.txt index 02f5e561b..1ba44211e 100644 --- a/npc/custom/quests/berzebub.txt +++ b/npc/custom/quests/berzebub.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Berzebub Card Quest //===== By: ================================================== //= jabs diff --git a/npc/custom/resetnpc.txt b/npc/custom/resetnpc.txt index eb34137e4..c3ad9afb2 100644 --- a/npc/custom/resetnpc.txt +++ b/npc/custom/resetnpc.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Reset NPC //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Resets skills, stats, or both. //===== Additional Comments: ================================= diff --git a/npc/events/MemorialDay_2008.txt b/npc/events/MemorialDay_2008.txt index 4073092f3..96c24bdfa 100644 --- a/npc/events/MemorialDay_2008.txt +++ b/npc/events/MemorialDay_2008.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= In Memory of Heroes //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= iRO Memorial Day (2008) //===== Additional Comments: ================================= diff --git a/npc/events/StPatrick_2008.txt b/npc/events/StPatrick_2008.txt index 3e85c8a04..bb736955f 100644 --- a/npc/events/StPatrick_2008.txt +++ b/npc/events/StPatrick_2008.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= St. Patrick's Day (2008) //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= iRO St. Patrick's Day. (2008) //= Find O'Riley's treasure for him, then hunt down coinds from diff --git a/npc/events/bossnia.txt b/npc/events/bossnia.txt index a50fa4980..ee71a940b 100644 --- a/npc/events/bossnia.txt +++ b/npc/events/bossnia.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Bossnia Warp NPCs //===== By: ================================================== //= Masao diff --git a/npc/events/children_week.txt b/npc/events/children_week.txt index 99c0fedaf..cc4fb543c 100644 --- a/npc/events/children_week.txt +++ b/npc/events/children_week.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Children Week Event //===== By: ================================================== //= Samuray22 //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Indian Ro: Children Week Event diff --git a/npc/events/christmas_2005.txt b/npc/events/christmas_2005.txt index fd82b553f..a5af84273 100644 --- a/npc/events/christmas_2005.txt +++ b/npc/events/christmas_2005.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= 2005 ChristMas Event //===== By: ================================================== //= Brainstorm //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Event 1: Louise's Kim creates Louise's Santa Hat. diff --git a/npc/events/christmas_2008.txt b/npc/events/christmas_2008.txt index b3a7de10a..91555424a 100644 --- a/npc/events/christmas_2008.txt +++ b/npc/events/christmas_2008.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= iRO 2008 Christmas Event //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= iRO Christmas Event. (2008) //= Create Music Box and Cake. diff --git a/npc/events/dumplingfestival.txt b/npc/events/dumplingfestival.txt index 443facc30..44135389b 100644 --- a/npc/events/dumplingfestival.txt +++ b/npc/events/dumplingfestival.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Imitation of Dumpling Festival //===== By =================================================== //= Massdriller //===== Version ============================================== //= 1.01 -//===== Compatible With ====================================== -//= rAthena 0.52+ //===== Description ========================================== //= A complete redering of the Dumpling Festival. //===== Comments ============================================= diff --git a/npc/events/easter_2008.txt b/npc/events/easter_2008.txt index 026d2a3d2..fe6e02c85 100644 --- a/npc/events/easter_2008.txt +++ b/npc/events/easter_2008.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Easter Event (2008) //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= iRO Easter Event. (2008) //= Create Holy Eggs diff --git a/npc/events/event_skill_reset.txt b/npc/events/event_skill_reset.txt index d5f7fbfe4..893e0c92b 100644 --- a/npc/events/event_skill_reset.txt +++ b/npc/events/event_skill_reset.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Official Skill Resetter Event in Yuno (kRO & idRO) //===== By: ================================================== //= $ephiroth //===== Current Version: ===================================== //= 1.02 -//===== Compatible With: ===================================== -//= rAthena 1.0 //===== Description: ========================================= //= 2006 - Edition Skill Reset NPC //= 2006/11/16: 1.0 Release and fully working. [$ephiroth] diff --git a/npc/events/gdevent_aru.txt b/npc/events/gdevent_aru.txt index 8fd4c4a1d..cafb8f01e 100644 --- a/npc/events/gdevent_aru.txt +++ b/npc/events/gdevent_aru.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Guild dungeon event, Arunafeltz. //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Guild dungeon event, Arunafeltz. Retrieve Morestone's //= pickaxe from Kublin. diff --git a/npc/events/gdevent_sch.txt b/npc/events/gdevent_sch.txt index 6bf391b28..786164320 100644 --- a/npc/events/gdevent_sch.txt +++ b/npc/events/gdevent_sch.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Guild dungeon event, Schwaltzvalt. //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Guild dungeon event, Schwaltzvalt. Retrieve Morestone's //= pickaxe from Kublin. diff --git a/npc/events/god_se_festival.txt b/npc/events/god_se_festival.txt index c9f84d6e0..5ceeebd44 100644 --- a/npc/events/god_se_festival.txt +++ b/npc/events/god_se_festival.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Valkyrie's Gift NPCs //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Post-God Item SE Creation Summoning Event diff --git a/npc/events/halloween_2006.txt b/npc/events/halloween_2006.txt index fce598c73..b8664de2e 100644 --- a/npc/events/halloween_2006.txt +++ b/npc/events/halloween_2006.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= 2006 Halloween Event //===== By: ================================================== //= Brainstorm //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Event 1: Redeem "Pumpkin Mojo" for pumpkin headgear. diff --git a/npc/events/halloween_2008.txt b/npc/events/halloween_2008.txt index c14dd1656..78407465f 100644 --- a/npc/events/halloween_2008.txt +++ b/npc/events/halloween_2008.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= iRO Halloween (2008) //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= iRO Halloween (2008) //= Run away from the zombies for tickets. diff --git a/npc/events/halloween_2009.txt b/npc/events/halloween_2009.txt index f143c95f4..9dee31807 100644 --- a/npc/events/halloween_2009.txt +++ b/npc/events/halloween_2009.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= iRO Halloween (2009) //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= iRO Halloween (2009) //= Quest for Weird Pumpkin Hat. diff --git a/npc/events/idul_fitri.txt b/npc/events/idul_fitri.txt index aad875821..c4c06f07f 100644 --- a/npc/events/idul_fitri.txt +++ b/npc/events/idul_fitri.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Feast Day Of Ramadan Idul Fitri Event //===== By: ================================================== //= $ephiroth //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Info : Official idRO //= 2006/10/16: 1.0 Release and fully working. [$ephiroth] diff --git a/npc/events/lunar_2008.txt b/npc/events/lunar_2008.txt index 7e5530981..72ebe644b 100644 --- a/npc/events/lunar_2008.txt +++ b/npc/events/lunar_2008.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Lunar New Year Event (2008) //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= iRO Lunar New Year event; Year of the Rat. (2008) //= Kill Cramps, Taruus, and Matrins to retrieve "Rice Pouches" diff --git a/npc/events/nguild/nguild_dunsw.txt b/npc/events/nguild/nguild_dunsw.txt index 8a34362f3..7f191290b 100644 --- a/npc/events/nguild/nguild_dunsw.txt +++ b/npc/events/nguild/nguild_dunsw.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium Dungeon Switch for NGuild Castles //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena 0.1+; RO Episode 4+ //===== Description: ========================================= //= Switch that warps guild members to the guild dungeon //===== Additional Comments: ================================= diff --git a/npc/events/nguild/nguild_ev_agit.txt b/npc/events/nguild/nguild_ev_agit.txt index 1dad83b83..96c16136c 100644 --- a/npc/events/nguild/nguild_ev_agit.txt +++ b/npc/events/nguild/nguild_ev_agit.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium - NGuild Wars Events //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= rAthena 0.1+; RO Episode 4+ //===== Description: ========================================= //= Event Triggers for NGuild Wars //===== Additional Comments: ================================= diff --git a/npc/events/nguild/nguild_flags.txt b/npc/events/nguild/nguild_flags.txt index 1642c4419..178125643 100644 --- a/npc/events/nguild/nguild_flags.txt +++ b/npc/events/nguild/nguild_flags.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium N Guild Flags //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena 0.1+; RO Episode 4+ //===== Description: ========================================= //= WoE flag scripts. Display guild emblems on flags. //===== Additional Comments: ================================= diff --git a/npc/events/nguild/nguild_guardians.txt b/npc/events/nguild/nguild_guardians.txt index 299c3a380..7b0e5bab4 100644 --- a/npc/events/nguild/nguild_guardians.txt +++ b/npc/events/nguild/nguild_guardians.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium - nguild guardians script //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena 0.1+; RO Episode 4+ //===== Description: ========================================= //= Re-spawns guardians on server start if they have been //= purchased. Also announces when a guardian dies. diff --git a/npc/events/nguild/nguild_kafras.txt b/npc/events/nguild/nguild_kafras.txt index a4bd7ff01..11d748ab4 100644 --- a/npc/events/nguild/nguild_kafras.txt +++ b/npc/events/nguild/nguild_kafras.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium Kafras for N Guild Castles //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena 0.1+; RO Episode 5+ //===== Description: ========================================= //= Provides Kafra services for guild members of NGuild Castles. //= Used in conjuction with function F_Kafra. diff --git a/npc/events/nguild/nguild_managers.txt b/npc/events/nguild/nguild_managers.txt index 7d5bf52ff..0b35108f7 100644 --- a/npc/events/nguild/nguild_managers.txt +++ b/npc/events/nguild/nguild_managers.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium Managers for N Guild Castles //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena 0.1+; RO Episode 4+ //===== Description: ========================================= //= //============================================== diff --git a/npc/events/nguild/nguild_treas.txt b/npc/events/nguild/nguild_treas.txt index 1fc8cbaf9..485a58e70 100644 --- a/npc/events/nguild/nguild_treas.txt +++ b/npc/events/nguild/nguild_treas.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium Treasure Rooms for NGuild Guild Castles //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== //= 1.3b -//===== Compatible With: ===================================== -//= rAthena 0.1+; RO Episode 4+ //===== Description: ========================================= //= //===== Additional Comments: ================================= diff --git a/npc/events/nguild/nguild_warper.txt b/npc/events/nguild/nguild_warper.txt index a3e16b940..57f5bc827 100644 --- a/npc/events/nguild/nguild_warper.txt +++ b/npc/events/nguild/nguild_warper.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Novice's Guild Castles War of Emperium Usher NPC //===== By: ================================================== //= Lupus //===== Current Version: ===================================== //= 1.7 -//===== Compatible With: ===================================== -//= rAthena 1+ with eaclass(); RO Episode 4+ //===== Description: ========================================= //= //===== Additional Comments: ================================= diff --git a/npc/events/twintowers.txt b/npc/events/twintowers.txt index 942807222..1e0505ffd 100644 --- a/npc/events/twintowers.txt +++ b/npc/events/twintowers.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Twin Towers NPCs //===== By: ================================================== //= sEiKaN (1.0) //===== Current Version: ===================================== //= 1.6 -//===== Compatible With: ===================================== -//= Any Athena Version; 0315+ //===== Description: ========================================= //= mRO Event: Twin Towers NPCs //===== Additional Comments: ================================= diff --git a/npc/events/valentinesday.txt b/npc/events/valentinesday.txt index c6941016d..8f2bd85d5 100644 --- a/npc/events/valentinesday.txt +++ b/npc/events/valentinesday.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Valentine Event Script //===== By: ================================================== //= Muad_Dib (Prometheus Project) //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= // //===== Additional Comments: ================================= diff --git a/npc/events/valentinesday_2009.txt b/npc/events/valentinesday_2009.txt index 6ded29242..dd09f4470 100644 --- a/npc/events/valentinesday_2009.txt +++ b/npc/events/valentinesday_2009.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= iRO Valentine's Day Event (2009) //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= iRO Valentine's Day Event. (2009) //= Make Chocolate/Chocolate Boxes/Home-Made Chocolate. diff --git a/npc/events/valentinesday_2012.txt b/npc/events/valentinesday_2012.txt index a92b24338..a8597cd22 100644 --- a/npc/events/valentinesday_2012.txt +++ b/npc/events/valentinesday_2012.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Valentine's Day Event (2012) //===== By: ================================================== //= Rikimaru //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= The full Valentine's Day NPCs of the Valentine's Day //= Event 2012 (account-based). diff --git a/npc/events/whiteday.txt b/npc/events/whiteday.txt index 932ec1469..d0acc8426 100644 --- a/npc/events/whiteday.txt +++ b/npc/events/whiteday.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= White Day Event Script //===== By: ================================================== //= 1.0a Muad_Dib (Prometheus Project) //===== Current Version: ===================================== //= 1.0a -//===== Compatible With: ===================================== -//= Any Athena Version; RO Episode 6+ //===== Description: ========================================= //= Sells candy, candy cane and well baked cookie. //===== Additional Comments: ================================= diff --git a/npc/events/xmas.txt b/npc/events/xmas.txt index ecab31491..99b3fdec9 100644 --- a/npc/events/xmas.txt +++ b/npc/events/xmas.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= X-mas Event //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= Any version of rAthena //===== Description: ========================================= //= Beat up Antonios and grab his socks. Get at least 3 and //= give them to Santa Claus Claus in exchange for a present. diff --git a/npc/guild/agit_controller.txt b/npc/guild/agit_controller.txt index 36ebdf941..57f1fe4d7 100644 --- a/npc/guild/agit_controller.txt +++ b/npc/guild/agit_controller.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium - WoE Auto-Start //===== By: ================================================== //= kalen (1.0) diff --git a/npc/guild/agit_main.txt b/npc/guild/agit_main.txt index 8f4253299..115238bfb 100644 --- a/npc/guild/agit_main.txt +++ b/npc/guild/agit_main.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium Guild Template File //===== By: ================================================== //= L0ne_W0lf diff --git a/npc/guild/aldeg_cas01.txt b/npc/guild/aldeg_cas01.txt index 06d523e09..0707d4725 100644 --- a/npc/guild/aldeg_cas01.txt +++ b/npc/guild/aldeg_cas01.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium (Al De Baran) //===== By: ================================================== //= L0ne_W0lf diff --git a/npc/guild/aldeg_cas02.txt b/npc/guild/aldeg_cas02.txt index e5c931239..06371f14d 100644 --- a/npc/guild/aldeg_cas02.txt +++ b/npc/guild/aldeg_cas02.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium (Al De Baran) //===== By: ================================================== //= L0ne_W0lf diff --git a/npc/guild/aldeg_cas03.txt b/npc/guild/aldeg_cas03.txt index 9666bdaf0..299ffdadc 100644 --- a/npc/guild/aldeg_cas03.txt +++ b/npc/guild/aldeg_cas03.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium (Al De Baran) //===== By: ================================================== //= L0ne_W0lf diff --git a/npc/guild/aldeg_cas04.txt b/npc/guild/aldeg_cas04.txt index cc91a0207..91e38c96d 100644 --- a/npc/guild/aldeg_cas04.txt +++ b/npc/guild/aldeg_cas04.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium (Al De Baran) //===== By: ================================================== //= L0ne_W0lf diff --git a/npc/guild/aldeg_cas05.txt b/npc/guild/aldeg_cas05.txt index 229c5ea36..85bb272f1 100644 --- a/npc/guild/aldeg_cas05.txt +++ b/npc/guild/aldeg_cas05.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium (Al De Baran) //===== By: ================================================== //= L0ne_W0lf diff --git a/npc/guild/gefg_cas01.txt b/npc/guild/gefg_cas01.txt index 1b4c2946f..527a1a9a6 100644 --- a/npc/guild/gefg_cas01.txt +++ b/npc/guild/gefg_cas01.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium (Geffen) //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= NPCs that relate to Geffen Guild Castle 1 //===== Additional Comments: ================================= diff --git a/npc/guild/gefg_cas02.txt b/npc/guild/gefg_cas02.txt index 7b4678c52..dfb20f93b 100644 --- a/npc/guild/gefg_cas02.txt +++ b/npc/guild/gefg_cas02.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium (Geffen) //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= NPCs that relate to Geffen Guild Castle 2 //===== Additional Comments: ================================= diff --git a/npc/guild/gefg_cas03.txt b/npc/guild/gefg_cas03.txt index 65358b274..b46ed18c7 100644 --- a/npc/guild/gefg_cas03.txt +++ b/npc/guild/gefg_cas03.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium (Geffen) //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= NPCs that relate to Geffen Guild Castle 3 //===== Additional Comments: ================================= diff --git a/npc/guild/gefg_cas04.txt b/npc/guild/gefg_cas04.txt index 9cd9c760b..b42055293 100644 --- a/npc/guild/gefg_cas04.txt +++ b/npc/guild/gefg_cas04.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium (Geffen) //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= NPCs that relate to Geffen Guild Castle 4 //===== Additional Comments: ================================= diff --git a/npc/guild/gefg_cas05.txt b/npc/guild/gefg_cas05.txt index 907429241..ce53a3d04 100644 --- a/npc/guild/gefg_cas05.txt +++ b/npc/guild/gefg_cas05.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium (Geffen) //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= NPCs that relate to Geffen Guild Castle 5 //===== Additional Comments: ================================= diff --git a/npc/guild/payg_cas01.txt b/npc/guild/payg_cas01.txt index 9f8ff665a..bd33111cd 100644 --- a/npc/guild/payg_cas01.txt +++ b/npc/guild/payg_cas01.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium (Payon) //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= NPCs that relate to Payon Guild Castle 1 //===== Additional Comments: ================================= diff --git a/npc/guild/payg_cas02.txt b/npc/guild/payg_cas02.txt index eb20d67af..4ada2da53 100644 --- a/npc/guild/payg_cas02.txt +++ b/npc/guild/payg_cas02.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium (Payon) //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= NPCs that relate to Payon Guild Castle 1 //===== Additional Comments: ================================= diff --git a/npc/guild/payg_cas03.txt b/npc/guild/payg_cas03.txt index a395f9d3b..e67b9798f 100644 --- a/npc/guild/payg_cas03.txt +++ b/npc/guild/payg_cas03.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium (Payon) //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= NPCs that relate to Payon Guild Castle 1 //===== Additional Comments: ================================= diff --git a/npc/guild/payg_cas04.txt b/npc/guild/payg_cas04.txt index 5ae0997a8..b3ddce797 100644 --- a/npc/guild/payg_cas04.txt +++ b/npc/guild/payg_cas04.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium (Payon) //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= NPCs that relate to Payon Guild Castle 1 //===== Additional Comments: ================================= diff --git a/npc/guild/payg_cas05.txt b/npc/guild/payg_cas05.txt index 0c1f833fe..ce5ee2f06 100644 --- a/npc/guild/payg_cas05.txt +++ b/npc/guild/payg_cas05.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium (Payon) //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= NPCs that relate to Payon Guild Castle 1 //===== Additional Comments: ================================= diff --git a/npc/guild/prtg_cas01.txt b/npc/guild/prtg_cas01.txt index 119658263..25206d922 100644 --- a/npc/guild/prtg_cas01.txt +++ b/npc/guild/prtg_cas01.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium (Prontera) //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= NPCs that relate to Prontera Guild Castle 1 //===== Additional Comments: ================================= diff --git a/npc/guild/prtg_cas02.txt b/npc/guild/prtg_cas02.txt index 2ddc7268e..4ddb3f64f 100644 --- a/npc/guild/prtg_cas02.txt +++ b/npc/guild/prtg_cas02.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium (Prontera) //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= NPCs that relate to Prontera Guild Castle 2 //===== Additional Comments: ================================= diff --git a/npc/guild/prtg_cas03.txt b/npc/guild/prtg_cas03.txt index bf55583e7..28dea58d4 100644 --- a/npc/guild/prtg_cas03.txt +++ b/npc/guild/prtg_cas03.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium (Prontera) //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= NPCs that relate to Prontera Guild Castle 3 //===== Additional Comments: ================================= diff --git a/npc/guild/prtg_cas04.txt b/npc/guild/prtg_cas04.txt index 5e1a050ff..d6bb7c15c 100644 --- a/npc/guild/prtg_cas04.txt +++ b/npc/guild/prtg_cas04.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium (Prontera) //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= NPCs that relate to Prontera Guild Castle 4 //===== Additional Comments: ================================= diff --git a/npc/guild/prtg_cas05.txt b/npc/guild/prtg_cas05.txt index 4dc70c639..40c485f95 100644 --- a/npc/guild/prtg_cas05.txt +++ b/npc/guild/prtg_cas05.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium (Prontera) //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= NPCs that relate to Prontera Guild Castle 5 //===== Additional Comments: ================================= diff --git a/npc/guild/trs_rp.txt b/npc/guild/trs_rp.txt index 681974875..7b3ae5545 100644 --- a/npc/guild/trs_rp.txt +++ b/npc/guild/trs_rp.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Treasure Room Protection //===== By: ================================================== //= Masao //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena //===== Description: ========================================= //= Warps every Player out of the Treasure Room except for the //= Guildleader. diff --git a/npc/guild2/agit_main_se.txt b/npc/guild2/agit_main_se.txt index dfe2887e0..0c15e3a70 100644 --- a/npc/guild2/agit_main_se.txt +++ b/npc/guild2/agit_main_se.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium SE - Template File //===== By: ================================================== //= Euphy diff --git a/npc/guild2/agit_start_se.txt b/npc/guild2/agit_start_se.txt index 7601fd18b..ec9de3d9b 100644 --- a/npc/guild2/agit_start_se.txt +++ b/npc/guild2/agit_start_se.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium SE - Auto-Start //===== By: ================================================== //= L0ne_W0lf diff --git a/npc/guild2/arug_cas01.txt b/npc/guild2/arug_cas01.txt index 61ada97c5..a2b929347 100644 --- a/npc/guild2/arug_cas01.txt +++ b/npc/guild2/arug_cas01.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium SE - Mardol //===== By: ================================================== //= Euphy diff --git a/npc/guild2/arug_cas02.txt b/npc/guild2/arug_cas02.txt index 0fcfeaa30..a6b7f0d55 100644 --- a/npc/guild2/arug_cas02.txt +++ b/npc/guild2/arug_cas02.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium SE - Cyr //===== By: ================================================== //= Euphy diff --git a/npc/guild2/arug_cas03.txt b/npc/guild2/arug_cas03.txt index 86c3f5c26..bf11c9449 100644 --- a/npc/guild2/arug_cas03.txt +++ b/npc/guild2/arug_cas03.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium SE - Horn //===== By: ================================================== //= Euphy diff --git a/npc/guild2/arug_cas04.txt b/npc/guild2/arug_cas04.txt index 977dc2fbd..c46c7ff15 100644 --- a/npc/guild2/arug_cas04.txt +++ b/npc/guild2/arug_cas04.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium SE - Gefn //===== By: ================================================== //= Euphy diff --git a/npc/guild2/arug_cas05.txt b/npc/guild2/arug_cas05.txt index 38be97b8d..b250a9385 100644 --- a/npc/guild2/arug_cas05.txt +++ b/npc/guild2/arug_cas05.txt @@ -1,4 +1,4 @@ -//===== HerculesScript ======================================= +//===== Hercules Script ====================================== //= War of Emperium SE - Banadis //===== By: ================================================== //= Euphy diff --git a/npc/guild2/guild_flags.txt b/npc/guild2/guild_flags.txt index d7652f760..c5cf9bbc1 100644 --- a/npc/guild2/guild_flags.txt +++ b/npc/guild2/guild_flags.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium Second Edition //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= WoE SE Guild Flags in Juno and Rachel //===== Additional Comments: ================================= diff --git a/npc/guild2/schg_cas01.txt b/npc/guild2/schg_cas01.txt index bc26fb3d1..8200b49a0 100644 --- a/npc/guild2/schg_cas01.txt +++ b/npc/guild2/schg_cas01.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium SE - Himinn //===== By: ================================================== //= Euphy //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Additional Comments: ================================= //= 1.0 Merged to template file. //============================================================ diff --git a/npc/guild2/schg_cas02.txt b/npc/guild2/schg_cas02.txt index e93aa17ad..0a39f484a 100644 --- a/npc/guild2/schg_cas02.txt +++ b/npc/guild2/schg_cas02.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium SE - Andlangr //===== By: ================================================== //= Euphy //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Additional Comments: ================================= //= 1.0 Merged to template file. //============================================================ diff --git a/npc/guild2/schg_cas03.txt b/npc/guild2/schg_cas03.txt index 9adfeeb1b..6adfa0ca1 100644 --- a/npc/guild2/schg_cas03.txt +++ b/npc/guild2/schg_cas03.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium SE - Vidblainn //===== By: ================================================== //= Euphy //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Additional Comments: ================================= //= 1.0 Merged to template file. //============================================================ diff --git a/npc/guild2/schg_cas04.txt b/npc/guild2/schg_cas04.txt index 9f83a5a28..8da46dec5 100644 --- a/npc/guild2/schg_cas04.txt +++ b/npc/guild2/schg_cas04.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium SE - Hljod //===== By: ================================================== //= Euphy //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Additional Comments: ================================= //= 1.0 Merged to template file. //============================================================ diff --git a/npc/guild2/schg_cas05.txt b/npc/guild2/schg_cas05.txt index 09ecc1b7f..46b03e8bd 100644 --- a/npc/guild2/schg_cas05.txt +++ b/npc/guild2/schg_cas05.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= War of Emperium SE - Skidbladnir //===== By: ================================================== //= Euphy //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Additional Comments: ================================= //= 1.0 Merged to template file. //============================================================ diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt index ef2731a6c..ba6508353 100644 --- a/npc/instances/EndlessTower.txt +++ b/npc/instances/EndlessTower.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Endless Tower //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 2.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Endless Tower Memorial Dungeon diff --git a/npc/instances/NydhoggsNest.txt b/npc/instances/NydhoggsNest.txt index 5928ae7aa..b404df86b 100644 --- a/npc/instances/NydhoggsNest.txt +++ b/npc/instances/NydhoggsNest.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Nidhoggr's Nest //===== By: ================================================== //= L0ne_W0lf, various sources //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Nidhoggr's Nest Instance diff --git a/npc/instances/OrcsMemory.txt b/npc/instances/OrcsMemory.txt index 3de99ecd5..f355ae289 100644 --- a/npc/instances/OrcsMemory.txt +++ b/npc/instances/OrcsMemory.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Orc's Memory //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.6 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Relive the memory of an orc. diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt index 3d39dc462..8f9d97591 100644 --- a/npc/instances/SealedShrine.txt +++ b/npc/instances/SealedShrine.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Sealed Shrine //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 2.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Seal away the Great Demon Baphomet. diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt index 29e210c8e..126db3baf 100644 --- a/npc/jobs/2-1/assassin.txt +++ b/npc/jobs/2-1/assassin.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Assassin Job Quest //===== By: ================================================== //= kobra_k88 diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt index da68deb45..c05b140aa 100644 --- a/npc/jobs/2-1/priest.txt +++ b/npc/jobs/2-1/priest.txt @@ -1,4 +1,4 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Priest Job Quest //===== By: ================================================== //= Translated By: Pgro Team (OwNaGe)(Aegis) @@ -6,8 +6,6 @@ //= Further bugfixed and tested by Lupus //===== Current Version: ===================================== //= 2.6 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Job Change quest for Priest class. diff --git a/npc/jobs/2-1a/AssassinCross.txt b/npc/jobs/2-1a/AssassinCross.txt index 04d44bb79..a1f12d64b 100644 --- a/npc/jobs/2-1a/AssassinCross.txt +++ b/npc/jobs/2-1a/AssassinCross.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Advance Class jobchanger after kRO Normals. //===== By: ================================================== //= Nana diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt index e6128b437..dd568b9ef 100644 --- a/npc/jobs/2-2/alchemist.txt +++ b/npc/jobs/2-2/alchemist.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Alchemist Job Quest //===== By: ================================================== //= nestor_zulueta (Fusion), converted by Darkchild diff --git a/npc/jobs/2-2/bard.txt b/npc/jobs/2-2/bard.txt index e61faf8d6..77a81374f 100644 --- a/npc/jobs/2-2/bard.txt +++ b/npc/jobs/2-2/bard.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Bard Job Quest //===== By: ================================================== //= Muad_Dib(The Prometheus Project), Lupus, Samuray22 diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt index 7501c478a..1e188778e 100644 --- a/npc/jobs/2-2/sage.txt +++ b/npc/jobs/2-2/sage.txt @@ -1,4 +1,4 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Sage Job Quest //===== By: ================================================== //= jAthena (0.9) - I guess @@ -6,8 +6,6 @@ //= Darkchild (1.2) //===== Current Version: ===================================== //= 2.8 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Job quest for Sage classes diff --git a/npc/jobs/2-2a/Champion.txt b/npc/jobs/2-2a/Champion.txt index d0ca625df..5e080f304 100644 --- a/npc/jobs/2-2a/Champion.txt +++ b/npc/jobs/2-2a/Champion.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Advance Class jobchanger after kRO Normals. //===== By: ================================================== //= Nana diff --git a/npc/kafras/cool_event_corp.txt b/npc/kafras/cool_event_corp.txt index 853d15cbc..4a8f8c188 100644 --- a/npc/kafras/cool_event_corp.txt +++ b/npc/kafras/cool_event_corp.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Cool Event Corp. Staff //===== By: ================================================== //= Gepard //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Cool Event Corp. Staff (Save, Storage & Pushcart Service) //= in Arunafeltz Region. diff --git a/npc/kafras/dts_warper.txt b/npc/kafras/dts_warper.txt index 4e373a3fc..b2fb64ba8 100644 --- a/npc/kafras/dts_warper.txt +++ b/npc/kafras/dts_warper.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Dungeon Teleport Service //===== By: ================================================== //= Evera //===== Current Version: ===================================== //= 2.8 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Cool Event Corp NPCs vs. Kafra Dungeon Teleport Service and voting system. diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt index c1e7d25ee..eb396d9e0 100644 --- a/npc/kafras/functions_kafras.txt +++ b/npc/kafras/functions_kafras.txt @@ -1,4 +1,4 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Kafra Functions //===== By: ================================================== //= rAthena Dev Team @@ -6,8 +6,6 @@ //= L0ne_W0lf //===== Current Version: ===================================== //= 6.7 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= These functions handle save, storage, cart rental, teleport, //= and Free Teleport/Warp/Rent Cart options for all Kafra NPCs. diff --git a/npc/kafras/kafras.txt b/npc/kafras/kafras.txt index 8e6d49c8a..49562e3be 100644 --- a/npc/kafras/kafras.txt +++ b/npc/kafras/kafras.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Kafras (Cities/Dungeons/Fields) //===== By: ================================================== //= Joseph //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Argument settings for callfunc "F_Kafra": //= arg(0): 0 - Default Kafra message diff --git a/npc/merchants/advanced_refiner.txt b/npc/merchants/advanced_refiner.txt index 70b11c167..01983d96d 100644 --- a/npc/merchants/advanced_refiner.txt +++ b/npc/merchants/advanced_refiner.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Advanced Refiner //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Refiner that uses Enriched ores to increase upgrade success. diff --git a/npc/merchants/alchemist.txt b/npc/merchants/alchemist.txt index d3506244d..d48ee68bb 100644 --- a/npc/merchants/alchemist.txt +++ b/npc/merchants/alchemist.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Alchemist Shop //===== By: ================================================== //= rAthena Team diff --git a/npc/merchants/ammo_boxes.txt b/npc/merchants/ammo_boxes.txt index 75d203123..f4df03a0a 100644 --- a/npc/merchants/ammo_boxes.txt +++ b/npc/merchants/ammo_boxes.txt @@ -1,7 +1,7 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Magazine Dealer Kenny //===== By: ================================================== -//= rAthena dev team +//= rAthena Dev Team //===== Current Version: ===================================== //= 1.5 //===== Description: ========================================= diff --git a/npc/merchants/buying_shops.txt b/npc/merchants/buying_shops.txt index 93e7d0f0b..89654f0cc 100644 --- a/npc/merchants/buying_shops.txt +++ b/npc/merchants/buying_shops.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Buying Shop Scripts //===== By: ================================================== //= Kisuka, skyiing, Scriptor diff --git a/npc/merchants/cash_hair.txt b/npc/merchants/cash_hair.txt index 3028d302d..dfde86a4d 100644 --- a/npc/merchants/cash_hair.txt +++ b/npc/merchants/cash_hair.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Cash Hair Stylist //===== By: ================================================== //= Kisuka diff --git a/npc/merchants/cash_trader.txt b/npc/merchants/cash_trader.txt index 1063800f6..b61120dea 100644 --- a/npc/merchants/cash_trader.txt +++ b/npc/merchants/cash_trader.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Cash Shop NPCs //===== By: ================================================== //= L0ne_W0lf diff --git a/npc/merchants/cashheadgear_dye.txt b/npc/merchants/cashheadgear_dye.txt index e0887b30e..49003e18b 100644 --- a/npc/merchants/cashheadgear_dye.txt +++ b/npc/merchants/cashheadgear_dye.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Headgear Dyer (Cash) //===== By: ================================================== //= Xantara diff --git a/npc/merchants/clothes_dyer.txt b/npc/merchants/clothes_dyer.txt index 489194428..514178bd6 100644 --- a/npc/merchants/clothes_dyer.txt +++ b/npc/merchants/clothes_dyer.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Clothes Dyer //===== By: ================================================== //= Usnul //===== Current Version: ===================================== //= 2.5 -//===== Compatible With: ===================================== -//= rAthena 1.0+ //===== Description: ========================================= //= Clothes dyer with standard palletes //===== Additional Comments: ================================= diff --git a/npc/merchants/coin_exchange.txt b/npc/merchants/coin_exchange.txt index 8603383ad..a894485a8 100644 --- a/npc/merchants/coin_exchange.txt +++ b/npc/merchants/coin_exchange.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Manuk & Splendide Coin Merchants //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Coin redemption NPCs. diff --git a/npc/merchants/dye_maker.txt b/npc/merchants/dye_maker.txt index 632e14f17..c4bc2f5f8 100644 --- a/npc/merchants/dye_maker.txt +++ b/npc/merchants/dye_maker.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Dye Maker //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //===== Additional Comments: ================================= diff --git a/npc/merchants/elemental_trader.txt b/npc/merchants/elemental_trader.txt index 3d30b1668..2d120d190 100644 --- a/npc/merchants/elemental_trader.txt +++ b/npc/merchants/elemental_trader.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Elemental Stone Trader //===== By: ================================================== -//= rAthena Team & MasterOfMuppets +//= MasterOfMuppets, rAthena Dev Team //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Trade impure types of elemental stones for pure ones. diff --git a/npc/merchants/enchan_arm.txt b/npc/merchants/enchan_arm.txt index d5f321518..94cdd615e 100644 --- a/npc/merchants/enchan_arm.txt +++ b/npc/merchants/enchan_arm.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//=====Hercules Script ======================================= //= Armor Enchanter //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Add a +1, +2, or +3 random stat to a specified armor. diff --git a/npc/merchants/gemstone.txt b/npc/merchants/gemstone.txt index 854954c0a..74962fef2 100644 --- a/npc/merchants/gemstone.txt +++ b/npc/merchants/gemstone.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Gemstone Trader //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Trade various colors of gemstones for other color gemstones. diff --git a/npc/merchants/hair_dyer.txt b/npc/merchants/hair_dyer.txt index 70f26ca58..c3479cbbe 100644 --- a/npc/merchants/hair_dyer.txt +++ b/npc/merchants/hair_dyer.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Hair Dyer //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Hair Dyer with standard palletes //===== Additional Comments: ================================= diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt index 19f5b9dca..cf4db6333 100644 --- a/npc/merchants/hair_style.txt +++ b/npc/merchants/hair_style.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Hair Dresser //===== By: ================================================== //= Muad_Dib, Samuray22, Kisuka //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Allows you to change your hairstyle. diff --git a/npc/merchants/icecream.txt b/npc/merchants/icecream.txt index d04dbe08e..f126b723e 100644 --- a/npc/merchants/icecream.txt +++ b/npc/merchants/icecream.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Ice Cream Maker //===== By: ================================================== //= KOOK SWU, Kisuka //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= A man makes you ice-cream //===== Additional Comments: ================================= diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt index d9cc39a8e..7c4935942 100644 --- a/npc/merchants/inn.txt +++ b/npc/merchants/inn.txt @@ -1,12 +1,10 @@ -//===== rAthena Script ======================================= -//= Inn Npcs +//===== Hercules Script ====================================== +//= Inn NPCs //===== By: ================================================== //= Darkchild (1.1) //= Playtester (1.2) //===== Current Version: ===================================== //= 2.9a -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Inn Npcs, Save and Heal //============================================================ diff --git a/npc/merchants/kunai_maker.txt b/npc/merchants/kunai_maker.txt index 97bc89f12..6f5fd953b 100644 --- a/npc/merchants/kunai_maker.txt +++ b/npc/merchants/kunai_maker.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Kunai Merchant Kashin //===== By: ================================================== -//= rAthena dev team +//= rAthena Dev Team //===== Current Version: ===================================== //= 1.3a -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Trades a few shurikens + ninja stones for elemental kunai. //===== Additional Comments: ================================= diff --git a/npc/merchants/milk_trader.txt b/npc/merchants/milk_trader.txt index 7e7da5c3f..15fe3c497 100644 --- a/npc/merchants/milk_trader.txt +++ b/npc/merchants/milk_trader.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Milk Trader //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Trades bottles for milk diff --git a/npc/merchants/novice_exchange.txt b/npc/merchants/novice_exchange.txt index 61049f805..cd8cede0e 100644 --- a/npc/merchants/novice_exchange.txt +++ b/npc/merchants/novice_exchange.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Novice Goods Exchanger //===== By: ================================================== -//= ???, rAthena Team +//= ???, rAthena Dev Team //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis COnversion] //= Exchanges your Basic Monster drops for Red Potions. diff --git a/npc/merchants/old_pharmacist.txt b/npc/merchants/old_pharmacist.txt index ba00b8f4d..d01eb92e3 100644 --- a/npc/merchants/old_pharmacist.txt +++ b/npc/merchants/old_pharmacist.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Old Pharmacist //===== By: ================================================== //= DZeroX //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= rAthena SVN Trunk //===== Description: ========================================= //= Trade in items for potions //=============================== diff --git a/npc/merchants/quivers.txt b/npc/merchants/quivers.txt index b193bac4c..30a4788a8 100644 --- a/npc/merchants/quivers.txt +++ b/npc/merchants/quivers.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Arrow Quiver Event //===== By: ================================================== //= Muad_Dib (Prometheus Project); L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis COnversion] //= Turns arrows into Arrow Quivers. diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt index 4433bbd66..a6a799774 100644 --- a/npc/merchants/refine.txt +++ b/npc/merchants/refine.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Refining NPCs //===== By: ================================================== //= Syrus22 (1.1) dafide18 (1.4) Skotlex (1.5) //===== Current Version: ===================================== //= 3.2 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Refining NPCs and Metal Salesmen. //===== Additional Comments: ================================= diff --git a/npc/merchants/renters.txt b/npc/merchants/renters.txt index bcaded6f6..02afc4059 100644 --- a/npc/merchants/renters.txt +++ b/npc/merchants/renters.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Renters //===== By: ================================================== //= kobra_k88, mod by Lupus //===== Current Version: ===================================== //= 2.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Knight and Crusader Peco Peco Breeders, Falcon Breeder scripts //===== Additional Comments: ================================= diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt index a06ba1ad2..50bc9b610 100644 --- a/npc/merchants/shops.txt +++ b/npc/merchants/shops.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Shops //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== //= 3.3 -//===== Compatible With: ===================================== -//= rAthena 1.0+ //===== Description: ========================================= //= Town shop NPCs. //===== Additional Comments: ================================= diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt index acd3b2fe6..4e0b7985d 100644 --- a/npc/merchants/socket_enchant.txt +++ b/npc/merchants/socket_enchant.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Episode 11.1 Socket Enchant NPC //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== //= 2.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Adds slots to selected weapons and armor. diff --git a/npc/merchants/socket_enchant2.txt b/npc/merchants/socket_enchant2.txt index c302b2763..6456ca25d 100644 --- a/npc/merchants/socket_enchant2.txt +++ b/npc/merchants/socket_enchant2.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Episode 12 Socket Enchant NPC //===== By: ================================================== //= Gepard //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Adds slots to selected weapons and armor. diff --git a/npc/merchants/wander_pet_food.txt b/npc/merchants/wander_pet_food.txt index 5bd9140e7..8be6ed276 100644 --- a/npc/merchants/wander_pet_food.txt +++ b/npc/merchants/wander_pet_food.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Spirit Liquor trader. //===== By: ================================================== -//= rAthena dev team +//= rAthena Dev Team //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Trade Broken Liquor Jars and alcohol for wanderer diff --git a/npc/mobs/bossnia.txt b/npc/mobs/bossnia.txt index 115f0c2ba..72d6fb1b0 100644 --- a/npc/mobs/bossnia.txt +++ b/npc/mobs/bossnia.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Bossnia Monster Spawn Script //===== By: ================================================== //= Masao diff --git a/npc/mobs/citycleaners.txt b/npc/mobs/citycleaners.txt index b866ce123..0e810ac5b 100644 --- a/npc/mobs/citycleaners.txt +++ b/npc/mobs/citycleaners.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= City Monster Spawn Script //===== By: ================================================== //= massdriller //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= Spawns monsters to clean up city. Apparently spawning //= occured in iRO and kRO. Enable this if you want. diff --git a/npc/mobs/jail.txt b/npc/mobs/jail.txt index 4ff6b0b48..bf18438db 100644 --- a/npc/mobs/jail.txt +++ b/npc/mobs/jail.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Jail Monster Spawn Script //===== By: ================================================== //= Masao //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= Any rAthena Version //===== Description: ========================================= //= Spawns monsters in Jail. //============================================================ diff --git a/npc/mobs/pvp.txt b/npc/mobs/pvp.txt index 9af49474e..0dcfe515e 100644 --- a/npc/mobs/pvp.txt +++ b/npc/mobs/pvp.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= PvP Nightmare Rooms Monster Spawn Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= //============================================================ diff --git a/npc/other/CashShop_Functions.txt b/npc/other/CashShop_Functions.txt index 9a17dacda..89bb76bab 100644 --- a/npc/other/CashShop_Functions.txt +++ b/npc/other/CashShop_Functions.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Cash Shop Functions //===== By: ================================================== //= L0ne_W0lf diff --git a/npc/other/Global_Functions.txt b/npc/other/Global_Functions.txt index fb6bf4f56..ec8688326 100644 --- a/npc/other/Global_Functions.txt +++ b/npc/other/Global_Functions.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Global Functions //===== By: ================================================== //= Lupus, kobra_k88 //===== Current Version: ===================================== //= 2.16 -//===== Compatible With: ===================================== -//= rAthena 1.0 //===== Description: ========================================= //= //===== Additional Comments: ================================= diff --git a/npc/other/auction.txt b/npc/other/auction.txt index dd8ccd068..899ed11a3 100644 --- a/npc/other/auction.txt +++ b/npc/other/auction.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Auction system //===== By: ================================================== //= L0ne_W0lf diff --git a/npc/other/books.txt b/npc/other/books.txt index 29b2586b1..f9ad768a5 100644 --- a/npc/other/books.txt +++ b/npc/other/books.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Prontera Library //===== By: ================================================== //= L0ne_W0lf diff --git a/npc/other/bulletin_boards.txt b/npc/other/bulletin_boards.txt index 4f09306fc..7f2a46de3 100644 --- a/npc/other/bulletin_boards.txt +++ b/npc/other/bulletin_boards.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Official scripts for beginners from iRO //===== By: ================================================== //= MasterOfMuppets diff --git a/npc/other/card_trader.txt b/npc/other/card_trader.txt index 5d1b6e6f9..e451a596e 100644 --- a/npc/other/card_trader.txt +++ b/npc/other/card_trader.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Card Trader //===== By: ================================================== //= Elias (og2) diff --git a/npc/other/comodo_gambling.txt b/npc/other/comodo_gambling.txt index 2d18e01d3..188066181 100644 --- a/npc/other/comodo_gambling.txt +++ b/npc/other/comodo_gambling.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Comodo Gambling //===== By: ================================================== //= Reddozen, Cypress, Zefris //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= Any rAthena SVN //===== Description: ========================================= //= Comodo Gambling: Win random Items with 3 Carat Diamonds. //===== Additional Comments: ================================= diff --git a/npc/other/divorce.txt b/npc/other/divorce.txt index 21e62013d..1511a68b2 100644 --- a/npc/other/divorce.txt +++ b/npc/other/divorce.txt @@ -1,12 +1,10 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Divorcing Deviruchi //===== By: ================================================== //= Perkka, Scriptor, LightFighter //= L0ne_W0lf //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Official Divorce script. diff --git a/npc/other/fortune.txt b/npc/other/fortune.txt index eb50f7eaa..9e0e1b6b4 100644 --- a/npc/other/fortune.txt +++ b/npc/other/fortune.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Fortune Teller //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis conversion] //= Fortune teller NPC. Displays random Card image. diff --git a/npc/other/guildpvp.txt b/npc/other/guildpvp.txt index 2afa86e8d..68aca1f5d 100644 --- a/npc/other/guildpvp.txt +++ b/npc/other/guildpvp.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Guild Battle NPC //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Guild Battle with PVP mechanics. diff --git a/npc/other/gympass.txt b/npc/other/gympass.txt index 40bba2437..33e4a8f3e 100644 --- a/npc/other/gympass.txt +++ b/npc/other/gympass.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Gym Pass Cash Item NPC //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Exchange Gym Passes to learn "Enlarge Weight Limit" diff --git a/npc/other/hugel_bingo.txt b/npc/other/hugel_bingo.txt index fd276ec33..6cec1b9ae 100644 --- a/npc/other/hugel_bingo.txt +++ b/npc/other/hugel_bingo.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Hugel Bingo script //===== By: ================================================== //= SinSloth //===== Current Version: ===================================== //= 1.8 -//===== Compatible With: ===================================== -//= Any rAthena Version //===== Description: ========================================= //= Hugel Bingo game //===== Additional Comments: ================================= diff --git a/npc/other/mail.txt b/npc/other/mail.txt index edd4af17b..95f680704 100644 --- a/npc/other/mail.txt +++ b/npc/other/mail.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Mail Boxes //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.8 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Pickup and write mail from/to players in game. diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt index 8d6b3f349..59771c077 100644 --- a/npc/other/marriage.txt +++ b/npc/other/marriage.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Player Marriage //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Official Marriage script. diff --git a/npc/other/mercenary_rent.txt b/npc/other/mercenary_rent.txt index 19b9079de..28221ad34 100644 --- a/npc/other/mercenary_rent.txt +++ b/npc/other/mercenary_rent.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Mercenary related NPCs //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Sells Lancer, Sword, and Archer mercenaries, diff --git a/npc/other/monster_museum.txt b/npc/other/monster_museum.txt index 4f042f41f..d1202b33d 100644 --- a/npc/other/monster_museum.txt +++ b/npc/other/monster_museum.txt @@ -1,12 +1,10 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Juno Monster Museum //===== By: ================================================== //= Muad_Dib (The Prometheus Project) //= L0ne_W0lf //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Juno Monster Museum - Non Player Character Locations diff --git a/npc/other/monster_race.txt b/npc/other/monster_race.txt index 91db569e3..a48afea3e 100644 --- a/npc/other/monster_race.txt +++ b/npc/other/monster_race.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Hugel Monster Races //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.8 -//===== Compatible With: ===================================== -//= rAthena SVN (Trunk, r12752+) //===== Description: ========================================= //= [Official Conversion] //= - Hugel Monster Races (Single and Double) diff --git a/npc/other/msg_boards.txt b/npc/other/msg_boards.txt index c7d3b9319..eef063dff 100644 --- a/npc/other/msg_boards.txt +++ b/npc/other/msg_boards.txt @@ -1,13 +1,10 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Misc. Message Boards //===== By: ================================================== //= kobra_k88 //= L0ne_W0lf //===== Current Version: ===================================== //= 1.6 -//===== Compatible With: ===================================== -//= [Aegis Conversion] -//= rAthena 7.15 + //===== Description: ========================================= //= Misc. Message Boards for: //= - Prontera diff --git a/npc/other/poring_war.txt b/npc/other/poring_war.txt index 23f7eb5a1..f81b54f89 100644 --- a/npc/other/poring_war.txt +++ b/npc/other/poring_war.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Poring War //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== //= 1.1b -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Poring War diff --git a/npc/other/powernpc.txt b/npc/other/powernpc.txt index 208503a37..7ed2b2f14 100644 --- a/npc/other/powernpc.txt +++ b/npc/other/powernpc.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Official Gonryun Power Arena //===== By: ================================================== //= KarLaeda //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Athena SVN 9000+ //===== Additional Comments: ================================= //= [Aegis Conversion] //= 1.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt index 1444ef374..94ea7cf10 100644 --- a/npc/other/pvp.txt +++ b/npc/other/pvp.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= PvP NPCs //===== By: ================================================== //= kobra_k88; L0ne_W0lf, Elias (og2) //===== Current Version: ===================================== //= 2.3 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= PvP NPCs that are found in the Inns in major cities. //= Includes Yoyo Mode, Nightmare Mode, and Event Mode. diff --git a/npc/other/resetskill.txt b/npc/other/resetskill.txt index 811d16aed..4d1a6f2c7 100644 --- a/npc/other/resetskill.txt +++ b/npc/other/resetskill.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Hypnotist //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis conversion] //= Permenent first class, base level 40 and under skill resetter. diff --git a/npc/other/sealstatus.txt b/npc/other/sealstatus.txt index 74cae182e..038d5357d 100644 --- a/npc/other/sealstatus.txt +++ b/npc/other/sealstatus.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= God Item Seal Status //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Goid Item Seal Status. //===== Additional Comments: ================================= diff --git a/npc/other/turbo_track.txt b/npc/other/turbo_track.txt index 7edb56c18..329d9b3f0 100644 --- a/npc/other/turbo_track.txt +++ b/npc/other/turbo_track.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Turbo Track //===== By: ================================================== //= Joseph //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Turbo Track Course: //= - Solo Mode/Time Attack diff --git a/npc/pre-re/airports/izlude.txt b/npc/pre-re/airports/izlude.txt index 15d6b62d2..b2c0ee2d5 100644 --- a/npc/pre-re/airports/izlude.txt +++ b/npc/pre-re/airports/izlude.txt @@ -1,9 +1,7 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Izlude Airport NPCs //===== By: ================================================== //= rAthena Dev Team -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Izlude Airport NPCs //===== Additional Comments: ================================= diff --git a/npc/pre-re/cities/alberta.txt b/npc/pre-re/cities/alberta.txt index 7cdf6544b..3643469de 100644 --- a/npc/pre-re/cities/alberta.txt +++ b/npc/pre-re/cities/alberta.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Alberta Town Pre-Renewal //===== By: ================================================== //= Euphy diff --git a/npc/pre-re/jobs/1-1/acolyte.txt b/npc/pre-re/jobs/1-1/acolyte.txt index d61c06fc2..7b46a6029 100644 --- a/npc/pre-re/jobs/1-1/acolyte.txt +++ b/npc/pre-re/jobs/1-1/acolyte.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Acolyte Job Quest //===== By: ================================================== //= kobra_k88; L0ne_W0lf diff --git a/npc/pre-re/jobs/1-1/archer.txt b/npc/pre-re/jobs/1-1/archer.txt index ec4eb2d2f..5018bc48f 100644 --- a/npc/pre-re/jobs/1-1/archer.txt +++ b/npc/pre-re/jobs/1-1/archer.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Archer Job Quest //===== By: ================================================== //= kobra_k88; L0ne_W0lf diff --git a/npc/pre-re/mobs/dungeons/abbey.txt b/npc/pre-re/mobs/dungeons/abbey.txt index 5babfaabd..8a292a7e1 100644 --- a/npc/pre-re/mobs/dungeons/abbey.txt +++ b/npc/pre-re/mobs/dungeons/abbey.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================== +//===== Hercules Script ====================================== //= Abbey Dungeon Monster Spawn Script //===== By: ================================================== //= $ephiroth diff --git a/npc/pre-re/mobs/dungeons/abyss.txt b/npc/pre-re/mobs/dungeons/abyss.txt index 65167a9bd..d1c7686f7 100644 --- a/npc/pre-re/mobs/dungeons/abyss.txt +++ b/npc/pre-re/mobs/dungeons/abyss.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Abyss Lake Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) diff --git a/npc/pre-re/mobs/dungeons/alde_dun.txt b/npc/pre-re/mobs/dungeons/alde_dun.txt index bd31e20dd..ef6a84413 100644 --- a/npc/pre-re/mobs/dungeons/alde_dun.txt +++ b/npc/pre-re/mobs/dungeons/alde_dun.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Al De Baran Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) diff --git a/npc/pre-re/mobs/dungeons/ayo_dun.txt b/npc/pre-re/mobs/dungeons/ayo_dun.txt index 91733887e..1caa4d5c0 100644 --- a/npc/pre-re/mobs/dungeons/ayo_dun.txt +++ b/npc/pre-re/mobs/dungeons/ayo_dun.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Ayothaya Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) diff --git a/npc/pre-re/mobs/dungeons/beach_dun.txt b/npc/pre-re/mobs/dungeons/beach_dun.txt index e6d34f789..170c9f0d0 100644 --- a/npc/pre-re/mobs/dungeons/beach_dun.txt +++ b/npc/pre-re/mobs/dungeons/beach_dun.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Beach Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) diff --git a/npc/pre-re/mobs/dungeons/c_tower.txt b/npc/pre-re/mobs/dungeons/c_tower.txt index 02db67e94..c33c25424 100644 --- a/npc/pre-re/mobs/dungeons/c_tower.txt +++ b/npc/pre-re/mobs/dungeons/c_tower.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Clock Tower Monster Spawn Script //===== By: ================================================== //= Athena (1.0) diff --git a/npc/pre-re/mobs/dungeons/gefenia.txt b/npc/pre-re/mobs/dungeons/gefenia.txt index a3b1214f6..b2c8a6678 100644 --- a/npc/pre-re/mobs/dungeons/gefenia.txt +++ b/npc/pre-re/mobs/dungeons/gefenia.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Geffenia Dungeon Monster Spawn Script //===== By: ================================================== -//= Muad_Dib, rAthena dev team +//= Muad_Dib, rAthena Dev Team //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= Added 1st Version. [Muad_Dib] //= Conversion to eA [MasterOfMuppets] diff --git a/npc/pre-re/mobs/dungeons/juperos.txt b/npc/pre-re/mobs/dungeons/juperos.txt index 67c9f4395..4d422200b 100644 --- a/npc/pre-re/mobs/dungeons/juperos.txt +++ b/npc/pre-re/mobs/dungeons/juperos.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Juperos Dungeon Monster Spawn Script //===== By: ================================================== -// The Prometheus Project, rAthena dev team +// The Prometheus Project, rAthena Dev Team //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= Any Athena/Freya Version //===== Additional Comments: ================================= //= 0.1 Added 1st version. [Muad_Dib] //= 0.2 Updated the spawns according to current info [MasterOfMuppets] diff --git a/npc/pre-re/mobs/dungeons/lhz_dun.txt b/npc/pre-re/mobs/dungeons/lhz_dun.txt index 58e079138..ee395123a 100644 --- a/npc/pre-re/mobs/dungeons/lhz_dun.txt +++ b/npc/pre-re/mobs/dungeons/lhz_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Lighthalzen Dungeon(Biolabs) Monster Spawn Script //===== By: ================================================== -// The Prometheus Project, rAthena dev team +// The Prometheus Project, rAthena Dev Team //===== Current Version: ===================================== //= 1.8 -//===== Compatible With: ===================================== -//= Any Athena //===== Additional Comments: ================================= //= 08/24/05 : Added 1st version. [Muad_Dib] //= 1.1: Some corrections to level 1, 2 as pointed out by diff --git a/npc/pre-re/mobs/fields/ayothaya.txt b/npc/pre-re/mobs/fields/ayothaya.txt index e60e4491b..ca0cb18ae 100644 --- a/npc/pre-re/mobs/fields/ayothaya.txt +++ b/npc/pre-re/mobs/fields/ayothaya.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Ayothaya Fields Monster Spawn Script //===== By: ================================================== //= Athena (1.0) diff --git a/npc/pre-re/mobs/fields/lighthalzen.txt b/npc/pre-re/mobs/fields/lighthalzen.txt index 45d9c5f02..46e660255 100644 --- a/npc/pre-re/mobs/fields/lighthalzen.txt +++ b/npc/pre-re/mobs/fields/lighthalzen.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Lighthalzen Fields Monster Spawn Script //===== By: ================================================== -//= Muad_Dib, rAthena dev team +//= Muad_Dib, rAthena Dev Team //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.0 by Muad_Dib (Prometheus Project) //= 1.1 Added Porcellio by MasterOfMuppets diff --git a/npc/pre-re/other/arena/arena_aco.txt b/npc/pre-re/other/arena/arena_aco.txt index 4ffc6308b..60077b88e 100644 --- a/npc/pre-re/other/arena/arena_aco.txt +++ b/npc/pre-re/other/arena/arena_aco.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================== +//===== Hercules Script ====================================== //= Izlude Arena script //===== By: ================================================== //= L0ne_W0lf diff --git a/npc/pre-re/other/arena/arena_lvl50.txt b/npc/pre-re/other/arena/arena_lvl50.txt index 6c2138458..9eaba7376 100644 --- a/npc/pre-re/other/arena/arena_lvl50.txt +++ b/npc/pre-re/other/arena/arena_lvl50.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================== +//===== Hercules Script ====================================== //= Izlude Arena lvl 50 //===== By: ================================================== //= SinSloth diff --git a/npc/pre-re/other/arena/arena_lvl60.txt b/npc/pre-re/other/arena/arena_lvl60.txt index 0835b64ad..b83dc8eea 100644 --- a/npc/pre-re/other/arena/arena_lvl60.txt +++ b/npc/pre-re/other/arena/arena_lvl60.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================== +//===== Hercules Script ====================================== //= Izlude Arena lvl 60 //===== By: ================================================== //= SinSloth diff --git a/npc/pre-re/other/arena/arena_lvl70.txt b/npc/pre-re/other/arena/arena_lvl70.txt index e683dea8c..e3ab5367f 100644 --- a/npc/pre-re/other/arena/arena_lvl70.txt +++ b/npc/pre-re/other/arena/arena_lvl70.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================== +//===== Hercules Script ====================================== //= Izlude Arena lvl 70 //===== By: ================================================== //= SinSloth diff --git a/npc/pre-re/other/arena/arena_lvl80.txt b/npc/pre-re/other/arena/arena_lvl80.txt index cc09dfa57..729311508 100644 --- a/npc/pre-re/other/arena/arena_lvl80.txt +++ b/npc/pre-re/other/arena/arena_lvl80.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================== +//===== Hercules Script ====================================== //= Izlude Arena lvl 80 //===== By: ================================================== //= SinSloth diff --git a/npc/pre-re/other/arena/arena_party.txt b/npc/pre-re/other/arena/arena_party.txt index 4755cc866..837c3eab1 100644 --- a/npc/pre-re/other/arena/arena_party.txt +++ b/npc/pre-re/other/arena/arena_party.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================== +//===== Hercules Script ====================================== //= Izlude Party Arena //===== By: ================================================== //= SinSloth diff --git a/npc/pre-re/other/arena/arena_point.txt b/npc/pre-re/other/arena/arena_point.txt index 8452e0692..0890867bf 100644 --- a/npc/pre-re/other/arena/arena_point.txt +++ b/npc/pre-re/other/arena/arena_point.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Point Exchanger //===== By: ================================================== //= L0ne_W0lf diff --git a/npc/pre-re/other/arena/arena_room.txt b/npc/pre-re/other/arena/arena_room.txt index 85a15fe60..925976f3b 100644 --- a/npc/pre-re/other/arena/arena_room.txt +++ b/npc/pre-re/other/arena/arena_room.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================== +//===== Hercules Script ====================================== //= Izlude Arena Room //===== By: ================================================== //= SinSloth diff --git a/npc/pre-re/warps/other/arena.txt b/npc/pre-re/warps/other/arena.txt index dbda03a66..daff4242d 100644 --- a/npc/pre-re/warps/other/arena.txt +++ b/npc/pre-re/warps/other/arena.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Arena Warps //===== By: ================================================== //= SinSloth diff --git a/npc/quests/bard_quest.txt b/npc/quests/bard_quest.txt index a735464f7..596f89d63 100644 --- a/npc/quests/bard_quest.txt +++ b/npc/quests/bard_quest.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Wandering Minstrel Quest //===== By: ================================================== //= Riotblade and L0ne_W0lf diff --git a/npc/quests/bunnyband.txt b/npc/quests/bunnyband.txt index 267e772b5..dffd650dd 100644 --- a/npc/quests/bunnyband.txt +++ b/npc/quests/bunnyband.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Bunny Band Quest //===== By: ================================================== //= rAthena Dev Team diff --git a/npc/quests/dandelion_request.txt b/npc/quests/dandelion_request.txt index 60af8ace2..028b71016 100644 --- a/npc/quests/dandelion_request.txt +++ b/npc/quests/dandelion_request.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Dandelion's Request / Morocc Invasion quest //===== By: ================================================== //= SinSloth //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= A Morroc quest that is no longer used. //===== Additional Comments: ================================= diff --git a/npc/quests/eye_of_hellion.txt b/npc/quests/eye_of_hellion.txt index 7ad4c4e32..f1a63e272 100644 --- a/npc/quests/eye_of_hellion.txt +++ b/npc/quests/eye_of_hellion.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= The Eye of Hellion Quest. //===== By: ================================================== //= MasterOfMuppets //===== Current Version: ===================================== //= 1.9 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Quest for getting a Nile Rose diff --git a/npc/quests/guildrelay.txt b/npc/quests/guildrelay.txt index b4158c31e..4e9713b1c 100644 --- a/npc/quests/guildrelay.txt +++ b/npc/quests/guildrelay.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Guild Relay Quest //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Guild Relay Quest. diff --git a/npc/quests/newgears/2004_headgears.txt b/npc/quests/newgears/2004_headgears.txt index 4ba6c165c..4a347877d 100644 --- a/npc/quests/newgears/2004_headgears.txt +++ b/npc/quests/newgears/2004_headgears.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= 2004 Headgear Quests //===== By: ================================================== //= Dj-Yhn diff --git a/npc/quests/newgears/2005_headgears.txt b/npc/quests/newgears/2005_headgears.txt index f50372cae..862e9d364 100644 --- a/npc/quests/newgears/2005_headgears.txt +++ b/npc/quests/newgears/2005_headgears.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= 2005 Headgear Quests //===== By: ================================================== //= MasterOfMuppets diff --git a/npc/quests/newgears/2006_headgears.txt b/npc/quests/newgears/2006_headgears.txt index da3f6cfdb..2b62662ce 100644 --- a/npc/quests/newgears/2006_headgears.txt +++ b/npc/quests/newgears/2006_headgears.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= 2006 Headgear //===== By: ================================================== //= DiviniaRO members, cleaned by reddozen diff --git a/npc/quests/newgears/2008_headgears.txt b/npc/quests/newgears/2008_headgears.txt index 0f3698eec..62e2aaac3 100644 --- a/npc/quests/newgears/2008_headgears.txt +++ b/npc/quests/newgears/2008_headgears.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= 2008 Headgear //===== By: ================================================== //= Masao diff --git a/npc/quests/okolnir.txt b/npc/quests/okolnir.txt index b288a87e5..a2a84f868 100644 --- a/npc/quests/okolnir.txt +++ b/npc/quests/okolnir.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Falicious Okolnir (Valfreja & Nidhoggr) //===== By: ================================================== //= Joseph //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= God Item SE Creation script (Asprika & Brynhild) diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt index 148abeb7f..86b0697a4 100644 --- a/npc/quests/quests_13_1.txt +++ b/npc/quests/quests_13_1.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Quest NPCs related to Ash-Vacuum //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 2.6a -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Contains Quests: diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt index 556bde823..6dc4fd0ad 100644 --- a/npc/quests/quests_alberta.txt +++ b/npc/quests/quests_alberta.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Quest NPCs related to Alberta //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== //= 2.5 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Dolls Quest diff --git a/npc/quests/quests_aldebaran.txt b/npc/quests/quests_aldebaran.txt index eb3ef7e38..5e087e724 100644 --- a/npc/quests/quests_aldebaran.txt +++ b/npc/quests/quests_aldebaran.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Quest NPCs related to Aldebaran -//===== By: ================================================== +//===== By: ================================================== //= rAthena Dev Team -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena 7.15 + //===== Description: ========================================= //= 'Doctor Band', 'Feather Bonnet', 'Opera Masque', 'Sakkat Hat' Quests. //===== Additional Comments: ================================= diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt index 231cee0af..0e931aca7 100644 --- a/npc/quests/quests_amatsu.txt +++ b/npc/quests/quests_amatsu.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Quest NPCs related to Amatsu //===== By: ================================================== //= rAthena team & others? & MasterOfMuppets //===== Current Version: ===================================== //= 1.4a -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Momotaro Event diff --git a/npc/quests/quests_ein.txt b/npc/quests/quests_ein.txt index 8a3a77520..762787bde 100644 --- a/npc/quests/quests_ein.txt +++ b/npc/quests/quests_ein.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Quest NPCs related to Einbroch and Einbech //===== By: ================================================== //= Evera and The rAthena Dev Team //===== Current Version: ===================================== //= 2.5 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis conversion] //= Oridecon/Mineral Quest diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt index f4e7bfa0f..b0ac801e4 100644 --- a/npc/quests/quests_hugel.txt +++ b/npc/quests/quests_hugel.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Hugel Quest NPCs //===== By: ================================================== //= MasterOfMuppets & SinSloth //===== Current Version: ===================================== //= 2.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Quest NPC's related to Hugel //===== Additional Comments: ================================= diff --git a/npc/quests/quests_izlude.txt b/npc/quests/quests_izlude.txt index de2955e01..8dc2e8f31 100644 --- a/npc/quests/quests_izlude.txt +++ b/npc/quests/quests_izlude.txt @@ -1,12 +1,10 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Quest NPCs related to Izlude //===== By: ================================================== //= Evera and The rAthena Dev Team //= L0ne_W0lf //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Edgar's Offer: //= - [Aegis conversion] diff --git a/npc/quests/quests_juperos.txt b/npc/quests/quests_juperos.txt index 9a4675eef..0f1fbfe77 100644 --- a/npc/quests/quests_juperos.txt +++ b/npc/quests/quests_juperos.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Juperos Dungeon Quests //===== By =================================================== //= MasterOfMuppets //===== Version ============================================== //= 1.7 -//===== Compatible With ====================================== -//= rAthena SVN //===== Description ========================================== //= [Partial Aegis COnversion] //= Juperos Ruins related Quests/Events diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt index e9a8458ad..d67e79c78 100644 --- a/npc/quests/quests_lighthalzen.txt +++ b/npc/quests/quests_lighthalzen.txt @@ -1,12 +1,10 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Quest NPCs located in Lighthalzen //===== By: ================================================== //= Persian, Vicious_Pucca, aoa00, Evera, MasterOfMupppets, //= Lupus, Lord Gywall //===== Current Version: ===================================== //= 4.8 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Quests related to Lighthalzen City. //===== Additional Comments: ================================= diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt index 53b1443ad..5c251d92d 100644 --- a/npc/quests/quests_louyang.txt +++ b/npc/quests/quests_louyang.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Quest NPCs related to Louyang //===== By: ================================================== //= Evera and The rAthena Dev Team //===== Current Version: ===================================== //= 2.2 -//===== Compatible With: ===================================== -//= rAthena 1.0 //===== Description: ========================================= //= [Aegis Conversion] //= Soup Quest diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt index ae0c686cb..12122d883 100644 --- a/npc/quests/quests_morocc.txt +++ b/npc/quests/quests_morocc.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Quest NPCs related to Morroc //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== //= 2.9 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= - Stop Post diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt index 21431ebbf..b6e740a93 100644 --- a/npc/quests/quests_nameless.txt +++ b/npc/quests/quests_nameless.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Nameless Island Quests //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 2.2a -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Collection of Nameless Island Quests diff --git a/npc/quests/quests_niflheim.txt b/npc/quests/quests_niflheim.txt index c23c5ba31..e5e95c6a1 100644 --- a/npc/quests/quests_niflheim.txt +++ b/npc/quests/quests_niflheim.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Quest NPCs related to Niflheim //===== By: ================================================== //= The rAthena Dev Team //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= rAthena 7.15 + //===== Description: ========================================= //= [Aegis Conversion] //= Piano Key Ouest diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt index cf7f4ef61..b79d8ac30 100644 --- a/npc/quests/quests_veins.txt +++ b/npc/quests/quests_veins.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Veins Quests //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 2.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Official Conversion] //= Collection of Veins Quests diff --git a/npc/quests/quests_yuno.txt b/npc/quests/quests_yuno.txt index 69c7d67c1..d6ed2a268 100644 --- a/npc/quests/quests_yuno.txt +++ b/npc/quests/quests_yuno.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Quest NPCs related to Juno //===== By: ================================================== //= rAthena Dev Team; L0ne_W0lf //===== Current Version: ===================================== //= 2.0a -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Metto Quest: diff --git a/npc/quests/seals/brisingamen_seal.txt b/npc/quests/seals/brisingamen_seal.txt index 2e64bbfb3..45e80aaf0 100644 --- a/npc/quests/seals/brisingamen_seal.txt +++ b/npc/quests/seals/brisingamen_seal.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Brisingamen seal unlocking NPCs. //===== By: ================================================== //= SinSloth diff --git a/npc/quests/seals/megingard_seal.txt b/npc/quests/seals/megingard_seal.txt index 2c0cd0c2e..4f210710b 100644 --- a/npc/quests/seals/megingard_seal.txt +++ b/npc/quests/seals/megingard_seal.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Megingjard seal unlocking NPCs. //===== By: ================================================== //= SinSloth //===== Current Version: ===================================== //= 1.9 -//===== Compatible With: ===================================== -//= rAthena //===== Description: ========================================= //= Quest for breaking the seal of Megingjard. //===== Additional Comments: ================================= diff --git a/npc/quests/skills/acolyte_skills.txt b/npc/quests/skills/acolyte_skills.txt index 012c499c8..3f81aee27 100644 --- a/npc/quests/skills/acolyte_skills.txt +++ b/npc/quests/skills/acolyte_skills.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Acolyte Skill Quest //===== By: ================================================== //= kobra_k88 diff --git a/npc/quests/skills/alchemist_skills.txt b/npc/quests/skills/alchemist_skills.txt index 07f3514cc..b53c6cd21 100644 --- a/npc/quests/skills/alchemist_skills.txt +++ b/npc/quests/skills/alchemist_skills.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Alchemist Skills Quests //===== By: ================================================== //= Lupus, Reddozen, Samuray22 diff --git a/npc/quests/skills/archer_skills.txt b/npc/quests/skills/archer_skills.txt index e9f87ae6d..4b140e7fb 100644 --- a/npc/quests/skills/archer_skills.txt +++ b/npc/quests/skills/archer_skills.txt @@ -1,7 +1,7 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Archer Skill Quest //===== By: ================================================== -//= rAthena dev team +//= rAthena Dev Team //===== Current Version: ===================================== //= 1.7 //===== Description: ========================================= diff --git a/npc/quests/skills/assassin_skills.txt b/npc/quests/skills/assassin_skills.txt index 7136634f0..109d699d3 100644 --- a/npc/quests/skills/assassin_skills.txt +++ b/npc/quests/skills/assassin_skills.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Assassin Skills Quests //===== By: ================================================== //= Lupus, Reddozen diff --git a/npc/quests/skills/bard_skills.txt b/npc/quests/skills/bard_skills.txt index 1b16c8362..f09437058 100644 --- a/npc/quests/skills/bard_skills.txt +++ b/npc/quests/skills/bard_skills.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Bard Skill Quest //===== By: ================================================== //= Lupus, Reddozen; L0ne_W0lf diff --git a/npc/quests/skills/blacksmith_skills.txt b/npc/quests/skills/blacksmith_skills.txt index 4ffbb06fe..26a69f91e 100644 --- a/npc/quests/skills/blacksmith_skills.txt +++ b/npc/quests/skills/blacksmith_skills.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Blacksmith Skills Quests //===== By: ================================================== //= Lupus, Reddozen, Samuray22 diff --git a/npc/re/airports/izlude.txt b/npc/re/airports/izlude.txt index f7a16147b..42ec73fe8 100644 --- a/npc/re/airports/izlude.txt +++ b/npc/re/airports/izlude.txt @@ -1,9 +1,7 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Izlude Airport NPCs //===== By: ================================================== //= rAthena Dev Team -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Izlude Airport NPCs //===== Additional Comments: ================================= diff --git a/npc/re/cities/alberta.txt b/npc/re/cities/alberta.txt index ba74fbb13..9d17acc65 100644 --- a/npc/re/cities/alberta.txt +++ b/npc/re/cities/alberta.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Alberta Town Renewal //===== By: ================================================== //= Euphy diff --git a/npc/re/cities/brasilis.txt b/npc/re/cities/brasilis.txt index 63c791feb..cde84e954 100644 --- a/npc/re/cities/brasilis.txt +++ b/npc/re/cities/brasilis.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Brasilis Town //===== By: ================================================== //= L0ne_W0lf diff --git a/npc/re/jobs/1-1/acolyte.txt b/npc/re/jobs/1-1/acolyte.txt index 138c641e1..4808879be 100644 --- a/npc/re/jobs/1-1/acolyte.txt +++ b/npc/re/jobs/1-1/acolyte.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Renewal Acolyte Job Quest //===== By: ================================================== //= Kisuka diff --git a/npc/re/jobs/1-1/archer.txt b/npc/re/jobs/1-1/archer.txt index d0050e428..86560b9ed 100644 --- a/npc/re/jobs/1-1/archer.txt +++ b/npc/re/jobs/1-1/archer.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Renewal Archer Job Quest //===== By: ================================================== //= Kisuka diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt index f6638bbc3..6dbfdaa3a 100644 --- a/npc/re/jobs/3-1/rune_knight.txt +++ b/npc/re/jobs/3-1/rune_knight.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Rune Knight Job Quest //===== By: ================================================== //= L0ne_W0lf, Muad_Dib //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Job change Quest from Knight / Lord Knight -> Rune Knight. //===== Additional Comments: ================================= diff --git a/npc/re/merchants/3rd_trader.txt b/npc/re/merchants/3rd_trader.txt index ceb6d9922..7c3ca3cac 100644 --- a/npc/re/merchants/3rd_trader.txt +++ b/npc/re/merchants/3rd_trader.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= 3rd Item Seller //===== By: ================================================== //= Masao, Mercurial diff --git a/npc/re/merchants/refine.txt b/npc/re/merchants/refine.txt index 70e666f82..749f573aa 100644 --- a/npc/re/merchants/refine.txt +++ b/npc/re/merchants/refine.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Renewal Refining NPCs //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Renewal-specific refining NPCs and material merchants. //===== Additional Comments: ================================= diff --git a/npc/re/merchants/renters.txt b/npc/re/merchants/renters.txt index 0ac62a476..5152fe102 100644 --- a/npc/re/merchants/renters.txt +++ b/npc/re/merchants/renters.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Renters //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== //= 2.1 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Renewal-specific breeder NPCs. //===== Additional Comments: ================================= diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt index a6f64174d..9c0692bdb 100644 --- a/npc/re/merchants/shops.txt +++ b/npc/re/merchants/shops.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Shops //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Renewal-specific town shop NPCs. //===== Additional Comments: ================================= diff --git a/npc/re/mobs/dungeons/abbey.txt b/npc/re/mobs/dungeons/abbey.txt index 9560313e8..e87c776ef 100644 --- a/npc/re/mobs/dungeons/abbey.txt +++ b/npc/re/mobs/dungeons/abbey.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================== +//===== Hercules Script ======================================= //= Abbey Dungeon Monster Spawn Script //===== By: ================================================== //= $ephiroth diff --git a/npc/re/mobs/dungeons/abyss.txt b/npc/re/mobs/dungeons/abyss.txt index ecf0336f8..7c111decf 100644 --- a/npc/re/mobs/dungeons/abyss.txt +++ b/npc/re/mobs/dungeons/abyss.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Abyss Lake Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) diff --git a/npc/re/mobs/dungeons/alde_dun.txt b/npc/re/mobs/dungeons/alde_dun.txt index e74d40741..5f1570b49 100644 --- a/npc/re/mobs/dungeons/alde_dun.txt +++ b/npc/re/mobs/dungeons/alde_dun.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Al De Baran Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) diff --git a/npc/re/mobs/dungeons/ama_dun.txt b/npc/re/mobs/dungeons/ama_dun.txt index 5d5af9259..a1a36735f 100644 --- a/npc/re/mobs/dungeons/ama_dun.txt +++ b/npc/re/mobs/dungeons/ama_dun.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Amatsu Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) diff --git a/npc/re/mobs/dungeons/ayo_dun.txt b/npc/re/mobs/dungeons/ayo_dun.txt index 3f49111ca..2d6775f35 100644 --- a/npc/re/mobs/dungeons/ayo_dun.txt +++ b/npc/re/mobs/dungeons/ayo_dun.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Ayothaya Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) diff --git a/npc/re/mobs/dungeons/beach_dun.txt b/npc/re/mobs/dungeons/beach_dun.txt index 01704525f..658444a76 100644 --- a/npc/re/mobs/dungeons/beach_dun.txt +++ b/npc/re/mobs/dungeons/beach_dun.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Beach Dungeon Monster Spawn Script //===== By: ================================================== //= Athena (1.0) diff --git a/npc/re/mobs/dungeons/bra_dun.txt b/npc/re/mobs/dungeons/bra_dun.txt index 88cf0263e..4c2832cd8 100644 --- a/npc/re/mobs/dungeons/bra_dun.txt +++ b/npc/re/mobs/dungeons/bra_dun.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================== +//===== Hercules Script ====================================== //= Brasilis Dungeon Monster Spawn Script //===== By: ================================================== //= Kisuka diff --git a/npc/re/mobs/dungeons/c_tower.txt b/npc/re/mobs/dungeons/c_tower.txt index 16c0673cf..b92dd7b4f 100644 --- a/npc/re/mobs/dungeons/c_tower.txt +++ b/npc/re/mobs/dungeons/c_tower.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Clock Tower Monster Spawn Script //===== By: ================================================== //= Athena (1.0) diff --git a/npc/re/mobs/dungeons/gefenia.txt b/npc/re/mobs/dungeons/gefenia.txt index 890d0879b..b10f90e34 100644 --- a/npc/re/mobs/dungeons/gefenia.txt +++ b/npc/re/mobs/dungeons/gefenia.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Geffenia Dungeon Monster Spawn Script //===== By: ================================================== -//= Muad_Dib, rAthena dev team +//= Muad_Dib, rAthena Dev Team //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= Added 1st Version. [Muad_Dib] //= Conversion to eA [MasterOfMuppets] diff --git a/npc/re/mobs/dungeons/juperos.txt b/npc/re/mobs/dungeons/juperos.txt index d3db3aefe..efa7bece7 100644 --- a/npc/re/mobs/dungeons/juperos.txt +++ b/npc/re/mobs/dungeons/juperos.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Juperos Dungeon Monster Spawn Script //===== By: ================================================== -// The Prometheus Project, rAthena dev team +// The Prometheus Project, rAthena Dev Team //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== -//= Any Athena/Freya Version //===== Additional Comments: ================================= //= 0.1 Added 1st version. [Muad_Dib] //= 0.2 Updated the spawns according to current info [MasterOfMuppets] diff --git a/npc/re/mobs/dungeons/lhz_dun.txt b/npc/re/mobs/dungeons/lhz_dun.txt index 54495a614..be3e34989 100644 --- a/npc/re/mobs/dungeons/lhz_dun.txt +++ b/npc/re/mobs/dungeons/lhz_dun.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Lighthalzen Dungeon(Biolabs) Monster Spawn Script //===== By: ================================================== -// The Prometheus Project, rAthena dev team +// The Prometheus Project, rAthena Dev Team //===== Current Version: ===================================== //= 1.9 -//===== Compatible With: ===================================== -//= Any Athena //===== Additional Comments: ================================= //= 08/24/05 : Added 1st version. [Muad_Dib] //= 1.1: Some corrections to level 1, 2 as pointed out by diff --git a/npc/re/mobs/fields/ayothaya.txt b/npc/re/mobs/fields/ayothaya.txt index db26edb43..6bf71ed2c 100644 --- a/npc/re/mobs/fields/ayothaya.txt +++ b/npc/re/mobs/fields/ayothaya.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Ayothaya Fields Monster Spawn Script //===== By: ================================================== //= Athena (1.0) diff --git a/npc/re/mobs/fields/bifrost.txt b/npc/re/mobs/fields/bifrost.txt index d060a61f2..c518669f6 100644 --- a/npc/re/mobs/fields/bifrost.txt +++ b/npc/re/mobs/fields/bifrost.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================== +//===== Hercules Script ====================================== //= Bifrost Field Monster Spawn Script //===== By: ================================================== //= Chilly diff --git a/npc/re/mobs/fields/brasilis.txt b/npc/re/mobs/fields/brasilis.txt index ff882402d..d0bc14591 100644 --- a/npc/re/mobs/fields/brasilis.txt +++ b/npc/re/mobs/fields/brasilis.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Brasilis Fields Monster Spawn Script //===== By: ================================================== //= Kisuka diff --git a/npc/re/mobs/fields/lighthalzen.txt b/npc/re/mobs/fields/lighthalzen.txt index 05fed705e..2a8867b13 100644 --- a/npc/re/mobs/fields/lighthalzen.txt +++ b/npc/re/mobs/fields/lighthalzen.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Lighthalzen Fields Monster Spawn Script //===== By: ================================================== -//= Muad_Dib, rAthena dev team +//= Muad_Dib, rAthena Dev Team //===== Current Version: ===================================== //= 1.6 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Additional Comments: ================================= //= 1.0 by Muad_Dib (Prometheus Project) //= 1.1 Added Porcellio by MasterOfMuppets diff --git a/npc/re/mobs/towns/brasilis.txt b/npc/re/mobs/towns/brasilis.txt index 1714cc557..12b0cd658 100644 --- a/npc/re/mobs/towns/brasilis.txt +++ b/npc/re/mobs/towns/brasilis.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Brasilis Quest Monsters //===== By: ================================================== //= L0ne_W0lf diff --git a/npc/re/quests/eden/11-25.txt b/npc/re/quests/eden/11-25.txt index 37de338a4..361f8fb57 100644 --- a/npc/re/quests/eden/11-25.txt +++ b/npc/re/quests/eden/11-25.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Eden Group Quests - Mission [11 - 25] //===== By: ================================================== //= L0ne_W0lf diff --git a/npc/re/quests/eden/26-40.txt b/npc/re/quests/eden/26-40.txt index 6c318f99d..5467c773e 100644 --- a/npc/re/quests/eden/26-40.txt +++ b/npc/re/quests/eden/26-40.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Eden Group Quests - Mission [26 - 40] //===== By: ================================================== //= L0ne_W0lf diff --git a/npc/re/quests/eden/41-55.txt b/npc/re/quests/eden/41-55.txt index 71d302440..dc71a6c5a 100644 --- a/npc/re/quests/eden/41-55.txt +++ b/npc/re/quests/eden/41-55.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Eden Group Quests - Mission [41 - 55] //===== By: ================================================== //= L0ne_W0lf diff --git a/npc/re/quests/eden/56-70.txt b/npc/re/quests/eden/56-70.txt index 88ae54604..d4599c557 100644 --- a/npc/re/quests/eden/56-70.txt +++ b/npc/re/quests/eden/56-70.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Eden Group Quests - Mission [56 - 70] //===== By: ================================================== //= L0ne_W0lf diff --git a/npc/re/quests/eden/71-85.txt b/npc/re/quests/eden/71-85.txt index c36fb219d..9a11bf2b5 100644 --- a/npc/re/quests/eden/71-85.txt +++ b/npc/re/quests/eden/71-85.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Eden Group Quests - Mission [71 - 85] //===== By: ================================================== //= L0ne_W0lf diff --git a/npc/re/quests/eden/86-90.txt b/npc/re/quests/eden/86-90.txt index 5e3f26e13..4ac5bbb19 100644 --- a/npc/re/quests/eden/86-90.txt +++ b/npc/re/quests/eden/86-90.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Eden Group Quests - Mission [86 - 90] //===== By: ================================================== //= Chilly diff --git a/npc/re/quests/eden/91-99.txt b/npc/re/quests/eden/91-99.txt index e834189a4..bf80c2a7c 100644 --- a/npc/re/quests/eden/91-99.txt +++ b/npc/re/quests/eden/91-99.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Eden Group Quests - Mission [91 - 99] //===== By: ================================================== //= Chilly diff --git a/npc/re/warps/cities/brasilis.txt b/npc/re/warps/cities/brasilis.txt index 3518f348b..e5e8a5386 100644 --- a/npc/re/warps/cities/brasilis.txt +++ b/npc/re/warps/cities/brasilis.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Brasilis Town Warps Script //===== By: ================================================== //= L0ne_W0lf diff --git a/npc/re/warps/dungeons/bra_dun.txt b/npc/re/warps/dungeons/bra_dun.txt index bbf164d06..de7d1d94f 100644 --- a/npc/re/warps/dungeons/bra_dun.txt +++ b/npc/re/warps/dungeons/bra_dun.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Brasilis Dungeon Warp //===== By: ================================================== //= L0ne_W0lf diff --git a/npc/re/warps/fields/bif_fild.txt b/npc/re/warps/fields/bif_fild.txt index 2d94c224e..3a32c3e75 100644 --- a/npc/re/warps/fields/bif_fild.txt +++ b/npc/re/warps/fields/bif_fild.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Bifrost Field Warp Script //===== By: ================================================== //= Chilly diff --git a/npc/re/warps/fields/bra_fild.txt b/npc/re/warps/fields/bra_fild.txt index 13a18eba7..c2078cdd2 100644 --- a/npc/re/warps/fields/bra_fild.txt +++ b/npc/re/warps/fields/bra_fild.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Brasilis Fild Warps Script //===== By: ================================================== //= Protimus diff --git a/npc/warps/cities/alberta.txt b/npc/warps/cities/alberta.txt index 4523bbb72..f6d66e93e 100644 --- a/npc/warps/cities/alberta.txt +++ b/npc/warps/cities/alberta.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Alberta Warp Script //===== By: ================================================== //= Athena (1.0) diff --git a/npc/warps/cities/aldebaran.txt b/npc/warps/cities/aldebaran.txt index 0c047dfbf..a6d5fb694 100644 --- a/npc/warps/cities/aldebaran.txt +++ b/npc/warps/cities/aldebaran.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Al de Baran Warp Script //===== By: ================================================== //= Athena (1.0) diff --git a/npc/warps/cities/ayothaya.txt b/npc/warps/cities/ayothaya.txt index 789314453..27f3e4573 100644 --- a/npc/warps/cities/ayothaya.txt +++ b/npc/warps/cities/ayothaya.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Ayothaya Town Warps Script //===== By: ================================================== //= Muad_Dib, L0ne_W0lf (1.0) diff --git a/npc/warps/cities/comodo.txt b/npc/warps/cities/comodo.txt index 8dfbc8198..c2074660e 100644 --- a/npc/warps/cities/comodo.txt +++ b/npc/warps/cities/comodo.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Comodo Warp Script //===== By: ================================================== -//= rAthena dev team +//= rAthena Dev Team //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Any Athena Version //===== Description: ========================================= //= [Aegis Conversion] //= Warp Points Comodo city diff --git a/npc/warps/dungeons/abbey.txt b/npc/warps/dungeons/abbey.txt index ac97ebeb8..222b6a2d3 100644 --- a/npc/warps/dungeons/abbey.txt +++ b/npc/warps/dungeons/abbey.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Abbey Dungeon Warp Script //===== By: ================================================== //= $ephiroth diff --git a/npc/warps/dungeons/abyss.txt b/npc/warps/dungeons/abyss.txt index 75d48e5e8..e2111d6a7 100644 --- a/npc/warps/dungeons/abyss.txt +++ b/npc/warps/dungeons/abyss.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Abyss Lake Dungeon Warp Script //===== By: ================================================== //= Muad-Dib (1.0) diff --git a/npc/warps/dungeons/alde_dun.txt b/npc/warps/dungeons/alde_dun.txt index cee943b20..c711ecd5c 100644 --- a/npc/warps/dungeons/alde_dun.txt +++ b/npc/warps/dungeons/alde_dun.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Al de Baran Dungeon Warp Script //===== By: ================================================== //= Nana (1.0) diff --git a/npc/warps/dungeons/ama_dun.txt b/npc/warps/dungeons/ama_dun.txt index 07cc1d173..0356ca8a0 100644 --- a/npc/warps/dungeons/ama_dun.txt +++ b/npc/warps/dungeons/ama_dun.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Amatsu Dungeon Script //===== By: ================================================== //= Nana (1.0) diff --git a/npc/warps/dungeons/ayo_dun.txt b/npc/warps/dungeons/ayo_dun.txt index 28c08f73b..68cc30d59 100644 --- a/npc/warps/dungeons/ayo_dun.txt +++ b/npc/warps/dungeons/ayo_dun.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Ayothaya Dungeon Warp Script //===== By: ================================================== //= rAthena Team (1.0) diff --git a/npc/warps/dungeons/beach_dun.txt b/npc/warps/dungeons/beach_dun.txt index 199a5d391..d2042a6de 100644 --- a/npc/warps/dungeons/beach_dun.txt +++ b/npc/warps/dungeons/beach_dun.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Comodo Dungeon Warp //===== By: ================================================== //= Nana (1.0) diff --git a/npc/warps/dungeons/c_tower.txt b/npc/warps/dungeons/c_tower.txt index 493fd1f9f..572df52bf 100644 --- a/npc/warps/dungeons/c_tower.txt +++ b/npc/warps/dungeons/c_tower.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Al de Baran Clock Tower Warp Script //===== By: ================================================== //= Nana (1.0) diff --git a/npc/warps/fields/abyss_warper.txt b/npc/warps/fields/abyss_warper.txt index 284104155..a210eb12b 100644 --- a/npc/warps/fields/abyss_warper.txt +++ b/npc/warps/fields/abyss_warper.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Abyss Cave Warper //===== By: ================================================== //= erKURITA diff --git a/npc/warps/other/airplane.txt b/npc/warps/other/airplane.txt index 336268eb3..840c1b204 100644 --- a/npc/warps/other/airplane.txt +++ b/npc/warps/other/airplane.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Airports & Airplanes Warp Script //===== By: ================================================== //= Sara-chan (1.0), SSUNNY@YOUNG(1.6) diff --git a/npc/warps/other/bossnia.txt b/npc/warps/other/bossnia.txt index 2ecf6145f..2566f2479 100644 --- a/npc/warps/other/bossnia.txt +++ b/npc/warps/other/bossnia.txt @@ -1,4 +1,4 @@ -//===== Hercules Script ======================================= +//===== Hercules Script ====================================== //= Bossnia Warps //===== By: ================================================== //= Masao -- cgit v1.2.3-70-g09d2 From 524291493e64196d8ce02f4b637ea0ee1a176d0a Mon Sep 17 00:00:00 2001 From: Matheus Macabu Date: Mon, 4 Feb 2013 00:32:19 -0200 Subject: Merged some commits from rAthena. --- conf/char-server.conf | 5 +++-- db/castle_db.txt | 20 ++++++++++---------- db/pre-re/item_combo_db.txt | 4 ++-- db/pre-re/item_db.txt | 2 +- db/re/item_combo_db.txt | 8 ++++---- db/re/item_trade.txt | 28 ++++++++++++++++++++++++++++ npc/guild/agit_main.txt | 5 +++-- npc/guild2/agit_main_se.txt | 19 +++++++++++++++++-- npc/jobs/2-1/hunter.txt | 1 + sql-files/item_db.sql | 2 +- sql-files/item_db_re.sql | 2 +- src/char/char.c | 9 +++++---- src/map/npc.c | 27 +++++++++++++-------------- src/map/pc.c | 4 ++++ 14 files changed, 93 insertions(+), 43 deletions(-) (limited to 'npc/guild') diff --git a/conf/char-server.conf b/conf/char-server.conf index 929bad5d0..4ed7c1a26 100644 --- a/conf/char-server.conf +++ b/conf/char-server.conf @@ -79,8 +79,9 @@ char_new: 1 // Display (New) in the server list. char_new_display: 0 -// Maximum users able to connect to the server. Set to 0 for unlimited. -max_connect_user: 0 +// Maximum users able to connect to the server. +// Set to 0 to disable users to log-in. (-1 means unlimited) +max_connect_user: -1 // Group ID that is allowed to bypass the server limit of users. // Default: -1 = nobody (there are no groups with ID < 0) diff --git a/db/castle_db.txt b/db/castle_db.txt index a77b5de7b..4e0f2e880 100644 --- a/db/castle_db.txt +++ b/db/castle_db.txt @@ -34,13 +34,13 @@ 21,nguild_gef,Air,Agit_N02,2 22,nguild_pay,Water,Agit_N03,2 23,nguild_prt,Fire,Agit_N04,2 -24,schg_cas01,Himinn,Agit_Sc01,1 // kRO : Himinn -25,schg_cas02,Andlangr,Agit_Sc02,1 // kRO : Andlangr -26,schg_cas03,Viblainn,Agit_Sc03,1 // kRO : Viblainn -27,schg_cas04,Hljod,Agit_Sc04,1 // kRO : Hljod -28,schg_cas05,Skidbladnir,Agit_Sc05,1 // kRO : Skidbladnir -29,arug_cas01,Mardol,Agit_Ar01,1 // kRO : Mardol -30,arug_cas02,Cyr,Agit_Ar02,1 // kRO : Cyr -31,arug_cas03,Horn,Agit_Ar03,1 // kRO : Horn -32,arug_cas04,Gefn,Agit_Ar04,1 // kRO : Gefn -33,arug_cas05,Bandis,Agit_Ar05,1 // kRO : Bandis +24,schg_cas01,Himinn,Manager#schg_cas01,1 // kRO : Himinn +25,schg_cas02,Andlangr,Manager#schg_cas02,1 // kRO : Andlangr +26,schg_cas03,Viblainn,Manager#schg_cas03,1 // kRO : Viblainn +27,schg_cas04,Hljod,Manager#schg_cas04,1 // kRO : Hljod +28,schg_cas05,Skidbladnir,Manager#schg_cas05,1 // kRO : Skidbladnir +29,arug_cas01,Mardol,Manager#arug_cas01,1 // kRO : Mardol +30,arug_cas02,Cyr,Manager#arug_cas02,1 // kRO : Cyr +31,arug_cas03,Horn,Manager#arug_cas03,1 // kRO : Horn +32,arug_cas04,Gefn,Manager#arug_cas04,1 // kRO : Gefn +33,arug_cas05,Bandis,Manager#arug_cas05,1 // kRO : Bandis diff --git a/db/pre-re/item_combo_db.txt b/db/pre-re/item_combo_db.txt index 3b8985fb0..c1eb3c039 100644 --- a/db/pre-re/item_combo_db.txt +++ b/db/pre-re/item_combo_db.txt @@ -21,7 +21,7 @@ 1573:2334,{ bonus bMdef,8; bonus bMaxSPRate,10; bonus bInt,4; } 1573:2372,{ bonus bMdef,8; bonus bMaxSPRate,10; bonus bInt,4; } 1573:2716:2717,{ bonus bInt,5; bonus bMaxHP,700; bonus bAspdRate,5; } -1615:18539,{ bonus bEquipmentMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bCastRate,-10; } +1615:18539,{ bonus bMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bCastRate,-10; } 1616:2515,{ bonus bSpeedRate,25; } 1618:2509,{ bonus bMaxHP,300; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R)-5; bonus2 bSubEle,Ele_Neutral,getrefine()*3; } 1618:2535,{ bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,25; } @@ -29,7 +29,7 @@ 1620:2535,{ bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,25; } 1629:5045,{ bonus bDex,2; bonus bInt,2; bonus bSPrecovRate,5; bonus bMatkRate,getrefine(); } 1631:2129,{ bonus2 bSkillAtk,"PR_MAGNUS",20; bonus3 bAutoSpellWhenHit,"PR_TURNUNDEAD",1,20; } -1636:18539,{ bonus bEquipmentMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bCastRate,-10; } +1636:18539,{ bonus bMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bCastRate,-10; } 1723:2718,{ bonus bDex,1; bonus bMaxSP,50; bonus bSPrecovRate,10; } 1730:1752,{ bonus bLongAtkRate,25; } 1731:1754,{ bonus bLongAtkRate,25; } diff --git a/db/pre-re/item_db.txt b/db/pre-re/item_db.txt index 391954fab..35763c257 100644 --- a/db/pre-re/item_db.txt +++ b/db/pre-re/item_db.txt @@ -1777,7 +1777,7 @@ 4149,Gargoyle_Card,Gargoyle Card,6,20,,10,,,,,,,,136,,,,,{ bonus3 bAddMonsterDropItem,12028,RC_Insect,100; },{},{} 4150,Goat_Card,Goat Card,6,20,,10,,,,,,,,16,,,,,{ if(getrefine()<6) { bonus bDef,2; bonus bMdef,5; } },{},{} 4151,Gajomart_Card,Gajomart Card,6,20,,10,,,,,,,,64,,,,,{ bonus2 bSubRace,RC_Plant,-20; bonus2 bExpAddRace,RC_Plant,10; },{},{} -4152,Galapago_Card,Galapago Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,IG_Juice,50; bonus3 bAddMonsterDropItem,531,RC_Insect,300; bonus3 bAddMonsterDropItem,532,RC_Insect,300; bonus3 bAddMonsterDropItem,533,RC_Insect,300; },{},{} +4152,Galapago_Card,Galapago Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,IG_Juice,50; bonus3 bAddMonsterDropItem,531,RC_Insect,300; bonus3 bAddMonsterDropItem,532,RC_Insect,300; bonus3 bAddMonsterDropItem,534,RC_Insect,300; },{},{} 4153,Crab_Card,Crab Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,5; bonus2 bAddDamageClass,1266,30; },{},{} 4154,Rice_Cake_Boy_Card,Dumpling Child Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,IG_Candy,50; bonus3 bAddMonsterDropItem,529,RC_DemiHuman,300; bonus3 bAddMonsterDropItem,530,RC_DemiHuman,100; },{},{} 4155,Goblin_Leader_Card,Goblin Leader Card,6,20,,10,,,,,,,,2,,,,,{ bonus2 bAddRace2,1,30; },{},{} diff --git a/db/re/item_combo_db.txt b/db/re/item_combo_db.txt index 81acb7f0d..f6bd7dc01 100644 --- a/db/re/item_combo_db.txt +++ b/db/re/item_combo_db.txt @@ -24,7 +24,7 @@ 1573:2334,{ bonus bMdef,8; bonus bMaxSPRate,10; bonus bInt,4; } 1573:2372,{ bonus bMdef,8; bonus bMaxSPRate,10; bonus bInt,4; } 1573:2716:2717,{ bonus bInt,5; bonus bMaxHP,700; bonus bAspdRate,5; } -1615:18539,{ bonus bEquipmentMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bVariableCastrate,-10; } +1615:18539,{ bonus bMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bVariableCastrate,-10; } 1616:2515,{ bonus bSpeedRate,25; } 1618:2509,{ bonus bMaxHP,300; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R)-5; bonus2 bSubEle,Ele_Neutral,getrefine()*3; } 1618:2535,{ bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,25; } @@ -32,7 +32,7 @@ 1620:2535,{ bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,25; } 1629:5045,{ bonus bDex,2; bonus bInt,2; bonus bSPrecovRate,5; bonus bMatkRate,getrefine(); } 1631:2129,{ bonus2 bSkillAtk,"PR_MAGNUS",20; bonus3 bAutoSpellWhenHit,"PR_TURNUNDEAD",1,20; } -1636:18539,{ bonus bEquipmentMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bVariableCastrate,-10; } +1636:18539,{ bonus bMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bVariableCastrate,-10; } 1657:2471:2569:15029,{ bonus bHealPower,25; } 1660:2471:2569:15029,{ bonus bHealPower,45; bonus3 bAutoSpellWhenHit,"AB_SILENTIUM",1,10; } 1718:1774,{ bonus bLongAtkRate,50; } @@ -117,7 +117,7 @@ 2475:2574:2883:15036,{ bonus bMaxHPRate,14; bonus2 bSkillAtk,"RK_HUNDREDSPEAR",50; skill "CR_AUTOGUARD",1; } 2476:2575:2884:15037,{ bonus2 bAddRace,RC_NonBoss,10; bonus2 bAddRace,RC_Boss,10; bonus2 bSkillAtk,"RK_SONICWAVE",100; bonus2 bSkillAtk,"RK_WINDCUTTER",100; autobonus "{ sc_start SC_CONCENTRATION,10000,getskilllv(\"LK_CONCENTRATION\")?getskilllv(\"LK_CONCENTRATION\"):1; bonus bAspd,2; }",1,10000,BF_WEAPON,"{}"; } 2477:2577:2886:15038,{ bonus bCritical,15; bonus bFlee,10; bonus bCritAtkRate,40; bonus2 bSkillAtk,"GC_CROSSIMPACT",20; } -2478:2578:2887:15039,{ bonus2 bAddRace,RC_NonBoss,10; bonus2 bAddRace,RC_Boss,10; /* bonus bEquipmentMatk,10; */ if(readparam(bStr)>119) { bonus bBaseAtk,30; } bonus3 bAutoSpell,"ASC_BREAKER",getskilllv("ASC_BREAKER"),10; bonus bCritical,-20; } +2478:2578:2887:15039,{ bonus2 bAddRace,RC_NonBoss,10; bonus2 bAddRace,RC_Boss,10; bonus bMatk,10; if(readparam(bStr)>119) { bonus bBaseAtk,30; } bonus3 bAutoSpell,"ASC_BREAKER",getskilllv("ASC_BREAKER"),10; bonus bCritical,-20; } 2479:2580:2890:15042,{ bonus bAspd,2; bonus bLongAtkRate,30; bonus3 bAutoSpell,"AC_DOUBLE",3,10; bonus2 bSkillAtk,"RA_ARROWSTORM",50; } 2480:2581:2891:15043,{ bonus bMaxHPRate,15; bonus2 bSkillAtk,"RA_CLUSTERBOMB",20; bonus bFlee2,20; bonus bLongAtkRate,-30; bonus bAspd,-7; } 2483:2586:15046,{ bonus2 bSubRace,RC_DemiHuman,15; } @@ -147,7 +147,7 @@ 2725:2772,{ bonus2 bAddRace,RC_NonBoss,5; bonus2 bAddRace,RC_Boss,5; bonus bMatkRate,3; bonus bHealPower,5; } 2726:2727,{ bonus bUseSPrate,-25; } 2733:2772,{ bonus2 bAddRace,RC_NonBoss,5; bonus2 bAddRace,RC_Boss,5; bonus bMatkRate,3; bonus bHealPower,5; } -2747:13061,{ bonus bHit,5; /* bonus bEquipmentMatk,5; */ } +2747:13061,{ bonus bHit,5; bonus bMatk,5; } 2777:2778:5479,{ bonus bMaxHP,300; bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,5; } 2779:2780:5482,{ bonus bMatkRate,10; bonus bInt,5; bonus2 bSubRace,RC_Angel,10; } 2779:2780:5577,{ bonus bMatkRate,10; bonus bInt,5; bonus2 bSubRace,RC_Angel,10; } diff --git a/db/re/item_trade.txt b/db/re/item_trade.txt index c8f518c12..abc6909c2 100644 --- a/db/re/item_trade.txt +++ b/db/re/item_trade.txt @@ -1870,3 +1870,31 @@ 13425,499,100 // Tourist Sword 15007,467,100 // Time Keeper Robe 16006,499,100 // Tourist Mace + +// Sealed Cards +4489,457,100 // Sealed Pharaoh Card +4490,457,100 // Sealed Moonlight Flower Card +4491,457,100 // Sealed Sniper Card +4492,457,100 // Sealed Orc Hero Card +4493,457,100 // Sealed Tao Gunka Card +4494,457,100 // Sealed Turtle General Card +4495,457,100 // Sealed Amon Ra Card +4496,457,100 // Sealed Drake Card +4497,457,100 // Sealed Stormy Knight Card +4498,457,100 // Sealed Lady Tanee Card +4499,457,100 // Sealed Samurai Spector Card +4500,457,100 // Sealed Orc Lord Card +4501,457,100 // Sealed High Priest Card +4502,457,100 // Sealed MasterSmith Card +4503,457,100 // Sealed Vesper Card +4504,457,100 // Sealed Eddga Card +4535,457,100 // Sealed Randgris Card +4536,457,100 // Sealed Atroce Card +4537,457,100 // Sealed Phreeoni Card +4538,457,100 // Sealed White Lady Card +4539,457,100 // Sealed Fallen Bishop Hibram Card +4540,457,100 // Sealed Lord of The Dead Card +4541,457,100 // Sealed High Wizard Card +4542,457,100 // Sealed Detale Card +4543,457,100 // Sealed Hatii Card +4544,457,100 // Sealed Evil Snake Lord Card diff --git a/npc/guild/agit_main.txt b/npc/guild/agit_main.txt index 115238bfb..5253fbe16 100644 --- a/npc/guild/agit_main.txt +++ b/npc/guild/agit_main.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.9 +//= 1.9a //===== Description: ========================================= //= [ Aegis Conversion] //= ---------------------------------------------------------- @@ -49,6 +49,7 @@ //= and added extended anouncement format for mapannounce. //= 1.8 Fixed a possible exploit in guild castle investment. [Brian] //= 1.9 Partially rewrote Script. [Masao] +//= 1.9a Fixed incorrect setcastledata parameter. [Euphy] //============================================================ // WoE : Main Functions @@ -156,7 +157,7 @@ OnGuildBreak: // Kill guardians, disable the Kafra, and set owner to 0. killmonster strnpcinfo(2),"Guardian#"+strnpcinfo(2)+"::OnGuardianDied"; disablenpc "Kafra Staff#"+strnpcinfo(2); - SetCastleData strnpcinfo(2),0,0; + SetCastleData strnpcinfo(2),1,0; // Wait before refreshing guild information. sleep 7000; Announce "Guild Base [" + GetCastleName(strnpcinfo(2)) + "] has been abandoned.",0; diff --git a/npc/guild2/agit_main_se.txt b/npc/guild2/agit_main_se.txt index 0c15e3a70..45c847d5d 100644 --- a/npc/guild2/agit_main_se.txt +++ b/npc/guild2/agit_main_se.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Euphy //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Description: ========================================= //= Like agit_main, this file is required //= for SE castles to function. @@ -13,6 +13,7 @@ //= 1.1 Fixed an incorrect label execution. [Euphy] //= 1.2 Hopefully fixed a processing error. [Euphy] //= 1.3 Fixed barricade issue in schg_cas02. [Cookie] +//= 1.4 Added OnGuildBreak event and a spawn check. [Euphy] //============================================================ // Core, triggers all other events @@ -64,6 +65,17 @@ OnAgitEnd2: } end; +OnGuildBreak: + if (strnpcinfo(2) == "template") end; + killmonster strnpcinfo(2),"gard1#"+strnpcinfo(2)+"::OnGuardianDied"; + killmonster strnpcinfo(2),"gard2#"+strnpcinfo(2)+"::OnGuardianDied"; + disablenpc "Kafra Employee#"+substr(strnpcinfo(2),0,1)+substr(strnpcinfo(2),8,9); + setcastledata strnpcinfo(2),1,0; + sleep 7000; + announce "Guild Base ["+getcastlename(strnpcinfo(2))+"] has been abandoned.",0; + donpcevent strnpcinfo(0)+"::OnRecvCastle2"; + end; + OnStart: // $agit_ar0x[] - $agit_sc0x[] // 1st Guardian stone, 2nd Guardian stone, Barrier 1, Barrier 2, Barrier 3, Summon Guardians @@ -76,7 +88,10 @@ OnStart: for(set .@i,0; .@i<4; set .@i,.@i+1) donpcevent "RL"+.@i+"#"+strnpcinfo(2)+"::OnEnable"; } + OnEmpSpawn: + set .@str$, substr(strnpcinfo(2),0,1)+substr(strnpcinfo(2),8,9); + if (mobcount(strnpcinfo(2),"Steward#"+.@str$+"::OnStartArena")) end; if (compare(strnpcinfo(2),"arug")) { if (strnpcinfo(2) == "arug_cas01") setarray .@i[0],87,219; else if (strnpcinfo(2) == "arug_cas02") setarray .@i[0],89,256; @@ -87,7 +102,7 @@ OnEmpSpawn: else if (strnpcinfo(2) == "schg_cas03") setarray .@i[0],338,202; else setarray .@i[0],120,272; // Castles 1,4,5 are identical. } - monster strnpcinfo(2),.@i[0],.@i[1],"Emperium",1288,1,"Steward#"+substr(strnpcinfo(2),0,1)+substr(strnpcinfo(2),8,9)+"::OnStartArena"; + monster strnpcinfo(2),.@i[0],.@i[1],"Emperium",1288,1,"Steward#"+.@str$+"::OnStartArena"; end; OnReset: diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt index 96874f73e..2777e0a43 100644 --- a/npc/jobs/2-1/hunter.txt +++ b/npc/jobs/2-1/hunter.txt @@ -534,6 +534,7 @@ hu_in01,382,382,4 script Guild Receptionist#hnt 732,{ close; } else if (HNTR_Q >= 3 && HNTR_Q <= 9) { + if(checkre(0)) set .@i,1; switch(HNTR_Q) { //Insect_Feeler/Claw_Of_Desert_Wolf, Wooden_Block, White_Herb case 3: setarray .@items[0], (.@i?928:7030),5, 1019,5, 509,3, 10; break; diff --git a/sql-files/item_db.sql b/sql-files/item_db.sql index bdef46fa7..9b0c8fff4 100644 --- a/sql-files/item_db.sql +++ b/sql-files/item_db.sql @@ -1808,7 +1808,7 @@ REPLACE INTO `item_db` VALUES (4148,'Pharaoh_Card','Pharaoh Card',6,20,NULL,10,N REPLACE INTO `item_db` VALUES (4149,'Gargoyle_Card','Gargoyle Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,136,NULL,NULL,NULL,NULL,'bonus3 bAddMonsterDropItem,12028,RC_Insect,100;',NULL,NULL); REPLACE INTO `item_db` VALUES (4150,'Goat_Card','Goat Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,'if(getrefine()<6) { bonus bDef,2; bonus bMdef,5; }',NULL,NULL); REPLACE INTO `item_db` VALUES (4151,'Gajomart_Card','Gajomart Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,64,NULL,NULL,NULL,NULL,'bonus2 bSubRace,RC_Plant,-20; bonus2 bExpAddRace,RC_Plant,10;',NULL,NULL); -REPLACE INTO `item_db` VALUES (4152,'Galapago_Card','Galapago Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,136,NULL,NULL,NULL,NULL,'bonus2 bAddItemHealRate,IG_Juice,50; bonus3 bAddMonsterDropItem,531,RC_Insect,300; bonus3 bAddMonsterDropItem,532,RC_Insect,300; bonus3 bAddMonsterDropItem,533,RC_Insect,300;',NULL,NULL); +REPLACE INTO `item_db` VALUES (4152,'Galapago_Card','Galapago Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,136,NULL,NULL,NULL,NULL,'bonus2 bAddItemHealRate,IG_Juice,50; bonus3 bAddMonsterDropItem,531,RC_Insect,300; bonus3 bAddMonsterDropItem,532,RC_Insect,300; bonus3 bAddMonsterDropItem,534,RC_Insect,300;',NULL,NULL); REPLACE INTO `item_db` VALUES (4153,'Crab_Card','Crab Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus bBaseAtk,5; bonus2 bAddDamageClass,1266,30;',NULL,NULL); REPLACE INTO `item_db` VALUES (4154,'Rice_Cake_Boy_Card','Dumpling Child Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,136,NULL,NULL,NULL,NULL,'bonus2 bAddItemHealRate,IG_Candy,50; bonus3 bAddMonsterDropItem,529,RC_DemiHuman,300; bonus3 bAddMonsterDropItem,530,RC_DemiHuman,100;',NULL,NULL); REPLACE INTO `item_db` VALUES (4155,'Goblin_Leader_Card','Goblin Leader Card',6,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,'bonus2 bAddRace2,1,30;',NULL,NULL); diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql index e9ddd31ca..a3fd574f7 100644 --- a/sql-files/item_db_re.sql +++ b/sql-files/item_db_re.sql @@ -7363,4 +7363,4 @@ REPLACE INTO `item_db_re` VALUES (19529,'Costume_Angel_Wing','Costume Angel Wing REPLACE INTO `item_db_re` VALUES (19530,'Costume_Wild_Rose','Costume Wild Rose',5,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,1024,NULL,'1',NULL,541,NULL,NULL,NULL); # More 2-Handed Swords REPLACE INTO `item_db_re` VALUES (21001,'Bellum_Claymore','Bellum Claymore',4,20,NULL,3500,'260',NULL,1,NULL,0x00004082,7,2,34,4,'95',1,3,'bonus2 bAddRace,RC_DemiHuman,80; bonus2 bIgnoreDefRate,RC_DemiHuman,30; if(getrefine()>=6) { bonus2 bAddRace,RC_DemiHuman,40; } if(getrefine()>=9) { autobonus2 "{bonus bShortWeaponDamageReturn,20; bonus bMagicDamageReturn,20;}",200,1000,BF_WEAPON,"{specialeffect2 EF_REFLECTSHIELD;}"; }',NULL,NULL); -REPLACE INTO `item_db_re` VALUES (21002,'Bellum_Katzbalger','Bellum Katzbalger',4,20,NULL,2500,'100',NULL,1,NULL,0x00004082,7,2,34,4,'95',1,3,'bonus2 bSPVanishRate,10000,8;',NULL,NULL); \ No newline at end of file +REPLACE INTO `item_db_re` VALUES (21002,'Bellum_Katzbalger','Bellum Katzbalger',4,20,NULL,2500,'100',NULL,1,NULL,0x00004082,7,2,34,4,'95',1,3,'bonus2 bSPVanishRate,10000,8;',NULL,NULL); diff --git a/src/char/char.c b/src/char/char.c index d454e8bd0..1b5c7898d 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -133,7 +133,7 @@ struct char_session_data { char birthdate[10+1]; // YYYY-MM-DD }; -int max_connect_user = 0; +int max_connect_user = -1; int gm_allow_group = -1; int autosave_interval = DEFAULT_AUTOSAVE_INTERVAL; int start_zeny = 0; @@ -2154,7 +2154,8 @@ int parse_fromlogin(int fd) { ARR_FIND( 0, ARRAYLENGTH(server), server_id, server[server_id].fd > 0 && server[server_id].map[0] ); // continued from char_auth_ok... if( server_id == ARRAYLENGTH(server) || //server not online, bugreport:2359 - ( max_connect_user && count_users() >= max_connect_user && sd->group_id != gm_allow_group ) ) { + (max_connect_user == 0 && sd->group_id != gm_allow_group) || + ( max_connect_user > 0 && count_users() >= max_connect_user && sd->group_id != gm_allow_group ) ) { // refuse connection (over populated) WFIFOHEAD(i,3); WFIFOW(i,0) = 0x6c; @@ -4588,8 +4589,8 @@ int char_config_read(const char* cfgName) char_new_display = atoi(w2); } else if (strcmpi(w1, "max_connect_user") == 0) { max_connect_user = atoi(w2); - if (max_connect_user < 0) - max_connect_user = 0; // unlimited online players + if (max_connect_user < -1) + max_connect_user = -1; // unlimited online players } else if(strcmpi(w1, "gm_allow_group") == 0) { gm_allow_group = atoi(w2); } else if (strcmpi(w1, "autosave_time") == 0) { diff --git a/src/map/npc.c b/src/map/npc.c index 3aabeaf98..383cd031a 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2884,24 +2884,23 @@ int npc_do_atcmd_event(struct map_session_data* sd, const char* command, const c setd_sub(st, NULL, ".@atcmd_command$", 0, (void *)command, NULL); // split atcmd parameters based on spaces - i = 0; - j = 0; - temp = (char*)aMalloc(strlen(message) + 1); - while( message[i] != '\0' ) { - if( message[i] == ' ' && k < 127 ) { - temp[j] = '\0'; - setd_sub(st, NULL, ".@atcmd_parameters$", k++, (void *)temp, NULL); - j = 0; - ++i; - } else - temp[j++] = message[i++]; + for( i = 0; i < ( strlen( message ) + 1 ) && k < 127; i ++ ) { + if( message[i] == ' ' || message[i] == '\0' ) { + if( message[ ( i - 1 ) ] == ' ' ) { + continue; // To prevent "@atcmd [space][space][space]..." + } + temp[k] = '\0'; + k = 0; + setd_sub( st, NULL, ".@atcmd_parameters$", j++, (void *)temp, NULL ); + } else { + temp[k] = message[i]; + k++; + } } - temp[j] = '\0'; - setd_sub(st, NULL, ".@atcmd_parameters$", k++, (void *)temp, NULL); - setd_sub(st, NULL, ".@atcmd_numparameters", 0, (void *)&k, NULL); + setd_sub(st, NULL, ".@atcmd_numparameters", 0, (void *)__64BPRTSIZE(j), NULL); aFree(temp); run_script_main(st); diff --git a/src/map/pc.c b/src/map/pc.c index 6f608cd49..4fb555d0f 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -8194,6 +8194,10 @@ int pc_removecombo(struct map_session_data *sd, struct item_data *data ) { cursor++; } + + /* check if combo requirements still fit */ + if( pc_checkcombo( sd, data ) ) + continue; /* it's empty, we can clear all the memory */ if( (sd->combos.count = cursor) == 0 ) { -- cgit v1.2.3-70-g09d2 From c6882c741f314f633e681066adb018738e5bb585 Mon Sep 17 00:00:00 2001 From: Streusel Date: Mon, 18 Feb 2013 17:58:19 -0800 Subject: -Updated map_cache.dat -Updated Izlude -Added Fly Wing to Lunatic & Poring -Added new Quests (Thanks Flaid) --Expanded MAX_QUEST_DB for the newly added quests Signed-off-by: Streusel --- conf/maps.conf | 21 +- db/job_db2.txt | 10 +- db/map_index.txt | 15 +- db/pre-re/map_cache.dat | Bin 2096346 -> 2114399 bytes db/pre-re/skill_cast_db.txt | 68 +++--- db/quest_db.txt | 114 ++++++++++ db/re/item_combo_db.txt | 2 +- db/re/map_cache.dat | Bin 2099548 -> 2114399 bytes db/re/mob_db.txt | 4 +- db/re/skill_cast_db.txt | 4 +- db/re/skill_db.txt | 6 +- doc/script_commands.txt | 4 +- npc/guild/agit_controller.txt | 9 +- npc/merchants/shops.txt | 5 +- npc/pre-re/cities/izlude.txt | 8 +- npc/pre-re/merchants/shops.txt | 9 +- npc/pre-re/quests/monstertamer.txt | 15 ++ npc/pre-re/quests/quests_13_1.txt | 17 ++ npc/pre-re/quests/quests_nameless.txt | 391 ++++++++++++++++++++++++++++++++++ npc/pre-re/scripts_athena.conf | 3 + npc/quests/monstertamers.txt | 9 +- npc/quests/quests_13_1.txt | 14 +- npc/quests/quests_nameless.txt | 381 +-------------------------------- npc/re/airports/izlude.txt | 3 +- npc/re/cities/jawaii.txt | 6 +- npc/re/merchants/shops.txt | 9 +- npc/re/quests/monstertamers.txt | 15 ++ npc/re/quests/quests_13_1.txt | 17 ++ npc/re/quests/quests_lighthalzen.txt | 9 +- npc/re/scripts_athena.conf | 4 +- npc/warps/pvp.txt | 7 +- src/common/mmo.h | 2 +- 32 files changed, 705 insertions(+), 476 deletions(-) create mode 100644 npc/pre-re/quests/monstertamer.txt create mode 100644 npc/pre-re/quests/quests_13_1.txt create mode 100644 npc/pre-re/quests/quests_nameless.txt create mode 100644 npc/re/quests/monstertamers.txt create mode 100644 npc/re/quests/quests_13_1.txt (limited to 'npc/guild') diff --git a/conf/maps.conf b/conf/maps.conf index c34b05adf..6d142e634 100644 --- a/conf/maps.conf +++ b/conf/maps.conf @@ -1052,6 +1052,8 @@ map: ecl_tdun03 map: ecl_tdun04 map: ecl_hub01 map: que_avan01 + +// Pyramids Basement Nightmare Mode map: moc_prydn1 map: moc_prydn2 @@ -1059,6 +1061,7 @@ map: moc_prydn2 // New Maps added 2013-02-10 (Thanks Streusel!) // Credits to Baneado for reporting some // =============================== +// Izlude Novice Academy & Tutorial map: iz_int map: iz_int01 map: iz_int02 @@ -1081,10 +1084,13 @@ map: izlude_d map: izlude_c map: izlude_b map: izlude_a + map: prt_fild08d map: prt_fild08c map: prt_fild08b map: prt_fild08a + +// War of Emperium - Third Edition (TE) map: te_prt_gld map: te_prtcas01 map: te_prtcas02 @@ -1099,14 +1105,27 @@ map: te_aldecas2 map: te_aldecas3 map: te_aldecas4 map: te_aldecas5 + +// Glast Heim Memorial & Nightmare map: gl_cas02_ map: gl_chyard_ -map: 2@gl_k map: 1@gl_k +map: 2@gl_k + map: silk_lair + +//Wave Mode Memorial Dungeon +map: 1@def01 map: 1@def02 map: 1@def03 +// Heroes' Trails - Part 1 +map: 1@gef +map: 1@face +map: 1@sara +map: 1@gef_in +map: dali + //------------------------- Clone Maps --------------------------- //------------------------- Extra Maps --------------------------- diff --git a/db/job_db2.txt b/db/job_db2.txt index ef1b4edbd..1880808fa 100644 --- a/db/job_db2.txt +++ b/db/job_db2.txt @@ -212,7 +212,7 @@ // Sura (Regular) 4070,2,5,0,1,1,0,0,0,1,2,5,0,0,3,3,1,0,0,3,1,0,0,2,2,5,0,0,4,4,1,3,0,0,0,2,5,5,0,0,0,4,3,2,2,0,0,0,4,5,5 // Genetic (Regular) -4071,4,4,5,0,0,5,4,2,0,0,0,4,5,0,0,0,0,3,5,2,0,0,4,3,3,0,0,5,2,0,6,0,0,0,4,4,1,0,5,2,4,0,0,4,4,0,2,0,0,4 +4071,4,4,5,0,0,5,4,2,0,0,0,4,5,3,0,0,0,3,5,2,0,0,4,3,3,0,0,5,2,0,6,0,0,1,4,4,0,0,5,2,4,0,0,4,4,0,2,0,0,4 // Shadow Chaser (Regular) 4072,6,1,0,0,1,0,6,2,5,4,0,0,4,6,0,0,2,0,3,3,4,5,0,0,3,6,0,0,3,0,1,1,3,6,0,0,4,4,0,0,0,3,3,1,1,0,0,5,2,0 // Royal Guard (Trans) @@ -226,7 +226,7 @@ // Sura (Trans) 4077,2,5,0,1,1,0,0,0,1,2,5,0,0,3,3,1,0,0,3,1,0,0,2,2,5,0,0,4,4,1,3,0,0,0,2,5,5,0,0,0,4,3,2,2,0,0,0,4,5,5 // Genetic (Trans) -4078,4,4,5,0,0,5,4,2,0,0,0,4,5,0,0,0,0,3,5,2,0,0,4,3,3,0,0,5,2,0,6,0,0,0,4,4,1,0,5,2,4,0,0,4,4,0,2,0,0,4 +4078,4,4,5,0,0,5,4,2,0,0,0,4,5,3,0,0,0,3,5,2,0,0,4,3,3,0,0,5,2,0,6,0,0,1,4,4,0,0,5,2,4,0,0,4,4,0,2,0,0,4 // Shadow Chaser (Trans) 4079,6,1,0,0,1,0,6,2,5,4,0,0,4,6,0,0,2,0,3,3,4,5,0,0,3,6,0,0,3,0,1,1,3,6,0,0,4,4,0,0,0,3,3,1,1,0,0,5,2,0 // Rune Knight (Dragon) (Regular) @@ -268,7 +268,7 @@ // Baby Sura 4106,2,5,0,1,1,0,0,0,1,2,5,0,0,3,3,1,0,0,3,1,0,0,2,2,5,0,0,4,4,1,3,0,0,0,2,5,5,0,0,0,4,3,2,2,0,0,0,4,5,5 // Baby Genetic -4107,4,4,5,0,0,5,4,2,0,0,0,4,5,0,0,0,0,3,5,2,0,0,4,3,3,0,0,5,2,0,6,0,0,0,4,4,1,0,5,2,4,0,0,4,4,0,2,0,0,4 +4107,4,4,5,0,0,5,4,2,0,0,0,4,5,3,0,0,0,3,5,2,0,0,4,3,3,0,0,5,2,0,6,0,0,1,4,4,0,0,5,2,4,0,0,4,4,0,2,0,0,4 // Baby Shadow Chaser 4108,6,1,0,0,1,0,6,2,5,4,0,0,4,6,0,0,2,0,3,3,4,5,0,0,3,6,0,0,3,0,1,1,3,6,0,0,4,4,0,0,0,3,3,1,1,0,0,5,2,0 // Baby Rune Knight (Dragon) @@ -285,6 +285,6 @@ 4191,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0 // Note: Kagerou and Oboro will temporarly use Ninja stat bonuses until official ones are known. // Kagerou -4211,2,2,0,0,5,2,0,0,0,4,2,5,0,4,6,2,5,0,0,6,2,4,5,0,0,0,0,0,0,4,2,6,5,0,0,0,0,0,1,3,2,4,5,6,0,0,0,0,0,0 +4211,5,0,4,0,2,3,0,1,6,0,5,1,2,0,4,6,3,0,1,5,2,0,6,3,4,0,5,0,2,0,1,4,0,5,4,0,3,5,1,0,2,4,1,0,5,6,2,1,0,5 // Oboro -4212,2,2,0,0,5,2,0,0,0,4,2,5,0,4,6,2,5,0,0,6,2,4,5,0,0,0,0,0,0,4,2,6,5,0,0,0,0,0,1,3,2,4,5,6,0,0,0,0,0,0 +4212,5,0,4,0,2,3,0,1,6,0,5,1,2,0,4,6,3,0,1,5,2,0,6,3,4,0,5,0,2,0,1,4,0,5,4,0,3,5,1,0,2,4,1,0,5,6,2,1,0,5 \ No newline at end of file diff --git a/db/map_index.txt b/db/map_index.txt index e2ed76848..d0464356d 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -862,11 +862,6 @@ ecl_hub01 que_avan01 moc_prydn1 moc_prydn2 - -// =============================== -// New Maps added 2013-02-10 (Thanks Streusel!) -// Credits also to Baneado for reporting some -// =============================== iz_int iz_int01 iz_int02 @@ -907,13 +902,19 @@ te_aldecas2 te_aldecas3 te_aldecas4 te_aldecas5 +1@gl_k +2@gl_k gl_cas02_ gl_chyard_ -2@gl_k -1@gl_k silk_lair +1@def01 1@def02 1@def03 +1@gef +1@face +1@sara +1@gef_in +dali // Only add maps under this line if they are not standard maps! diff --git a/db/pre-re/map_cache.dat b/db/pre-re/map_cache.dat index 645961065..dea34f052 100644 Binary files a/db/pre-re/map_cache.dat and b/db/pre-re/map_cache.dat differ diff --git a/db/pre-re/skill_cast_db.txt b/db/pre-re/skill_cast_db.txt index 892ce938e..90f579a8c 100644 --- a/db/pre-re/skill_cast_db.txt +++ b/db/pre-re/skill_cast_db.txt @@ -1072,75 +1072,75 @@ //========================================== //===== Rune Knight ======================== -//-- RK_ENCHANTBLADE +//-- RK_ENCHANTBLADE 2001,1000,0,0,300000,0,0 -//-- RK_SONICWAVE +//-- RK_SONICWAVE 2002,0,1000,0,0,0,2000 -//-- RK_DEATHBOUND +//-- RK_DEATHBOUND 2003,0,2000,0,2000,0,3000 -//-- RK_HUNDREDSPEAR +//-- RK_HUNDREDSPEAR 2004,1000:900:800:700:600:500:400:300:200:100,500,0,0,0,3000 -//-- RK_WINDCUTTER -2005,0,2000,0,0,0,2000 -//-- RK_IGNITIONBREAK +//-- RK_WINDCUTTER +2005,0,0,0,15000,0,2000 +//-- RK_IGNITIONBREAK 2006,1000,0,0,0,0,2000 -//-- RK_DRAGONBREATH +//-- RK_DRAGONBREATH 2008,0:0:0:1000:1000:1000:1500:1500:2000:2000,2000,0,10000,0,0 -//-- RK_DRAGONHOWLING +//-- RK_DRAGONHOWLING 2009,0,0,0,15000,0,10000 -//-- RK_MILLENNIUMSHIELD +//-- RK_MILLENNIUMSHIELD 2011,0,1000,0,180000,0,60000 -//-- RK_CRUSHSTRIKE +//-- RK_CRUSHSTRIKE 2012,0,0,0,180000,0,30000 -//-- RK_REFRESH +//-- RK_REFRESH 2013,0,0,0,60000,0,120000 -//-- RK_GIANTGROWTH +//-- RK_GIANTGROWTH 2014,0,0,0,180000,0,0 -//-- RK_STONEHARDSKIN +//-- RK_STONEHARDSKIN 2015,0,0,0,180000,10000,0 -//-- RK_VITALITYACTIVATION +//-- RK_VITALITYACTIVATION 2016,0,0,0,180000,0,0 -//-- RK_STORMBLAST -2017,0,0,0,0,0,0 -//-- RK_FIGHTINGSPIRIT +//-- RK_STORMBLAST +2017,0,2000,0,0,0,0 +//-- RK_FIGHTINGSPIRIT 2018,0,0,0,180000,0,0 -//-- RK_ABUNDANCE +//-- RK_ABUNDANCE 2019,0,0,0,180000,0,0 //========================================== //===== Gillotine Cross ==================== -//-- GC_VENOMIMPRESS +//-- GC_VENOMIMPRESS 2021,0,3000:2500:2000:1500:1000,0,10000:20000:30000:40000:50000,0,0 -//-- GC_CROSSIMPACT +//-- GC_CROSSIMPACT 2022,0,2500:2000:1500:1000:500,0,0,0,0 -//-- GC_DARKILLUSION +//-- GC_DARKILLUSION 2023,0,1500,0,0,0,0 -//-- GC_CREATENEWPOISON +//-- GC_CREATENEWPOISON 2025,0,500,0,0,0,0 -//-- GC_ANTIDOTE +//-- GC_ANTIDOTE 2026,0,0,0,0,0,0 -//-- GC_POISONINGWEAPON +//-- GC_POISONINGWEAPON 2027,0,1000,0,60000:120000:180000:240000:300000,300000,0 -//-- GC_WEAPONBLOCKING +//-- GC_WEAPONBLOCKING 2028,0,2000,0,180000,0,0 -//-- GC_COUNTERSLASH +//-- GC_COUNTERSLASH 2029,0,2000,0,0,0,0 -//-- GC_WEAPONCRUSH +//-- GC_WEAPONCRUSH 2030,0,1000,0,60000,0,0 -//-- GC_VENOMPRESSURE +//-- GC_VENOMPRESSURE 2031,0,1000,0,0,0,0 -//-- GC_POISONSMOKE +//-- GC_POISONSMOKE 2032,0,2000,0,6000:8000:10000:12000:14000,0,0 -//-- GC_CLOAKINGEXCEED +//-- GC_CLOAKINGEXCEED 2033,0,2000,0,0,0,0 -//-- GC_PHANTOMMENACE +//-- GC_PHANTOMMENACE 2034,0,1000,0,0,0,0 -//-- GC_HALLUCINATIONWALK +//-- GC_HALLUCINATIONWALK 2035,0,0,0,30000:35000:40000:45000:50000,25000,300000 -//-- GC_ROLLINGCUTTER +//-- GC_ROLLINGCUTTER 2036,0,200,0,3000,0,0 //-- GC_CROSSRIPPERSLASHER 2037,0,1000,0,0,0,0 diff --git a/db/quest_db.txt b/db/quest_db.txt index 50dcc1dc4..7dcf6735b 100644 --- a/db/quest_db.txt +++ b/db/quest_db.txt @@ -2219,3 +2219,117 @@ 60353,0,0,0,0,0,0,0,"Bathroom Ghost" 60354,0,0,0,0,0,0,0,"Bathroom Ghost" 60355,0,0,0,0,0,0,0,"Bathroom Ghost" + +// Mora +// Mora Quests +// Misty Forest Labyrinth +7211,9000,0,0,0,0,0,0,"Misty Forest Labyrinth Exploration" +7212,0,0,0,0,0,0,0,"Loki's Search" +7213,0,0,0,0,0,0,0,"Wandering Protector" + +// New Sapha's Honor Quest +7206,0,0,0,0,0,0,0,"New Day for Cheshire" +7207,0,0,0,0,0,0,0,"Cheshire's Box" +7208,82800,0,0,0,0,0,0,"Wait for Cheshire?" + +// Roast Beef Quest +11182,180,0,0,0,0,0,0,"Teohre's Report" +11183,0,0,0,0,0,0,0,"Teohre's Favor" +// Theo +11184,0,0,0,0,0,0,0,"Runaway Laphine" +11185,0,0,0,0,0,0,0,"Pouch" +11186,0,0,0,0,0,0,0,"Pouch" +11187,0,0,0,0,0,0,0,"Pouch" +11188,0,0,0,0,0,0,0,"Pouch" +11189,0,0,0,0,0,0,0,"Roast Beef" +11190,0,0,0,0,0,0,0,"Roast Beef" +11191,0,0,0,0,0,0,0,"Shortage of Roast Beef" + +11198,0,0,0,0,0,0,0,"Mora Village..." +11199,0,0,0,0,0,0,0,"Theo's Friend" +// Sonya +11192,0,0,0,0,0,0,0,"Mora Village..." +11193,0,0,0,0,0,0,0,"Sonya's Friend" + +11194,0,0,0,0,0,0,0,"Runaway Laphine" +11195,0,0,0,0,0,0,0,"Pouch" +11196,0,0,0,0,0,0,0,"Pouch" +11197,0,0,0,0,0,0,0,"Pouch" +// +11200,0,0,0,0,0,0,0,"Pouch" +11201,0,0,0,0,0,0,0,"Roast Beef" +11202,0,0,0,0,0,0,0,"Roast Beef" +11203,0,0,0,0,0,0,0,"Shortage of Roast Beef" + +11206,0,0,0,0,0,0,0,"Quick Delivery Yoneseu" +11207,0,0,0,0,0,0,0,"A Very Heavy Burden" +11208,0,0,0,0,0,0,0,"Daphne" + +// Ropewa & Yuridi Quest +1109,0,0,0,0,0,0,0,"Ropewa & Yuridi - Survivors of the Labyrinth" +1110,0,0,0,0,0,0,0,"Ropewa & Yuridi - Victims of the Labyrinth" +1111,0,0,0,0,0,0,0,"Ropewa & Yuridi - Maze in the Labyrinth" +1112,0,0,0,0,0,0,0,"Ropewa & Yuridi - Lost in the Labyrinth" +1113,0,0,0,0,0,0,0,"Ropewa & Yuridi - Torn Apart" +1114,0,0,0,0,0,0,0,"Ropewa & Yuridi - The Cost of Restoration" +1115,0,0,0,0,0,0,0,"Ropewa & Yuridi - Song of the Abyss" +1116,0,0,0,0,0,0,0,"Ropewa & Yuridi - Dead Man's Song" +1117,0,0,0,0,0,0,0,"Ropewa & Yuridi - Eternal Promise, Broken Ring" + +// Ropewa Clue Quest +1118,0,0,0,0,0,0,0,"Neighborhood Knight - I Need Clues" + +// Researcher's Quest +5016,0,0,0,0,0,0,0,"Bring me a Research Tool Bag" +5017,0,0,0,0,0,0,0,"Revenge of the Reseacher" +5018,0,0,0,0,0,0,0,"Revenge of the Reseacher" +5019,0,0,0,0,0,0,0,"Bathroom Sample Studying" +5020,86400,0,0,0,0,0,0,"Sample Researching" +5021,0,0,0,0,0,0,0,"Sample Collecting" +5022,0,0,0,0,0,0,0,"Sample Collecting" +5023,21600,0,0,0,0,0,0,"Inspection of the Sample" +5024,0,0,0,0,0,0,0,"Eastern Pool Research" +5025,0,0,0,0,0,0,0,"Western Pool Research" +5026,0,0,0,0,0,0,0,"Southern Pool Research" +5027,0,0,0,0,0,0,0,"Northern Pool Research" +5028,43200,0,0,0,0,0,0,"Inspection of the Sample" +5029,3600,0,0,0,0,0,0,"Unidentified Creature" + +// Mora Coin Daily Quests +12225,0,2132,3,0,0,0,0,"Pom Spider Hunting" +12226,0,2133,4,0,0,0,0,"Angra Mantis Hunting" +12227,0,2134,5,0,0,0,0,"Parus Hunting" +12228,0,2136,6,0,0,0,0,"Little Fatam Hunting" +12229,0,2137,7,0,0,0,0,"Miming Hunting" +12230,82800,0,0,0,0,0,0,"Mora Monster Hunt" +12231,0,0,0,0,0,0,0,"Insect Feeler Collecting" +12232,0,0,0,0,0,0,0,"Immortal Heart Collecting" +12233,0,0,0,0,0,0,0,"Rotten Bandage Collecting" +12234,0,0,0,0,0,0,0,"Orcish Voucher Collecting" +12235,0,0,0,0,0,0,0,"Skeleton Bone Collecting" +12236,0,0,0,0,0,0,0,"Memento Collecting" +12237,0,0,0,0,0,0,0,"Shell Collecting" +12238,0,0,0,0,0,0,0,"Scale Shell Collecting" +12239,0,0,0,0,0,0,0,"Venom Canine Collecting" +12240,0,0,0,0,0,0,0,"Sticky Mucus Collecting" +12241,82800,0,0,0,0,0,0,"Mora Item Request 1" +12242,82800,0,0,0,0,0,0,"Mora Item Request 2" + +// Missing Person Quests +12243,0,0,0,0,0,0,0,"Missing Information on Tajareu" +12244,0,0,0,0,0,0,0,"Missing Information on Tokenizer" +12245,0,0,0,0,0,0,0,"Missing Information on Mesile" +12246,0,0,0,0,0,0,0,"Missing Information on Noir" +12247,0,0,0,0,0,0,0,"Missing Information on Pajama God" +12248,0,0,0,0,0,0,0,"Missing Information on Mendel" +12249,0,0,0,0,0,0,0,"Missing Information on Miles" +12250,0,0,0,0,0,0,0,"Missing Information on Kunmune" +12251,0,0,0,0,0,0,0,"Missing Information on Chayihokin" +12252,0,0,0,0,0,0,0,"Missing Information on Tuale" +12253,82800,0,0,0,0,0,0,"Missing Person Search Time Limit" + +// New Novice Ground +2299,0,0,0,0,0,0,0,"Training Center: Talk to Lisa" +2300,0,0,0,0,0,0,0,"Training Center: Talk to General Reindeer" +2301,0,0,0,0,0,0,0,"Training Center: Leave the boat" +2302,0,0,0,0,0,0,0,"Training Center: Formation" \ No newline at end of file diff --git a/db/re/item_combo_db.txt b/db/re/item_combo_db.txt index f6bd7dc01..d921689c3 100644 --- a/db/re/item_combo_db.txt +++ b/db/re/item_combo_db.txt @@ -147,7 +147,7 @@ 2725:2772,{ bonus2 bAddRace,RC_NonBoss,5; bonus2 bAddRace,RC_Boss,5; bonus bMatkRate,3; bonus bHealPower,5; } 2726:2727,{ bonus bUseSPrate,-25; } 2733:2772,{ bonus2 bAddRace,RC_NonBoss,5; bonus2 bAddRace,RC_Boss,5; bonus bMatkRate,3; bonus bHealPower,5; } -2747:13061,{ bonus bHit,5; bonus bMatk,5; } +2747:13061,{ bonus bHit,5; bonus bMatk,5; bonus2 bSkillUseSP,"SC_ENERVATION",20; bonus2 bSkillUseSP,"SC_GROOMY",20;} 2777:2778:5479,{ bonus bMaxHP,300; bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,5; } 2779:2780:5482,{ bonus bMatkRate,10; bonus bInt,5; bonus2 bSubRace,RC_Angel,10; } 2779:2780:5577,{ bonus bMatkRate,10; bonus bInt,5; bonus2 bSubRace,RC_Angel,10; } diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat index cd79556d3..dea34f052 100644 Binary files a/db/re/map_cache.dat and b/db/re/map_cache.dat differ diff --git a/db/re/mob_db.txt b/db/re/mob_db.txt index 597547e68..462e2fb26 100644 --- a/db/re/mob_db.txt +++ b/db/re/mob_db.txt @@ -5,7 +5,7 @@ // Note: Keep the Sprite_Name field as it is in the game client. 1001,SCORPION,Scorpion,Scorpion,16,153,1,108,81,1,33,40,16,5,12,15,10,5,19,5,10,12,0,4,23,0x3191,200,1564,864,576,0,0,0,0,0,0,0,990,70,904,5500,757,57,943,210,7041,100,508,200,625,20,0,0,0,0,4068,1 -1002,PORING,Poring,Poring,1,60,1,27,20,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,909,7000,1202,100,938,400,512,1000,713,1500,512,150,619,20,0,0,0,0,4001,1 +1002,PORING,Poring,Poring,1,60,1,27,20,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,909,7000,1202,100,938,400,512,1000,713,1500,512,150,619,20,601,20,0,0,4001,1 //1003,TESTEGG,Test Egg,Test Egg,2,100000,0,10,10,0,3,9,99,0,1,99,1,1,1,1,10,12,0,4,22,0,512,0,512,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1004,HORNET,Hornet,Hornet,11,90,1,81,60,1,13,16,7,1,12,24,4,5,6,5,10,12,0,4,24,0x1181,150,1292,792,216,0,0,0,0,0,0,0,992,80,939,9000,909,3500,1208,15,511,350,518,150,0,0,0,0,0,0,4019,1 1005,FARMILIAR,Familiar,Familiar,24,427,1,144,162,1,68,77,26,5,15,19,20,5,20,1,10,12,0,2,27,0x3881,150,1276,576,384,0,0,0,0,0,0,0,913,5500,1105,20,2209,15,601,50,514,100,507,700,645,50,0,0,0,0,4020,1 @@ -66,7 +66,7 @@ 1060,BIGFOOT,Bigfoot,Bigfoot,29,587,1,180,203,1,50,62,55,7,18,4,7,0,12,0,10,12,2,2,22,0x91,300,1260,192,192,0,0,0,0,0,0,0,948,9000,2289,5,919,5000,740,80,516,1500,518,450,756,43,0,0,0,0,4074,1 1061,NIGHTMARE,Nightmare,Nightmare,69,2872,1,501,1032,1,283,345,116,15,57,32,20,15,70,15,10,12,2,6,68,0x3395,150,1816,816,432,0,0,0,0,0,0,0,944,6000,510,500,2608,2,603,30,505,100,1261,1,984,60,0,0,0,0,4127,1 1062,PORING_,Santa Poring,Santa Poring,3,69,1,4,5,1,12,16,0,0,1,14,3,10,12,90,10,12,1,3,26,0x81,400,1672,672,480,0,0,0,0,0,0,0,529,2000,530,1000,507,1000,512,1000,2236,100,512,7,0,0,0,0,0,0,4005,1 -1063,LUNATIC,Lunatic,Lunatic,3,55,1,36,27,1,11,12,18,0,10,3,3,0,8,5,10,12,0,2,60,0x81,200,1456,456,336,0,0,0,0,0,0,0,705,6500,949,1000,2262,4,512,2000,507,600,515,1100,622,20,0,0,0,0,4006,1 +1063,LUNATIC,Lunatic,Lunatic,3,55,1,36,27,1,11,12,18,0,10,3,3,0,8,5,10,12,0,2,60,0x81,200,1456,456,336,0,0,0,0,0,0,0,705,6500,949,1000,2262,4,512,2000,507,600,515,1100,622,20,601,20,0,0,4006,1 1064,MEGALODON,Megalodon,Megalodon,46,1335,1,342,386,1,117,149,52,28,35,24,30,28,29,15,10,12,1,1,29,0x81,200,2492,792,432,0,0,0,0,0,0,0,959,5500,932,1500,510,80,717,120,719,10,603,2,624,20,0,0,0,0,4067,1 1065,STROUF,Strouf,Strouf,61,3052,1,626,705,1,162,192,67,21,49,16,31,20,33,20,10,12,2,5,61,0x3885,150,1872,672,384,0,0,0,0,0,0,0,951,5335,756,115,2315,2,1461,2,949,3000,720,20,956,1500,0,0,0,0,4111,1 1066,VADON,Vadon,Vadon,45,1252,1,342,386,1,78,103,54,21,35,21,28,20,33,15,10,12,0,5,21,0x91,300,1632,432,540,0,0,0,0,0,0,0,991,40,960,9000,910,3000,2313,5,943,100,757,40,717,50,0,0,0,0,4049,1 diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt index 5b83447bf..0b7a905cf 100644 --- a/db/re/skill_cast_db.txt +++ b/db/re/skill_cast_db.txt @@ -1080,7 +1080,7 @@ //-- RK_HUNDREDSPEAR 2004,1000:900:800:700:600:500:400:300:200:100,500,0,0,0,3000,-1 //-- RK_WINDCUTTER -2005,0,2000,0,0,0,2000,-1 +2005,0,0,0,15000,0,2000,-1 //-- RK_IGNITIONBREAK 2006,1000,0,0,0,0,2000,-1 @@ -1102,7 +1102,7 @@ //-- RK_VITALITYACTIVATION 2016,0,0,0,180000,0,0,-1 //-- RK_STORMBLAST -2017,0,0,0,0,0,0,2000 +2017,0,2000,0,0,0,0,-1 //-- RK_FIGHTINGSPIRIT 2018,0,0,0,180000,0,0,-1 //-- RK_ABUNDANCE diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt index acb879442..1659d9aac 100644 --- a/db/re/skill_db.txt +++ b/db/re/skill_db.txt @@ -678,15 +678,15 @@ //**** // RK Rune Knight //**** -2001,1,6,4,0,0x1,0,5,1,yes,0,0,0,none,0, RK_ENCHANTBLADE,Enchant Blade +2001,0,6,4,0,0x1,0,5,1,yes,0,0,0,none,0, RK_ENCHANTBLADE,Enchant Blade 2002,7:8:9:10:11,6,1,-1,0,0,5,1,no,0,0,0,weapon,0, RK_SONICWAVE,Sonic Wave 2003,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0, RK_DEATHBOUND,Death Bound 2004,1,8,1,-1,0,0,10,-5,no,0,0,0,weapon,0, RK_HUNDREDSPEAR,Hundred Spear 2005,1,6,2,4,0x2,2,5,1,no,0,0,0,weapon,3, RK_WINDCUTTER,Wind Cutter 2006,0,6,4,-1,0x2,5,5,1,no,0,0,0,weapon,0, RK_IGNITIONBREAK,Ignition Break 2007,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0, RK_DRAGONTRAINING,Dragon Training -2008,9,6,2,3,0xC2,1:1:1:2:2:2:3:3:4:4,10,1,no,0,0,0,misc,0, RK_DRAGONBREATH,Dragon Breath //CHECK May have to change this back to a weapon type attack. -2009,0,6,4,0,0x3,3:4:5:6:7,5,1,yes,0,0,0,weapon,0, RK_DRAGONHOWLING,Dragon Howling +2008,9,6,2,3,0xC2,1:1:1:2:2:2:3:3:4:4,10,1,no,0,0,0,misc,0, RK_DRAGONBREATH,Dragon Breath +2009,0,6,4,0,0x3,3:4:5:6:7,5,1,yes,0,0,0,none,0, RK_DRAGONHOWLING,Dragon Howling 2010,0,0,0,0,0,0,10,0,no,0,0,0,none,0, RK_RUNEMASTERY,Rune Mastery 2011,0,6,4,0,0x1,0,1,1,yes,0,0,0,none,0, RK_MILLENNIUMSHIELD,Millenium Shield 2012,1,6,4,-1,0,0x8,1,1,yes,0,0,0,weapon,0, RK_CRUSHSTRIKE,Crush Strike diff --git a/doc/script_commands.txt b/doc/script_commands.txt index e1759966f..a5ba6e065 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -1,4 +1,4 @@ -//===== Hercules Documentation ================================ +//===== Hercules Documentation ================================ //= Hercules Script Commands //===== By: ================================================== //= Hercules Dev Team @@ -6435,7 +6435,7 @@ placement of the illustration and takes following values: 3 - middle of screen in a movable window with an empty title bar 4 - middle of screen without the window header, but still movable -The picture is read from data\texture\???????\illust, from both the GRF archive +The picture is read from data\texture\유저인터페이스\illust, from both the GRF archive and data folder, and is required to be a bitmap. The file extension .bmp can be omitted. Magenta color (#ff00ff) is considered transparent. There is no limit placed on the size of the illustrations by the client, although loading of large diff --git a/npc/guild/agit_controller.txt b/npc/guild/agit_controller.txt index 57f1fe4d7..283807a46 100644 --- a/npc/guild/agit_controller.txt +++ b/npc/guild/agit_controller.txt @@ -4,7 +4,7 @@ //= kalen (1.0) //= 1.1 by Akaru and ho|yAnge| //===== Current Version: ===================================== -//= 2.0 +//= 2.0a //===== Description: ========================================= //= Auto Start for War of Emperium //============================================= @@ -29,6 +29,7 @@ //= 1.9 Rearranged the time-checks so they no longer use goto. [L0ne_W0lf] //= Removed treasure spawning function calls. (No longer needed) //= 2.0 Added WoE Battle Log support for broadcasts. [L0ne_W0lf] +//= 2.0a Removed some brackets //============================================================ //| To know how to set up WoE times, go to doc\woe_time_explanation.txt // WoE Start/Stop times @@ -71,12 +72,10 @@ S_DisplayOwners: setarray .@maps$[10],"payg_cas01","payg_cas02","payg_cas03","payg_cas04","payg_cas05"; setarray .@maps$[15],"prtg_cas01","prtg_cas02","prtg_cas03","prtg_cas04","prtg_cas05"; for( set .@i, 0; .@i <= 19; set .@i, .@i+1 ) { - if (GetCastleData(.@maps$[.@i],1)) { + if (GetCastleData(.@maps$[.@i],1)) Announce "The [" + GetCastleName(.@maps$[.@i]) + "] castle has been conquered by the [" + GetGuildName(GetCastleData(.@maps$[.@i],1)) + "] guild.",bc_all|bc_woe; - } - else { + else Announce "The [" + GetCastleName(.@maps$[.@i]) + "] castle is currently unoccupied.",bc_all|bc_woe; - } } end; } diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt index 50bc9b610..b9c47b659 100644 --- a/npc/merchants/shops.txt +++ b/npc/merchants/shops.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== -//= 3.3 +//= 3.4 //===== Description: ========================================= //= Town shop NPCs. //===== Additional Comments: ================================= @@ -35,6 +35,7 @@ //= 3.1 Moved some merchants to a separate renewal file. [Kenpachi] //= 3.2 Added Missing Items to the pet Groomers in prontera, payon, and yuno. BugReport:6680[Spre] //= 3.3 Moved more shops to Renewal file. [Euphy] +//= 3.4 Removed some Izlude shops [Streusel] //============================================================ //======================================================= @@ -141,8 +142,6 @@ hu_in01,94,313,3 shop Armor Dealer#hu 86,2224:-1,2232:-1,2226:-1,2101:-1,2103:-1 //======================================================= izlude_in,60,127,4 shop Weapon Dealer#iz 72,1750:-1,1751:-1,1701:-1,1601:-1,1201:-1,1204:-1,1207:-1,1101:-1,1104:-1,1107:-1,1116:-1,1151:-1,1154:-1,1157:-1,1160:-1,1301:-1 izlude_in,70,127,4 shop Armor Dealer#iz 62,2103:-1,2105:-1,2403:-1,2405:-1,2503:-1,2505:-1,2226:-1,2228:-1,2303:-1,2305:-1,2328:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2628:-1 -izlude_in,115,61,0 shop Tool Dealer#iz 47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1 -izlude_in,121,64,3 shop Trading Merchant#iz 900,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1 //======================================================= // Jawaii diff --git a/npc/pre-re/cities/izlude.txt b/npc/pre-re/cities/izlude.txt index 0c304adaa..950f19abd 100644 --- a/npc/pre-re/cities/izlude.txt +++ b/npc/pre-re/cities/izlude.txt @@ -1,16 +1,17 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Izlude Town Pre-Renewal //===== By: ================================================== //= Daegaladh //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== -//= rAthena SVN +//= Hercules GIT //===== Description: ========================================= //= Izlude town NPCs. //===== Additional Comments: ================================= //= 1.0 First Version. //= 1.1 Added bullet NPC duplicates. [Euphy] +//= 1.2 Added Dorian duplicate [Streusel] //============================================================ izlude,201,181,2 duplicate(Sailor_izlude) Sailor#izlude 100 @@ -24,3 +25,4 @@ izlude,58,126,2 duplicate(Cebalis_izlude) Cebalis#izlude 98 izlude,124,178,2 duplicate(Soldier_izlude) Soldier#izlude 105 izlude,171,133,3 duplicate(bdt) Bullet Dealer Tony#iz 86 izlude,171,127,3 duplicate(mdk) Magazine Dealer Kenny 83 +izlude_in,110,64,3 duplicate(Dorian) Dorian#izlude 878,2,2,{ \ No newline at end of file diff --git a/npc/pre-re/merchants/shops.txt b/npc/pre-re/merchants/shops.txt index d8fd1d96a..124ea0ef3 100644 --- a/npc/pre-re/merchants/shops.txt +++ b/npc/pre-re/merchants/shops.txt @@ -1,15 +1,16 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Shops //===== By: ================================================== //= Daegaladh //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== -//= rAthena SVN +//= Hercules GIT //===== Description: ========================================= //= Pre-renewal-specific town shop NPCs. //===== Additional Comments: ================================= //= 1.0 First version. +//= 1.1 Added Tool Dealer & Trading Merchant [Streusel] //============================================================ //======================================================= @@ -19,3 +20,5 @@ izlude,105,99,0 shop Butcher#iz 54,517:-1 izlude,94,98,4 shop Fruit Gardener#iz 53,512:-1,513:-1,515:-1,516:-1 izlude,105,92,7 shop Vendor from Milk Ranch#i 90,519:-1 izlude,164,138,4 shop Pet Groomer#iz 124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1 +izlude_in,115,61,0 shop Tool Dealer#iz 47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1 +izlude_in,121,64,3 shop Trading Merchant#iz 900,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1 \ No newline at end of file diff --git a/npc/pre-re/quests/monstertamer.txt b/npc/pre-re/quests/monstertamer.txt new file mode 100644 index 000000000..86f118f5a --- /dev/null +++ b/npc/pre-re/quests/monstertamer.txt @@ -0,0 +1,15 @@ +//===== Hercules Script ======================================= +//= Monster Tamers +//===== By: ================================================== +//= Streusel +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= Hercules +//===== Description: ========================================= +//= Cute pet quest items +//===== Additional Comments: ================================= +//= 1.0 Duplicates for Monster Tamer [Streusel] +//============================================================ + +izlude_in,129,64,4 duplicate(Monster_Tamer#izu) Monster Tamer#izlude 125 \ No newline at end of file diff --git a/npc/pre-re/quests/quests_13_1.txt b/npc/pre-re/quests/quests_13_1.txt new file mode 100644 index 000000000..b98aa2b95 --- /dev/null +++ b/npc/pre-re/quests/quests_13_1.txt @@ -0,0 +1,17 @@ +//===== Hercules Script ====================================== +//= Quest NPCs related to Ash-Vacuum +//===== By: ================================================== +//= Streusel +//===== Current Version: ===================================== +//= 1.0 +//===== Description: ========================================= +//= [Official Conversion] +//= Contains: +//= Promotional Staff Duplicate for pre-renewal +//===== Additional Comments: ================================= +//= 1.0 First Version. [Streusel] +//============================================================ + +// Onward to the New World +//============================================================ +izlude,101,173,6 duplicate(Promotional Staff#iz) Promotional Staff#izlude 100 \ No newline at end of file diff --git a/npc/pre-re/quests/quests_nameless.txt b/npc/pre-re/quests/quests_nameless.txt new file mode 100644 index 000000000..ab5d816dc --- /dev/null +++ b/npc/pre-re/quests/quests_nameless.txt @@ -0,0 +1,391 @@ +//===== Hercules Script ====================================== +//= Nameless Island Quests +//===== By: ================================================== +//= Streusel +//===== Current Version: ===================================== +//= 1.0 +//===== Description: ========================================= +//= Contains: +//= Part of Muff's Loan: +//- - Help Muff clear his Debt and get his collateral back. +//= - prerequisite Quest to "Broken Diamond" +//= - Variable in use: diamond_edq (Max: 14) +//===== Additional Comments: ================================= +//= 1.0 First version. +//============================================================ + +izlude_in,113,66,0 script Strange Machine 111,{ + if (checkweight(907,200) == 0) { + mes "[Dorian]"; + mes "Ugh, just like a member"; + mes "of the working class:"; + mes "hoarding all your items"; + mes "like a packrat? Have the"; + mes "decency to relocate your"; + mes "goods to Kafra Storage, please."; + close; + } + if (diamond_edq) == 10 { + set .@bolt_rand,rand(2,5); + mes "^3355FFThis must be Dorian's"; + mes "Mystic Dryer de Elegance."; + mes "What do you want to do?^000000"; + next; + while(1) { + set .@switch_sound,rand(1,4); + switch(select("Check the Machine:Replace the Engine:Tighten the Screw:Press a Switch")) { + case 1: + if (.@hit_status == 0) { + mes "^3355FFThere's no power"; + mes "in this behemoth"; + mes "of a machine.^000000"; + next; + } + break; + case 2: + if (.@engine == 0) { + mes "^3355FFYou replace the rough"; + mes "ruby in the ruby engine"; + mes "with a new rough ruby."; + mes "It clicks into place"; + mes "inside the engine core.^000000"; + next; + set .@engine,.@engine+1; + } + else if (engine > 0) { + mes "^3355FFThe ruby in the"; + mes "engine has already"; + mes "been replaced.^000000"; + next; + } + break; + case 3: + if (.@engine < 1) { + mes "^3355FFYou probably need"; + mes "to replace the ruby"; + mes "in the engine first.^000000"; + next; + } + else if ((.@engine == 1) && (.@bolt < .@bolt_rand)) { + mes "^3355FF*Krrrr-Krrrrr*^000000"; + mes "^3355FF*Krrrr-Krrrrr*^000000"; + next; + set .@bolt,.@bolt+1; + } + else if ((.@engine == 1) && (.@bolt == .@bolt_rand)) { + mes "^3355FF*Krrrr-Krrrrr*^000000"; + mes "^0000FF*Click*^000000"; + next; + set .@bolt,.@bolt+1; + set .@bolt_suc,.@bolt_suc+1; + } + else if ((.@engine == 1) && (.@bolt > .@bolt_rand)) { + mes "^3355FF*Krrrr-Krrrrr*^000000"; + mes "^3355FF*KrrICK-ICK-ICK-KOOM*^000000"; + next; + mes "^3355FFYou tightened the"; + mes "screw too tightly!"; + mes "The joint is broken..."; + mes "You should go back"; + mes "to Dorian for help.^000000"; + setquest 3106; + set diamond_edq,11; + close; + } + else { + mes "^3355FFSomething must have"; + mes "gone wrong. You'd be"; + mes "better off starting"; + mes "from the beginning...^000000"; + close; + } + break; + case 4: + if ((.@engine < 1) && (.@bolt_suc < 1)) { + mes "^3355FFYou need to replace"; + mes "the engine's ruby and"; + mes "tighten the main screw"; + mes "before you mess with"; + mes "these switches.^000000"; + next; + } + else if ((.@engine == 1) && (.@bolt_suc < 1)) { + mes "^3355FFYou need to tighten"; + mes "the scren before you can"; + mes "start the engine safely."; + next; + } + else if ((.@red >= 1) && (.@blue >= 1) && (.@yellow >= 1) && (.@green >= 1)) { + mes "^3355FFThe Mystic Dryer de"; + mes "Elegance started with"; + mes "a mighty buzz, and the"; + mes "sound lowers to a calm"; + mes "hum as it stabilizes."; + mes "It looks like you fixed it!^000000"; + next; + mes "^3355FFYou should tell Dorian"; + mes "first so that you can"; + mes "use this machine.^000000"; + setquest 3107; + set diamond_edq,12; + close; + } + else if ((.@engine == 1) && (.@bolt_suc == 1)) { + if (.@switch_sound == 1) { + mes "^3355FF*Buzz Buzz*^000000"; + mes "^3355FF*Buzz Buzz*^000000"; + mes "^3355FFThe machine is"; + mes "vibrating weakly."; + mes "Which switch do"; + mes "you want to press?^000000"; + next; + switch(select("Red Switch:Blue Switch:Yellow Switch:Green Switch")) { + default: + mes "^3355FF*Whiz Whiz*^000000"; + mes "^3355FF*Whiz Whiz*^000000"; + next; + mes "^3355FFThe machine made some"; + mes "violent, erratic sounds,"; + mes "and vibrated violently"; + mes "before coming to a sudden"; + mes "stop. That was the wrong"; + mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; + setquest 3106; + set diamond_edq,11; + close; + case 1: + if (.@red >= 0) { + mes "^3355FF*Buzzz Buzzz*^000000"; + mes "^3355FF*Clang...!*^000000"; + next; + mes "^3355FFThe machine's"; + mes "vibrations have"; + mes "grown stronger."; + mes "It looks like you"; + mes "chose the right switch.^000000"; + next; + set .@red,.@red+1; + } + else { + mes "^3355FF*Whiz Whiz*^000000"; + mes "^3355FF*Whiz Whiz*^000000"; + next; + mes "^3355FFThe machine made some"; + mes "violent, erratic sounds,"; + mes "and vibrated violently"; + mes "before coming to a sudden"; + mes "stop. That was the wrong"; + mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; + setquest 3106; + set diamond_edq,11; + close; + } + break; + } + } + else if (.@switch_sound == 2) { + mes "^3355FF*Purr Purr*^000000"; + mes "^3355FF*Purr Purr*^000000"; + mes "^3355FFThe machine is vibrating"; + mes "a little bit more strongly."; + mes "Which switch will"; + mes "you try now?^000000"; + next; + switch(select("Red Switch:Blue Switch:Yellow Switch:Green Switch")) { + default: + mes "^3355FF*Whiz Whiz*^000000"; + mes "^3355FF*Whiz Whiz*^000000"; + next; + mes "^3355FFThe machine made some"; + mes "violent, erratic sounds,"; + mes "and vibrated violently"; + mes "before coming to a sudden"; + mes "stop. That was the wrong"; + mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; + setquest 3106; + set diamond_edq,11; + close; + case 2: + if (.@blue >= 0) { + mes "^3355FF*Purrr Purr*^000000"; + mes "^3355FF*Clang...!*^000000"; + next; + mes "^3355FFThe machine's"; + mes "vibrations have"; + mes "grown stronger."; + mes "It looks like you"; + mes "chose the right switch.^000000"; + next; + set .@blue,.@blue+1; + } + else { + mes "^3355FF*Whiz Whiz*^000000"; + mes "^3355FF*Whiz Whiz*^000000"; + next; + mes "^3355FFThe machine made some"; + mes "violent, erratic sounds,"; + mes "and vibrated violently"; + mes "before coming to a sudden"; + mes "stop. That was the wrong"; + mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; + setquest 3106; + set diamond_edq,11; + close; + } + break; + } + } + else if (.@switch_sound == 3) { + mes "^3355FF*Bzzz Bzzz*"; + mes "*Bzzz Bzzz*"; + mes "The machine's vibrations"; + mes "are a bit more stable now."; + mes "Which switch will you try?^000000"; + next; + switch(select("Red Switch:Blue Switch:Yellow Switch:Green Switch")) { + default: + mes "^3355FF*Whiz Whiz*^000000"; + mes "^3355FF*Whiz Whiz*^000000"; + next; + mes "^3355FFThe machine made some"; + mes "violent, erratic sounds,"; + mes "and vibrated violently"; + mes "before coming to a sudden"; + mes "stop. That was the wrong"; + mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; + setquest 3106; + set diamond_edq,11; + close; + case 3: + if (.@yellow >= 0) { + mes "^3355FF*Bzzzz Bzzzz*^000000"; + mes "^3355FF*Clang...!*^000000"; + next; + mes "^3355FFThe machine's"; + mes "vibrations have"; + mes "grown stronger."; + mes "It looks like you"; + mes "chose the right switch.^000000"; + next; + set .@yellow,.@yellow+1; + } + else { + mes "^3355FF*Whiz Whiz*^000000"; + mes "^3355FF*Whiz Whiz*^000000"; + next; + mes "^3355FFThe machine made some"; + mes "violent, erratic sounds,"; + mes "and vibrated violently"; + mes "before coming to a sudden"; + mes "stop. That was the wrong"; + mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; + setquest 3106; + set diamond_edq,11; + close; + } + break; + } + } + else if (.@switch_sound == 4) { + next; + mes "^3355FF*Pzzzz Pzzz*"; + mes "*Pzzzz Pzzz*"; + mes "The machine is vibrating"; + mes "fairly strongly now. Which"; + mes "switch will you try?^000000"; + next; + switch(select("Red Switch:Blue Switch:Yellow Switch:Green Switch")) { + default: + mes "^3355FF*Whiz Whiz*^000000"; + mes "^3355FF*Whiz Whiz*^000000"; + next; + mes "^3355FFThe machine made some"; + mes "violent, erratic sounds,"; + mes "and vibrated violently"; + mes "before coming to a sudden"; + mes "stop. That was the wrong"; + mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; + setquest 3106; + set diamond_edq,11; + close; + case 4: + if (.@green >= 0) { + mes "^3355FFPzzzzz Pzzzz*^000000"; + mes "^3355FF*Clang...!*^000000"; + next; + mes "^3355FFThe machine's"; + mes "vibrations have"; + mes "grown stronger."; + mes "It looks like you"; + mes "chose the right switch.^000000"; + next; + set .@green,.@green+1; + } + else { + mes "^3355FF*Whiz Whiz*^000000"; + mes "^3355FF*Whiz Whiz*^000000"; + next; + mes "^3355FFThe machine made some"; + mes "violent, erratic sounds,"; + mes "and vibrated violently"; + mes "before coming to a sudden"; + mes "stop. That was the wrong"; + mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; + setquest 3106; + set diamond_edq,11; + close; + } + break; + } + } + } + } + } + } + if (diamond_edq == 12) { + mes "[Dorian]"; + mes "It sounds like you're"; + mes "done fixing my Mystic"; + mes "Dryer de Elegance."; + mes "Why don't you come"; + mes "back so I can explain"; + mes "how you can use it?"; + close; + } + if ((diamond_edq == 13) && (countitem(7722) < 1)) { + mes "^3355FFYou lift the main"; + mes "operational switch,"; + mes "turning on a light and"; + mes "opening a convenient"; + mes "slot. You insert the"; + mes "wet bond of debt.^000000"; + next; + mes "^3355FFThe engine's pistons"; + mes "and cylinders churn"; + mes "with a lively din, and"; + mes "when the heater stops,"; + mes "the slot reopens.^000000"; + next; + mes "[" + strcharinfo(0) + "]"; + mes "So this is the original"; + mes "bond of debt that Muff"; + mes "lost? It looks... Perfect!"; + changequest 3108,3109; + getitem 7722,1; //Debt_Note + close; + } + else if ((diamond_edq == 13) && (countitem(7722) > 0)) { + mes "You already used this"; + mes "machine to restore the"; + mes "bond of debt. There's no"; + mes "need to mess around"; + mes "with it any longer."; + close; + } + mes "[Dorian]"; + mes "Who are you?"; + mes "Don't you dare lay"; + mes "a hand on my precious"; + mes "masterpiece inventions! "; + close; +} \ No newline at end of file diff --git a/npc/pre-re/scripts_athena.conf b/npc/pre-re/scripts_athena.conf index 875900bda..fa2d6de8f 100644 --- a/npc/pre-re/scripts_athena.conf +++ b/npc/pre-re/scripts_athena.conf @@ -79,3 +79,6 @@ npc: npc/pre-re/other/mercenary_rent.txt npc: npc/pre-re/quests/mrsmile.txt npc: npc/pre-re/quests/quests_izlude.txt npc: npc/pre-re/quests/quests_lighthalzen.txt +npc: npc/pre-re/quests/monstertamers.txt +npc: npc/pre-re/quests/quests_nameless.txt +npc: npc/pre-re/quests/quests_13_1.txt \ No newline at end of file diff --git a/npc/quests/monstertamers.txt b/npc/quests/monstertamers.txt index 75bc84b1b..b5fa9a8a9 100644 --- a/npc/quests/monstertamers.txt +++ b/npc/quests/monstertamers.txt @@ -1,11 +1,11 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Monster Tamers //===== By: ================================================== //= kobra_k88, Darkchild, x[tsk] //===== Current Version: ===================================== -//= 1.4b +//= 1.5 //===== Compatible With: ===================================== -//= rAthena 1.0 +//= Hercules //===== Description: ========================================= //= Cute pet quest items //===== Additional Comments: ================================= @@ -16,6 +16,7 @@ //= 1.4 Updated Monster taming item quests. [L0ne_W0lf] //= 1.4a FIXED item requirement for stellar hairpin. [L0ne_W0lf] //= 1.4b Fixed the delitem assosiated with the last uptate. [L0ne_W0lf] +//= 1.5 Renamed Izlude Monster Tamer to function with Renewal [Streusel] //============================================================ alberta_in,173,76,4 script Monster Tamer#alb 125,{ @@ -464,7 +465,7 @@ aldeba_in,168,175,4 script Monster Tamer#alde 125,{ } } -izlude_in,129,64,4 script Monster Tamer#izu 125,{ +- script ::Monster_Tamer#izu -1,{ mes "[Shogo]"; mes "Are you pre-occupied with"; mes "gathering items for monsters"; diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt index c8cc1d29a..1fe7d0bb9 100644 --- a/npc/quests/quests_13_1.txt +++ b/npc/quests/quests_13_1.txt @@ -1,10 +1,10 @@ //===== Hercules Script ====================================== //= Quest NPCs related to Ash-Vacuum -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 2.7 -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Contains Quests: //= Onward to the Other World @@ -22,7 +22,7 @@ //= - Contains Custom translated dialog. // Persuing Rayan Moore //= - Contains Custom translated dialog. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. [L0ne_W0lf] //= 1.1 I missed an end in one of the lhz guards. [L0ne_W0lf] //= 1.2 Fixed missing ends, wrong label and some typos [Gepard] @@ -44,10 +44,10 @@ //= 2.6 Disabled "Ash Vacuum Warper" as it's no longer in iRO. [Euphy] //= 2.6a Added 'npcskill' command. [Euphy] //= 2.7 Updated incorrect EXP values & added checkre() checks -//============================================================ +//============================================================ // Onward to the New World -//============================================================ +//============================================================ prontera,163,53,3 script Promotional Staff#prt 100,{ mes "[Promotional Staff]"; mes "We are looking for adventurers who are super curious and extremely brave."; @@ -679,7 +679,7 @@ geffen,90,67,3 script Promotional Staff#gef 100,{ } } -izlude,101,173,6 script Promotional Staff#iz 100,{ +- script ::Promotional Staff#iz -1,{ if (ep13_ryu > 8) { mes "[Promotional Staff]"; mes "I bless you for your future! May it be full of happiness!"; diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt index b6e740a93..ae37edcea 100644 --- a/npc/quests/quests_nameless.txt +++ b/npc/quests/quests_nameless.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 2.2a +//= 2.3 //===== Description: ========================================= //= [Aegis Conversion] //= Collection of Nameless Island Quests @@ -58,6 +58,7 @@ //= - Broken Diamond //= - Z-Gang Quest //= 2.2a Fixed a few job constant typos. [Euphy] +//= 2.3 Removed Strange Machine [Streusel] //============================================================ // Nameless Island and Cursed Monestary Access Quest @@ -3642,7 +3643,7 @@ cmd_fild01,55,160,0 script Heap of Earth 844,{ close; } -izlude_in,110,64,3 script Dorian 878,2,2,{ +- script ::Dorian -1,{ if (checkweight(907,200) == 0) { mes "[Dorian]"; mes "Ugh, just like a member"; @@ -4148,382 +4149,6 @@ OnTouch: end; } -izlude_in,113,66,0 script Strange Machine 111,{ - if (checkweight(907,200) == 0) { - mes "[Dorian]"; - mes "Ugh, just like a member"; - mes "of the working class:"; - mes "hoarding all your items"; - mes "like a packrat? Have the"; - mes "decency to relocate your"; - mes "goods to Kafra Storage, please."; - close; - } - if (diamond_edq) == 10 { - set .@bolt_rand,rand(2,5); - mes "^3355FFThis must be Dorian's"; - mes "Mystic Dryer de Elegance."; - mes "What do you want to do?^000000"; - next; - while(1) { - set .@switch_sound,rand(1,4); - switch(select("Check the Machine:Replace the Engine:Tighten the Screw:Press a Switch")) { - case 1: - if (.@hit_status == 0) { - mes "^3355FFThere's no power"; - mes "in this behemoth"; - mes "of a machine.^000000"; - next; - } - break; - case 2: - if (.@engine == 0) { - mes "^3355FFYou replace the rough"; - mes "ruby in the ruby engine"; - mes "with a new rough ruby."; - mes "It clicks into place"; - mes "inside the engine core.^000000"; - next; - set .@engine,.@engine+1; - } - else if (engine > 0) { - mes "^3355FFThe ruby in the"; - mes "engine has already"; - mes "been replaced.^000000"; - next; - } - break; - case 3: - if (.@engine < 1) { - mes "^3355FFYou probably need"; - mes "to replace the ruby"; - mes "in the engine first.^000000"; - next; - } - else if ((.@engine == 1) && (.@bolt < .@bolt_rand)) { - mes "^3355FF*Krrrr-Krrrrr*^000000"; - mes "^3355FF*Krrrr-Krrrrr*^000000"; - next; - set .@bolt,.@bolt+1; - } - else if ((.@engine == 1) && (.@bolt == .@bolt_rand)) { - mes "^3355FF*Krrrr-Krrrrr*^000000"; - mes "^0000FF*Click*^000000"; - next; - set .@bolt,.@bolt+1; - set .@bolt_suc,.@bolt_suc+1; - } - else if ((.@engine == 1) && (.@bolt > .@bolt_rand)) { - mes "^3355FF*Krrrr-Krrrrr*^000000"; - mes "^3355FF*KrrICK-ICK-ICK-KOOM*^000000"; - next; - mes "^3355FFYou tightened the"; - mes "screw too tightly!"; - mes "The joint is broken..."; - mes "You should go back"; - mes "to Dorian for help.^000000"; - setquest 3106; - set diamond_edq,11; - close; - } - else { - mes "^3355FFSomething must have"; - mes "gone wrong. You'd be"; - mes "better off starting"; - mes "from the beginning...^000000"; - close; - } - break; - case 4: - if ((.@engine < 1) && (.@bolt_suc < 1)) { - mes "^3355FFYou need to replace"; - mes "the engine's ruby and"; - mes "tighten the main screw"; - mes "before you mess with"; - mes "these switches.^000000"; - next; - } - else if ((.@engine == 1) && (.@bolt_suc < 1)) { - mes "^3355FFYou need to tighten"; - mes "the scren before you can"; - mes "start the engine safely."; - next; - } - else if ((.@red >= 1) && (.@blue >= 1) && (.@yellow >= 1) && (.@green >= 1)) { - mes "^3355FFThe Mystic Dryer de"; - mes "Elegance started with"; - mes "a mighty buzz, and the"; - mes "sound lowers to a calm"; - mes "hum as it stabilizes."; - mes "It looks like you fixed it!^000000"; - next; - mes "^3355FFYou should tell Dorian"; - mes "first so that you can"; - mes "use this machine.^000000"; - setquest 3107; - set diamond_edq,12; - close; - } - else if ((.@engine == 1) && (.@bolt_suc == 1)) { - if (.@switch_sound == 1) { - mes "^3355FF*Buzz Buzz*^000000"; - mes "^3355FF*Buzz Buzz*^000000"; - mes "^3355FFThe machine is"; - mes "vibrating weakly."; - mes "Which switch do"; - mes "you want to press?^000000"; - next; - switch(select("Red Switch:Blue Switch:Yellow Switch:Green Switch")) { - default: - mes "^3355FF*Whiz Whiz*^000000"; - mes "^3355FF*Whiz Whiz*^000000"; - next; - mes "^3355FFThe machine made some"; - mes "violent, erratic sounds,"; - mes "and vibrated violently"; - mes "before coming to a sudden"; - mes "stop. That was the wrong"; - mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; - setquest 3106; - set diamond_edq,11; - close; - case 1: - if (.@red >= 0) { - mes "^3355FF*Buzzz Buzzz*^000000"; - mes "^3355FF*Clang...!*^000000"; - next; - mes "^3355FFThe machine's"; - mes "vibrations have"; - mes "grown stronger."; - mes "It looks like you"; - mes "chose the right switch.^000000"; - next; - set .@red,.@red+1; - } - else { - mes "^3355FF*Whiz Whiz*^000000"; - mes "^3355FF*Whiz Whiz*^000000"; - next; - mes "^3355FFThe machine made some"; - mes "violent, erratic sounds,"; - mes "and vibrated violently"; - mes "before coming to a sudden"; - mes "stop. That was the wrong"; - mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; - setquest 3106; - set diamond_edq,11; - close; - } - break; - } - } - else if (.@switch_sound == 2) { - mes "^3355FF*Purr Purr*^000000"; - mes "^3355FF*Purr Purr*^000000"; - mes "^3355FFThe machine is vibrating"; - mes "a little bit more strongly."; - mes "Which switch will"; - mes "you try now?^000000"; - next; - switch(select("Red Switch:Blue Switch:Yellow Switch:Green Switch")) { - default: - mes "^3355FF*Whiz Whiz*^000000"; - mes "^3355FF*Whiz Whiz*^000000"; - next; - mes "^3355FFThe machine made some"; - mes "violent, erratic sounds,"; - mes "and vibrated violently"; - mes "before coming to a sudden"; - mes "stop. That was the wrong"; - mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; - setquest 3106; - set diamond_edq,11; - close; - case 2: - if (.@blue >= 0) { - mes "^3355FF*Purrr Purr*^000000"; - mes "^3355FF*Clang...!*^000000"; - next; - mes "^3355FFThe machine's"; - mes "vibrations have"; - mes "grown stronger."; - mes "It looks like you"; - mes "chose the right switch.^000000"; - next; - set .@blue,.@blue+1; - } - else { - mes "^3355FF*Whiz Whiz*^000000"; - mes "^3355FF*Whiz Whiz*^000000"; - next; - mes "^3355FFThe machine made some"; - mes "violent, erratic sounds,"; - mes "and vibrated violently"; - mes "before coming to a sudden"; - mes "stop. That was the wrong"; - mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; - setquest 3106; - set diamond_edq,11; - close; - } - break; - } - } - else if (.@switch_sound == 3) { - mes "^3355FF*Bzzz Bzzz*"; - mes "*Bzzz Bzzz*"; - mes "The machine's vibrations"; - mes "are a bit more stable now."; - mes "Which switch will you try?^000000"; - next; - switch(select("Red Switch:Blue Switch:Yellow Switch:Green Switch")) { - default: - mes "^3355FF*Whiz Whiz*^000000"; - mes "^3355FF*Whiz Whiz*^000000"; - next; - mes "^3355FFThe machine made some"; - mes "violent, erratic sounds,"; - mes "and vibrated violently"; - mes "before coming to a sudden"; - mes "stop. That was the wrong"; - mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; - setquest 3106; - set diamond_edq,11; - close; - case 3: - if (.@yellow >= 0) { - mes "^3355FF*Bzzzz Bzzzz*^000000"; - mes "^3355FF*Clang...!*^000000"; - next; - mes "^3355FFThe machine's"; - mes "vibrations have"; - mes "grown stronger."; - mes "It looks like you"; - mes "chose the right switch.^000000"; - next; - set .@yellow,.@yellow+1; - } - else { - mes "^3355FF*Whiz Whiz*^000000"; - mes "^3355FF*Whiz Whiz*^000000"; - next; - mes "^3355FFThe machine made some"; - mes "violent, erratic sounds,"; - mes "and vibrated violently"; - mes "before coming to a sudden"; - mes "stop. That was the wrong"; - mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; - setquest 3106; - set diamond_edq,11; - close; - } - break; - } - } - else if (.@switch_sound == 4) { - next; - mes "^3355FF*Pzzzz Pzzz*"; - mes "*Pzzzz Pzzz*"; - mes "The machine is vibrating"; - mes "fairly strongly now. Which"; - mes "switch will you try?^000000"; - next; - switch(select("Red Switch:Blue Switch:Yellow Switch:Green Switch")) { - default: - mes "^3355FF*Whiz Whiz*^000000"; - mes "^3355FF*Whiz Whiz*^000000"; - next; - mes "^3355FFThe machine made some"; - mes "violent, erratic sounds,"; - mes "and vibrated violently"; - mes "before coming to a sudden"; - mes "stop. That was the wrong"; - mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; - setquest 3106; - set diamond_edq,11; - close; - case 4: - if (.@green >= 0) { - mes "^3355FFPzzzzz Pzzzz*^000000"; - mes "^3355FF*Clang...!*^000000"; - next; - mes "^3355FFThe machine's"; - mes "vibrations have"; - mes "grown stronger."; - mes "It looks like you"; - mes "chose the right switch.^000000"; - next; - set .@green,.@green+1; - } - else { - mes "^3355FF*Whiz Whiz*^000000"; - mes "^3355FF*Whiz Whiz*^000000"; - next; - mes "^3355FFThe machine made some"; - mes "violent, erratic sounds,"; - mes "and vibrated violently"; - mes "before coming to a sudden"; - mes "stop. That was the wrong"; - mes "switch. You'd better ask Dorian... ^FFFFFF ^000000"; - setquest 3106; - set diamond_edq,11; - close; - } - break; - } - } - } - } - } - } - if (diamond_edq == 12) { - mes "[Dorian]"; - mes "It sounds like you're"; - mes "done fixing my Mystic"; - mes "Dryer de Elegance."; - mes "Why don't you come"; - mes "back so I can explain"; - mes "how you can use it?"; - close; - } - if ((diamond_edq == 13) && (countitem(7722) < 1)) { - mes "^3355FFYou lift the main"; - mes "operational switch,"; - mes "turning on a light and"; - mes "opening a convenient"; - mes "slot. You insert the"; - mes "wet bond of debt.^000000"; - next; - mes "^3355FFThe engine's pistons"; - mes "and cylinders churn"; - mes "with a lively din, and"; - mes "when the heater stops,"; - mes "the slot reopens.^000000"; - next; - mes "[" + strcharinfo(0) + "]"; - mes "So this is the original"; - mes "bond of debt that Muff"; - mes "lost? It looks... Perfect!"; - changequest 3108,3109; - getitem 7722,1; //Debt_Note - close; - } - else if ((diamond_edq == 13) && (countitem(7722) > 0)) { - mes "You already used this"; - mes "machine to restore the"; - mes "bond of debt. There's no"; - mes "need to mess around"; - mes "with it any longer."; - close; - } - mes "[Dorian]"; - mes "Who are you?"; - mes "Don't you dare lay"; - mes "a hand on my precious"; - mes "masterpiece inventions! "; - close; -} - // Broken Diamond //============================================================ moc_ruins,152,147,5 script Ibrahim 732,3,3,{ diff --git a/npc/re/airports/izlude.txt b/npc/re/airports/izlude.txt index 42ec73fe8..bf5cabdf3 100644 --- a/npc/re/airports/izlude.txt +++ b/npc/re/airports/izlude.txt @@ -7,6 +7,7 @@ //===== Additional Comments: ================================= //= Official NPCs. //= Updated to match the new Izlude Map. [Masao] +//= Updated to Official coordinates //============================================================ -izlude,204,75,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude 90 +izlude,202,75,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude 90 diff --git a/npc/re/cities/jawaii.txt b/npc/re/cities/jawaii.txt index f6e6f70ec..a4b584d3a 100644 --- a/npc/re/cities/jawaii.txt +++ b/npc/re/cities/jawaii.txt @@ -1,11 +1,11 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Jawaii Town Renewal //===== By: ================================================== //= Daegaladh, Masao //===== Current Version: ===================================== //= 1.0 //===== Compatible With: ===================================== -//= rAthena SVN +//= Hercules GIT //===== Description: ========================================= //= Jawaii town NPCs. //===== Additional Comments: ================================= @@ -13,4 +13,4 @@ //= 1.1 Changed to Official coordinates [Streusel] //============================================================ -izlude,180,224,6 duplicate(Honeymoon_Helper_Izlude) Honeymoon Helper#Izlude 71 +izlude,180,224,6 duplicate(Honeymoon_Helper_Izlude) Honeymoon Helper#Izlude 71 \ No newline at end of file diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt index 9c0692bdb..77f1f8d68 100644 --- a/npc/re/merchants/shops.txt +++ b/npc/re/merchants/shops.txt @@ -11,6 +11,7 @@ //= 1.1 Added Dicastes merchants. [Joseph] //= 1.2 Moved more shops to Renewal file. [Euphy] //= 1.3 Added Malangdo tool dealer. [Euphy] +//= 1.4 Moved Izlude merchants to Official coordinates [Streusel] //============================================================ //======================================================= @@ -33,10 +34,12 @@ dicastes01,207,200,6 shop Points Merchant#dic 66,6360:-1,6361:-1,6362:-1,6363:-1 //======================================================= // Izlude //======================================================= -izlude,97,146,0 shop Butcher#iz 54,517:-1 +izlude,160,186,0 shop Butcher#iz 54,517:-1 izlude,124,165,4 shop Fruit Gardener#iz 53,512:-1,513:-1,515:-1,516:-1 -izlude,95,145,6 shop Vendor from Milk Ranch#i 90,519:-1 -izlude,174,164,4 shop Pet Groomer#iz 124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1 +izlude,128,158,6 shop Vendor from Milk Ranch#i 90,519:-1 +izlude_in,72,98,3 shop Pet Groomer#iz 124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1 +izlude_in,57,109,0 shop Tool Dealer#iz 47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1 +izlude_in,72,110,3 shop Trading Merchant#iz 900,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1 //======================================================= // Juno diff --git a/npc/re/quests/monstertamers.txt b/npc/re/quests/monstertamers.txt new file mode 100644 index 000000000..cc95d3749 --- /dev/null +++ b/npc/re/quests/monstertamers.txt @@ -0,0 +1,15 @@ +//===== Hercules Script ======================================= +//= Monster Tamers +//===== By: ================================================== +//= Streusel +//===== Current Version: ===================================== +//= 1.0 +//===== Compatible With: ===================================== +//= Hercules +//===== Description: ========================================= +//= Cute pet quest items +//===== Additional Comments: ================================= +//= 1.0 Duplicates for Monster Tamer +//============================================================ + +izlude_in,55,105,4 duplicate(Monster_Tamer#izu) Monster Tamer#izlude 125 \ No newline at end of file diff --git a/npc/re/quests/quests_13_1.txt b/npc/re/quests/quests_13_1.txt new file mode 100644 index 000000000..107b7c029 --- /dev/null +++ b/npc/re/quests/quests_13_1.txt @@ -0,0 +1,17 @@ +//===== Hercules Script ====================================== +//= Quest NPCs related to Ash-Vacuum +//===== By: ================================================== +//= Streusel +//===== Current Version: ===================================== +//= 1.0 +//===== Description: ========================================= +//= [Official Conversion] +//= Contains: +//= Promotional Staff Duplicate for Renewal +//===== Additional Comments: ================================= +//= 1.0 First Version. +//============================================================ + +// Onward to the New World +//============================================================ +izlude,102,171,6 duplicate(Promotional Staff#iz) Promotional Staff#izlude 100 \ No newline at end of file diff --git a/npc/re/quests/quests_lighthalzen.txt b/npc/re/quests/quests_lighthalzen.txt index a68fcb632..3f029f7f4 100644 --- a/npc/re/quests/quests_lighthalzen.txt +++ b/npc/re/quests/quests_lighthalzen.txt @@ -1,21 +1,22 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Quest NPCs located in Lighthalzen //===== By: ================================================== //= Ziu, Heris (translation) //===== Current Version: ===================================== -//= 1.1 +//= 1.1a //===== Compatible With: ===================================== -//= rAthena SVN +//= Hercules GIT //===== Description: ========================================= //= Quests related to Lighthalzen City. //===== Additional Comments: ================================= //= 1.0 Updated to match the new Izlude Map. [Masao] //= 1.1 Added Somatology Laboratory F4 quest. [Euphy] +//= 1.1a Coordinate update //============================================================ // Renewal split [Daegaladh] //============================================================ -izlude,171,73,6 duplicate(Scamp) Scamp#2 853 +izlude,172,73,6 duplicate(Scamp) Scamp#2 853 // Somatology Laboratory F4 //============================================================ diff --git a/npc/re/scripts_athena.conf b/npc/re/scripts_athena.conf index cc12ddceb..30bf67476 100644 --- a/npc/re/scripts_athena.conf +++ b/npc/re/scripts_athena.conf @@ -80,4 +80,6 @@ npc: npc/re/quests/quests_dicastes.txt npc: npc/re/quests/quests_izlude.txt npc: npc/re/quests/quests_lighthalzen.txt npc: npc/re/quests/quests_malangdo.txt -npc: npc/re/quests/quests_veins.txt \ No newline at end of file +npc: npc/re/quests/quests_veins.txt +npc: npc/re/quests/monstertamers.txt +npc: npc/re/quests/quests_13_1.txt \ No newline at end of file diff --git a/npc/warps/pvp.txt b/npc/warps/pvp.txt index e9440aeb9..c0e6b09a3 100644 --- a/npc/warps/pvp.txt +++ b/npc/warps/pvp.txt @@ -1,11 +1,11 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= Prontera Arena & PvP Warp Script //===== By: ================================================== //= Athena (any) //===== Current Version: ===================================== -//= 1.3 +//= 1.4 //===== Compatible With: ===================================== -//= Any Athena Version +//= Hercules GIT //===== Description: ========================================= //= Warp Points for Prontera Arena and PvP Maps //===== Additional Comments: ================================= @@ -13,6 +13,7 @@ //= 1.1 Fixed Prontera Arena warp [Yor] //= 1.2 Added addition warps for PvP Nightmare Mode maps. //= 1.3 Fixed duplicate warp names [Timexy] +//= 1.4 Disabled removed maps ordeal_*-3 and ordeal_*-4 [Streusel] //============================================================ //Battle Ordeal Mode diff --git a/src/common/mmo.h b/src/common/mmo.h index 2ef9789f2..7b492bc90 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -97,7 +97,7 @@ #define MAX_GUILDSKILL 15 // increased max guild skills because of new skills [Sara-chan] #define MAX_GUILDLEVEL 50 #define MAX_GUARDIANS 8 //Local max per castle. [Skotlex] -#define MAX_QUEST_DB 2200 //Max quests that the server will load +#define MAX_QUEST_DB 2300 //Max quests that the server will load #define MAX_QUEST_OBJECTIVES 3 //Max quest objectives for a quest // for produce -- cgit v1.2.3-70-g09d2