From 7e10f1611d51f1d0c6d9efce6efe3e046cdd3aca Mon Sep 17 00:00:00 2001 From: Mysteries Date: Tue, 29 Jan 2013 20:02:52 -0500 Subject: Updated placeholders. --- npc/guild2/agit_main_se.txt | 4 +--- npc/guild2/agit_start_se.txt | 4 +--- npc/guild2/arug_cas01.txt | 4 +--- npc/guild2/arug_cas02.txt | 4 +--- npc/guild2/arug_cas03.txt | 4 +--- npc/guild2/arug_cas04.txt | 4 +--- npc/guild2/arug_cas05.txt | 4 +--- 7 files changed, 7 insertions(+), 21 deletions(-) (limited to 'npc/guild2') diff --git a/npc/guild2/agit_main_se.txt b/npc/guild2/agit_main_se.txt index f37580617..dfe2887e0 100644 --- a/npc/guild2/agit_main_se.txt +++ b/npc/guild2/agit_main_se.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= War of Emperium SE - Template File //===== By: ================================================== //= Euphy //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Like agit_main, this file is required //= for SE castles to function. diff --git a/npc/guild2/agit_start_se.txt b/npc/guild2/agit_start_se.txt index 81e16ac36..7601fd18b 100644 --- a/npc/guild2/agit_start_se.txt +++ b/npc/guild2/agit_start_se.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= War of Emperium SE - Auto-Start //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN; RO Episode 11.3 //===== Description: ========================================= //= Auto Start for War of Emperium //= To know how to set up WoE times, go to doc\woe_time_explanation.txt diff --git a/npc/guild2/arug_cas01.txt b/npc/guild2/arug_cas01.txt index 1dcffa9c1..61ada97c5 100644 --- a/npc/guild2/arug_cas01.txt +++ b/npc/guild2/arug_cas01.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= War of Emperium SE - Mardol //===== By: ================================================== //= Euphy //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Additional Comments: ================================= //= 1.0 Merged to template file. //============================================================ diff --git a/npc/guild2/arug_cas02.txt b/npc/guild2/arug_cas02.txt index 1d786902f..0fcfeaa30 100644 --- a/npc/guild2/arug_cas02.txt +++ b/npc/guild2/arug_cas02.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= War of Emperium SE - Cyr //===== By: ================================================== //= Euphy //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Additional Comments: ================================= //= 1.0 Merged to template file. //============================================================ diff --git a/npc/guild2/arug_cas03.txt b/npc/guild2/arug_cas03.txt index fa25cffd3..86c3f5c26 100644 --- a/npc/guild2/arug_cas03.txt +++ b/npc/guild2/arug_cas03.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= War of Emperium SE - Horn //===== By: ================================================== //= Euphy //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Additional Comments: ================================= //= 1.0 Merged to template file. //============================================================ diff --git a/npc/guild2/arug_cas04.txt b/npc/guild2/arug_cas04.txt index e26ec613f..977dc2fbd 100644 --- a/npc/guild2/arug_cas04.txt +++ b/npc/guild2/arug_cas04.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ======================================= //= War of Emperium SE - Gefn //===== By: ================================================== //= Euphy //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Additional Comments: ================================= //= 1.0 Merged to template file. //============================================================ diff --git a/npc/guild2/arug_cas05.txt b/npc/guild2/arug_cas05.txt index 621ac8ad9..38be97b8d 100644 --- a/npc/guild2/arug_cas05.txt +++ b/npc/guild2/arug_cas05.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== HerculesScript ======================================= //= War of Emperium SE - Banadis //===== By: ================================================== //= Euphy //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Additional Comments: ================================= //= 1.0 Merged to template file. //============================================================ -- 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/guild2') 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/guild2') 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 e742e8cf1a8356f9b70ab3ad9ecdc1051976ef72 Mon Sep 17 00:00:00 2001 From: shennetsind Date: Sun, 7 Apr 2013 18:57:13 -0300 Subject: Fixed zone changing not reverting mapflags from previous zone http://hercules.ws/board/topic/302-introducing-hercules-map-zone-database/ Signed-off-by: shennetsind --- conf/mapflag/zone.txt | 53 +-- npc/guild2/agit_main_se.txt | 2 + src/map/atcommand.c | 30 +- src/map/map.c | 792 +++++++++++++++++++++++++++++++++++++++++++- src/map/map.h | 8 +- src/map/npc.c | 77 ++++- src/map/script.c | 10 +- 7 files changed, 893 insertions(+), 79 deletions(-) (limited to 'npc/guild2') diff --git a/conf/mapflag/zone.txt b/conf/mapflag/zone.txt index ced22128a..62047effa 100644 --- a/conf/mapflag/zone.txt +++ b/conf/mapflag/zone.txt @@ -32,18 +32,6 @@ force_1-2 mapflag zone Izlude Battle Arena force_1-3 mapflag zone Izlude Battle Arena prt_are_in mapflag zone Izlude Battle Arena -//WoE:SE Maps -schg_cas01 mapflag zone GvG2 -schg_cas02 mapflag zone GvG2 -schg_cas03 mapflag zone GvG2 -schg_cas04 mapflag zone GvG2 -schg_cas05 mapflag zone GvG2 -arug_cas01 mapflag zone GvG2 -arug_cas02 mapflag zone GvG2 -arug_cas03 mapflag zone GvG2 -arug_cas04 mapflag zone GvG2 -arug_cas05 mapflag zone GvG2 - //Sealed Shrine ================== 1@cata mapflag zone Sealed Shrine 2@cata mapflag zone Sealed Shrine @@ -119,43 +107,4 @@ splendide mapflag zone Towns umbala mapflag zone Towns veins mapflag zone Towns xmas mapflag zone Towns -yuno mapflag zone Towns - -//Temporary Fix (the real deal is being designed) -bat_c01 mapflag zone Battlegrounds -bat_c02 mapflag zone Battlegrounds -bat_c03 mapflag zone Battlegrounds -bat_b01 mapflag zone Battlegrounds -bat_b02 mapflag zone Battlegrounds -bat_a01 mapflag zone Battlegrounds -bat_a02 mapflag zone Battlegrounds -aldeg_cas01 mapflag zone GvG -aldeg_cas02 mapflag zone GvG -aldeg_cas03 mapflag zone GvG -aldeg_cas04 mapflag zone GvG -aldeg_cas05 mapflag zone GvG -gefg_cas01 mapflag zone GvG -gefg_cas02 mapflag zone GvG -gefg_cas03 mapflag zone GvG -gefg_cas04 mapflag zone GvG -gefg_cas05 mapflag zone GvG -payg_cas01 mapflag zone GvG -payg_cas02 mapflag zone GvG -payg_cas03 mapflag zone GvG -payg_cas04 mapflag zone GvG -payg_cas05 mapflag zone GvG -prtg_cas01 mapflag zone GvG -prtg_cas02 mapflag zone GvG -prtg_cas03 mapflag zone GvG -prtg_cas04 mapflag zone GvG -prtg_cas05 mapflag zone GvG -schg_cas01 mapflag zone GvG2 -schg_cas02 mapflag zone GvG2 -schg_cas03 mapflag zone GvG2 -schg_cas04 mapflag zone GvG2 -schg_cas05 mapflag zone GvG2 -arug_cas01 mapflag zone GvG2 -arug_cas02 mapflag zone GvG2 -arug_cas03 mapflag zone GvG2 -arug_cas04 mapflag zone GvG2 -arug_cas05 mapflag zone GvG2 +yuno mapflag zone Towns \ No newline at end of file diff --git a/npc/guild2/agit_main_se.txt b/npc/guild2/agit_main_se.txt index 45c847d5d..cea4d2223 100644 --- a/npc/guild2/agit_main_se.txt +++ b/npc/guild2/agit_main_se.txt @@ -48,6 +48,7 @@ OnAgitStart2: if (agitcheck2()) { maprespawnguildid strnpcinfo(2),getcastledata(strnpcinfo(2),1),2; gvgon strnpcinfo(2); + setmapflag strnpcinfo(2),mf_zone,"GvG2"; donpcevent strnpcinfo(0)+"::OnStart"; } else for(set .@i,0; .@i<4; set .@i,.@i+1) @@ -57,6 +58,7 @@ OnAgitStart2: OnAgitEnd2: if (strnpcinfo(2) == "template") end; gvgoff strnpcinfo(2); + removemapflag strnpcinfo(2),mf_zone; if (getcastledata(strnpcinfo(2),1)) { set .@str$,substr(strnpcinfo(2),0,1)+substr(strnpcinfo(2),8,9); killmonster strnpcinfo(2),"Steward#"+.@str$+"::OnStartArena"; diff --git a/src/map/atcommand.c b/src/map/atcommand.c index f52e245ea..d9c01b0fb 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -1531,6 +1531,7 @@ ACMD_FUNC(pvpoff) return -1; } + map_zone_change2(sd->bl.m,map[sd->bl.m].prev_zone); map[sd->bl.m].flag.pvp = 0; if (!battle_config.pk_mode) @@ -1566,11 +1567,11 @@ ACMD_FUNC(pvpon) clif->message(fd, msg_txt(161)); // PvP is already On. return -1; } - + + map_zone_change2(sd->bl.m,strdb_get(zone_db, MAP_ZONE_PVP_NAME)); map[sd->bl.m].flag.pvp = 1; - if (!battle_config.pk_mode) - {// display pvp circle and rank + if (!battle_config.pk_mode) {// display pvp circle and rank clif->map_property_mapall(sd->bl.m, MAPPROPERTY_FREEPVPZONE); map_foreachinmap(atcommand_pvpon_sub,sd->bl.m, BL_PC); } @@ -1592,6 +1593,7 @@ ACMD_FUNC(gvgoff) return -1; } + map_zone_change2(sd->bl.m,map[sd->bl.m].prev_zone); map[sd->bl.m].flag.gvg = 0; clif->map_property_mapall(sd->bl.m, MAPPROPERTY_NOTHING); map_foreachinmap(atcommand_stopattack,sd->bl.m, BL_CHAR, 0); @@ -1611,7 +1613,8 @@ ACMD_FUNC(gvgon) clif->message(fd, msg_txt(163)); // GvG is already On. return -1; } - + + map_zone_change2(sd->bl.m,strdb_get(zone_db, MAP_ZONE_GVG_NAME)); map[sd->bl.m].flag.gvg = 1; clif->map_property_mapall(sd->bl.m, MAPPROPERTY_AGITZONE); clif->message(fd, msg_txt(34)); // GvG: On. @@ -7668,6 +7671,23 @@ ACMD_FUNC(mapflag) { } for (i = 0; flag_name[i]; i++) flag_name[i] = (char)tolower(flag_name[i]); //lowercase + if ( strcmp( flag_name , "gvg" ) == 0 ) { + if( flag && !map[sd->bl.m].flag.gvg ) + map_zone_change2(sd->bl.m,strdb_get(zone_db, MAP_ZONE_GVG_NAME)); + else if ( !flag && map[sd->bl.m].flag.gvg ) + map_zone_change2(sd->bl.m,map[sd->bl.m].prev_zone); + } else if ( strcmp( flag_name , "pvp" ) == 0 ) { + if( flag && !map[sd->bl.m].flag.pvp ) + map_zone_change2(sd->bl.m,strdb_get(zone_db, MAP_ZONE_PVP_NAME)); + else if ( !flag && map[sd->bl.m].flag.pvp ) + map_zone_change2(sd->bl.m,map[sd->bl.m].prev_zone); + } else if ( strcmp( flag_name , "battleground" ) == 0 ) { + if( flag && !map[sd->bl.m].flag.battleground ) + map_zone_change2(sd->bl.m,strdb_get(zone_db, MAP_ZONE_BG_NAME)); + else if ( !flag && map[sd->bl.m].flag.battleground ) + map_zone_change2(sd->bl.m,map[sd->bl.m].prev_zone); + } + setflag(autotrade); setflag(allowks); setflag(nomemo); setflag(noteleport); setflag(noreturn); setflag(monster_noteleport);setflag(nosave); setflag(nobranch); setflag(noexppenalty); setflag(pvp); setflag(pvp_noparty); setflag(pvp_noguild); @@ -7680,7 +7700,7 @@ ACMD_FUNC(mapflag) { setflag(nojobexp); setflag(nomobloot); setflag(nomvploot); setflag(nightenabled); setflag(nodrop); setflag(novending); setflag(loadevent); setflag(nochat); setflag(partylock); setflag(guildlock); setflag(src4instance); - + clif->message(sd->fd,msg_txt(1314)); // Invalid flag name or flag. clif->message(sd->fd,msg_txt(1312)); // Usage: "@mapflag monster_noteleport 1" (0=Off | 1=On) clif->message(sd->fd,msg_txt(1315)); // Available Flags: diff --git a/src/map/map.c b/src/map/map.c index 656ddb6d0..779070f0e 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -1712,6 +1712,10 @@ int map_quit(struct map_session_data *sd) { } } + if( hChSys.local && map[sd->bl.m].channel && idb_exists(map[sd->bl.m].channel->users, sd->status.char_id) ) { + clif->chsys_left(map[sd->bl.m].channel,sd); + } + if( sd->channel_count ) { for( i = 0; i < sd->channel_count; i++ ) { if( sd->channels[i] != NULL ) @@ -2985,6 +2989,18 @@ void do_final_maps(void) { } map[i].skill_count = 0; } + + if( map[i].zone_mf_count ) { + for(v = 0; v < map[i].zone_mf_count; v++) { + aFree(map[i].zone_mf[v]); + } + if( map[i].zone_mf ) { + aFree(map[i].zone_mf); + map[i].zone_mf = NULL; + } + map[i].zone_mf_count = 0; + } + if( map[i].channel ) clif->chsys_delete(map[i].channel); } @@ -3031,6 +3047,17 @@ void map_flags_init(void) { } else /* align with 'All' zone */ map[i].zone = &map_zone_all; + if( map[i].zone_mf_count ) { + for(v = 0; v < map[i].zone_mf_count; v++) { + aFree(map[i].zone_mf[v]); + } + aFree(map[i].zone_mf); + } + + map[i].zone_mf = NULL; + map[i].zone_mf_count = 0; + map[i].prev_zone = map[i].zone; + map[i].invincible_time_inc = 0; map[i].weapon_damage_rate = 100; @@ -3598,12 +3625,759 @@ int log_sql_init(void) #endif return 0; } -void map_zone_apply(int m, struct map_zone_data *zone,char* w1, const char* start, const char* buffer, const char* filepath) { +void map_zone_change2(int m, struct map_zone_data *zone) { + char empty[1] = "\0"; + + map[m].prev_zone = map[m].zone; + + if( map[m].zone_mf_count ) + map_zone_remove(m); + + map_zone_apply(m,zone,empty,empty,empty); +} +/* when changing from a mapflag to another during runtime */ +void map_zone_change(int m, struct map_zone_data *zone, const char* start, const char* buffer, const char* filepath) { + map[m].prev_zone = map[m].zone; + + if( map[m].zone_mf_count ) + map_zone_remove(m); + map_zone_apply(m,zone,start,buffer,filepath); +} +/* removes previous mapflags from this map */ +void map_zone_remove(int m) { + char flag[MAP_ZONE_MAPFLAG_LENGTH], params[MAP_ZONE_MAPFLAG_LENGTH]; + unsigned short k; + char empty[1] = "\0"; + for(k = 0; k < map[m].zone_mf_count; k++) { + int len = strlen(map[m].zone_mf[k]),j; + params[0] = '\0'; + memcpy(flag, map[m].zone_mf[k], MAP_ZONE_MAPFLAG_LENGTH); + for(j = 0; j < len; j++) { + if( flag[j] == '\t' ) { + memcpy(params, &flag[j+1], len - j); + flag[j] = '\0'; + break; + } + } + + npc_parse_mapflag(map[m].name,empty,flag,params,empty,empty,empty); + aFree(map[m].zone_mf[k]); + map[m].zone_mf[k] = NULL; + } + + aFree(map[m].zone_mf); + map[m].zone_mf = NULL; + map[m].zone_mf_count = 0; +} +static inline void map_zone_mf_cache_add(int m, char *rflag) { + RECREATE(map[m].zone_mf, char *, ++map[m].zone_mf_count); + CREATE(map[m].zone_mf[map[m].zone_mf_count - 1], char, MAP_ZONE_MAPFLAG_LENGTH); + safestrncpy(map[m].zone_mf[map[m].zone_mf_count - 1], rflag, MAP_ZONE_MAPFLAG_LENGTH); +} +/* TODO: introduce enumerations to each mapflag so instead of reading the string a number of times we read it only once and use its value wherever we need */ +/* cache previous values to revert */ +bool map_zone_mf_cache(int m, char *flag, char *params) { + char rflag[MAP_ZONE_MAPFLAG_LENGTH]; + int state = 1; + + if (params[0] != '\0' && !strcmpi(params, "off")) + state = 0; + + if (!strcmpi(flag, "nosave")) { + ;/* not yet supported to be reversed */ + /* + char savemap[32]; + int savex, savey; + if (state == 0) { + if( map[m].flag.nosave ) { + sprintf(rflag, "nosave SavePoint"); + map_zone_mf_cache_add(m,nosave); + } + } else if (!strcmpi(params, "SavePoint")) { + if( map[m].save.map ) { + sprintf(rflag, "nosave %s,%d,%d",mapindex_id2name(map[m].save.map),map[m].save.x,map[m].save.y); + } else + sprintf(rflag, "nosave %s,%d,%d",mapindex_id2name(map[m].save.map),map[m].save.x,map[m].save.y); + map_zone_mf_cache_add(m,nosave); + } else if (sscanf(params, "%31[^,],%d,%d", savemap, &savex, &savey) == 3) { + if( map[m].save.map ) { + sprintf(rflag, "nosave %s,%d,%d",mapindex_id2name(map[m].save.map),map[m].save.x,map[m].save.y); + map_zone_mf_cache_add(m,nosave); + } + }*/ + } else if (!strcmpi(flag,"autotrade")) { + if( state && map[m].flag.autotrade ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"autotrade off"); + else if( !map[m].flag.autotrade ) + map_zone_mf_cache_add(m,"autotrade"); + } + } else if (!strcmpi(flag,"allowks")) { + if( state && map[m].flag.allowks ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"allowks off"); + else if( !map[m].flag.allowks ) + map_zone_mf_cache_add(m,"allowks"); + } + } else if (!strcmpi(flag,"town")) { + if( state && map[m].flag.town ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"town off"); + else if( !map[m].flag.town ) + map_zone_mf_cache_add(m,"town"); + } + } else if (!strcmpi(flag,"nomemo")) { + if( state && map[m].flag.nomemo ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"nomemo off"); + else if( !map[m].flag.nomemo ) + map_zone_mf_cache_add(m,"nomemo"); + } + } else if (!strcmpi(flag,"noteleport")) { + if( state && map[m].flag.noteleport ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"noteleport off"); + else if( !map[m].flag.noteleport ) + map_zone_mf_cache_add(m,"noteleport"); + } + } else if (!strcmpi(flag,"nowarp")) { + if( state && map[m].flag.nowarp ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"nowarp off"); + else if( !map[m].flag.nowarp ) + map_zone_mf_cache_add(m,"nowarp"); + } + } else if (!strcmpi(flag,"nowarpto")) { + if( state && map[m].flag.nowarpto ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"nowarpto off"); + else if( !map[m].flag.nowarpto ) + map_zone_mf_cache_add(m,"nowarpto"); + } + } else if (!strcmpi(flag,"noreturn")) { + if( state && map[m].flag.noreturn ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"noreturn off"); + else if( map[m].flag.noreturn ) + map_zone_mf_cache_add(m,"noreturn"); + } + } else if (!strcmpi(flag,"monster_noteleport")) { + if( state && map[m].flag.monster_noteleport ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"monster_noteleport off"); + else if( map[m].flag.monster_noteleport ) + map_zone_mf_cache_add(m,"monster_noteleport"); + } + } else if (!strcmpi(flag,"nobranch")) { + if( state && map[m].flag.nobranch ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"nobranch off"); + else if( map[m].flag.nobranch ) + map_zone_mf_cache_add(m,"nobranch"); + } + } else if (!strcmpi(flag,"nopenalty")) { + if( state && map[m].flag.noexppenalty ) /* they are applied together, no need to check both */ + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"nopenalty off"); + else if( map[m].flag.noexppenalty ) + map_zone_mf_cache_add(m,"nopenalty"); + } + } else if (!strcmpi(flag,"pvp")) { + if( state && map[m].flag.pvp ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"pvp off"); + else if( map[m].flag.pvp ) + map_zone_mf_cache_add(m,"pvp"); + } + } + else if (!strcmpi(flag,"pvp_noparty")) { + if( state && map[m].flag.pvp_noparty ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"pvp_noparty off"); + else if( map[m].flag.pvp_noparty ) + map_zone_mf_cache_add(m,"pvp_noparty"); + } + } else if (!strcmpi(flag,"pvp_noguild")) { + if( state && map[m].flag.pvp_noguild ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"pvp_noguild off"); + else if( map[m].flag.pvp_noguild ) + map_zone_mf_cache_add(m,"pvp_noguild"); + } + } else if (!strcmpi(flag, "pvp_nightmaredrop")) { + if( state && map[m].flag.pvp_nightmaredrop ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"pvp_nightmaredrop off"); + else if( map[m].flag.pvp_nightmaredrop ) + map_zone_mf_cache_add(m,"pvp_nightmaredrop"); + } + /* not yet fully supported */ + /*char drop_arg1[16], drop_arg2[16]; + int drop_per = 0; + if (sscanf(w4, "%[^,],%[^,],%d", drop_arg1, drop_arg2, &drop_per) == 3) { + int drop_id = 0, drop_type = 0; + if (!strcmpi(drop_arg1, "random")) + drop_id = -1; + else if (itemdb_exists((drop_id = atoi(drop_arg1))) == NULL) + drop_id = 0; + if (!strcmpi(drop_arg2, "inventory")) + drop_type = 1; + else if (!strcmpi(drop_arg2,"equip")) + drop_type = 2; + else if (!strcmpi(drop_arg2,"all")) + drop_type = 3; + + if (drop_id != 0){ + int i; + for (i = 0; i < MAX_DROP_PER_MAP; i++) { + if (map[m].drop_list[i].drop_id == 0){ + map[m].drop_list[i].drop_id = drop_id; + map[m].drop_list[i].drop_type = drop_type; + map[m].drop_list[i].drop_per = drop_per; + break; + } + } + map[m].flag.pvp_nightmaredrop = 1; + } + } else if (!state) //Disable + map[m].flag.pvp_nightmaredrop = 0; + */ + } else if (!strcmpi(flag,"pvp_nocalcrank")) { + if( state && map[m].flag.pvp_nocalcrank ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"pvp_nocalcrank off"); + else if( map[m].flag.pvp_nocalcrank ) + map_zone_mf_cache_add(m,"pvp_nocalcrank"); + } + } else if (!strcmpi(flag,"gvg")) { + if( state && map[m].flag.gvg ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"gvg off"); + else if( map[m].flag.gvg ) + map_zone_mf_cache_add(m,"gvg"); + } + } else if (!strcmpi(flag,"gvg_noparty")) { + if( state && map[m].flag.gvg_noparty ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"gvg_noparty off"); + else if( map[m].flag.gvg_noparty ) + map_zone_mf_cache_add(m,"gvg_noparty"); + } + } else if (!strcmpi(flag,"gvg_dungeon")) { + if( state && map[m].flag.gvg_dungeon ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"gvg_dungeon off"); + else if( map[m].flag.gvg_dungeon ) + map_zone_mf_cache_add(m,"gvg_dungeon"); + } + } + else if (!strcmpi(flag,"gvg_castle")) { + if( state && map[m].flag.gvg_castle ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"gvg_castle off"); + else if( map[m].flag.gvg_castle ) + map_zone_mf_cache_add(m,"gvg_castle"); + } + } + else if (!strcmpi(flag,"battleground")) { + if( state && map[m].flag.battleground ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"battleground off"); + else if( map[m].flag.battleground ) + map_zone_mf_cache_add(m,"battleground"); + } + } else if (!strcmpi(flag,"noexppenalty")) { + if( state && map[m].flag.noexppenalty ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"noexppenalty off"); + else if( map[m].flag.noexppenalty ) + map_zone_mf_cache_add(m,"noexppenalty"); + } + } else if (!strcmpi(flag,"nozenypenalty")) { + if( state && map[m].flag.nozenypenalty ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"nozenypenalty off"); + else if( map[m].flag.nozenypenalty ) + map_zone_mf_cache_add(m,"nozenypenalty"); + } + } else if (!strcmpi(flag,"notrade")) { + if( state && map[m].flag.notrade ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"notrade off"); + else if( map[m].flag.notrade ) + map_zone_mf_cache_add(m,"notrade"); + } + } else if (!strcmpi(flag,"novending")) { + if( state && map[m].flag.novending ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"novending off"); + else if( map[m].flag.novending ) + map_zone_mf_cache_add(m,"novending"); + } + } else if (!strcmpi(flag,"nodrop")) { + if( state && map[m].flag.nodrop ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"nodrop off"); + else if( map[m].flag.nodrop ) + map_zone_mf_cache_add(m,"nodrop"); + } + } else if (!strcmpi(flag,"noskill")) { + if( state && map[m].flag.noskill ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"noskill off"); + else if( map[m].flag.noskill ) + map_zone_mf_cache_add(m,"noskill"); + } + } else if (!strcmpi(flag,"noicewall")) { + if( state && map[m].flag.noicewall ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"noicewall off"); + else if( map[m].flag.noicewall ) + map_zone_mf_cache_add(m,"noicewall"); + } + } else if (!strcmpi(flag,"snow")) { + if( state && map[m].flag.snow ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"snow off"); + else if( map[m].flag.snow ) + map_zone_mf_cache_add(m,"snow"); + } + } else if (!strcmpi(flag,"clouds")) { + if( state && map[m].flag.clouds ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"clouds off"); + else if( map[m].flag.clouds ) + map_zone_mf_cache_add(m,"clouds"); + } + } else if (!strcmpi(flag,"clouds2")) { + if( state && map[m].flag.clouds2 ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"clouds2 off"); + else if( map[m].flag.clouds2 ) + map_zone_mf_cache_add(m,"clouds2"); + } + } else if (!strcmpi(flag,"fog")) { + if( state && map[m].flag.fog ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"fog off"); + else if( map[m].flag.fog ) + map_zone_mf_cache_add(m,"fog"); + } + } else if (!strcmpi(flag,"fireworks")) { + if( state && map[m].flag.fireworks ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"fireworks off"); + else if( map[m].flag.fireworks ) + map_zone_mf_cache_add(m,"fireworks"); + } + } else if (!strcmpi(flag,"sakura")) { + if( state && map[m].flag.sakura ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"sakura off"); + else if( map[m].flag.sakura ) + map_zone_mf_cache_add(m,"sakura"); + } + } else if (!strcmpi(flag,"leaves")) { + if( state && map[m].flag.leaves ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"leaves off"); + else if( map[m].flag.leaves ) + map_zone_mf_cache_add(m,"leaves"); + } + } else if (!strcmpi(flag,"nightenabled")) { + if( state && map[m].flag.nightenabled ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"nightenabled off"); + else if( map[m].flag.nightenabled ) + map_zone_mf_cache_add(m,"nightenabled"); + } + } else if (!strcmpi(flag,"nogo")) { + if( state && map[m].flag.nogo ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"nogo off"); + else if( map[m].flag.nogo ) + map_zone_mf_cache_add(m,"nogo"); + } + } else if (!strcmpi(flag,"noexp")) { + if( state && map[m].flag.nobaseexp ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"noexp off"); + else if( map[m].flag.nobaseexp ) + map_zone_mf_cache_add(m,"noexp"); + } + } + else if (!strcmpi(flag,"nobaseexp")) { + if( state && map[m].flag.nobaseexp ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"nobaseexp off"); + else if( map[m].flag.nobaseexp ) + map_zone_mf_cache_add(m,"nobaseexp"); + } + } else if (!strcmpi(flag,"nojobexp")) { + if( state && map[m].flag.nojobexp ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"nojobexp off"); + else if( map[m].flag.nojobexp ) + map_zone_mf_cache_add(m,"nojobexp"); + } + } else if (!strcmpi(flag,"noloot")) { + if( state && map[m].flag.nomobloot ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"noloot off"); + else if( map[m].flag.nomobloot ) + map_zone_mf_cache_add(m,"noloot"); + } + } else if (!strcmpi(flag,"nomobloot")) { + if( state && map[m].flag.nomobloot ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"nomobloot off"); + else if( map[m].flag.nomobloot ) + map_zone_mf_cache_add(m,"nomobloot"); + } + } else if (!strcmpi(flag,"nomvploot")) { + if( state && map[m].flag.nomvploot ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"nomvploot off"); + else if( map[m].flag.nomvploot ) + map_zone_mf_cache_add(m,"nomvploot"); + } + } else if (!strcmpi(flag,"nocommand")) { + /* implementation may be incomplete */ + if( state && sscanf(params, "%d", &state) == 1 ) { + sprintf(rflag, "nocommand %s",params); + map_zone_mf_cache_add(m,rflag); + } else if( !state && map[m].nocommand ) { + sprintf(rflag, "nocommand %d",map[m].nocommand); + map_zone_mf_cache_add(m,rflag); + } else if( map[m].nocommand ) { + map_zone_mf_cache_add(m,"nocommand off"); + } + } else if (!strcmpi(flag,"jexp")) { + if( !state ) { + if( map[m].jexp != 100 ) { + sprintf(rflag,"jexp %d",map[m].jexp); + map_zone_mf_cache_add(m,rflag); + } + } if( sscanf(params, "%d", &state) == 1 ) { + if( state != map[m].jexp ) { + sprintf(rflag,"jexp %s",params); + map_zone_mf_cache_add(m,rflag); + } + } + } else if (!strcmpi(flag,"bexp")) { + if( !state ) { + if( map[m].bexp != 100 ) { + sprintf(rflag,"bexp %d",map[m].jexp); + map_zone_mf_cache_add(m,rflag); + } + } if( sscanf(params, "%d", &state) == 1 ) { + if( state != map[m].bexp ) { + sprintf(rflag,"bexp %s",params); + map_zone_mf_cache_add(m,rflag); + } + } + } else if (!strcmpi(flag,"loadevent")) { + if( state && map[m].flag.loadevent ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"loadevent off"); + else if( map[m].flag.loadevent ) + map_zone_mf_cache_add(m,"loadevent"); + } + } else if (!strcmpi(flag,"nochat")) { + if( state && map[m].flag.nochat ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"nochat off"); + else if( map[m].flag.nochat ) + map_zone_mf_cache_add(m,"nochat"); + } + } else if (!strcmpi(flag,"partylock")) { + if( state && map[m].flag.partylock ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"partylock off"); + else if( map[m].flag.partylock ) + map_zone_mf_cache_add(m,"partylock"); + } + } else if (!strcmpi(flag,"guildlock")) { + if( state && map[m].flag.guildlock ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"guildlock off"); + else if( map[m].flag.guildlock ) + map_zone_mf_cache_add(m,"guildlock"); + } + } else if (!strcmpi(flag,"reset")) { + if( state && map[m].flag.reset ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"reset off"); + else if( map[m].flag.reset ) + map_zone_mf_cache_add(m,"reset"); + } + } else if (!strcmpi(flag,"adjust_unit_duration")) { + int skill_id, k; + char skill_name[MAP_ZONE_MAPFLAG_LENGTH], modifier[MAP_ZONE_MAPFLAG_LENGTH]; + int len = strlen(params); + + modifier[0] = '\0'; + memcpy(skill_name, params, MAP_ZONE_MAPFLAG_LENGTH); + + for(k = 0; k < len; k++) { + if( skill_name[k] == '\t' ) { + memcpy(modifier, &skill_name[k+1], len - k); + skill_name[k] = '\0'; + break; + } + } + + if( modifier[0] == '\0' || !( skill_id = skill->name2id(skill_name) ) || !skill->get_unit_id( skill->name2id(skill_name), 0) || atoi(modifier) < 1 || atoi(modifier) > USHRT_MAX ) { + ;/* we dont mind it, the server will take care of it next. */ + } else { + int idx = map[m].unit_count; + + k = 0; + ARR_FIND(0, idx, k, map[m].units[k]->skill_id == skill_id); + + if( k < idx ) { + if( atoi(modifier) != map[m].units[k]->modifier ) { + sprintf(rflag,"adjust_unit_duration %s %d",skill_name,map[m].units[k]->modifier); + map_zone_mf_cache_add(m,rflag); + } + } else { + sprintf(rflag,"adjust_unit_duration %s 100",skill_name); + map_zone_mf_cache_add(m,rflag); + } + } + } else if (!strcmpi(flag,"adjust_skill_damage")) { + int skill_id, k; + char skill_name[MAP_ZONE_MAPFLAG_LENGTH], modifier[MAP_ZONE_MAPFLAG_LENGTH]; + int len = strlen(params); + + modifier[0] = '\0'; + memcpy(skill_name, params, MAP_ZONE_MAPFLAG_LENGTH); + + for(k = 0; k < len; k++) { + if( skill_name[k] == '\t' ) { + memcpy(modifier, &skill_name[k+1], len - k); + skill_name[k] = '\0'; + break; + } + } + + if( modifier[0] == '\0' || !( skill_id = skill->name2id(skill_name) ) || atoi(modifier) < 1 || atoi(modifier) > USHRT_MAX ) { + ;/* we dont mind it, the server will take care of it next. */ + } else { + int idx = map[m].skill_count; + + k = 0; + ARR_FIND(0, idx, k, map[m].skills[k]->skill_id == skill_id); + + if( k < idx ) { + if( atoi(modifier) != map[m].skills[k]->modifier ) { + sprintf(rflag,"adjust_skill_damage %s %d",skill_name,map[m].skills[k]->modifier); + map_zone_mf_cache_add(m,rflag); + } + } else { + sprintf(rflag,"adjust_skill_damage %s 100",skill_name); + map_zone_mf_cache_add(m,rflag); + } + + } + } else if (!strcmpi(flag,"zone")) { + ShowWarning("You can't add a zone through a zone! ERROR, skipping for '%s'...\n",map[m].name); + return true; + } else if ( !strcmpi(flag,"nomapchannelautojoin") ) { + if( state && map[m].flag.chsysnolocalaj ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"nomapchannelautojoin off"); + else if( map[m].flag.chsysnolocalaj ) + map_zone_mf_cache_add(m,"nomapchannelautojoin"); + } + } else if ( !strcmpi(flag,"invincible_time_inc") ) { + if( !state ) { + if( map[m].invincible_time_inc != 0 ) { + sprintf(rflag,"invincible_time_inc %d",map[m].invincible_time_inc); + map_zone_mf_cache_add(m,rflag); + } + } if( sscanf(params, "%d", &state) == 1 ) { + if( state != map[m].invincible_time_inc ) { + sprintf(rflag,"invincible_time_inc %s",params); + map_zone_mf_cache_add(m,rflag); + } + } + } else if ( !strcmpi(flag,"noknockback") ) { + if( state && map[m].flag.noknockback ) + ;/* nothing to do */ + else { + if( state ) + map_zone_mf_cache_add(m,"noknockback off"); + else if( map[m].flag.noknockback ) + map_zone_mf_cache_add(m,"noknockback"); + } + } else if ( !strcmpi(flag,"weapon_damage_rate") ) { + if( !state ) { + if( map[m].weapon_damage_rate != 100 ) { + sprintf(rflag,"weapon_damage_rate %d",map[m].weapon_damage_rate); + map_zone_mf_cache_add(m,rflag); + } + } if( sscanf(params, "%d", &state) == 1 ) { + if( state != map[m].weapon_damage_rate ) { + sprintf(rflag,"weapon_damage_rate %s",params); + map_zone_mf_cache_add(m,rflag); + } + } + } else if ( !strcmpi(flag,"magic_damage_rate") ) { + if( !state ) { + if( map[m].magic_damage_rate != 100 ) { + sprintf(rflag,"magic_damage_rate %d",map[m].magic_damage_rate); + map_zone_mf_cache_add(m,rflag); + } + } if( sscanf(params, "%d", &state) == 1 ) { + if( state != map[m].magic_damage_rate ) { + sprintf(rflag,"magic_damage_rate %s",params); + map_zone_mf_cache_add(m,rflag); + } + } + } else if ( !strcmpi(flag,"misc_damage_rate") ) { + if( !state ) { + if( map[m].misc_damage_rate != 100 ) { + sprintf(rflag,"misc_damage_rate %d",map[m].misc_damage_rate); + map_zone_mf_cache_add(m,rflag); + } + } if( sscanf(params, "%d", &state) == 1 ) { + if( state != map[m].misc_damage_rate ) { + sprintf(rflag,"misc_damage_rate %s",params); + map_zone_mf_cache_add(m,rflag); + } + } + } else if ( !strcmpi(flag,"short_damage_rate") ) { + if( !state ) { + if( map[m].short_damage_rate != 100 ) { + sprintf(rflag,"short_damage_rate %d",map[m].short_damage_rate); + map_zone_mf_cache_add(m,rflag); + } + } if( sscanf(params, "%d", &state) == 1 ) { + if( state != map[m].short_damage_rate ) { + sprintf(rflag,"short_damage_rate %s",params); + map_zone_mf_cache_add(m,rflag); + } + } + } else if ( !strcmpi(flag,"long_damage_rate") ) { + if( !state ) { + if( map[m].long_damage_rate != 100 ) { + sprintf(rflag,"long_damage_rate %d",map[m].long_damage_rate); + map_zone_mf_cache_add(m,rflag); + } + } if( sscanf(params, "%d", &state) == 1 ) { + if( state != map[m].long_damage_rate ) { + sprintf(rflag,"long_damage_rate %s",params); + map_zone_mf_cache_add(m,rflag); + } + } + } + return false; +} +void map_zone_apply(int m, struct map_zone_data *zone, const char* start, const char* buffer, const char* filepath) { int i; char empty[1] = "\0"; + char flag[MAP_ZONE_MAPFLAG_LENGTH], params[MAP_ZONE_MAPFLAG_LENGTH]; map[m].zone = zone; for(i = 0; i < zone->mapflags_count; i++) { - char flag[MAP_ZONE_MAPFLAG_LENGTH], params[MAP_ZONE_MAPFLAG_LENGTH]; int len = strlen(zone->mapflags[i]); int k; params[0] = '\0'; @@ -3615,11 +4389,16 @@ void map_zone_apply(int m, struct map_zone_data *zone,char* w1, const char* star break; } } - npc_parse_mapflag(w1,empty,flag,params,start,buffer,filepath); + + if( map_zone_mf_cache(m,flag,params) ) + continue; + + npc_parse_mapflag(map[m].name,empty,flag,params,start,buffer,filepath); } } /* used on npc load and reload to apply all "Normal" and "PK Mode" zones */ void map_zone_init(void) { + char flag[MAP_ZONE_MAPFLAG_LENGTH], params[MAP_ZONE_MAPFLAG_LENGTH]; struct map_zone_data *zone; char empty[1] = "\0"; int i,k,j; @@ -3627,7 +4406,6 @@ void map_zone_init(void) { zone = &map_zone_all; for(i = 0; i < zone->mapflags_count; i++) { - char flag[MAP_ZONE_MAPFLAG_LENGTH], params[MAP_ZONE_MAPFLAG_LENGTH]; int len = strlen(zone->mapflags[i]); params[0] = '\0'; memcpy(flag, zone->mapflags[i], MAP_ZONE_MAPFLAG_LENGTH); @@ -3638,8 +4416,11 @@ void map_zone_init(void) { break; } } + for(j = 0; j < map_num; j++) { if( map[j].zone == zone ) { + if( map_zone_mf_cache(j,flag,params) ) + break; npc_parse_mapflag(map[j].name,empty,flag,params,empty,empty,empty); } } @@ -3648,7 +4429,6 @@ void map_zone_init(void) { if( battle_config.pk_mode ) { zone = &map_zone_pk; for(i = 0; i < zone->mapflags_count; i++) { - char flag[MAP_ZONE_MAPFLAG_LENGTH], params[MAP_ZONE_MAPFLAG_LENGTH]; int len = strlen(zone->mapflags[i]); params[0] = '\0'; memcpy(flag, zone->mapflags[i], MAP_ZONE_MAPFLAG_LENGTH); @@ -3661,6 +4441,8 @@ void map_zone_init(void) { } for(j = 0; j < map_num; j++) { if( map[j].zone == zone ) { + if( map_zone_mf_cache(j,flag,params) ) + break; npc_parse_mapflag(map[j].name,empty,flag,params,empty,empty,empty); } } diff --git a/src/map/map.h b/src/map/map.h index 6f1a51e9f..dd0a47aaf 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -520,7 +520,10 @@ struct map_zone_data { int mapflags_count; }; void map_zone_init(void); -void map_zone_apply(int m, struct map_zone_data *zone,char* w1, const char* start, const char* buffer, const char* filepath); +void map_zone_remove(int m); +void map_zone_apply(int m, struct map_zone_data *zone, const char* start, const char* buffer, const char* filepath); +void map_zone_change(int m, struct map_zone_data *zone, const char* start, const char* buffer, const char* filepath); +void map_zone_change2(int m, struct map_zone_data *zone); struct map_zone_data map_zone_all;/* used as a base on all maps */ struct map_zone_data map_zone_pk;/* used for (pk_mode) */ @@ -624,6 +627,9 @@ struct map_data { /* Hercules nocast db overhaul */ struct map_zone_data *zone; + char **zone_mf;/* used to store this map's zone mapflags that should be re-applied once zone is removed */ + unsigned short zone_mf_count; + struct map_zone_data *prev_zone; /* Hercules Local Chat */ struct hChSysCh *channel; diff --git a/src/map/npc.c b/src/map/npc.c index b16c8b13c..aa44d8840 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -3242,7 +3242,7 @@ const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, const char ShowWarning("npc_parse_mapflag: You can't set PvP and BattleGround flags for the same map! Removing BattleGround flag from %s (file '%s', line '%d').\n", map[m].name, filepath, strline(buffer,start-buffer)); } if( state && (zone = strdb_get(zone_db, MAP_ZONE_PVP_NAME)) && map[m].zone != zone ) { - map_zone_apply(m,zone,w1,start,buffer,filepath); + map_zone_change(m,zone,start,buffer,filepath); } else if ( !state ) { map[m].zone = &map_zone_pk; } @@ -3297,7 +3297,7 @@ const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, const char ShowWarning("npc_parse_mapflag: You can't set GvG and BattleGround flags for the same map! Removing BattleGround flag from %s (file '%s', line '%d').\n", map[m].name, filepath, strline(buffer,start-buffer)); } if( state && (zone = strdb_get(zone_db, MAP_ZONE_GVG_NAME)) && map[m].zone != zone ) { - map_zone_apply(m,zone,w1,start,buffer,filepath); + map_zone_change(m,zone,start,buffer,filepath); } } else if (!strcmpi(w3,"gvg_noparty")) @@ -3332,7 +3332,7 @@ const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, const char } if( state && (zone = strdb_get(zone_db, MAP_ZONE_BG_NAME)) && map[m].zone != zone ) { - map_zone_apply(m,zone,w1,start,buffer,filepath); + map_zone_change(m,zone,start,buffer,filepath); } } else if (!strcmpi(w3,"noexppenalty")) @@ -3436,10 +3436,35 @@ const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, const char ShowWarning("npc_parse_mapflag: Invalid modifier '%d' for skill '%s' for 'adjust_unit_duration' flag! removing flag from %s (file '%s', line '%d').\n", atoi(modifier), skill_name, map[m].name, filepath, strline(buffer,start-buffer)); } else { int idx = map[m].unit_count; - RECREATE(map[m].units, struct mapflag_skill_adjust*, ++map[m].unit_count); - CREATE(map[m].units[idx],struct mapflag_skill_adjust,1); - map[m].units[idx]->skill_id = (unsigned short)skill_id; - map[m].units[idx]->modifier = (unsigned short)atoi(modifier); + + ARR_FIND(0, idx, k, map[m].units[k]->skill_id == skill_id); + + if( k < idx ) { + if( atoi(modifier) != 100 ) + map[m].units[k]->modifier = (unsigned short)atoi(modifier); + else { /* remove */ + int cursor = 0; + aFree(map[m].units[k]); + map[m].units[k] = NULL; + for( k = 0; k < idx; k++ ) { + if( map[m].units[k] == NULL ) + continue; + + memmove(&map[m].units[cursor], &map[m].units[k], sizeof(struct mapflag_skill_adjust)); + + cursor++; + } + if( !( map[m].unit_count = cursor ) ) { + aFree(map[m].units); + map[m].units = NULL; + } + } + } else if( atoi(modifier) != 100 ) { + RECREATE(map[m].units, struct mapflag_skill_adjust*, ++map[m].unit_count); + CREATE(map[m].units[idx],struct mapflag_skill_adjust,1); + map[m].units[idx]->skill_id = (unsigned short)skill_id; + map[m].units[idx]->modifier = (unsigned short)atoi(modifier); + } } } else if (!strcmpi(w3,"adjust_skill_damage")) { int skill_id, k; @@ -3465,18 +3490,44 @@ const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, const char ShowWarning("npc_parse_mapflag: Invalid modifier '%d' for skill '%s' for 'adjust_skill_damage' flag! removing flag from %s (file '%s', line '%d').\n", atoi(modifier), skill_name, map[m].name, filepath, strline(buffer,start-buffer)); } else { int idx = map[m].skill_count; - RECREATE(map[m].skills, struct mapflag_skill_adjust*, ++map[m].skill_count); - CREATE(map[m].skills[idx],struct mapflag_skill_adjust,1); - map[m].skills[idx]->skill_id = (unsigned short)skill_id; - map[m].skills[idx]->modifier = (unsigned short)atoi(modifier); + + ARR_FIND(0, idx, k, map[m].skills[k]->skill_id == skill_id); + + if( k < idx ) { + if( atoi(modifier) != 100 ) + map[m].skills[k]->modifier = (unsigned short)atoi(modifier); + else { /* remove */ + int cursor = 0; + aFree(map[m].skills[k]); + map[m].skills[k] = NULL; + for( k = 0; k < idx; k++ ) { + if( map[m].skills[k] == NULL ) + continue; + + memmove(&map[m].skills[cursor], &map[m].skills[k], sizeof(struct mapflag_skill_adjust)); + + cursor++; + } + if( !( map[m].skill_count = cursor ) ) { + aFree(map[m].skills); + map[m].skills = NULL; + } + } + } else if( atoi(modifier) != 100 ) { + RECREATE(map[m].skills, struct mapflag_skill_adjust*, ++map[m].skill_count); + CREATE(map[m].skills[idx],struct mapflag_skill_adjust,1); + map[m].skills[idx]->skill_id = (unsigned short)skill_id; + map[m].skills[idx]->modifier = (unsigned short)atoi(modifier); + } + } } else if (!strcmpi(w3,"zone")) { struct map_zone_data *zone; if( !(zone = strdb_get(zone_db, w4)) ) { ShowWarning("npc_parse_mapflag: Invalid zone '%s'! removing flag from %s (file '%s', line '%d').\n", w4, map[m].name, filepath, strline(buffer,start-buffer)); - } else if( map[m].zone != zone ) { /* we do not override :P would mess everything */ - map_zone_apply(m,zone,w1,start,buffer,filepath); + } else if( map[m].zone != zone ) { + map_zone_change(m,zone,start,buffer,filepath); } } else if ( !strcmpi(w3,"nomapchannelautojoin") ) { map[m].flag.chsysnolocalaj = state; diff --git a/src/map/script.c b/src/map/script.c index 5b076aeff..3e51859d1 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -10906,8 +10906,8 @@ BUILDIN_FUNC(removemapflag) case MF_NORETURN: map[m].flag.noreturn = 0; break; case MF_NOWARPTO: map[m].flag.nowarpto = 0; break; case MF_NIGHTMAREDROP: map[m].flag.pvp_nightmaredrop = 0; break; - case MF_ZONE:/* reset zone state, mapflags cant be removed however */ - map[m].zone = ( battle_config.pk_mode && map[m].flag.pvp ) ? &map_zone_pk : &map_zone_all; + case MF_ZONE: + map_zone_change2(m, map[m].prev_zone); break; case MF_NOCOMMAND: map[m].nocommand = 0; break; case MF_NODROP: map[m].flag.nodrop = 0; break; @@ -10943,6 +10943,7 @@ BUILDIN_FUNC(pvpon) if( m < 0 || map[m].flag.pvp ) return 0; // nothing to do + map_zone_change2(m, strdb_get(zone_db, MAP_ZONE_PVP_NAME)); map[m].flag.pvp = 1; clif->map_property_mapall(m, MAPPROPERTY_FREEPVPZONE); @@ -10987,7 +10988,8 @@ BUILDIN_FUNC(pvpoff) m = map_mapname2mapid(str); if(m < 0 || !map[m].flag.pvp) return 0; //fixed Lupus - + + map_zone_change2(m, map[m].prev_zone); map[m].flag.pvp = 0; clif->map_property_mapall(m, MAPPROPERTY_NOTHING); @@ -11006,6 +11008,7 @@ BUILDIN_FUNC(gvgon) str=script_getstr(st,2); m = map_mapname2mapid(str); if(m >= 0 && !map[m].flag.gvg) { + map_zone_change2(m, strdb_get(zone_db, MAP_ZONE_GVG_NAME)); map[m].flag.gvg = 1; clif->map_property_mapall(m, MAPPROPERTY_AGITZONE); } @@ -11020,6 +11023,7 @@ BUILDIN_FUNC(gvgoff) str=script_getstr(st,2); m = map_mapname2mapid(str); if(m >= 0 && map[m].flag.gvg) { + map_zone_change2(m, map[m].prev_zone); map[m].flag.gvg = 0; clif->map_property_mapall(m, MAPPROPERTY_NOTHING); } -- cgit v1.2.3-70-g09d2